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 ebecf4942916d7043ba680d91ee7d8abbc4a8664 (commit) via ad3d164f7f87e5cecbdd8993df64618a27e3cf47 (commit) via 37f8526caa7151095c3024e34d95a991831a7816 (commit) via 77b784fba9c3cdee6df1aa2354a08277c6a5e022 (commit) via 5f009f41ed69145232e475c44ffe54fadc0b4c78 (commit) via 560853bf81451d5ea5e62d9581b2b4c887cfda8d (commit) via a9986c2480fea530165c6682b2874fbccb85461c (commit) via 48a7da788c7cacc3c2eac46386cde6c9f00c7d30 (commit) via 96e09198fc51c8a5a73c564f2a8fc637a412eede (commit) via fc22686ffb4cb8a8daacf6f3c703ecd828afcdb6 (commit) from f21b66c3e5098d210c4844c9253a44b86c5ea449 (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 ebecf4942916d7043ba680d91ee7d8abbc4a8664 Merge: 37f8526caa7151095c3024e34d95a991831a7816 ad3d164f7f87e5cecbdd8993df64618a27e3cf47 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 13:08:25 2010 +0200
Merge commit 'ms/master'
commit ad3d164f7f87e5cecbdd8993df64618a27e3cf47 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 13:07:49 2010 +0200
pam_ldap: Add --sysconfdir option to configure command.
commit 37f8526caa7151095c3024e34d95a991831a7816 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 13:06:03 2010 +0200
naoki: Change download behaviour.
Naoki checks the sha1 checksum if provided and it only creates the target file if the file is completely downloaded and hash the correct hashsum.
commit 77b784fba9c3cdee6df1aa2354a08277c6a5e022 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 11:04:12 2010 +0200
nss_ldap: Fixed up package which was completely broken.
commit 5f009f41ed69145232e475c44ffe54fadc0b4c78 Merge: 560853bf81451d5ea5e62d9581b2b4c887cfda8d a9986c2480fea530165c6682b2874fbccb85461c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 08:58:27 2010 +0200
Merge remote branch 'stevee/e2fsprogs' into next
commit 560853bf81451d5ea5e62d9581b2b4c887cfda8d Merge: fc22686ffb4cb8a8daacf6f3c703ecd828afcdb6 f21b66c3e5098d210c4844c9253a44b86c5ea449 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 28 00:10:23 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit a9986c2480fea530165c6682b2874fbccb85461c Author: Schantl Stefan Stevee@ipfire.org Date: Sat Mar 27 16:42:52 2010 +0100
e2fsprogs: Clean up naoki-makefile.
commit 48a7da788c7cacc3c2eac46386cde6c9f00c7d30 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Mar 27 16:39:40 2010 +0100
e2fsprogs: Update to version 1.4.11.
Fixes issue #592.
commit 96e09198fc51c8a5a73c564f2a8fc637a412eede Author: Schantl Stefan Stevee@ipfire.org Date: Sat Mar 27 16:36:31 2010 +0100
e2fsprogs: Drop symlink for libuuid.
commit fc22686ffb4cb8a8daacf6f3c703ecd828afcdb6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 27 09:38:27 2010 +0100
strace: Update to 4.5.19.
This fixes compiling issues with the current kernel.
-----------------------------------------------------------------------
Summary of changes: naoki/backend.py | 44 ++++++++++++++++---- naoki/exception.py | 3 + pkgs/core/e2fsprogs/e2fsprogs.nm | 7 +--- pkgs/core/nss_ldap/nss_ldap.nm | 11 ++++- pkgs/core/pam_ldap/pam_ldap.nm | 1 + .../patches/strace-4.5.19-fix-kernel-headers.patch | 30 +++++++++++++ pkgs/core/strace/strace.nm | 2 +- 7 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch
Difference in files: diff --git a/naoki/backend.py b/naoki/backend.py index 1fde02c..813c8fc 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -8,6 +8,7 @@ import urllib import chroot import util
+from exception import * from constants import *
__cache = { @@ -15,6 +16,13 @@ __cache = { "group_names" : None, }
+try: + import hashlib + have_hashlib = 1 +except ImportError: + import sha + have_hashlib = 0 + def find_package_info(name, toolchain=False): for repo in get_repositories(toolchain): if not os.path.exists(os.path.join(repo.path, name, name + ".nm")): @@ -130,6 +138,14 @@ def depsort(packages, toolchain=False): ret.extend(l1) return ret
+def calc_hash(data): + if have_hashlib: + obj = hashlib.sha1(data) + else: + obj = sha.new(data) + + return obj.hexdigest() + def download(files, logger=None): for file in files: filepath = os.path.join(TARBALLDIR, file) @@ -154,15 +170,30 @@ def download(files, logger=None): try: gobj = g.urlopen(url) except urlgrabber.grabber.URLGrabError, e: - logger.error("Could not retrieve %s - %s" % (url, e)) + if logger: + logger.error("Could not retrieve %s - %s" % (url, e)) raise
- # XXX Need to check SHA1 sum here + data = gobj.read() + gobj.close() + + if gobj.hdr.has_key("X-Hash-Sha1"): + hash_server = gobj.hdr["X-Hash-Sha1"] + msg = "Comparing hashes - %s" % hash_server + + hash_calculated = calc_hash(data) + if hash_calculated == hash_server: + if logger: + logger.debug(msg + " - OK") + else: + if logger: + logger.error(msg + " - ERROR") + raise DownloadError, "Hash sum of downloaded file does not match"
fobj = open(filepath, "w") - fobj.write(gobj.read()) + fobj.write(data) fobj.close() - gobj.close() +
class PackageInfo(object): __data = {} @@ -437,8 +468,3 @@ class Repository(object): @property def path(self): return os.path.join(PKGSDIR, self.name) - -if __name__ == "__main__": - pi = PackageInfo("core/grub") - - print pi.dependencies diff --git a/naoki/exception.py b/naoki/exception.py index d0c661f..e132934 100644 --- a/naoki/exception.py +++ b/naoki/exception.py @@ -27,3 +27,6 @@ class commandTimeoutExpired(Error): self.msg = msg self.resultcode = 10
+ +class DownloadError(Exception): + pass diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm index fca6b59..392ef76 100644 --- a/pkgs/core/e2fsprogs/e2fsprogs.nm +++ b/pkgs/core/e2fsprogs/e2fsprogs.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = e2fsprogs -PKG_VER = 1.41.8 +PKG_VER = 1.41.11 PKG_REL = 0
PKG_MAINTAINER = @@ -47,10 +47,6 @@ PKG_DEPS += util-linux-ng
PKG_TARBALL = $(THISAPP).tar.gz
-############################################################################### -# Installation Details -############################################################################### - define STAGE_PREPARE_CMDS -mkdir -pv $(DIR_APP)/build
@@ -96,5 +92,4 @@ define STAGE_INSTALL ln -svf ../../lib/libe2p.so.2 $(BUILDROOT)/usr/lib/libe2p.so ln -svf ../../lib/libext2fs.so.2 $(BUILDROOT)/usr/lib/libext2fs.so ln -svf ../../lib/libss.so.2 $(BUILDROOT)/usr/lib/libss.so - ln -svf ../../lib/libuuid.so.1 $(BUILDROOT)/usr/lib/libuuid.so endef diff --git a/pkgs/core/nss_ldap/nss_ldap.nm b/pkgs/core/nss_ldap/nss_ldap.nm index 0e1e895..5122bc2 100644 --- a/pkgs/core/nss_ldap/nss_ldap.nm +++ b/pkgs/core/nss_ldap/nss_ldap.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.padl.com/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = NSS library and PAM module for LDAP.
-PKG_DEPS += openldap +PKG_DEPS += cyrus-sasl openldap
define PKG_DESCRIPTION This package includes two LDAP access clients: nss_ldap and \ @@ -46,12 +46,17 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-CONFIGURE_OPTIONS += \ +CONFIGURE_OPTIONS = \ + --prefix=/ \ + --libdir=/usr/lib \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --with-ldap=openldap \ --enable-schema-mapping
define STAGE_INSTALL_CMDS - mv -vf $(BUILDROOT)/usr/lib/libnss_ldap.so.* $(BUILDROOT)/usr/lib/libnss_ldap.so + # Remove awkward directory + rm -rvf $(BUILDROOT)/usr/usr + + ln -svf libnss_ldap.so.2 $(BUILDROOT)/usr/lib/libnss_ldap.so endef diff --git a/pkgs/core/pam_ldap/pam_ldap.nm b/pkgs/core/pam_ldap/pam_ldap.nm index d754694..ff26ba8 100644 --- a/pkgs/core/pam_ldap/pam_ldap.nm +++ b/pkgs/core/pam_ldap/pam_ldap.nm @@ -45,5 +45,6 @@ endef PKG_TARBALL = $(THISAPP).tar.gz
CONFIGURE_OPTIONS += \ + --sysconfdir=/etc \ --libdir=/lib \ --mandir=/usr/share/man diff --git a/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch b/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch new file mode 100644 index 0000000..98cfb95 --- /dev/null +++ b/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch @@ -0,0 +1,30 @@ + +From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560516 + +This bug is due to linux header changes. The following patch, from +upstream, fixes the problem: + +diff -Nru strace-4.5.19/configure strace-4.5.19/configure +--- strace-4.5.19/configure 2009-10-21 19:41:11.000000000 +0200 ++++ strace-4.5.19/configure 2010-01-26 08:47:33.000000000 +0100 +@@ -5880,7 +5880,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h> +-#include <linux/socket.h> ++#include <sys/socket.h> + " + eval as_val=$$as_ac_Header + if test "x$as_val" = x""yes; then : +diff -Nru strace-4.5.19/configure.ac strace-4.5.19/configure.ac +--- strace-4.5.19/configure.ac 2009-10-12 21:54:43.000000000 +0200 ++++ strace-4.5.19/configure.ac 2010-01-26 08:47:18.000000000 +0100 +@@ -258,7 +258,7 @@ + ], [], []) + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], + [], [], [#include <stddef.h> +-#include <linux/socket.h>]) ++#include <sys/socket.h>]) + AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) + AC_CHECK_TYPES([struct sigcontext_struct, + struct sigcontext],,, [#include <signal.h>]) diff --git a/pkgs/core/strace/strace.nm b/pkgs/core/strace/strace.nm index 2209a0b..95ee41a 100644 --- a/pkgs/core/strace/strace.nm +++ b/pkgs/core/strace/strace.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = strace -PKG_VER = 4.5.18 +PKG_VER = 4.5.19 PKG_REL = 0
PKG_MAINTAINER =
hooks/post-receive -- IPFire 3.x development tree