[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e4990aee4077e2877b7409236d7192ca85349318
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 e4990aee4077e2877b7409236d7192ca85349318 (commit) via 6e93c5ae186da04a37c93af3d650a8ece4159452 (commit) via b11d6c7f33fc01aa530f22c8c8027ac54c0efd3b (commit) via 867e9a496d9fded30e56dce0f1ab08c58930e767 (commit) via 34455806efd8627837e0a165ddfa3e95f9dd9d24 (commit) via 8267348295c9aa50957020846f25a6d2626a588d (commit) via 317c604648661f1dff68dd0a9b8bf3e081e57d4e (commit) via 5e16fec2ab10e57dc026d5a9b584fe79075e2a89 (commit) via 7d9b1d618e4daceb26aee90ed8efb07bc0119c71 (commit) via 73c3d9b022173f41c1f5f7dea79c561d406146b9 (commit) from be87bcf68a6df87fc47e1017d172e8159711118a (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 e4990aee4077e2877b7409236d7192ca85349318 Merge: 6e93c5a 3445580 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:58:15 2012 +0100
Merge remote-tracking branch 'stevee/subversion'
commit 6e93c5ae186da04a37c93af3d650a8ece4159452 Merge: b11d6c7 7d9b1d6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:57:05 2012 +0100
Merge remote-tracking branch 'stevee/prerequires'
commit b11d6c7f33fc01aa530f22c8c8027ac54c0efd3b Merge: 867e9a4 73c3d9b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:56:44 2012 +0100
Merge remote-tracking branch 'stevee/libevent'
commit 867e9a496d9fded30e56dce0f1ab08c58930e767 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:55:49 2012 +0100
libdb: Properly remove docs.
Docs are installed in a wrong directory and very big. We don't need them at all.
commit 34455806efd8627837e0a165ddfa3e95f9dd9d24 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 10 17:49:32 2012 +0100
subversion: New package.
commit 8267348295c9aa50957020846f25a6d2626a588d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:24:44 2012 +0100
perl-Crypt-PasswdMD5: Fix double BUILDROOT.
commit 317c604648661f1dff68dd0a9b8bf3e081e57d4e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:24:04 2012 +0100
perl-Digest-SHA1: Fix double BUILDROOT.
commit 5e16fec2ab10e57dc026d5a9b584fe79075e2a89 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 10 17:22:59 2012 +0100
perl-WWW-Curl: Fix double BUILDROOT.
commit 7d9b1d618e4daceb26aee90ed8efb07bc0119c71 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 10 14:14:42 2012 +0100
Fix deprecated prerequires of some packages.
* chrony * lldpd * pdns-recursor * squid
commit 73c3d9b022173f41c1f5f7dea79c561d406146b9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 10 13:47:33 2012 +0100
libevent: Update to 2.0.17.
* Fix package URL * Add download URL for source.
Fixes #10054.
-----------------------------------------------------------------------
Summary of changes: chrony/chrony.nm | 7 +- libdb/libdb.nm | 4 +- libevent/libevent.nm | 19 ++-- lldpd/lldpd.nm | 7 +- pdns-recursor/pdns-recursor.nm | 7 +- perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm | 4 +- perl-Digest-SHA1/perl-Digest-SHA1.nm | 4 +- perl-WWW-Curl/perl-WWW-Curl.nm | 4 +- squid/squid.nm | 7 +- .../patches/001-subversion-1.7.0-rpath.patch | 49 ++++++++++ subversion/patches/002-subversion-1.7.0-pie.patch | 57 ++++++++++++ subversion/subversion.nm | 97 ++++++++++++++++++++ 12 files changed, 240 insertions(+), 26 deletions(-) create mode 100644 subversion/patches/001-subversion-1.7.0-rpath.patch create mode 100644 subversion/patches/002-subversion-1.7.0-pie.patch create mode 100644 subversion/subversion.nm
Difference in files: diff --git a/chrony/chrony.nm b/chrony/chrony.nm index 956eead..10daf27 100644 --- a/chrony/chrony.nm +++ b/chrony/chrony.nm @@ -5,7 +5,7 @@
name = chrony version = 1.26 -release = 8 +release = 9
groups = System/Daemons url = http://chrony.tuxfamily.org @@ -80,7 +80,10 @@ packages /etc/chrony.keys end
- prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end
script prein %{create_user} diff --git a/libdb/libdb.nm b/libdb/libdb.nm index ace6d14..9fd6508 100644 --- a/libdb/libdb.nm +++ b/libdb/libdb.nm @@ -8,7 +8,7 @@ version_major = 5 version_minor = 2 version_patch = 36 version = %{version_major}.%{version_minor}.%{version_patch} -release = 1 +release = 2 thisapp = db-%{version}
soversion = %{version_major}.%{version_minor} @@ -68,7 +68,7 @@ build done
# Remove documentation which is very big. - rm -rf %{BUILDROOT}%{datadir}/docs + rm -rf %{BUILDROOT}%{prefix}/docs
# Remove unversioned libs. rm -vf %{BUILDROOT}%{libdir}/libdb*-%{version_major}.so diff --git a/libevent/libevent.nm b/libevent/libevent.nm index 4add6aa..a6abbd3 100644 --- a/libevent/libevent.nm +++ b/libevent/libevent.nm @@ -4,25 +4,25 @@ ###############################################################################
name = libevent -version = 2.0.10 +version = 2.0.17 release = 1
groups = Development/Tools -url = http://sourceforge.net/projects/levent/files/libevent/libevent-2.0 +url = http://libevent.org license = BSD summary = Abstract asynchronous event notification library.
description - The libevent API provides a mechanism to execute a callback \ - function when a specific event occurs on a file descriptor or \ - after a timeout has been reached. libevent is meant to replace \ - the asynchronous event loop found in event driven network \ - servers. An application just needs to call event_dispatch() and \ - can then add or remove events dynamically without having to \ + The libevent API provides a mechanism to execute a callback + function when a specific event occurs on a file descriptor or + after a timeout has been reached. libevent is meant to replace + the asynchronous event loop found in event driven network + servers. An application just needs to call event_dispatch() and + can then add or remove events dynamically without having to change the event loop. end
-source_dl = +source_dl = http://sourceforge.net/projects/levent/files/%%7Bname%7D/libevent-2.0/ sources = %{thisapp}-stable.tar.gz
build @@ -34,7 +34,6 @@ end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm index 7cce877..0c6bec8 100644 --- a/lldpd/lldpd.nm +++ b/lldpd/lldpd.nm @@ -5,7 +5,7 @@
name = lldpd version = 0.5.4 -release = 1 +release = 2
groups = Networking/Tools url = https://trac.luffy.cx/lldpd/ @@ -51,7 +51,10 @@ end
packages package %{name} - prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end
script prein %{create_user} diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm index dc91a5c..a044e99 100644 --- a/pdns-recursor/pdns-recursor.nm +++ b/pdns-recursor/pdns-recursor.nm @@ -5,7 +5,7 @@
name = pdns-recursor version = 3.3 -release = 6 +release = 7
groups = Networking/DNS url = http://powerdns.com/ @@ -72,7 +72,10 @@ packages /etc/%{name}/recursor.conf end
- prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end
script prein %{create_user} diff --git a/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm b/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm index 8eb1500..9e5a596 100644 --- a/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm +++ b/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm @@ -5,7 +5,7 @@
name = perl-Crypt-PasswdMD5 version = 1.3 -release = 1 +release = 2 arch = noarch thisapp = Crypt-PasswdMD5-%{version}
@@ -30,7 +30,7 @@ build make %{PARALLELISMFLAGS} end
- make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + make_install_targets = pure_install end
packages diff --git a/perl-Digest-SHA1/perl-Digest-SHA1.nm b/perl-Digest-SHA1/perl-Digest-SHA1.nm index 96ad90b..cd7a722 100644 --- a/perl-Digest-SHA1/perl-Digest-SHA1.nm +++ b/perl-Digest-SHA1/perl-Digest-SHA1.nm @@ -5,7 +5,7 @@
name = perl-Digest-SHA1 version = 2.13 -release = 1 +release = 2 thisapp = Digest-SHA1-%{version}
groups = Development/Libraries @@ -39,7 +39,7 @@ build make %{PARALLELISMFLAGS} end
- make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + make_install_targets = pure_install end
packages diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm index 9b1cf1a..8a20f72 100644 --- a/perl-WWW-Curl/perl-WWW-Curl.nm +++ b/perl-WWW-Curl/perl-WWW-Curl.nm @@ -5,7 +5,7 @@
name = perl-WWW-Curl version = 4.15 -release = 1 +release = 2 thisapp = WWW-Curl-%{version}
groups = Development/Libraries @@ -31,7 +31,7 @@ build make %{PARALLELISMFLAGS} end
- make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + make_install_targets = pure_install end
packages diff --git a/squid/squid.nm b/squid/squid.nm index f41eb27..e2d74d5 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -6,7 +6,7 @@ name = squid major_ver = 3.1 version = %{major_ver}.16 -release = 4 +release = 5
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -118,7 +118,10 @@ end
packages package %{name} - prerequires = shadow-utils systemd-units + prerequires + shadow-utils + systemd-units + end
configfiles /etc/squid.conf diff --git a/subversion/patches/001-subversion-1.7.0-rpath.patch b/subversion/patches/001-subversion-1.7.0-rpath.patch new file mode 100644 index 0000000..2481346 --- /dev/null +++ b/subversion/patches/001-subversion-1.7.0-rpath.patch @@ -0,0 +1,49 @@ +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 new file mode 100644 index 0000000..85e9f07 --- /dev/null +++ b/subversion/patches/002-subversion-1.7.0-pie.patch @@ -0,0 +1,57 @@ +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 new file mode 100644 index 0000000..98a1ad3 --- /dev/null +++ b/subversion/subversion.nm @@ -0,0 +1,97 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = subversion +version = 1.7.2 +release = 1 + +groups = Development/Tools +url = http://subversion.apache.org/ +license = ASL 2.0 +summary = A Modern Concurrent Version Control System. + +description + Subversion is a concurrent version control system which enables one + or more users to collaborate in developing and maintaining a + hierarchy of files and directories while keeping a history of all + changes. Subversion only stores the differences between versions, + instead of every complete file. Subversion is intended to be a + compelling replacement for CVS. +end + +source_dl = http://www.apache.org/dist/subversion/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(ExtUtils::Embed) + perl-Carp + autoconf + apr-util-devel + automake + db4-devel + expat-devel + libapr-devel + perl-devel + sqlite-devel + swig + zlib-devel + end + + configure_options += \ + --sbindir=/sbin \ + --disable-mod-activation \ + --disable-static \ + --with-berkeley-db + + prepare_cmds + ./autogen.sh --release + + # Fix shebang lines. + perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in + end + + install_cmds + # Build / Install perl bindings. + make swig-pl-lib %{PARALELLISMFLAGS} + make install-swig-pl-lib DESTDIR=%{BUILDROOT} + + cd subversion/bindings/swig/perl/native + + # Doesn't allow OPTIMIZE="%{CFLAGS}". + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALELLISMFLAGS} + make pure_install PERL_INSTALL_ROOT=%{BUILDROOT} + end +end + +packages + package %{name} + + package perl-%{name} + summary = Perl bindings to the Subversion libraries. + description + This package includes the Perl bindings to + the Subversion libraries. + end + + files + /usr/lib/libsvn_swig_perl-1.so.* + /usr/lib/perl*/ + end + end + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org