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 f28f3f056c879081c2043e76e5ac9ff314c68fda (commit) via a167c52ef4fdc09075aa8d49bb6d9cd4f4e5be83 (commit) via 39b5c95819e295f29fa48feb48ab43da6aa36199 (commit) via 92ab017887663220cec6c47e009adfab975a0acc (commit) via 522503e1de5acfa51de5e9c2674fe57bcec4a500 (commit) via b59e9d0eb9adfda9f43cef779e9d8fe34dbc2a4d (commit) via 80ed332f6a44ef110268fef939321333270cf03d (commit) via d1ae0dc8e7183fb13ea5560f3107c37c29a2e4cf (commit) from e4aab17fd28389e1bbfd850c2a2d5417a31120a4 (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 f28f3f056c879081c2043e76e5ac9ff314c68fda Merge: a167c52ef4fdc09075aa8d49bb6d9cd4f4e5be83 e4aab17fd28389e1bbfd850c2a2d5417a31120a4 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 22:52:37 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into clean
Conflicts: pkgs/core/tar/tar.nm
commit a167c52ef4fdc09075aa8d49bb6d9cd4f4e5be83 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 22:49:46 2010 +0100
tar: Clean up naoki-makefile.
commit 39b5c95819e295f29fa48feb48ab43da6aa36199 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 22:43:14 2010 +0100
tar: Fix testsuite.
This fixes issue #590.
commit 92ab017887663220cec6c47e009adfab975a0acc Merge: 522503e1de5acfa51de5e9c2674fe57bcec4a500 89ba8f2f60194ad004b1a0570e858db5245fb04a Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 22:46:38 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into clean
commit 522503e1de5acfa51de5e9c2674fe57bcec4a500 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 17:42:33 2010 +0100
cyrus-sasl: Clean up naoki-makefile.
commit b59e9d0eb9adfda9f43cef779e9d8fe34dbc2a4d Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 17:41:13 2010 +0100
curl: Clean up naoki-makefile.
commit 80ed332f6a44ef110268fef939321333270cf03d Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 17:39:20 2010 +0100
cracklib: Clean up naoki-makefile.
commit d1ae0dc8e7183fb13ea5560f3107c37c29a2e4cf Author: Schantl Stefan Stevee@ipfire.org Date: Fri Mar 19 17:37:34 2010 +0100
cpio: Clean up naoki-makefile.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/cpio/cpio.nm | 18 ++++-------------- pkgs/core/cracklib/cracklib.nm | 22 +++++----------------- pkgs/core/curl/curl.nm | 10 ---------- pkgs/core/cyrus-sasl/cyrus-sasl.nm | 12 ++++-------- pkgs/core/tar/tar.nm | 17 ++++------------- 5 files changed, 17 insertions(+), 62 deletions(-)
Difference in files: diff --git a/pkgs/core/cpio/cpio.nm b/pkgs/core/cpio/cpio.nm index 7ecbe7e..9fe8cb6 100644 --- a/pkgs/core/cpio/cpio.nm +++ b/pkgs/core/cpio/cpio.nm @@ -46,25 +46,15 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-############################################################################### -# Installation Details -############################################################################### +CONFIGURE_OPTIONS += \ + --bindir=/bin \ + --libexecdir=/tmp \ + --with-rmt=/usr/sbin/rmt
define STAGE_PREPARE_CMDS cd $(DIR_APP) && autoreconf --force endef
-define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --bindir=/bin \ - --libexecdir=/tmp \ - --with-rmt=/usr/sbin/rmt - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - define STAGE_TEST cd $(DIR_APP) && make check endef diff --git a/pkgs/core/cracklib/cracklib.nm b/pkgs/core/cracklib/cracklib.nm index 940c94b..2cd7ad5 100644 --- a/pkgs/core/cracklib/cracklib.nm +++ b/pkgs/core/cracklib/cracklib.nm @@ -49,24 +49,12 @@ endef PKG_TARBALL = $(THISAPP).tar.gz PKG_OBJECTS += cracklib-words-20080507.gz
-############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --with-default-dict=/lib/cracklib/pw_dict \ - --with-python \ - --disable-static - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) +CONFIGURE_OPTIONS += \ + --with-default-dict=/lib/cracklib/pw_dict \ + --with-python \ + --disable-static
+define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib mv -v $(BUILDROOT)/usr/lib/libcrack.so.2* $(BUILDROOT)/lib ln -vsf ../../lib/libcrack.so.2.8.0 $(BUILDROOT)/usr/lib/libcrack.so diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm index 7b8a9a6..0f343b3 100644 --- a/pkgs/core/curl/curl.nm +++ b/pkgs/core/curl/curl.nm @@ -47,9 +47,6 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-############################################################################### -# Installation Details -############################################################################### CONFIGURE_OPTIONS += \ --disable-static \ --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \ @@ -59,13 +56,6 @@ CONFIGURE_OPTIONS += \ --enable-ldaps \ --enable-ipv6
-#define STAGE_PREPARE_CMDS -# # Remove bogus rpath -# cd $(DIR_APP) && sed -i \ -# -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -# -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -#endef - # Doesn't work #define STAGE_TEST # cd $(DIR_APP) && make check diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/core/cyrus-sasl/cyrus-sasl.nm index 7a950de..2d40a12 100644 --- a/pkgs/core/cyrus-sasl/cyrus-sasl.nm +++ b/pkgs/core/cyrus-sasl/cyrus-sasl.nm @@ -44,19 +44,15 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-CONFIGURE_OPTIONS += --sysconfdir=/etc \ +CONFIGURE_OPTIONS += \ + --sysconfdir=/etc \ --with-dbpath=/var/lib/sasl/sasldb2 \ --with-saslauthd=/var/run/saslauthd \ --mandir=/usr/share/man
-PARALLELISMFLAGS = -############################################################################### -# Installation Details -############################################################################### - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) +PARALLELISMFLAGS = # Disabled
+define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/usr/lib/sasl2 cp -vf $(DIR_SOURCE)/smtpd.conf $(BUILDROOT)/usr/lib/sasl2/
diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm index 6345c74..cc1ffbb 100644 --- a/pkgs/core/tar/tar.nm +++ b/pkgs/core/tar/tar.nm @@ -49,20 +49,11 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-############################################################################### -# Installation Details -############################################################################### +CONFIGURE_ENVIRONMENT = CC="gcc -std=gnu99 -fgnu89-inline"
-define STAGE_BUILD - cd $(DIR_APP) && \ - CC="gcc -std=gnu99 -fgnu89-inline" \ - ./configure \ - --prefix=/usr \ - --bindir=/bin \ - --libexecdir=/usr/sbin - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --bindir=/bin \ + --libexecdir=/usr/sbin
define STAGE_TEST cd $(DIR_APP) && sed -i '35 i AT_UNPRIVILEGED_PREREQ' tests/remfiles01.at
hooks/post-receive -- IPFire 3.x development tree