IPFire-SCM February 2011

ipfire-scm@lists.ipfire.org

1 participants
67 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core47, created. 52e457d501bb5019abf7767178074aaef69e2077
by git＠ipfire.org 26 Feb '11

26 Feb '11

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 2.x development tree". The tag, v2.9-core47 has been created at 52e457d501bb5019abf7767178074aaef69e2077 (commit) - Log ----------------------------------------------------------------- commit 52e457d501bb5019abf7767178074aaef69e2077 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 25 08:53:30 2011 +0100 Finish core47. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core47, created. 52e457d501bb5019abf7767178074aaef69e2077
by git＠ipfire.org 26 Feb '11

26 Feb '11

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 2.x development tree". The branch, core47 has been created at 52e457d501bb5019abf7767178074aaef69e2077 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 524ce8f8fe41ff965b1c58df6b244fbd7d01e29b
by git＠ipfire.org 26 Feb '11

26 Feb '11

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 524ce8f8fe41ff965b1c58df6b244fbd7d01e29b (commit) via 34f6529fb286b3d13c31766de1041557b739ef93 (commit) via df937e04405b53623c80956a6f053bd6840bb32d (commit) via fe2b47e8295d68c8ae4f0711b37b78ee22a42c5a (commit) via aa38f7ea0bd041f964e8866c833203aa2bdecd5c (commit) via fd6ce0778efa05b8f566907eb4371f7b314e8ded (commit) via ae623e8c7d5aad8f09c5950ca0eb8e2832dfaaf3 (commit) via 8f793a37efaa1ee475947194704aaebc12329275 (commit) via b415c6aa8d97dead231ad762a3e70e3362cb5a73 (commit) via f2e11d1277d8768a527b0fe09e8713c1f6018602 (commit) via cf002ff5d837b197622887049a8ddfd65f6c04c2 (commit) from cd5121cd427656f57e18517c087c48424a228253 (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 524ce8f8fe41ff965b1c58df6b244fbd7d01e29b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:47:06 2011 +0100 squid: Fix build dependencies. commit 34f6529fb286b3d13c31766de1041557b739ef93 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:46:45 2011 +0100 parted: Fix build dependencies. commit df937e04405b53623c80956a6f053bd6840bb32d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:46:26 2011 +0100 pango: Fix build dependencies. commit fe2b47e8295d68c8ae4f0711b37b78ee22a42c5a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:45:30 2011 +0100 pakfire: Change python version. This is just a left-over from the past and is not used anymore. However this created a dependency for the python api 2.6 which is not available. commit aa38f7ea0bd041f964e8866c833203aa2bdecd5c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:44:21 2011 +0100 openl2tp: Fix build dependencies. commit fd6ce0778efa05b8f566907eb4371f7b314e8ded Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:43:26 2011 +0100 libvirt: Reorder and clarify dependencies. Also add mount and umount. commit ae623e8c7d5aad8f09c5950ca0eb8e2832dfaaf3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:42:25 2011 +0100 libpng: Fix runtime dependencies of devel package. commit 8f793a37efaa1ee475947194704aaebc12329275 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:41:59 2011 +0100 guile: Fix runtime dependencies of devel package. commit b415c6aa8d97dead231ad762a3e70e3362cb5a73 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:41:25 2011 +0100 gcc: Disable libunwind exceptions and enable build-id. commit f2e11d1277d8768a527b0fe09e8713c1f6018602 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:40:43 2011 +0100 cairo: Correct runtime dependencies for build package. commit cf002ff5d837b197622887049a8ddfd65f6c04c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 26 07:39:02 2011 +0100 autogen: Fix build dependencies. ----------------------------------------------------------------------- Summary of changes: pkgs/core/autogen/autogen.nm | 2 +- pkgs/core/cairo/cairo.nm | 6 +++++- pkgs/core/gcc/gcc.nm | 5 ++++- pkgs/core/guile/guile.nm | 4 +++- pkgs/core/libpng/libpng.nm | 4 +++- pkgs/core/libvirt/libvirt.nm | 37 +++++++++++++++++++++++++++++++------ pkgs/core/openl2tp/openl2tp.nm | 2 +- pkgs/core/pakfire/src/Makefile | 2 +- pkgs/core/pango/pango.nm | 4 ++-- pkgs/core/parted/parted.nm | 4 ++-- pkgs/core/squid/squid.nm | 2 +- 11 files changed, 54 insertions(+), 18 deletions(-) Difference in files: diff --git a/pkgs/core/autogen/autogen.nm b/pkgs/core/autogen/autogen.nm index 9b8965f..670aace 100644 --- a/pkgs/core/autogen/autogen.nm +++ b/pkgs/core/autogen/autogen.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/autogen/ PKG_LICENSE = GPLv3 PKG_SUMMARY = Automated text file generator. -PKG_DEPS += guile libxml2 +PKG_BUILD_DEPS+= guile-devel libxml2-devel define PKG_DESCRIPTION AutoGen is a tool designed to simplify the creation and maintenance of \ diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/core/cairo/cairo.nm index 34db8f4..779902d 100644 --- a/pkgs/core/cairo/cairo.nm +++ b/pkgs/core/cairo/cairo.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = cairo PKG_VER = 1.10.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Graphics @@ -45,3 +45,7 @@ endef PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-devel + +# The development package needs the other dependencies as well. +PKG_DEPS-$(PKG_NAME_REAL)-devel += fontconfig-devel freetype-devel \ + libpng-devel pixman-devel diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm index 145ad4e..5386c54 100644 --- a/pkgs/core/gcc/gcc.nm +++ b/pkgs/core/gcc/gcc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = gcc PKG_VER = 4.5.2 -PKG_REL = 6 +PKG_REL = 7 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Compilers @@ -178,6 +178,9 @@ define STAGE_BUILD --disable-static \ --with-system-zlib \ --with-bugurl=http://bugtracker.ipfire.org \ + --disable-libunwind-exceptions \ + --enable-gnu-unique-object \ + --enable-linker-build-id \ $(CONFIGURE_ARGS) cd $(DIR_SRC)/gcc-build && make $(PARALLELISMFLAGS) diff --git a/pkgs/core/guile/guile.nm b/pkgs/core/guile/guile.nm index 3572846..7e898d2 100644 --- a/pkgs/core/guile/guile.nm +++ b/pkgs/core/guile/guile.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = guile PKG_VER = 1.8.7 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -52,3 +52,5 @@ QUALITY_AGENT_WHITELIST_RPATH = /usr/lib define STAGE_TEST cd $(DIR_APP) && make check endef + +PKG_DEPS-$(PKG_NAME_REAL)-devel += gmp-devel libtool-devel diff --git a/pkgs/core/libpng/libpng.nm b/pkgs/core/libpng/libpng.nm index 066ca7e..0e6363a 100644 --- a/pkgs/core/libpng/libpng.nm +++ b/pkgs/core/libpng/libpng.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = libpng PKG_VER = 1.4.5 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -47,3 +47,5 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.xz + +PKG_DEPS-$(PKG_NAME)-devel = zlib-devel diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm index 8361377..e0d22a3 100644 --- a/pkgs/core/libvirt/libvirt.nm +++ b/pkgs/core/libvirt/libvirt.nm @@ -34,12 +34,37 @@ PKG_URL = http://www.libvirt.org/ PKG_LICENSE = LGPLv2.1+ PKG_SUMMARY = A library for controlling VMs. -PKG_BUILD_DEPS+= avahi-devel libcurl-devel cyrus-sasl-devel gnutls-devel \ - openssl openssl-devel libgcrypt-devel libnl-devel libselinux-devel \ - libpciaccess-devel libssh2-devel libtool libxml2-devel lvm2-devel \ - lvm2 parted-devel perl-core pkg-config python-devel readline-devel \ - libudev-devel xen-devel -PKG_DEPS += lvm2 +PKG_BUILD_DEPS+= \ + avahi-devel \ + cyrus-sasl-devel \ + gnutls-devel \ + libcurl-devel \ + libgcrypt-devel \ + libnl-devel \ + libselinux-devel \ + libdevmapper-devel \ + libpciaccess-devel \ + libssh2-devel \ + libtool \ + libudev-devel \ + libxml2-devel \ + lvm2 \ + openssl-devel \ + parted-devel \ + perl-core \ + pkg-config \ + python-devel \ + readline-devel \ + xen-devel \ + \ + /bin/mount \ + /bin/umount + +PKG_DEPS += \ + lvm2 \ + \ + /bin/mount \ + /bin/umount define PKG_DESCRIPTION A toolkit to interact with the virtualization capabilities of recent \ diff --git a/pkgs/core/openl2tp/openl2tp.nm b/pkgs/core/openl2tp/openl2tp.nm index 1cc5a9e..a1efcc3 100644 --- a/pkgs/core/openl2tp/openl2tp.nm +++ b/pkgs/core/openl2tp/openl2tp.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.openl2tp.org/ PKG_LICENSE = GPL PKG_SUMMARY = A Linux L2TP solution for enterprise VPN and ISPs. -PKG_BUILD_DEPS+= bison flex readline-devel tcl +PKG_BUILD_DEPS+= bison flex-devel readline-devel tcl define PKG_DESCRIPTION OpenL2TP is an open source L2TP client / server, written specifically \ diff --git a/pkgs/core/pakfire/src/Makefile b/pkgs/core/pakfire/src/Makefile index ec706b4..86dfaa9 100644 --- a/pkgs/core/pakfire/src/Makefile +++ b/pkgs/core/pakfire/src/Makefile @@ -1,7 +1,7 @@ SUBSTITUDE = sed -e "s/@VERSION@/$(VERSION)/g" -PYTHON_MAJ = "2.6" +PYTHON_MAJ = "2.7" PYTHON_DIR = $(DESTDIR)/usr/lib/python$(PYTHON_MAJ)/site-packages/pakfire all: pakfire diff --git a/pkgs/core/pango/pango.nm b/pkgs/core/pango/pango.nm index 15d4f15..479cb9f 100644 --- a/pkgs/core/pango/pango.nm +++ b/pkgs/core/pango/pango.nm @@ -34,8 +34,8 @@ PKG_URL = http://www.pango.org/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = System for layout and rendering of internationalized text. -PKG_BUILD_DEPS+= cairo-devel fontconfig-devel gcc-c++ glib2-devel perl \ - pkg-config +PKG_BUILD_DEPS+= cairo-devel fontconfig-devel freetype-devel gcc-c++ \ + glib2-devel perl pkg-config PKG_DEPS-$(PKG_NAME)-devel += glib2-devel diff --git a/pkgs/core/parted/parted.nm b/pkgs/core/parted/parted.nm index 75ef2d6..cde4c41 100644 --- a/pkgs/core/parted/parted.nm +++ b/pkgs/core/parted/parted.nm @@ -34,8 +34,8 @@ PKG_URL = http://www.gnu.org/software/parted PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU disk partition manipulation program. -PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel libuuid-devel\ - readline-devel +PKG_BUILD_DEPS+= libdevmapper-devel libselinux-devel libsepol-devel \ + libuuid-devel ncurses-devel readline-devel define PKG_DESCRIPTION The GNU Parted program allows you to create, destroy, resize, move, \ diff --git a/pkgs/core/squid/squid.nm b/pkgs/core/squid/squid.nm index 04a384e..d8d16e1 100644 --- a/pkgs/core/squid/squid.nm +++ b/pkgs/core/squid/squid.nm @@ -35,7 +35,7 @@ PKG_LICENSE = GPLv2+ PKG_SUMMARY = The Squid proxy caching server. PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel samba-devel \ - iptables-devel $(PKG_DEPS) + iptables-devel $(PKG_DEPS) pam-devel PKG_DEPS += /usr/bin/smbclient define PKG_DESCRIPTION hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2daf2ca308661547782cd819869dc8477ed08910
by git＠ipfire.org 25 Feb '11

25 Feb '11

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 2.x development tree". The branch, master has been updated via 2daf2ca308661547782cd819869dc8477ed08910 (commit) from 52e457d501bb5019abf7767178074aaef69e2077 (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 2daf2ca308661547782cd819869dc8477ed08910 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 25 09:00:09 2011 +0100 Started core48. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{47 => 48}/exclude | 0 config/rootfiles/core/48/filelists/files | 1 + config/rootfiles/core/{44 => 48}/meta | 0 config/rootfiles/core/{47 => 48}/update.sh | 5 ----- make.sh | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) copy config/rootfiles/core/{47 => 48}/exclude (100%) create mode 100644 config/rootfiles/core/48/filelists/files copy config/rootfiles/core/{44 => 48}/meta (100%) copy config/rootfiles/core/{47 => 48}/update.sh (93%) Difference in files: diff --git a/config/rootfiles/core/48/exclude b/config/rootfiles/core/48/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/48/filelists/files b/config/rootfiles/core/48/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/48/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/48/meta b/config/rootfiles/core/48/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/48/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/48/update.sh b/config/rootfiles/core/48/update.sh new file mode 100644 index 0000000..b67200a --- /dev/null +++ b/config/rootfiles/core/48/update.sh @@ -0,0 +1,54 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 566cca7..55bdf9a 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="47" # Core Level (Filename) +CORE="48" # Core Level (Filename) PAKFIRE_CORE="47" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 52e457d501bb5019abf7767178074aaef69e2077
by git＠ipfire.org 25 Feb '11

25 Feb '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bbb7dc042092e75f56f1822bbfa1024c74c9b5a9
by git＠ipfire.org 24 Feb '11

24 Feb '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cd5121cd427656f57e18517c087c48424a228253
by git＠ipfire.org 23 Feb '11

23 Feb '11

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 cd5121cd427656f57e18517c087c48424a228253 (commit) via b701d96ffe3baafbc8355635064bb179e9c30c12 (commit) via 36c41da7e922e9ca0c6b8dcc842f6b033019b676 (commit) via 9ffc9c2c282c7615ca704bbeaea9819a28e4c1c1 (commit) via f79f24feacb8be7a26333f36e25c97ef43fefc39 (commit) via 641d349548379f23d84ced1e5308a20360079b40 (commit) via 1336997e2503d089a5f5f89b91c0b965b98c5971 (commit) from 8e72a7c5978061f0cc0c6f3f5f23def7559623e1 (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 cd5121cd427656f57e18517c087c48424a228253 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:37:51 2011 +0100 coreutils: Add gmp and libcap support. commit b701d96ffe3baafbc8355635064bb179e9c30c12 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:32:18 2011 +0100 curl: Fix curl-config --libs which put out all different kinds of libs that curl is liked to. commit 36c41da7e922e9ca0c6b8dcc842f6b033019b676 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:31:28 2011 +0100 nss: Add -devel dependency nspr-devel. commit 9ffc9c2c282c7615ca704bbeaea9819a28e4c1c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:21:53 2011 +0100 qt: Fix build dependencies. commit f79f24feacb8be7a26333f36e25c97ef43fefc39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:20:55 2011 +0100 python-urlgrabber: Update to 3.9.1 (with fixes from upstream). commit 641d349548379f23d84ced1e5308a20360079b40 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 22:20:27 2011 +0100 python-pycurl: New package. commit 1336997e2503d089a5f5f89b91c0b965b98c5971 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:40:57 2011 +0100 linux-atm: Fix build dependencies (flex-devel). ----------------------------------------------------------------------- Summary of changes: pkgs/core/coreutils/coreutils.nm | 6 +- pkgs/core/curl/curl.nm | 13 +- .../curl/patches/0101-curl-7.21.1-multilib.patch | 64 ++ pkgs/core/linux-atm/linux-atm.nm | 2 +- pkgs/core/nss/nss.nm | 2 +- .../python-pycurl-fix-do_curl_reset-refcount.patch | 24 + .../patches/python-pycurl-no-static-libs.patch0 | 12 + .../python-pycurl.nm} | 33 +- .../patches/urlgrabber-HEAD.patch | 701 ++++++++++++++++++++ pkgs/core/python-urlgrabber/python-urlgrabber.nm | 4 +- pkgs/core/qt/qt.nm | 9 +- 11 files changed, 841 insertions(+), 29 deletions(-) create mode 100644 pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch create mode 100644 pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch create mode 100644 pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0 copy pkgs/core/{python-decorator/python-decorator.nm => python-pycurl/python-pycurl.nm} (71%) create mode 100644 pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch Difference in files: diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm index 6222b9b..a9ca919 100644 --- a/pkgs/core/coreutils/coreutils.nm +++ b/pkgs/core/coreutils/coreutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = coreutils PKG_VER = 8.9 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Base @@ -39,8 +39,8 @@ define PKG_DESCRIPTION the old GNU fileutils, sh-utils, and textutils packages. endef -PKG_BUILD_DEPS+= autoconf automake libacl-devel libattr-devel libcap \ - libselinux-devel ncurses-devel e2fsprogs pam-devel +PKG_BUILD_DEPS+= autoconf automake e2fsprogs-devel gmp-devel libacl-devel \ + libattr-devel libcap-devel libselinux-devel ncurses-devel pam-devel PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm index 9085941..aceda4f 100644 --- a/pkgs/core/curl/curl.nm +++ b/pkgs/core/curl/curl.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = curl PKG_VER = 7.21.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Application/Internet @@ -34,8 +34,8 @@ PKG_URL = http://www.curl.haxx.se/ PKG_LICENSE = MIT PKG_SUMMARY = A utility for getting files from remote servers (FTP, HTTP, and others). -PKG_BUILD_DEPS+= autoconf automake libidn-devel libssh2-devel libtool \ - openldap-devel openssl-devel pkg-config zlib-devel +PKG_BUILD_DEPS+= autoconf automake groff libidn-devel libssh2-devel libtool \ + nss-devel openldap-devel pkg-config zlib-devel define PKG_DESCRIPTION cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS, \ @@ -58,15 +58,20 @@ PKG_DEPS-libcurl-devel = $(PKG_DEPS-$(PKG_NAME)-devel) PKG_BUILD_DEPS-libcurl-devel = $(PKG_BUILD_DEPS-$(PKG_NAME)-devel) PKG_SUMMARY-libcurl-devel = $(PKG_SUMMARY-$(PKG_NAME)-devel) PKG_FILES-libcurl-devel = $(PKG_FILES-$(PKG_NAME)-devel) +PKG_PROVIDES-libcurl-devel = curl-devel CONFIGURE_OPTIONS += \ + --enable-hidden-symbols \ --disable-static \ --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \ --with-libidn \ --with-libssh2 \ --with-nss \ --enable-ldaps \ - --enable-ipv6 + --enable-ipv6 \ + --enable-manual \ + --enable-threaded-resolver \ + --without-ssl define STAGE_PREPARE_CMDS cd $(DIR_APP) && autoreconf -vfi diff --git a/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch b/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch new file mode 100644 index 0000000..83c1cd8 --- /dev/null +++ b/pkgs/core/curl/patches/0101-curl-7.21.1-multilib.patch @@ -0,0 +1,64 @@ + curl-config.in | 22 ++++------------------ + libcurl.pc.in | 1 + + 2 files changed, 5 insertions(+), 18 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index ebda129..b404827 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -43,7 +43,6 @@ Available values for OPTION include: + --libs library linking information + --prefix curl install prefix + --protocols newline separated list of enabled protocols +- --static-libs static libcurl library linking information + --version output version information + --vernum output the version information as a number (hexadecimal) + EOF +@@ -74,7 +73,7 @@ while test $# -gt 0; do + ;; + + --cc) +- echo "@CC@" ++ echo "gcc" + ;; + + --prefix) +@@ -136,25 +135,12 @@ while test $# -gt 0; do + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi +- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ +- else +- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ +- fi +- ;; +- +- --static-libs) +- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ ++ pkg-config libcurl --libs + ;; + + --configure) +- echo @CONFIGURE_OPTIONS@ +- ;; ++ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' ++ ;; + + *) + echo "unknown option: $1" +--- a/libcurl.pc.in ++++ b/libcurl.pc.in +@@ -29,6 +29,7 @@ libdir=@libdir@ + includedir=@includedir@ + supported_protocols="@SUPPORT_PROTOCOLS@" + supported_features="@SUPPORT_FEATURES@" ++configure_options=@CONFIGURE_OPTIONS@ + + Name: libcurl + URL: http://curl.haxx.se/ diff --git a/pkgs/core/linux-atm/linux-atm.nm b/pkgs/core/linux-atm/linux-atm.nm index c11e70c..d114a75 100644 --- a/pkgs/core/linux-atm/linux-atm.nm +++ b/pkgs/core/linux-atm/linux-atm.nm @@ -34,7 +34,7 @@ PKG_URL = http://linux-atm.sourceforge.net/ PKG_LICENSE = BSD and GPLv2 and GPLv2+ and LGPLv2+ and MIT PKG_SUMMARY = Tools to support ATM networking under Linux. -PKG_BUILD_DEPS+= flex kernel-headers perl +PKG_BUILD_DEPS+= flex-devel kernel-headers perl define PKG_DESCRIPTION This package contains header files and libraries for development \ diff --git a/pkgs/core/nss/nss.nm b/pkgs/core/nss/nss.nm index d1a9e34..dd2ffd8 100644 --- a/pkgs/core/nss/nss.nm +++ b/pkgs/core/nss/nss.nm @@ -50,7 +50,7 @@ PKG_OBJECTS += nss-pem-20100809.tar.bz2 PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs -PKG_DEPS-$(PKG_NAME_REAL)-devel += nss nss-softokn-devel nss-util-devel +PKG_DEPS-$(PKG_NAME_REAL)-devel += nspr-devel nss nss-softokn-devel nss-util-devel # Mozilla does no versioning :( define PKG_FILES-$(PKG_NAME_REAL)-devel diff --git a/pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch new file mode 100644 index 0000000..7e20b15 --- /dev/null +++ b/pkgs/core/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch @@ -0,0 +1,24 @@ +--- a/src/pycurl.c ++++ a/src/pycurl.c +@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self) + } + } + ++ Py_INCREF(Py_None); + return Py_None; + } + +--- a/tests/test_internals.py ++++ a/tests/test_internals.py +@@ -245,6 +245,11 @@ if 1 and gc: + if opts.verbose >= 1: + print "Tracked objects:", len(gc.get_objects()) + ++if 1: ++ # Ensure that the refcounting error in "reset" is fixed: ++ for i in xrange(100000): ++ c = Curl() ++ c.reset() + + # /*********************************************************************** + # // done diff --git a/pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0 b/pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0 new file mode 100644 index 0000000..c1410dc --- /dev/null +++ b/pkgs/core/python-pycurl/patches/python-pycurl-no-static-libs.patch0 @@ -0,0 +1,12 @@ +--- setup.py~ 2008-04-22 17:00:45.000000000 +0300 ++++ setup.py 2008-07-03 21:53:36.000000000 +0300 +@@ -97,8 +97,7 @@ + else: + extra_compile_args.append(e) + libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) diff --git a/pkgs/core/python-pycurl/python-pycurl.nm b/pkgs/core/python-pycurl/python-pycurl.nm new file mode 100644 index 0000000..27c9777 --- /dev/null +++ b/pkgs/core/python-pycurl/python-pycurl.nm @@ -0,0 +1,63 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = pycurl +PKG_VER = 7.19.0 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://pycurl.sourceforge.net/ +PKG_LICENSE = LGPLv2+ or MIT +PKG_SUMMARY = A Python interface to libcurl. + +CFLAGS += -DHAVE_CURL_OPENSSL + +PKG_BUILD_DEPS+= curl-devel openssl-devel python-devel + +define PKG_DESCRIPTION + PycURL is a Python interface to libcurl. PycURL can be used to fetch \ + objects identified by a URL from a Python program, similar to the \ + urllib Python module. PycURL is mature, very fast, and supports a lot \ + of features. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && python setup.py build +endef + +define STAGE_TEST + cd $(DIR_APP) && PYTHONPATH=$PWD/build/lib* python tests/test_internals.py -q +endef + +define STAGE_INSTALL + cd $(DIR_APP) && python setup.py install --skip-build -O1 \ + --root=$(BUILDROOT) + cd $(DIR_APP) && rm -rf $(BUILDROOT)/usr/share/doc/pycurl +endef diff --git a/pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch b/pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch new file mode 100644 index 0000000..6627a1f --- /dev/null +++ b/pkgs/core/python-urlgrabber/patches/urlgrabber-HEAD.patch @@ -0,0 +1,701 @@ +diff --git a/scripts/urlgrabber b/scripts/urlgrabber +index 518e512..09cd896 100644 +--- a/scripts/urlgrabber ++++ b/scripts/urlgrabber +@@ -115,6 +115,7 @@ options: + including quotes in the case of strings. + e.g. --user_agent='"foobar/2.0"' + ++ --output FILE + -o FILE write output to FILE, otherwise the basename of the + url will be used + -O print the names of saved files to STDOUT +@@ -170,12 +171,17 @@ class client_options: + return ug_options, ug_defaults + + def process_command_line(self): +- short_options = 'vd:hoOpD' ++ short_options = 'vd:ho:OpD' + long_options = ['profile', 'repeat=', 'verbose=', +- 'debug=', 'help', 'progress'] ++ 'debug=', 'help', 'progress', 'output='] + ug_long = [ o + '=' for o in self.ug_options ] +- optlist, args = getopt.getopt(sys.argv[1:], short_options, +- long_options + ug_long) ++ try: ++ optlist, args = getopt.getopt(sys.argv[1:], short_options, ++ long_options + ug_long) ++ except getopt.GetoptError, e: ++ print >>sys.stderr, "Error:", e ++ self.help([], ret=1) ++ + self.verbose = 0 + self.debug = None + self.outputfile = None +@@ -193,6 +199,7 @@ class client_options: + if o == '--verbose': self.verbose = v + if o == '-v': self.verbose += 1 + if o == '-o': self.outputfile = v ++ if o == '--output': self.outputfile = v + if o == '-p' or o == '--progress': self.progress = 1 + if o == '-d' or o == '--debug': self.debug = v + if o == '--profile': self.profile = 1 +@@ -222,7 +229,7 @@ class client_options: + print "ERROR: cannot use -o when grabbing multiple files" + sys.exit(1) + +- def help(self, args): ++ def help(self, args, ret=0): + if not args: + print MAINHELP + else: +@@ -234,7 +241,7 @@ class client_options: + self.help_ug_option(a) + else: + print 'ERROR: no help on command "%s"' % a +- sys.exit(0) ++ sys.exit(ret) + + def help_doc(self): + print __doc__ +diff --git a/test/base_test_code.py b/test/base_test_code.py +index 50c6348..5fb43f9 100644 +--- a/test/base_test_code.py ++++ b/test/base_test_code.py +@@ -1,6 +1,6 @@ + from munittest import * + +-base_http = 'http://www.linux.duke.edu/projects/urlgrabber/test/' ++base_http = 'http://urlgrabber.baseurl.org/test/' + base_ftp = 'ftp://localhost/test/' + + # set to a proftp server only. we're working around a couple of +diff --git a/urlgrabber/byterange.py b/urlgrabber/byterange.py +index 3e5f3b7..8eeaeda 100644 +--- a/urlgrabber/byterange.py ++++ b/urlgrabber/byterange.py +@@ -68,7 +68,7 @@ class HTTPRangeHandler(urllib2.BaseHandler): + + def http_error_416(self, req, fp, code, msg, hdrs): + # HTTP's Range Not Satisfiable error +- raise RangeError('Requested Range Not Satisfiable') ++ raise RangeError(9, 'Requested Range Not Satisfiable') + + class HTTPSRangeHandler(HTTPRangeHandler): + """ Range Header support for HTTPS. """ +@@ -208,7 +208,7 @@ class RangeableFileObject: + bufsize = offset - pos + buf = self.fo.read(bufsize) + if len(buf) != bufsize: +- raise RangeError('Requested Range Not Satisfiable') ++ raise RangeError(9, 'Requested Range Not Satisfiable') + pos+= bufsize + + class FileRangeHandler(urllib2.FileHandler): +@@ -238,7 +238,7 @@ class FileRangeHandler(urllib2.FileHandler): + (fb,lb) = brange + if lb == '': lb = size + if fb < 0 or fb > size or lb > size: +- raise RangeError('Requested Range Not Satisfiable') ++ raise RangeError(9, 'Requested Range Not Satisfiable') + size = (lb - fb) + fo = RangeableFileObject(fo, (fb,lb)) + headers = mimetools.Message(StringIO( +@@ -318,12 +318,12 @@ class FTPRangeHandler(urllib2.FTPHandler): + (fb,lb) = range_tup + if lb == '': + if retrlen is None or retrlen == 0: +- raise RangeError('Requested Range Not Satisfiable due to unobtainable file length.') ++ raise RangeError(9, 'Requested Range Not Satisfiable due to unobtainable file length.') + lb = retrlen + retrlen = lb - fb + if retrlen < 0: + # beginning of range is larger than file +- raise RangeError('Requested Range Not Satisfiable') ++ raise RangeError(9, 'Requested Range Not Satisfiable') + else: + retrlen = lb - fb + fp = RangeableFileObject(fp, (0,retrlen)) +@@ -458,6 +458,6 @@ def range_tuple_normalize(range_tup): + # check if range is over the entire file + if (fb,lb) == (0,''): return None + # check that the range is valid +- if lb < fb: raise RangeError('Invalid byte range: %s-%s' % (fb,lb)) ++ if lb < fb: raise RangeError(9, 'Invalid byte range: %s-%s' % (fb,lb)) + return (fb,lb) + +diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py +index e090e90..b2770c5 100644 +--- a/urlgrabber/grabber.py ++++ b/urlgrabber/grabber.py +@@ -68,14 +68,14 @@ GENERAL ARGUMENTS (kwargs) + (which can be set on default_grabber.throttle) is used. See + BANDWIDTH THROTTLING for more information. + +- timeout = None ++ timeout = 300 + +- a positive float expressing the number of seconds to wait for socket +- operations. If the value is None or 0.0, socket operations will block +- forever. Setting this option causes urlgrabber to call the settimeout +- method on the Socket object used for the request. See the Python +- documentation on settimeout for more information. +- http://www.python.org/doc/current/lib/socket-objects.html ++ a positive integer expressing the number of seconds to wait before ++ timing out attempts to connect to a server. If the value is None ++ or 0, connection attempts will not time out. The timeout is passed ++ to the underlying pycurl object as its CONNECTTIMEOUT option, see ++ the curl documentation on CURLOPT_CONNECTTIMEOUT for more information. ++ http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCONNECTTIMEOUT + + bandwidth = 0 + +@@ -198,6 +198,12 @@ GENERAL ARGUMENTS (kwargs) + control, you should probably subclass URLParser and pass it in via + the 'urlparser' option. + ++ username = None ++ username to use for simple http auth - is automatically quoted for special characters ++ ++ password = None ++ password to use for simple http auth - is automatically quoted for special characters ++ + ssl_ca_cert = None + + this option can be used if M2Crypto is available and will be +@@ -248,6 +254,11 @@ GENERAL ARGUMENTS (kwargs) + + Maximum size (in bytes) of the headers. + ++ self.ip_resolve = 'whatever' ++ ++ What type of name to IP resolving to use, default is to do both IPV4 and ++ IPV6. ++ + + RETRY RELATED ARGUMENTS + +@@ -420,6 +431,7 @@ import time + import string + import urllib + import urllib2 ++from httplib import responses + import mimetools + import thread + import types +@@ -439,6 +451,12 @@ try: + except: + __version__ = '???' + ++try: ++ # this part isn't going to do much - need to talk to gettext ++ from i18n import _ ++except ImportError, msg: ++ def _(st): return st ++ + ######################################################################## + # functions for debugging output. These functions are here because they + # are also part of the module initialization. +@@ -527,6 +545,22 @@ def _(st): + # END MODULE INITIALIZATION + ######################################################################## + ++######################################################################## ++# UTILITY FUNCTIONS ++######################################################################## ++ ++# These functions are meant to be utilities for the urlgrabber library to use. ++ ++def _to_utf8(obj, errors='replace'): ++ '''convert 'unicode' to an encoded utf-8 byte string ''' ++ # stolen from yum.i18n ++ if isinstance(obj, unicode): ++ obj = obj.encode('utf-8', errors) ++ return obj ++ ++######################################################################## ++# END UTILITY FUNCTIONS ++######################################################################## + + + class URLGrabError(IOError): +@@ -662,6 +696,7 @@ class URLParser: + opts.quote = 0 --> do not quote it + opts.quote = None --> guess + """ ++ url = _to_utf8(url) + quote = opts.quote + + if opts.prefix: +@@ -800,6 +835,7 @@ class URLGrabberOptions: + self.close_connection = 0 + self.range = None + self.user_agent = 'urlgrabber/%s' % __version__ ++ self.ip_resolve = None + self.keepalive = 1 + self.proxies = None + self.reget = None +@@ -808,13 +844,15 @@ class URLGrabberOptions: + self.prefix = None + self.opener = None + self.cache_openers = True +- self.timeout = None ++ self.timeout = 300 + self.text = None + self.http_headers = None + self.ftp_headers = None + self.data = None + self.urlparser = URLParser() + self.quote = None ++ self.username = None ++ self.password = None + self.ssl_ca_cert = None # sets SSL_CAINFO - path to certdb + self.ssl_context = None # no-op in pycurl + self.ssl_verify_peer = True # check peer's cert for authenticityb +@@ -846,7 +884,7 @@ class URLGrabberOptions: + s = s + indent + '}' + return s + +-class URLGrabber: ++class URLGrabber(object): + """Provides easy opening of URLs with a variety of options. + + All options are specified as kwargs. Options may be specified when +@@ -931,6 +969,9 @@ class URLGrabber: + (scheme, host, path, parm, query, frag) = parts + if filename is None: + filename = os.path.basename( urllib.unquote(path) ) ++ if not filename: ++ # This is better than nothing. ++ filename = 'index.html' + if scheme == 'file' and not opts.copy_local: + # just return the name of the local file - don't make a + # copy currently +@@ -1030,7 +1071,7 @@ class URLGrabber: + default_grabber = URLGrabber() + + +-class PyCurlFileObject(): ++class PyCurlFileObject(object): + def __init__(self, url, filename, opts): + self.fo = None + self._hdr_dump = '' +@@ -1052,9 +1093,15 @@ class PyCurlFileObject(): + self._reget_length = 0 + self._prog_running = False + self._error = (None, None) +- self.size = None ++ self.size = 0 ++ self._hdr_ended = False + self._do_open() + ++ ++ def geturl(self): ++ """ Provide the geturl() method, used to be got from ++ urllib.addinfourl, via. urllib.URLopener.* """ ++ return self.url + + def __getattr__(self, name): + """This effectively allows us to wrap at the instance level. +@@ -1085,9 +1132,14 @@ class PyCurlFileObject(): + return -1 + + def _hdr_retrieve(self, buf): ++ if self._hdr_ended: ++ self._hdr_dump = '' ++ self.size = 0 ++ self._hdr_ended = False ++ + if self._over_max_size(cur=len(self._hdr_dump), + max_size=self.opts.max_header_size): +- return -1 ++ return -1 + try: + self._hdr_dump += buf + # we have to get the size before we do the progress obj start +@@ -1104,7 +1156,17 @@ class PyCurlFileObject(): + s = parse150(buf) + if s: + self.size = int(s) +- ++ ++ if buf.lower().find('location') != -1: ++ location = ':'.join(buf.split(':')[1:]) ++ location = location.strip() ++ self.scheme = urlparse.urlsplit(location)[0] ++ self.url = location ++ ++ if len(self._hdr_dump) != 0 and buf == '\r\n': ++ self._hdr_ended = True ++ if DEBUG: DEBUG.info('header ended:') ++ + return len(buf) + except KeyboardInterrupt: + return pycurl.READFUNC_ABORT +@@ -1113,8 +1175,10 @@ class PyCurlFileObject(): + if self._parsed_hdr: + return self._parsed_hdr + statusend = self._hdr_dump.find('\n') ++ statusend += 1 # ridiculous as it may seem. + hdrfp = StringIO() + hdrfp.write(self._hdr_dump[statusend:]) ++ hdrfp.seek(0) + self._parsed_hdr = mimetools.Message(hdrfp) + return self._parsed_hdr + +@@ -1136,11 +1200,21 @@ class PyCurlFileObject(): + self.curl_obj.setopt(pycurl.PROGRESSFUNCTION, self._progress_update) + self.curl_obj.setopt(pycurl.FAILONERROR, True) + self.curl_obj.setopt(pycurl.OPT_FILETIME, True) ++ self.curl_obj.setopt(pycurl.FOLLOWLOCATION, True) + + if DEBUG: + self.curl_obj.setopt(pycurl.VERBOSE, True) + if opts.user_agent: + self.curl_obj.setopt(pycurl.USERAGENT, opts.user_agent) ++ if opts.ip_resolve: ++ # Default is: IPRESOLVE_WHATEVER ++ ipr = opts.ip_resolve.lower() ++ if ipr == 'whatever': # Do we need this? ++ self.curl_obj.setopt(pycurl.IPRESOLVE,pycurl.IPRESOLVE_WHATEVER) ++ if ipr == 'ipv4': ++ self.curl_obj.setopt(pycurl.IPRESOLVE, pycurl.IPRESOLVE_V4) ++ if ipr == 'ipv6': ++ self.curl_obj.setopt(pycurl.IPRESOLVE, pycurl.IPRESOLVE_V6) + + # maybe to be options later + self.curl_obj.setopt(pycurl.FOLLOWLOCATION, True) +@@ -1148,9 +1222,11 @@ class PyCurlFileObject(): + + # timeouts + timeout = 300 +- if opts.timeout: +- timeout = int(opts.timeout) +- self.curl_obj.setopt(pycurl.CONNECTTIMEOUT, timeout) ++ if hasattr(opts, 'timeout'): ++ timeout = int(opts.timeout or 0) ++ self.curl_obj.setopt(pycurl.CONNECTTIMEOUT, timeout) ++ self.curl_obj.setopt(pycurl.LOW_SPEED_LIMIT, 1) ++ self.curl_obj.setopt(pycurl.LOW_SPEED_TIME, timeout) + + # ssl options + if self.scheme == 'https': +@@ -1203,12 +1279,19 @@ class PyCurlFileObject(): + if proxy == '_none_': proxy = "" + self.curl_obj.setopt(pycurl.PROXY, proxy) + +- # FIXME username/password/auth settings ++ if opts.username and opts.password: ++ if self.scheme in ('http', 'https'): ++ self.curl_obj.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY) ++ ++ if opts.username and opts.password: ++ # apparently when applying them as curlopts they do not require quoting of any kind ++ userpwd = '%s:%s' % (opts.username, opts.password) ++ self.curl_obj.setopt(pycurl.USERPWD, userpwd) + + #posts - simple - expects the fields as they are + if opts.data: + self.curl_obj.setopt(pycurl.POST, True) +- self.curl_obj.setopt(pycurl.POSTFIELDS, self._to_utf8(opts.data)) ++ self.curl_obj.setopt(pycurl.POSTFIELDS, _to_utf8(opts.data)) + + # our url + self.curl_obj.setopt(pycurl.URL, self.url) +@@ -1228,12 +1311,14 @@ class PyCurlFileObject(): + + code = self.http_code + errcode = e.args[0] ++ errurl = urllib.unquote(self.url) ++ + if self._error[0]: + errcode = self._error[0] + + if errcode == 23 and code >= 200 and code < 299: +- err = URLGrabError(15, _('User (or something) called abort %s: %s') % (self.url, e)) +- err.url = self.url ++ err = URLGrabError(15, _('User (or something) called abort %s: %s') % (errurl, e)) ++ err.url = errurl + + # this is probably wrong but ultimately this is what happens + # we have a legit http code and a pycurl 'writer failed' code +@@ -1244,23 +1329,23 @@ class PyCurlFileObject(): + raise KeyboardInterrupt + + elif errcode == 28: +- err = URLGrabError(12, _('Timeout on %s: %s') % (self.url, e)) +- err.url = self.url ++ err = URLGrabError(12, _('Timeout on %s: %s') % (errurl, e)) ++ err.url = errurl + raise err + elif errcode == 35: + msg = _("problem making ssl connection") + err = URLGrabError(14, msg) +- err.url = self.url ++ err.url = errurl + raise err + elif errcode == 37: +- msg = _("Could not open/read %s") % (self.url) ++ msg = _("Could not open/read %s") % (errurl) + err = URLGrabError(14, msg) +- err.url = self.url ++ err.url = errurl + raise err + + elif errcode == 42: +- err = URLGrabError(15, _('User (or something) called abort %s: %s') % (self.url, e)) +- err.url = self.url ++ err = URLGrabError(15, _('User (or something) called abort %s: %s') % (errurl, e)) ++ err.url = errurl + # this is probably wrong but ultimately this is what happens + # we have a legit http code and a pycurl 'writer failed' code + # which almost always means something aborted it from outside +@@ -1272,33 +1357,93 @@ class PyCurlFileObject(): + elif errcode == 58: + msg = _("problem with the local client certificate") + err = URLGrabError(14, msg) +- err.url = self.url ++ err.url = errurl + raise err + + elif errcode == 60: +- msg = _("client cert cannot be verified or client cert incorrect") ++ msg = _("Peer cert cannot be verified or peer cert invalid") + err = URLGrabError(14, msg) +- err.url = self.url ++ err.url = errurl + raise err + + elif errcode == 63: + if self._error[1]: + msg = self._error[1] + else: +- msg = _("Max download size exceeded on %s") % (self.url) ++ msg = _("Max download size exceeded on %s") % () + err = URLGrabError(14, msg) +- err.url = self.url ++ err.url = errurl + raise err + + elif str(e.args[1]) == '' and self.http_code != 0: # fake it until you make it +- msg = 'HTTP Error %s : %s ' % (self.http_code, self.url) ++ if self.scheme in ['http', 'https']: ++ if self.http_code in responses: ++ resp = responses[self.http_code] ++ msg = 'HTTP Error %s - %s : %s' % (self.http_code, resp, errurl) ++ else: ++ msg = 'HTTP Error %s : %s ' % (self.http_code, errurl) ++ elif self.scheme in ['ftp']: ++ msg = 'FTP Error %s : %s ' % (self.http_code, errurl) ++ else: ++ msg = "Unknown Error: URL=%s , scheme=%s" % (errurl, self.scheme) + else: +- msg = 'PYCURL ERROR %s - "%s"' % (errcode, str(e.args[1])) ++ pyerr2str = { 5 : _("Couldn't resolve proxy"), ++ 6 : _("Couldn't resolve host"), ++ 7 : _("Couldn't connect"), ++ 8 : _("Bad reply to FTP server"), ++ 9 : _("Access denied"), ++ 11 : _("Bad reply to FTP pass"), ++ 13 : _("Bad reply to FTP pasv"), ++ 14 : _("Bad reply to FTP 227"), ++ 15 : _("Couldn't get FTP host"), ++ 17 : _("Couldn't set FTP type"), ++ 18 : _("Partial file"), ++ 19 : _("FTP RETR command failed"), ++ 22 : _("HTTP returned error"), ++ 23 : _("Write error"), ++ 25 : _("Upload failed"), ++ 26 : _("Read error"), ++ 27 : _("Out of Memory"), ++ 28 : _("Operation timed out"), ++ 30 : _("FTP PORT command failed"), ++ 31 : _("FTP REST command failed"), ++ 33 : _("Range failed"), ++ 34 : _("HTTP POST failed"), ++ 35 : _("SSL CONNECT failed"), ++ 36 : _("Couldn't resume download"), ++ 37 : _("Couldn't read file"), ++ 42 : _("Aborted by callback"), ++ 47 : _("Too many redirects"), ++ 51 : _("Peer certificate failed verification"), ++ 53 : _("SSL engine not found"), ++ 54 : _("SSL engine set failed"), ++ 55 : _("Network error send()"), ++ 56 : _("Network error recv()"), ++ 58 : _("Local certificate failed"), ++ 59 : _("SSL set cipher failed"), ++ 60 : _("Local CA certificate failed"), ++ 61 : _("HTTP bad transfer encoding"), ++ 63 : _("Maximum file size exceeded"), ++ 64 : _("FTP SSL failed"), ++ 67 : _("Authentication failure"), ++ 70 : _("Out of disk space on server"), ++ 73 : _("Remove file exists"), ++ } ++ errstr = str(e.args[1]) ++ if not errstr: ++ errstr = pyerr2str.get(errcode, '<Unknown>') ++ msg = 'curl#%s - "%s"' % (errcode, errstr) + code = errcode + err = URLGrabError(14, msg) + err.code = code + err.exception = e + raise err ++ else: ++ if self._error[1]: ++ msg = self._error[1] ++ err = URLGRabError(14, msg) ++ err.url = urllib.unquote(self.url) ++ raise err + + def _do_open(self): + self.curl_obj = _curl_cache +@@ -1333,7 +1478,11 @@ class PyCurlFileObject(): + + if self.opts.range: + rt = self.opts.range +- if rt[0]: rt = (rt[0] + reget_length, rt[1]) ++ ++ if rt[0] is None: ++ rt = (0, rt[1]) ++ rt = (rt[0] + reget_length, rt[1]) ++ + + if rt: + header = range_tuple_to_header(rt) +@@ -1434,9 +1583,13 @@ class PyCurlFileObject(): + #fh, self._temp_name = mkstemp() + #self.fo = open(self._temp_name, 'wb') + +- +- self._do_perform() +- ++ try: ++ self._do_perform() ++ except URLGrabError, e: ++ self.fo.flush() ++ self.fo.close() ++ raise e ++ + + + if _was_filename: +@@ -1446,9 +1599,23 @@ class PyCurlFileObject(): + # set the time + mod_time = self.curl_obj.getinfo(pycurl.INFO_FILETIME) + if mod_time != -1: +- os.utime(self.filename, (mod_time, mod_time)) ++ try: ++ os.utime(self.filename, (mod_time, mod_time)) ++ except OSError, e: ++ err = URLGrabError(16, _(\ ++ 'error setting timestamp on file %s from %s, OSError: %s') ++ % (self.filename, self.url, e)) ++ err.url = self.url ++ raise err + # re open it +- self.fo = open(self.filename, 'r') ++ try: ++ self.fo = open(self.filename, 'r') ++ except IOError, e: ++ err = URLGrabError(16, _(\ ++ 'error opening file from %s, IOError: %s') % (self.url, e)) ++ err.url = self.url ++ raise err ++ + else: + #self.fo = open(self._temp_name, 'r') + self.fo.seek(0) +@@ -1532,11 +1699,14 @@ class PyCurlFileObject(): + def _over_max_size(self, cur, max_size=None): + + if not max_size: +- max_size = self.size +- if self.opts.size: # if we set an opts size use that, no matter what +- max_size = self.opts.size ++ if not self.opts.size: ++ max_size = self.size ++ else: ++ max_size = self.opts.size ++ + if not max_size: return False # if we have None for all of the Max then this is dumb +- if cur > max_size + max_size*.10: ++ ++ if cur > int(float(max_size) * 1.10): + + msg = _("Downloaded more than max size for %s: %s > %s") \ + % (self.url, cur, max_size) +@@ -1544,13 +1714,6 @@ class PyCurlFileObject(): + return True + return False + +- def _to_utf8(self, obj, errors='replace'): +- '''convert 'unicode' to an encoded utf-8 byte string ''' +- # stolen from yum.i18n +- if isinstance(obj, unicode): +- obj = obj.encode('utf-8', errors) +- return obj +- + def read(self, amt=None): + self._fill_buffer(amt) + if amt is None: +@@ -1582,9 +1745,21 @@ class PyCurlFileObject(): + self.opts.progress_obj.end(self._amount_read) + self.fo.close() + +- ++ def geturl(self): ++ """ Provide the geturl() method, used to be got from ++ urllib.addinfourl, via. urllib.URLopener.* """ ++ return self.url ++ + _curl_cache = pycurl.Curl() # make one and reuse it over and over and over + ++def reset_curl_obj(): ++ """To make sure curl has reread the network/dns info we force a reload""" ++ global _curl_cache ++ _curl_cache.close() ++ _curl_cache = pycurl.Curl() ++ ++ ++ + + ##################################################################### + # DEPRECATED FUNCTIONS +diff --git a/urlgrabber/mirror.py b/urlgrabber/mirror.py +index dad410b..8731aed 100644 +--- a/urlgrabber/mirror.py ++++ b/urlgrabber/mirror.py +@@ -90,7 +90,7 @@ CUSTOMIZATION + import random + import thread # needed for locking to make this threadsafe + +-from grabber import URLGrabError, CallbackObject, DEBUG ++from grabber import URLGrabError, CallbackObject, DEBUG, _to_utf8 + + def _(st): + return st +@@ -263,7 +263,8 @@ class MirrorGroup: + def _parse_mirrors(self, mirrors): + parsed_mirrors = [] + for m in mirrors: +- if type(m) == type(''): m = {'mirror': m} ++ if isinstance(m, basestring): ++ m = {'mirror': _to_utf8(m)} + parsed_mirrors.append(m) + return parsed_mirrors + +diff --git a/urlgrabber/progress.py b/urlgrabber/progress.py +index dd07c6a..45eb248 100644 +--- a/urlgrabber/progress.py ++++ b/urlgrabber/progress.py +@@ -658,6 +658,8 @@ def format_time(seconds, use_hours=0): + if seconds is None or seconds < 0: + if use_hours: return '--:--:--' + else: return '--:--' ++ elif seconds == float('inf'): ++ return 'Infinite' + else: + seconds = int(seconds) + minutes = seconds / 60 diff --git a/pkgs/core/python-urlgrabber/python-urlgrabber.nm b/pkgs/core/python-urlgrabber/python-urlgrabber.nm index 358de7f..b5beca8 100644 --- a/pkgs/core/python-urlgrabber/python-urlgrabber.nm +++ b/pkgs/core/python-urlgrabber/python-urlgrabber.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = urlgrabber -PKG_VER = 3.1.0 +PKG_VER = 3.9.1 PKG_REL = 1 PKG_ARCH = noarch @@ -35,7 +35,7 @@ PKG_URL = http://urlgrabber.baseurl.org/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A high-level cross-protocol url-grabber. -PKG_BUILD_DEPS+= python-devel +PKG_BUILD_DEPS+= python-devel python-pycurl define PKG_DESCRIPTION A high-level cross-protocol url-grabber for python supporting HTTP, \ diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm index 287121c..94ffa07 100644 --- a/pkgs/core/qt/qt.nm +++ b/pkgs/core/qt/qt.nm @@ -42,11 +42,10 @@ PKG_FILES-$(PKG_NAME_REAL)-devel += \ /usr/lib/qt4/*.prl \ /usr/lib/qt4/mkspecs -PKG_BUILD_DEPS+= fontconfig-devel gcc-c++ libjpeg-devel libmng-devel \ - libpng-devel libtiff-devel libX11-devel libXext-devel libXfixes-devel \ - libXrandr-devel libXrender-devel libXi-devel pcre-devel pkg-config \ - xorg-x11-proto-devel zlib-devel - +PKG_BUILD_DEPS+= fontconfig-devel freetype-devel gcc-c++ libjpeg-devel \ + libmng-devel libpng-devel libtiff-devel libX11-devel \ + libXext-devel libXfixes-devel libXrandr-devel libXrender-devel \ + libXi-devel pcre-devel pkg-config xorg-x11-proto-devel zlib-devel define PKG_DESCRIPTION Qt is a software toolkit for developing applications. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8e72a7c5978061f0cc0c6f3f5f23def7559623e1
by git＠ipfire.org 22 Feb '11

22 Feb '11

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 8e72a7c5978061f0cc0c6f3f5f23def7559623e1 (commit) via 2a102ca9c6c7955aa6154d5769afa62db68d8f52 (commit) via 54f4ff79c803895aee23b7ebef1590fd5f67b3e2 (commit) via 6764945a26b7fa9271184bc770e8538e094afb2e (commit) via b38b08f1ebbb778d3b319807bd4adf7afdad33f6 (commit) via 354c6166b97cb1c815a7a57772432950a74e8602 (commit) via 6e20be98f8c4dbcaa58898e3c51d947d048b16a0 (commit) via 7c67838f988be4c778d975bc18d66766b9a4a51d (commit) from 766d95bfda1ef85442d8fa9fc1c468dff6b34563 (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 8e72a7c5978061f0cc0c6f3f5f23def7559623e1 Merge: 2a102ca 766d95b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:33:33 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 2a102ca9c6c7955aa6154d5769afa62db68d8f52 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:26:16 2011 +0100 python-dbus: Fix build dependencies (dbus-devel). commit 54f4ff79c803895aee23b7ebef1590fd5f67b3e2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:25:38 2011 +0100 intltool: Fix build dependencies (perl-XML-Parser). commit 6764945a26b7fa9271184bc770e8538e094afb2e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:25:10 2011 +0100 dbus-glib: Add runtime dependency glib2-devel for devel package. commit b38b08f1ebbb778d3b319807bd4adf7afdad33f6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:24:46 2011 +0100 cups: Remove non-ascii characters from description. commit 354c6166b97cb1c815a7a57772432950a74e8602 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:24:25 2011 +0100 avahi: Fix build dependencies (perl-XML-Parser). commit 6e20be98f8c4dbcaa58898e3c51d947d048b16a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 22 16:54:34 2011 +0100 libuser: Buildfix. commit 7c67838f988be4c778d975bc18d66766b9a4a51d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 21 14:00:33 2011 +0100 build-essentials: Remove ccache because the buildsystem decides whether to install it or not. ----------------------------------------------------------------------- Summary of changes: pkgs/core/avahi/avahi.nm | 5 +++-- pkgs/core/build-essentials/build-essentials.nm | 6 +++--- pkgs/core/cups/cups.nm | 2 +- pkgs/core/dbus-glib/dbus-glib.nm | 3 ++- pkgs/core/intltool/intltool.nm | 4 ++-- pkgs/core/libuser/libuser.nm | 4 ++-- pkgs/core/python-dbus/python-dbus.nm | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) Difference in files: diff --git a/pkgs/core/avahi/avahi.nm b/pkgs/core/avahi/avahi.nm index 2459b4f..68c2293 100644 --- a/pkgs/core/avahi/avahi.nm +++ b/pkgs/core/avahi/avahi.nm @@ -44,8 +44,9 @@ define PKG_DESCRIPTION convenient endef -PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel gcc-c++ gettext libdaemon-devel \ - intltool perl perl-xml-parser pkg-config python-devel python-dbus +PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel expat-devel gcc-c++ gettext \ + libdaemon-devel intltool perl perl-XML-Parser pkg-config python-devel \ + python-dbus PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm index d383d4e..63bf21e 100644 --- a/pkgs/core/build-essentials/build-essentials.nm +++ b/pkgs/core/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 5 +PKG_REL = 6 PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> @@ -36,8 +36,8 @@ PKG_LICENSE = GPL PKG_SUMMARY = Elementary scripts for the build system. PKG_BUILD_DEPS = -PKG_DEPS += bash bzip2 ccache coreutils cpio diffutils file findutils \ - gawk grep gzip make patch sed system-release tar which xz +PKG_DEPS += bash bzip2 coreutils cpio diffutils file findutils gawk \ + grep gzip make patch sed system-release tar which xz define PKG_DESCRIPTION This package contains elementary scripts for the pakfire build system. diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index f792714..d347228 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -42,7 +42,7 @@ PKG_DEPS += ghostscript define PKG_DESCRIPTION CUPS is the standards-based, open source printing system developed \ - by Apple Inc. for Mac OS® X and other UNIX®-like operating systems. + by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems. endef PKG_TARBALL = $(THISAPP)-source.tar.bz2 diff --git a/pkgs/core/dbus-glib/dbus-glib.nm b/pkgs/core/dbus-glib/dbus-glib.nm index f5051bb..47af08c 100644 --- a/pkgs/core/dbus-glib/dbus-glib.nm +++ b/pkgs/core/dbus-glib/dbus-glib.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = dbus-glib PKG_VER = 0.82 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -35,6 +35,7 @@ PKG_LICENSE = GPLv2+ AFL PKG_SUMMARY = Glib bindings for D-Bus. PKG_BUILD_DEPS+= dbus dbus-devel expat-devel gettext glib2-devel pkg-config +PKG_DEPS-$(PKG_NAME)-devel = glib2-devel define PKG_DESCRIPTION D-Bus add-on library to integrate the standard D-Bus library with \ diff --git a/pkgs/core/intltool/intltool.nm b/pkgs/core/intltool/intltool.nm index ecbf249..65876e8 100644 --- a/pkgs/core/intltool/intltool.nm +++ b/pkgs/core/intltool/intltool.nm @@ -41,8 +41,8 @@ define PKG_DESCRIPTION them in the po files. endef -PKG_BUILD_DEPS+= expat-devel gettext perl-xml-parser -PKG_DEPS += gettext perl-xml-parser +PKG_BUILD_DEPS+= expat-devel gettext perl-XML-Parser +PKG_DEPS += gettext perl-XML-Parser PKG_TARBALL = $(THISAPP).tar.bz2 diff --git a/pkgs/core/libuser/libuser.nm b/pkgs/core/libuser/libuser.nm index 5363c6a..3858fad 100644 --- a/pkgs/core/libuser/libuser.nm +++ b/pkgs/core/libuser/libuser.nm @@ -34,8 +34,8 @@ PKG_URL = https://fedorahosted.org/libuser/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A user and group account administration library. -PKG_BUILD_DEPS+= glib2-devel libselinux-devel openldap-devel pkg-config\ - popt-devel python-devel +PKG_BUILD_DEPS+= cyrus-sasl-devel glib2-devel libselinux-devel openldap-devel \ + pam-devel pkg-config popt-devel python-devel define PKG_DESCRIPTION The libuser library implements a standardized interface for \ diff --git a/pkgs/core/python-dbus/python-dbus.nm b/pkgs/core/python-dbus/python-dbus.nm index f777ce9..e798d3f 100644 --- a/pkgs/core/python-dbus/python-dbus.nm +++ b/pkgs/core/python-dbus/python-dbus.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = MIT PKG_SUMMARY = Dbus Python Bindings. -PKG_BUILD_DEPS+= dbus-glib-devel pkg-config python-devel +PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel pkg-config python-devel define PKG_DESCRIPTION D-Bus python bindings for use with python programs. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 766d95bfda1ef85442d8fa9fc1c468dff6b34563
by git＠ipfire.org 22 Feb '11

22 Feb '11

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 766d95bfda1ef85442d8fa9fc1c468dff6b34563 (commit) via e02825d13a4b403c4e2520f14632422ece4ee3c7 (commit) from 83c5d32d095266cd3f748c399dd56da0459838f8 (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 766d95bfda1ef85442d8fa9fc1c468dff6b34563 Merge: 83c5d32 e02825d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:29:59 2011 +0100 Merge branch 'next' commit e02825d13a4b403c4e2520f14632422ece4ee3c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 23 00:29:08 2011 +0100 bash: Update to 4.2. ----------------------------------------------------------------------- Summary of changes: pkgs/core/bash/bash.nm | 4 +- pkgs/core/bash/patches/bash-4.0-rng.patch | 149 ---------------------- pkgs/core/bash/patches/bash-4.1-upstream-1.patch | 46 ------- pkgs/core/bash/patches/bash-4.1-upstream-2.patch | 63 --------- 4 files changed, 2 insertions(+), 260 deletions(-) delete mode 100644 pkgs/core/bash/patches/bash-4.0-rng.patch delete mode 100644 pkgs/core/bash/patches/bash-4.1-upstream-1.patch delete mode 100644 pkgs/core/bash/patches/bash-4.1-upstream-2.patch Difference in files: diff --git a/pkgs/core/bash/bash.nm b/pkgs/core/bash/bash.nm index 5d14486..ee8ba6b 100644 --- a/pkgs/core/bash/bash.nm +++ b/pkgs/core/bash/bash.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = bash -PKG_VER = 4.1 -PKG_REL = 0 +PKG_VER = 4.2 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Tools diff --git a/pkgs/core/bash/patches/bash-4.0-rng.patch b/pkgs/core/bash/patches/bash-4.0-rng.patch deleted file mode 100644 index 5534466..0000000 --- a/pkgs/core/bash/patches/bash-4.0-rng.patch +++ /dev/null @@ -1,149 +0,0 @@ -This patch is from: - http://cvs.fedoraproject.org/viewvc/devel/bash/bash-3.2-rng.patch - http://cvs.fedoraproject.org/viewvc/devel/bash/bash-3.2-344411.patch - -The second patch (bash-3.2-344411.patch) was integrated in bash-4.0, to provide -$RANDOM in sub shells. - -Use /dev/urandom for $RANDOM. This patch does not break the Korn shell -behaviour, where we can initialize $RANDOM ourselves and get the same results -each time. /dev/urandom is only opened when $RANDOM is called. - -I pulled out all the autoconf stuff. This patch depends on random(3) and -srandom(3) in libc, and /dev/urandom. getpid(3) and gettimeofday(3) are used -if /dev/urandom isn't available at run time (like in a chroot). - -Test case: -( echo $RANDOM; ( echo $RANDOM ); ( echo $RANDOM ) ) - -robert - -diff -Naur bash-4.0.orig/variables.c bash-4.0/variables.c ---- bash-4.0.orig/variables.c 2009-01-04 19:32:46.000000000 +0000 -+++ bash-4.0/variables.c 2009-02-22 20:15:50.000000000 +0000 -@@ -44,6 +44,12 @@ - #include "bashansi.h" - #include "bashintl.h" - -+#include <errno.h> -+#include "filecntl.h" -+#ifndef RANDOMDEV -+#define RANDOMDEV "/dev/urandom" -+#endif -+ - #include "shell.h" - #include "flags.h" - #include "execute_cmd.h" -@@ -188,7 +194,7 @@ - static SHELL_VAR *init_seconds_var __P((void)); - - static int brand __P((void)); --static void sbrand __P((unsigned long)); /* set bash random number generator. */ -+static void sbrand __P((unsigned int)); /* set bash random number generator. */ - static void seedrand __P((void)); /* seed generator randomly */ - static SHELL_VAR *assign_random __P((SHELL_VAR *, char *, arrayind_t, char *)); - static SHELL_VAR *get_random __P((SHELL_VAR *)); -@@ -518,9 +524,6 @@ - } - #endif /* HISTORY */ - -- /* Seed the random number generator. */ -- seedrand (); -- - /* Handle some "special" variables that we may have inherited from a - parent shell. */ - if (interactive_shell) -@@ -1204,9 +1207,8 @@ - } - - /* The random number seed. You can change this by setting RANDOM. */ --static unsigned long rseed = 1; - static int last_random_value; --static int seeded_subshell = 0; -+static int seeded_subshell = -1; - - /* A linear congruential random number generator based on the example - one in the ANSI C standard. This one isn't very good, but a more -@@ -1216,44 +1218,36 @@ - static int - brand () - { --#if 0 -- rseed = rseed * 1103515245 + 12345; -- return ((unsigned int)((rseed >> 16) & 32767)); /* was % 32768 */ --#else -- /* From "Random number generators: good ones are hard to find", -- Park and Miller, Communications of the ACM, vol. 31, no. 10, -- October 1988, p. 1195. filtered through FreeBSD */ -- long h, l; -- -- if (rseed == 0) -- seedrand (); -- h = rseed / 127773; -- l = rseed % 127773; -- rseed = 16807 * l - 2836 * h; --#if 0 -- if (rseed < 0) -- rseed += 0x7fffffff; --#endif -+ unsigned int rseed; -+ rseed = random(); - return ((unsigned int)(rseed & 32767)); /* was % 32768 */ --#endif - } - - /* Set the random number generator seed to SEED. */ - static void - sbrand (seed) -- unsigned long seed; -+ unsigned int seed; - { -- rseed = seed; -+ srandom((unsigned int)seed); - last_random_value = 0; - } - - static void - seedrand () - { -- struct timeval tv; -- -- gettimeofday (&tv, NULL); -- sbrand (tv.tv_sec ^ tv.tv_usec ^ getpid ()); -+ unsigned int seed; -+ int fd; -+ int rv; -+ if ((rv = fd = open (RANDOMDEV, O_RDONLY)) != -1) { -+ while ((rv = read(fd, &seed, sizeof(seed))) != sizeof(seed) && errno == EINTR); -+ close (fd); -+ } -+ if (rv != sizeof(seed)) { -+ struct timeval tv; -+ gettimeofday (&tv, NULL); -+ seed = (unsigned int)tv.tv_sec + (unsigned int)tv.tv_usec + getpid(); -+ } -+ sbrand (seed); - } - - static SHELL_VAR * -@@ -1263,9 +1257,8 @@ - arrayind_t unused; - char *key; - { -- sbrand (strtoul (value, (char **)NULL, 10)); -- if (subshell_environment) -- seeded_subshell = getpid (); -+ sbrand ((unsigned int)strtoul (value, (char **)NULL, 10)); -+ seeded_subshell = getpid (); - return (self); - } - -@@ -1276,7 +1269,7 @@ - - /* Reset for command and process substitution. */ - pid = getpid (); -- if (subshell_environment && seeded_subshell != pid) -+ if (seeded_subshell != pid) - { - seedrand (); - seeded_subshell = pid; diff --git a/pkgs/core/bash/patches/bash-4.1-upstream-1.patch b/pkgs/core/bash/patches/bash-4.1-upstream-1.patch deleted file mode 100644 index 6cb4314..0000000 --- a/pkgs/core/bash/patches/bash-4.1-upstream-1.patch +++ /dev/null @@ -1,46 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-001 - -Bug-Reported-by: Yann Rouillard <yann(a)pleiades.fr.eu.org> -Bug-Reference-ID: <4B44A410.4070107(a)pleiades.fr.eu.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html - -Bug-Description: - -A prototype for vsnprintf was incorrect, and caused compilation failures -on systems that did not have a suitable vsnprintf, but had a declaration in -one of the system header files. - -*** bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - -*** bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/pkgs/core/bash/patches/bash-4.1-upstream-2.patch b/pkgs/core/bash/patches/bash-4.1-upstream-2.patch deleted file mode 100644 index d74f806..0000000 --- a/pkgs/core/bash/patches/bash-4.1-upstream-2.patch +++ /dev/null @@ -1,63 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 4.1 -Patch-ID: bash41-002 - -Bug-Reported-by: guillaume.outters(a)free.fr -Bug-Reference-ID: <20100105230441.70D171AA7F52(a)asterix.local> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html - -Bug-Description: - -Bash-4.1/Readline-6.1 introduced a hook function that allows applications -to rewrite or modify filenames read from the file system before comparing -them with a word to be completed. The converted filename, if it matches, -needs to be inserted into the line buffer, replacing the original contents. - -This fixes a completion bug on Mac OS X involving filenames containing -UTF-8 characters. - -*** bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500 ---- lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500 -*************** -*** 2139,2143 **** - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name)) - continue; - ---- 2139,2143 ---- - if (filename_len == 0) - { -! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn)) - continue; - -*************** -*** 2220,2224 **** - } - -! strcpy (temp + dirlen, entry->d_name); - } - else ---- 2220,2224 ---- - } - -! strcpy (temp + dirlen, convfn); - } - else -*** bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 ---- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 83c5d32d095266cd3f748c399dd56da0459838f8
by git＠ipfire.org 20 Feb '11

20 Feb '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2011