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 7f6de0561242fa1f913257ab13a2a227952881ed (commit) via baa8be1ef74fd1e6273858a729c3a853dd1dc04f (commit) via f4a3c8dceb2c14e5dd55337d612ef3b96d78088a (commit) via cc16266577b86b1a3b6af06fd9abb02983135cc6 (commit) via 29b7c49271108dcf434a3b745463fead71233aa3 (commit) from 1b638aac495b4f256930742d6ccf74d2e4b514f4 (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 7f6de0561242fa1f913257ab13a2a227952881ed Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 20:19:25 2010 +0200

sqlite: Forgot to commit patches.

commit baa8be1ef74fd1e6273858a729c3a853dd1dc04f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 20:17:47 2010 +0200

sip: Update to 4.11.2 (stable release).

commit f4a3c8dceb2c14e5dd55337d612ef3b96d78088a Author: Stefan Schantl Stevee@ipfire.org Date: Sat Oct 9 16:15:36 2010 +0200

hplip: Update to 3.10.9.

commit cc16266577b86b1a3b6af06fd9abb02983135cc6 Author: Stefan Schantl Stevee@ipfire.org Date: Sat Oct 9 16:16:28 2010 +0200

fuse: Update to 2.8.5.

commit 29b7c49271108dcf434a3b745463fead71233aa3 Author: Stefan Schantl Stevee@ipfire.org Date: Fri Oct 8 22:54:42 2010 +0200

glib2: Update to 2.25.17.

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

Summary of changes: pkgs/core/fuse/fuse.nm | 2 +- pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/hplip/hplip.nm | 2 +- .../hplip/patches/hplip-3.10.2-udev-rules.patch | 17 ------------- .../hplip/patches/hplip-3.10.5-udev-rules.patch | 21 ++++++++++++++++ pkgs/core/sip/patches/fix-linking.patch | 11 ++++++++ pkgs/core/sip/patches/no-strip.patch | 26 ++++++++++++++++++++ pkgs/core/sip/sip.nm | 9 ++++-- pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch | 11 ++++++++ 9 files changed, 78 insertions(+), 23 deletions(-) delete mode 100644 pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch create mode 100644 pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch create mode 100644 pkgs/core/sip/patches/fix-linking.patch create mode 100644 pkgs/core/sip/patches/no-strip.patch create mode 100644 pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch

Difference in files: diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/core/fuse/fuse.nm index 03a5c41..2ae82e0 100644 --- a/pkgs/core/fuse/fuse.nm +++ b/pkgs/core/fuse/fuse.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = fuse -PKG_VER = 2.8.4 +PKG_VER = 2.8.5 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index bbee6aa..008365c 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = glib -PKG_VER = 2.25.11 +PKG_VER = 2.25.17 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/hplip/hplip.nm b/pkgs/core/hplip/hplip.nm index 396f7dc..6b787d9 100644 --- a/pkgs/core/hplip/hplip.nm +++ b/pkgs/core/hplip/hplip.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = hplip -PKG_VER = 3.10.2 +PKG_VER = 3.10.9 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch deleted file mode 100644 index 49cb808..0000000 --- a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules ---- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 -+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 -@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul - LABEL="pid_test" - - # Check for LaserJet products (0x03f0xx17). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" -+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" -+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" - --ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" -+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" - --LABEL="hpmud_rules_end" -\ No newline at end of file -+LABEL="hpmud_rules_end" diff --git a/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch new file mode 100644 index 0000000..d56fe6c --- /dev/null +++ b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch @@ -0,0 +1,21 @@ +diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules +--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 ++++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 +@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + + LABEL="pid_test" + ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" ++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + +-LABEL="hpmud_rules_end" +\ No newline at end of file ++LABEL="hpmud_rules_end" + diff --git a/pkgs/core/sip/patches/fix-linking.patch b/pkgs/core/sip/patches/fix-linking.patch new file mode 100644 index 0000000..b4a5fae --- /dev/null +++ b/pkgs/core/sip/patches/fix-linking.patch @@ -0,0 +1,11 @@ +--- a/specs/linux-g++ 2009/08/31 11:59:37 1.1 ++++ b/specs/linux-g++ 2009/08/31 12:00:19 +@@ -53,7 +53,7 @@ + QMAKE_LFLAGS = + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +-QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = diff --git a/pkgs/core/sip/patches/no-strip.patch b/pkgs/core/sip/patches/no-strip.patch new file mode 100644 index 0000000..033b54f --- /dev/null +++ b/pkgs/core/sip/patches/no-strip.patch @@ -0,0 +1,26 @@ +Index: sip-4.8.2/specs/linux-g++ +=================================================================== +--- sip-4.8.2.orig/specs/linux-g++ ++++ sip-4.8.2/specs/linux-g++ +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +Index: sip-4.8.2/specs/linux-lsb +=================================================================== +--- sip-4.8.2.orig/specs/linux-lsb ++++ sip-4.8.2/specs/linux-lsb +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm index 96a70fb..3b3ac15 100644 --- a/pkgs/core/sip/sip.nm +++ b/pkgs/core/sip/sip.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include

PKG_NAME = sip -PKG_VER = 4.11.2-snapshot-5167b98767e2 -PKG_REL = 0 +PKG_VER = 4.11.2 +PKG_REL = 1 +PKG_EPOCH = 1

PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -51,7 +52,9 @@ PKG_DEPS-$(PKG_NAME_REAL)-devel = sip

define STAGE_BUILD cd $(DIR_APP) && python configure.py \ - CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" + CFLAGS+="$(CFLAGS)" CXXFLAGS+="$(CXXFLAGS)"

cd $(DIR_APP) && make $(PARALLELISMFLAGS) endef + +PKG_FILES-$(PKG_NAME)-devel += /usr/bin/sip diff --git a/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch b/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch new file mode 100644 index 0000000..4d2c272 --- /dev/null +++ b/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch @@ -0,0 +1,11 @@ +diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac +--- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200 ++++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200 +@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST + [use_loadextension=$enableval],[use_loadextension=no]) + if test "${use_loadextension}" = "yes" ; then + OPT_FEATURE_FLAGS="" ++ AC_SEARCH_LIBS(dlopen, [dl]) + else + OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" + fi

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