This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 83a5eb26574a09dc234e4df2ffcde3a28ce9284a (commit) via 09c3106fb13fde1c815c9513fd89b402e344c05b (commit) via 25c9ad1d0ab612d9d23182ec6021d4dc482c4481 (commit) via 61236b2f1e59951641b02d7b41fc44ead5a9c5ae (commit) via e4c8a47ac6a9c5e3d4b7cbd8d25584b476d8cf75 (commit) via d4430d70fc0a9a1aec3b0f684384a87634a395c1 (commit) via baa1830edeba8cde6d29184368ce3b773c7072f7 (commit) from faff1ffe8c05edffc1090dd52a5d7fc583fd2c25 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 83a5eb26574a09dc234e4df2ffcde3a28ce9284a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 13:03:51 2016 +0100

network: Pull in quagga routing daemon

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 09c3106fb13fde1c815c9513fd89b402e344c05b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 13:01:02 2016 +0100

bird: Drop package

Lacking some features and we will change to quagga

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 25c9ad1d0ab612d9d23182ec6021d4dc482c4481 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 13:00:14 2016 +0100

bird: Update to 1.6.0

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 61236b2f1e59951641b02d7b41fc44ead5a9c5ae Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 11:34:30 2016 +0100

quagga: Re-add package

We need quagga because bird is lacking the VRF feature

This reverts commit 28f3bd19767fdbf6a48563cd9bb71ad251243738.

commit e4c8a47ac6a9c5e3d4b7cbd8d25584b476d8cf75 Author: Alexander Marx alexander.marx@ipfire.org Date: Sat Sep 3 15:37:11 2016 +0000

Subversion: Update to 1.9.4

Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit d4430d70fc0a9a1aec3b0f684384a87634a395c1 Author: Alexander Marx alexander.marx@ipfire.org Date: Sat Sep 3 15:43:20 2016 +0000

sudo: Update to 1.8.17p1

Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit baa1830edeba8cde6d29184368ce3b773c7072f7 Author: Alexander Marx alexander.marx@ipfire.org Date: Sat Sep 3 15:53:06 2016 +0000

Suricata: Update to 3.1.1

Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: bird/bird.nm | 88 -------------------- bird/systemd/bird.service | 13 --- bird/systemd/bird6.service | 13 --- network/network.nm | 6 +- quagga/quagga.nm | 94 ++++++++++++++++++++++ quagga/quagga.tmpfiles | 1 + quagga/systemd/bgpd.service | 12 +++ quagga/systemd/ospf6d.service | 12 +++ quagga/systemd/ospfd.service | 12 +++ quagga/systemd/zebra.service | 12 +++ .../patches/0001-subversion-1.9.0-rpath.patch | 41 ++++++++++ subversion/patches/0002-subversion-1.9.0-pie.patch | 89 ++++++++++++++++++++ .../patches/0003-subversion-1.8.5-swigplWall.patch | 16 ++++ .../patches/001-subversion-1.7.0-rpath.patch | 49 ----------- subversion/patches/002-subversion-1.7.0-pie.patch | 57 ------------- subversion/subversion.nm | 15 ++-- sudo/sudo.nm | 2 +- suricata/suricata.nm | 2 +- 18 files changed, 306 insertions(+), 228 deletions(-) delete mode 100644 bird/bird.nm delete mode 100644 bird/systemd/bird.service delete mode 100644 bird/systemd/bird6.service create mode 100644 quagga/quagga.nm create mode 100644 quagga/quagga.tmpfiles create mode 100644 quagga/systemd/bgpd.service create mode 100644 quagga/systemd/ospf6d.service create mode 100644 quagga/systemd/ospfd.service create mode 100644 quagga/systemd/zebra.service create mode 100644 subversion/patches/0001-subversion-1.9.0-rpath.patch create mode 100644 subversion/patches/0002-subversion-1.9.0-pie.patch create mode 100644 subversion/patches/0003-subversion-1.8.5-swigplWall.patch delete mode 100644 subversion/patches/001-subversion-1.7.0-rpath.patch delete mode 100644 subversion/patches/002-subversion-1.7.0-pie.patch

Difference in files: diff --git a/bird/bird.nm b/bird/bird.nm deleted file mode 100644 index 5891fc0..0000000 --- a/bird/bird.nm +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = bird -version = 1.5.0 -release = 1 - -groups = Networking/Routing -url = http://bird.network.cz/ -license = GPLv2+ -summary = BIRD Internet Routing Daemon. - -description - BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing - protocols BGP, RIP and OSPF. -end - -source_dl = ftp://bird.network.cz/pub/bird/ - -build - requires - bison - flex - ncurses-devel - readline-devel - end - - configure_options += \ - --sysconfdir=/etc \ - --localstatedir=/var - - prepare_cmds - mkdir -pv %{DIR_APP}/ipv6 - tar c --exclude ipv6 . | tar x -C ipv6 - end - - build - ./configure %{configure_options} - make %{PARALLELISMFLAGS} - - cd ipv6 - ./configure %{configure_options} --enable-ipv6 - make %{PARALLELISMFLAGS} - end - - install - make install DESTDIR=%{BUILDROOT} - - cd ipv6 - make install DESTDIR=%{BUILDROOT} - - rm -rfv %{BUILDROOT}/var - end -end - -packages - package %{name} - prerequires = systemd-units - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - /bin/systemctl --no-reload disable bird.service > /dev/null 2>&1 || : - /bin/systemctl stop bird.service > /dev/null 2>&1 || : - - /bin/systemctl --no-reload disable bird6.service > /dev/null 2>&1 || : - /bin/systemctl stop bird6.service > /dev/null 2>&1 || : - end - - script postun - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - /bin/systemctl daemon-reload 2>&1 || : - /bin/systemctl reload-or-try-restart bird.service >/dev/null 2>&1 || : - /bin/systemctl reload-or-try-restart bird6.service >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/bird/systemd/bird.service b/bird/systemd/bird.service deleted file mode 100644 index 438d6af..0000000 --- a/bird/systemd/bird.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=BIRD Internet Routing Daemon -Requires=network.target -After=network.target -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/bird -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/bird/systemd/bird6.service b/bird/systemd/bird6.service deleted file mode 100644 index 0d8e9b5..0000000 --- a/bird/systemd/bird6.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=BIRD Internet Routing Daemon -Requires=network.target -After=network.target -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/bird6 -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/network/network.nm b/network/network.nm index c4e6f2c..10418dc 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 008 -release = 1 +release = 2

maintainer = Michael Tremer michael.tremer@ipfire.org groups = Base Networking/Tools @@ -70,6 +70,10 @@ packages /usr/bin/logger end

+ recommends + quagga + end + configfiles /etc/network end diff --git a/quagga/quagga.nm b/quagga/quagga.nm new file mode 100644 index 0000000..33b2530 --- /dev/null +++ b/quagga/quagga.nm @@ -0,0 +1,94 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = quagga +version = 1.0.20160315 +release = 1 + +groups = Networking/Routing +url = http://www.quagga.net/ +license = GPLv2+ +summary = Quagga is a rounting daemon. + +description + Quagga is a free software that manages TCP/IP based routing + protocol. It takes multi-server and multi-thread approach to resolve + the current complexity of the Internet. + + Quagga supports BGP4, BGP4+, OSPFv2 and OSPFv3. +end + +source_dl = http://download.savannah.gnu.org/releases/quagga/ +sources = %{thisapp}.tar.xz + +build + requires + ncurses-devel + net-snmp-devel + readline-devel + systemd-units + end + + configure_options += \ + --sysconfdir=/etc/quagga \ + --disable-static \ + --disable-watchquagga \ + --enable-multipath=64 \ + --disable-isisd \ + --disable-pimd \ + --disable-ripd \ + --disable-ripngd +end + +create_user + getent group quagga >/dev/null || /usr/sbin/groupadd -r quagga + getent passwd quagga >/dev/null || /usr/sbin/useradd -r -g quagga \ + -d %{sysconfdir}/%{name} -s /sbin/nologin quagga +end + +packages + package %{name} + services = bgpd ospf6d ospfd zebra + + script prein + %{create_user} + end + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + for i in %{services}; do + systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : + systemctl stop ${i}.service >/dev/null 2>&1 || : + done + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + + for i in %{services}; do + systemctl try-restart ${i}.service >/dev/null 2>&1 || : + done + end + end + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/quagga/quagga.tmpfiles b/quagga/quagga.tmpfiles new file mode 100644 index 0000000..8974b64 --- /dev/null +++ b/quagga/quagga.tmpfiles @@ -0,0 +1 @@ +d /var/run/quagga 0755 quagga quagga diff --git a/quagga/systemd/bgpd.service b/quagga/systemd/bgpd.service new file mode 100644 index 0000000..2874432 --- /dev/null +++ b/quagga/systemd/bgpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=BGP routing daemon +BindTo=zebra.service +After=syslog.target network.target zebra.service + +[Service] +Type=forking +ExecStart=/usr/sbin/bgpd -d -f /etc/quagga/bgpd.conf +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/quagga/systemd/ospf6d.service b/quagga/systemd/ospf6d.service new file mode 100644 index 0000000..93b9dfa --- /dev/null +++ b/quagga/systemd/ospf6d.service @@ -0,0 +1,12 @@ +[Unit] +Description=OSPF routing daemon for IPv6 +BindTo=zebra.service +After=syslog.target network.target zebra.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ospf6d -d -f /etc/quagga/ospf6d.conf +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/quagga/systemd/ospfd.service b/quagga/systemd/ospfd.service new file mode 100644 index 0000000..e276649 --- /dev/null +++ b/quagga/systemd/ospfd.service @@ -0,0 +1,12 @@ +[Unit] +Description=OSPF routing daemon +BindTo=zebra.service +After=syslog.target network.target zebra.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ospfd -d -f /etc/quagga/ospfd.conf +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/quagga/systemd/zebra.service b/quagga/systemd/zebra.service new file mode 100644 index 0000000..977c2dc --- /dev/null +++ b/quagga/systemd/zebra.service @@ -0,0 +1,12 @@ +[Unit] +Description=GNU Zebra routing manager +After=syslog.target network.target + +[Service] +Type=forking +ExecStartPre=/sbin/ip route flush proto zebra +ExecStart=/usr/sbin/zebra -d -f /etc/quagga/zebra.conf +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/subversion/patches/0001-subversion-1.9.0-rpath.patch b/subversion/patches/0001-subversion-1.9.0-rpath.patch new file mode 100644 index 0000000..1531006 --- /dev/null +++ b/subversion/patches/0001-subversion-1.9.0-rpath.patch @@ -0,0 +1,41 @@ + +Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables. + +--- subversion-1.9.0/build.conf.rpath ++++ subversion-1.9.0/build.conf +@@ -561,7 +561,7 @@ lang = python + path = subversion/bindings/swig/python/libsvn_swig_py + libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr + apriconv apr python swig +-link-cmd = $(LINK) ++link-cmd = $(LINK_LIB) + install = swig-py-lib + # need special build rule to include -DSWIGPYTHON + compile-cmd = $(COMPILE_SWIG_PY) +@@ -586,7 +586,7 @@ type = swig_lib + lang = ruby + path = subversion/bindings/swig/ruby/libsvn_swig_ruby + libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig +-link-cmd = $(LINK) $(SWIG_RB_LIBS) ++link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) + install = swig-rb-lib + # need special build rule to include + compile-cmd = $(COMPILE_SWIG_RB) +diff -uap subversion-1.9.0/Makefile.in.rpath subversion-1.9.0/Makefile.in +--- subversion-1.9.0/Makefile.in.rpath ++++ subversion-1.9.0/Makefile.in +@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $( + COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c + COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c + +-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) +-LINK_LIB = $(LINK) $(LT_SO_VERSION) +-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) +-LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) ++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) ++LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) ++LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) ++LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir) + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) diff --git a/subversion/patches/0002-subversion-1.9.0-pie.patch b/subversion/patches/0002-subversion-1.9.0-pie.patch new file mode 100644 index 0000000..437e1b7 --- /dev/null +++ b/subversion/patches/0002-subversion-1.9.0-pie.patch @@ -0,0 +1,89 @@ + +Link executables using -pie, link test executables using -no-install. + +diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf +diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf +diff -uap subversion-1.9.0/build.conf.pie subversion-1.9.0/build.conf +--- subversion-1.9.0/build.conf.pie ++++ subversion-1.9.0/build.conf +@@ -743,7 +743,7 @@ libs = libsvncxxhl libgmock libsvn_subr + sources = tests/*.cpp + install = tests + compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX) +-link-cmd = $(LINK_CXX) ++link-cmd = $(LINK_TEST_CXX) + + + # ---------------------------------------------------------------------------- +@@ -760,7 +760,7 @@ sources = gmock-gtest-all.cc + install = tests + msvc-static = yes + compile-cmd = $(COMPILE_GMOCK_CXX) +-link-cmd = $(LINK_CXX_LIB) ++link-cmd = $(LINK_TEST_CXX_LIB) + + # ---------------------------------------------------------------------------- + # +@@ -775,6 +775,7 @@ install = test + libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr + msvc-static = yes + undefined-lib-symbols = yes ++link-cmd = $(LINK_TEST_LIB) + + # ---------------------------------------------------------------------------- + # Tests for libsvn_fs_base +diff -uap subversion-1.9.0/build/generator/gen_base.py.pie subversion-1.9.0/build/generator/gen_base.py +--- subversion-1.9.0/build/generator/gen_base.py.pie ++++ subversion-1.9.0/build/generator/gen_base.py +@@ -585,7 +585,7 @@ class TargetLinked(Target): + self.install = options.get('install') + self.compile_cmd = options.get('compile-cmd') + self.sources = options.get('sources', '*.c *.cpp') +- self.link_cmd = options.get('link-cmd', '$(LINK)') ++ self.link_cmd = options.get('link-cmd', '$(LINK_LIB)') + + self.external_lib = options.get('external-lib') + self.external_project = options.get('external-project') +@@ -644,6 +644,14 @@ class TargetExe(TargetLinked): + + self.msvc_force_static = options.get('msvc-force-static') == 'yes' + ++ if self.install in ['test', 'bdb-test', 'sub-test', ]: ++ self.link_cmd = '$(LINK_TEST)' ++ elif self.link_cmd == '$(LINK_LIB)': ++ # Over-ride the default for TargetLinked. ++ self.link_cmd = '$(LINK_EXE)' ++ elif self.link_cmd not in ['$(LINK_TEST_CXX)', ]: ++ raise GenError('ERROR: Unknown executable link type for ' + self.name + ': ' + self.link_cmd) ++ + def add_dependencies(self): + TargetLinked.add_dependencies(self) + +diff -uap subversion-1.9.0/Makefile.in.pie subversion-1.9.0/Makefile.in +--- subversion-1.9.0/Makefile.in.pie ++++ subversion-1.9.0/Makefile.in +@@ -259,6 +259,11 @@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link + LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) + LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) + LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir) ++LINK_TEST = $(LINK) -no-install ++LINK_TEST_LIB = $(LINK) -avoid-version ++LINK_TEST_CXX_LIB = $(LINK_CXX) -avoid-version ++LINK_EXE = $(LINK) -pie ++LINK_CXX_EXE = $(LINK) -pie + + # special link rule for mod_dav_svn + LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) +@@ -753,10 +758,10 @@ schema-clean: + $(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@ + + .c.o: +- $(COMPILE) -o $@ -c $< ++ $(COMPILE) -fPIE -o $@ -c $< + + .cpp.o: +- $(COMPILE_CXX) -o $@ -c $< ++ $(COMPILE_CXX) -fPIE -o $@ -c $< + + .c.lo: + $(LT_COMPILE) -o $@ -c $< diff --git a/subversion/patches/0003-subversion-1.8.5-swigplWall.patch b/subversion/patches/0003-subversion-1.8.5-swigplWall.patch new file mode 100644 index 0000000..af66806 --- /dev/null +++ b/subversion/patches/0003-subversion-1.8.5-swigplWall.patch @@ -0,0 +1,16 @@ + +Don't drop -Wall in the swig Perl bindings, otherwise building with +e.g. -Wformat-security might break. + +https://bugzilla.redhat.com/show_bug.cgi?id=1037341 + +--- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall ++++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in +@@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1 + # SWIG is using C++ style comments in an extern "C" code. + $cflags =~ s/-ansi\s+//g; + $cflags =~ s/-std=c89\s+//g; +-$cflags =~ s/-Wall//g; + $cflags =~ s/-Wunused//g; + $cflags =~ s/-Wshadow//g; + $cflags =~ s/-Wstrict-prototypes//g; diff --git a/subversion/patches/001-subversion-1.7.0-rpath.patch b/subversion/patches/001-subversion-1.7.0-rpath.patch deleted file mode 100644 index 2481346..0000000 --- a/subversion/patches/001-subversion-1.7.0-rpath.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf ---- subversion-1.7.0/build.conf.rpath 2011-08-04 21:18:50.000000000 +0100 -+++ subversion-1.7.0/build.conf 2011-10-12 09:23:43.844525530 +0100 -@@ -478,7 +478,7 @@ type = swig_lib - lang = python - path = subversion/bindings/swig/python/libsvn_swig_py - libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr --link-cmd = $(LINK) -+link-cmd = $(LINK_LIB) - install = swig-py-lib - # need special build rule to include -DSWIGPYTHON - compile-cmd = $(COMPILE_SWIG_PY) -@@ -501,7 +501,7 @@ type = swig_lib - lang = ruby - path = subversion/bindings/swig/ruby/libsvn_swig_ruby - libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr --link-cmd = $(LINK) $(SWIG_RB_LIBS) -+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) - install = swig-rb-lib - # need special build rule to include - compile-cmd = $(COMPILE_SWIG_RB) -diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/build/generator/gen_base.py ---- subversion-1.7.0/build/generator/gen_base.py.rpath 2011-06-22 17:44:54.000000000 +0100 -+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:23:15.368649375 +0100 -@@ -506,6 +506,10 @@ class TargetLib(TargetLinked): - self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target - self.msvc_export = options.get('msvc-export', '').split() - -+ ### hmm. this is Makefile-specific -+ if self.link_cmd == '$(LINK)': -+ self.link_cmd = '$(LINK_LIB)' -+ - class TargetApacheMod(TargetLib): - - def __init__(self, name, options, gen_obj): -diff -uap subversion-1.7.0/Makefile.in.rpath subversion-1.7.0/Makefile.in ---- subversion-1.7.0/Makefile.in.rpath 2011-07-16 12:50:53.000000000 +0100 -+++ subversion-1.7.0/Makefile.in 2011-10-12 09:24:36.165524732 +0100 -@@ -203,8 +203,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF - COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) - COMPILE_JAVAHL_JAVAH = $(JAVAH) - --LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) --LINK_LIB = $(LINK) $(LT_SO_VERSION) -+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -+LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) - LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) - LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) - diff --git a/subversion/patches/002-subversion-1.7.0-pie.patch b/subversion/patches/002-subversion-1.7.0-pie.patch deleted file mode 100644 index 85e9f07..0000000 --- a/subversion/patches/002-subversion-1.7.0-pie.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -uap subversion-1.7.0/build/generator/gen_base.py.pie subversion-1.7.0/build/generator/gen_base.py ---- subversion-1.7.0/build/generator/gen_base.py.pie 2011-10-12 09:25:30.510524103 +0100 -+++ subversion-1.7.0/build/generator/gen_base.py 2011-10-12 09:25:30.515650110 +0100 -@@ -406,7 +406,7 @@ class TargetLinked(Target): - self.install = options.get('install') - self.compile_cmd = options.get('compile-cmd') - self.sources = options.get('sources', '*.c *.cpp') -- self.link_cmd = options.get('link-cmd', '$(LINK)') -+ self.link_cmd = options.get('link-cmd', '$(LINK_LIB)') - - self.external_lib = options.get('external-lib') - self.external_project = options.get('external-project') -@@ -462,6 +462,11 @@ class TargetExe(TargetLinked): - self.manpages = options.get('manpages', '') - self.testing = options.get('testing') - -+ if self.install == 'test' or self.install == 'bdb-test': -+ self.link_cmd = '$(LINK_TEST)' -+ else: -+ self.link_cmd = '$(LINK_EXE)' -+ - def add_dependencies(self): - TargetLinked.add_dependencies(self) - -@@ -507,8 +512,8 @@ class TargetLib(TargetLinked): - self.msvc_export = options.get('msvc-export', '').split() - - ### hmm. this is Makefile-specific -- if self.link_cmd == '$(LINK)': -- self.link_cmd = '$(LINK_LIB)' -+ if self.install == 'test': -+ self.link_cmd = '$(LINK_TEST_LIB)' - - class TargetApacheMod(TargetLib): - -diff -uap subversion-1.7.0/Makefile.in.pie subversion-1.7.0/Makefile.in ---- subversion-1.7.0/Makefile.in.pie 2011-10-12 09:25:30.511600030 +0100 -+++ subversion-1.7.0/Makefile.in 2011-10-12 09:26:16.757524426 +0100 -@@ -205,6 +205,9 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH) - - LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) - LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) -+LINK_TEST = $(LINK) -no-install -+LINK_TEST_LIB = $(LINK) -avoid-version -+LINK_EXE = $(LINK) -pie - LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) - LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) - -@@ -657,7 +660,7 @@ schema-clean: - $(PYTHON) $(top_srcdir)/build/transform_sql.py $< $(top_srcdir)/$@ - - .c.o: -- $(COMPILE) -o $@ -c $< -+ $(COMPILE) -fpie -o $@ -c $< - - .cpp.o: - $(COMPILE_CXX) -o $@ -c $< diff --git a/subversion/subversion.nm b/subversion/subversion.nm index 54ab6a7..db42224 100644 --- a/subversion/subversion.nm +++ b/subversion/subversion.nm @@ -4,7 +4,7 @@ ###############################################################################

name = subversion -version = 1.8.13 +version = 1.9.4 release = 1

groups = Development/Tools @@ -41,13 +41,14 @@ build end

configure_options += \ - --sbindir=/sbin \ + CPPFLAGS="-P" \ --disable-mod-activation \ - --disable-static \ - --with-berkeley-db + --disable-static

prepare_cmds - ./autogen.sh --release + # Regenerate build system. + sed -i "/seems to be moved/s/^/#/" build/ltmain.sh && + ./autogen.sh

# Fix shebang lines. perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in @@ -77,6 +78,10 @@ packages the Subversion libraries. end

+ requires + perl(:MODULE_COMPAT_%{perl_version}) + end + files /usr/lib/libsvn_swig_perl-1.so.* /usr/lib/perl*/ diff --git a/sudo/sudo.nm b/sudo/sudo.nm index cef02e5..5087c1e 100644 --- a/sudo/sudo.nm +++ b/sudo/sudo.nm @@ -4,7 +4,7 @@ ###############################################################################

name = sudo -version = 1.8.10 +version = 1.8.17p1 release = 1

groups = Applications/System diff --git a/suricata/suricata.nm b/suricata/suricata.nm index 1394166..035f9df 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -4,7 +4,7 @@ ###############################################################################

name = suricata -version = 2.0 +version = 3.1 release = 1

groups = Networking/IDS

hooks/post-receive -- IPFire 3.x development tree