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 1b638aac495b4f256930742d6ccf74d2e4b514f4 (commit) via 8dd3645366cdb4b530c2deecfa01f42373005e8d (commit) via 4e28f667bf9048e209b91b8c61106e0892a47d55 (commit) via 3b9fde50f0231f5d65d0cbb1eda4f96706afe447 (commit) via ff39b55bc1f900385865eb20cbb8005117d32e13 (commit) via 73a7ee3d49fdb9c0ddf13713060886feec668fae (commit) via 4bc1522088ceb29d6b5d28e14fa507baeb4b4234 (commit) via 64ae1f141d067cea8d706a4f3537f4d78032ebb7 (commit) via 7c9a52d59765a30120d26b3e84561f22fc30f7e1 (commit) via 839b4e22a444d73185a6e50a934a66ca5e487533 (commit) via 13da499558349006466dd87121ade6617494ee05 (commit) via f2226b55d0a956932d524593912bbeb580e908bc (commit) via 2cef88078552f91a7cca73f6f049235d8373a39d (commit) via 6ffdb2b8861a3c7fb398d0da9821d2bacfd239ea (commit) via e386259d3faf3b0dbefc90f8d9cd7e31fcda1c18 (commit) via a066b0a36dedc4a34c2e878127647b3b716a9af4 (commit) via e3e891c5d4eda67d7d265a8bd8460842c6088efc (commit) via 62b3c3129f0d7b589a9974fdd19f07340cb3ac10 (commit) via 1641689267cbb51e3e1726387d765529c3ecef14 (commit) from fa527c3a549acaf820a534bbb234a570c4891673 (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 1b638aac495b4f256930742d6ccf74d2e4b514f4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 17:13:22 2010 +0200

generator: Copy kernel modules so we can omit the kernel itself and dracut.

The LiveOS carries way to much things around nobody needs :D

commit 8dd3645366cdb4b530c2deecfa01f42373005e8d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 17:06:40 2010 +0200

squashfs-tools: Add dependency to libgcc_s.so.1.

Otherwise mksquashfs failed saying: libgcc_s.so.1 must be installed for pthread_cancel to work

commit 4e28f667bf9048e209b91b8c61106e0892a47d55 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 23 13:35:44 2010 +0200

qt: Move *.pcl files to development package.

commit 3b9fde50f0231f5d65d0cbb1eda4f96706afe447 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 15:10:52 2010 +0200

xen: Remove ldconfig hack.

This is covered by naoki, now.

commit ff39b55bc1f900385865eb20cbb8005117d32e13 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 15:03:48 2010 +0200

naoki: Run ldconfig before building.

commit 73a7ee3d49fdb9c0ddf13713060886feec668fae Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 15:03:24 2010 +0200

glibc: Repackage (because auf *_nonshared.a).

commit 4bc1522088ceb29d6b5d28e14fa507baeb4b4234 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 15:02:51 2010 +0200

naoki: Package all /usr/lib/*.a into devel packages.

commit 64ae1f141d067cea8d706a4f3537f4d78032ebb7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 14:32:01 2010 +0200

basesystem: Drop dependency to kernel.

commit 7c9a52d59765a30120d26b3e84561f22fc30f7e1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 14:04:36 2010 +0200

python-dbus: Pack headers into development package.

commit 839b4e22a444d73185a6e50a934a66ca5e487533 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 6 14:18:10 2010 +0200

swig: New package.

commit 13da499558349006466dd87121ade6617494ee05 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 13:37:20 2010 +0200

dhcp: Remove unuseable header files.

commit f2226b55d0a956932d524593912bbeb580e908bc Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 13:21:20 2010 +0200

pyQt: Buildfix since split of qt package.

commit 2cef88078552f91a7cca73f6f049235d8373a39d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 13:20:57 2010 +0200

glibc: Remove /sbin/sln.

Unneeded binary.

commit 6ffdb2b8861a3c7fb398d0da9821d2bacfd239ea Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 11:17:25 2010 +0200

qt: Split into several packages.

Squashed commit of the following:

commit 8a0cfa01a56c219cc22e2f83ee5b4d69b7d304c8 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 23 00:58:53 2010 +0200

qt: Increase release number.

commit d60891bd439690d64cddfb43b4fba32b1bcce169 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 23 00:57:38 2010 +0200

qt: Add support for libmng, finish improvement of NM.

commit 7f673740d452c528d3d5dd3ad39cb5b9f7abfb33 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 23 00:37:33 2010 +0200

qt: Improve NM, also build development package.

commit e386259d3faf3b0dbefc90f8d9cd7e31fcda1c18 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 23 00:24:30 2010 +0200

libmng: New package.

commit a066b0a36dedc4a34c2e878127647b3b716a9af4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 00:39:38 2010 +0200

pyQt: Update to 4.8 (stable release).

commit e3e891c5d4eda67d7d265a8bd8460842c6088efc Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 23 00:01:05 2010 +0200

sqlite: Update to 3.7.3.

commit 62b3c3129f0d7b589a9974fdd19f07340cb3ac10 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 22 23:53:19 2010 +0200

elfutils: Re-package libs correctly.

commit 1641689267cbb51e3e1726387d765529c3ecef14 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 22 20:00:42 2010 +0200

ccache: Update to 3.1.

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

Summary of changes: pkgs/Functions | 8 ++ pkgs/Templates | 1 + pkgs/core/basesystem/basesystem.nm | 4 +- pkgs/core/ccache/ccache.nm | 13 ++- pkgs/core/dhcp/dhcp.nm | 6 +- pkgs/core/elfutils/elfutils.nm | 7 ++- pkgs/core/glibc/glibc.nm | 5 +- pkgs/core/{gnutls/gnutls.nm => libmng/libmng.nm} | 29 ++++--- pkgs/core/pyQt/pyQt.nm | 5 +- pkgs/core/python-dbus/python-dbus.nm | 6 +- pkgs/core/qt/qt.nm | 86 +++++++++++++------- pkgs/core/sqlite/sqlite.nm | 31 ++++---- pkgs/core/squashfs-tools/squashfs-tools.nm | 6 +- pkgs/core/swig/patches/swig-1.3.23-pylib.patch | 29 +++++++ pkgs/core/swig/patches/swig200-rh623854.patch | 92 ++++++++++++++++++++++ pkgs/core/{man-db/man-db.nm => swig/swig.nm} | 38 ++++----- pkgs/core/xen/xen.nm | 4 - tools/generator | 6 +- 18 files changed, 279 insertions(+), 97 deletions(-) copy pkgs/core/{gnutls/gnutls.nm => libmng/libmng.nm} (78%) create mode 100644 pkgs/core/swig/patches/swig-1.3.23-pylib.patch create mode 100644 pkgs/core/swig/patches/swig200-rh623854.patch copy pkgs/core/{man-db/man-db.nm => swig/swig.nm} (70%)

Difference in files: diff --git a/pkgs/Functions b/pkgs/Functions index ff64af3..42cfa80 100644 --- a/pkgs/Functions +++ b/pkgs/Functions @@ -12,6 +12,11 @@ DO_PACKAGE_FILENAME = $(1)$(call DO_PKG_SUFFIX,$(1)) DO_PKG_SUFFIX = \ -$(if $(PKG_VER-$(1)),$(PKG_VER-$(1)),$(PKG_VER))-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(if $(PKG_REL-$(1)),$(PKG_REL-$(1)),$(PKG_REL)).ipk

+define DO_INIT + # Run ldconfig + ldconfig +endef + define DO_PACKAGE @echo "#####################################################################" @echo "# $(1) - Package build started" @@ -75,6 +80,9 @@ define DO_FIX_LIBTOOL endef

define DO_PREPARE + # Initialize the environment at the beginning + $(DO_INIT) + @echo "#####################################################################" @echo "# $(PKG_NAME) - Preparation started" @echo "#####################################################################" diff --git a/pkgs/Templates b/pkgs/Templates index a1a921e..f1cba10 100644 --- a/pkgs/Templates +++ b/pkgs/Templates @@ -27,6 +27,7 @@ PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)=$(THISVER) \ define PKG_FILES-$(PKG_NAME_REAL)-devel /usr/bin/*-config /usr/include + /usr/lib/*.a /usr/lib/pkgconfig /usr/share/aclocal */lib/*.so diff --git a/pkgs/core/basesystem/basesystem.nm b/pkgs/core/basesystem/basesystem.nm index 75562bf..9331aa1 100644 --- a/pkgs/core/basesystem/basesystem.nm +++ b/pkgs/core/basesystem/basesystem.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = basesystem -PKG_VER = +PKG_VER = $(DISTRO_VERSION) PKG_REL = 0

PKG_MAINTAINER = @@ -39,7 +39,7 @@ PKG_BUILD_DEPS = # There are no build dependencies # This is a package that pulls lots of other dependencies to always have a # useable system. PKG_DEPS += /bin/sh /sbin/init \ - coreutils file findutils gawk grep iana-etc initscripts kbd kernel less \ + coreutils file findutils gawk grep iana-etc initscripts kbd less \ module-init-tools network pakfire passwd procps psmisc sed shadow \ system-release tar udev util-linux-ng vim

diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm index e8a8768..80167d4 100644 --- a/pkgs/core/ccache/ccache.nm +++ b/pkgs/core/ccache/ccache.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = ccache -PKG_VER = 3.0.1 +PKG_VER = 3.1 PKG_REL = 0

PKG_MAINTAINER = @@ -34,7 +34,7 @@ PKG_URL = http://ccache.samba.org/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = C/C++ compiler cache.

-PKG_DEPS += zlib +PKG_BUILD_DEPS+= zlib-devel

define PKG_DESCRIPTION ccache is a compiler cache. It acts as a caching pre-processor to \ @@ -43,13 +43,18 @@ define PKG_DESCRIPTION a 5 to 10 times speedup in common compilations. endef

-PKG_TARBALL = $(THISAPP).tar.gz +PKG_TARBALL = $(THISAPP).tar.xz

# Sets ccache max size up to 2 GB CFLAGS += -DDEFAULT_MAXSIZE=2097152

CONFIGURE_OPTIONS += \ - --mandir=/usr/share + --mandir=/usr/share/man + +define STAGE_PREPARE_CMDS + # Disable pch test that fails + cd $(DIR_APP) && sed -e "s/^pch_suite.*/& return 0/" -i test.sh +endef

define STAGE_TEST cd $(DIR_APP) && make check diff --git a/pkgs/core/dhcp/dhcp.nm b/pkgs/core/dhcp/dhcp.nm index 008c9ad..e575b33 100644 --- a/pkgs/core/dhcp/dhcp.nm +++ b/pkgs/core/dhcp/dhcp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = dhcp PKG_VER = 4.1.1 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = Networking/Daemons @@ -63,4 +63,8 @@ define STAGE_INSTALL_CMDS install -v -m 755 $(DIR_SOURCE)/dhclient-script \ $(BUILDROOT)/sbin/dhclient-script -mkdir -pv $(BUILDROOT)/var/lib/dhclient + + # Remove header files. + # There is nothing that makes use out of them. + rm -rfv $(BUILDROOT)/usr/include endef diff --git a/pkgs/core/elfutils/elfutils.nm b/pkgs/core/elfutils/elfutils.nm index 0063693..0d7f748 100644 --- a/pkgs/core/elfutils/elfutils.nm +++ b/pkgs/core/elfutils/elfutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = elfutils PKG_VER = 0.145 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Development/Libraries @@ -61,3 +61,8 @@ endef #define STAGE_TEST # cd $(DIR_APP) && make check #endef + +# Libs are not versioned very well... +PKG_FILES-$(PKG_NAME_REAL)-libs += \ + /usr/lib/lib*$(PKG_VER).so \ + /usr/lib/elfutils diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm index bc5ad53..4bbaacd 100644 --- a/pkgs/core/glibc/glibc.nm +++ b/pkgs/core/glibc/glibc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = glibc PKG_VER = 2.12.1 -PKG_REL = 0 +PKG_REL = 2

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = System/Base @@ -278,4 +278,7 @@ define STAGE_INSTALL # Configuration cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc -mkdir -pv $(BUILDROOT)/etc/ld.so.conf.d + + # Remove unused binaries + rm -vf $(BUILDROOT)/sbin/sln endef diff --git a/pkgs/core/libmng/libmng.nm b/pkgs/core/libmng/libmng.nm new file mode 100644 index 0000000..3709703 --- /dev/null +++ b/pkgs/core/libmng/libmng.nm @@ -0,0 +1,57 @@ +############################################################################### +# # +# 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 = libmng +PKG_VER = 1.0.10 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.libmng.org +PKG_LICENSE = zlib +PKG_SUMMARY = Library for Multiple-image Network Graphics support. + +PKG_BUILD_DEPS+= autoconf automake libjpeg-devel libtool zlib-devel + +define PKG_DESCRIPTION + LibMNG is a library for accessing graphics in MNG (Multi-image Network \ + Graphics) and JNG (JPEG Network Graphics) formats. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +PKG_PACKAGES += $(PKG_NAME)-devel + +CONFIGURE_OPTIONS += \ + --enable-shared \ + --disable-static \ + --with-zlib \ + --with-jpeg \ + --with-gnu-ld + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && unmaintained/autogen.sh +endef diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm index 7e85ead..b885b92 100644 --- a/pkgs/core/pyQt/pyQt.nm +++ b/pkgs/core/pyQt/pyQt.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include

PKG_NAME = pyQt -PKG_VER = snapshot-4.8-3011e73e866d +PKG_VER = 4.8 PKG_REL = 0 +PKG_EPOCH = 1

PKG_MAINTAINER = PKG_GROUP = Development/Languages @@ -34,7 +35,7 @@ PKG_URL = http://www.riverbankcomputing.com/software/pyqt/ PKG_LICENSE = GPLv3 or GPLv2 with exceptions PKG_SUMMARY = Python bindings for Qt4.

-PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt sip-devel +PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt-devel sip-devel PKG_DEPS += sip

define PKG_DESCRIPTION diff --git a/pkgs/core/python-dbus/python-dbus.nm b/pkgs/core/python-dbus/python-dbus.nm index 2df7e78..f777ce9 100644 --- a/pkgs/core/python-dbus/python-dbus.nm +++ b/pkgs/core/python-dbus/python-dbus.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = dbus-python PKG_VER = 0.82.4 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -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 +PKG_BUILD_DEPS+= dbus-glib-devel pkg-config python-devel

define PKG_DESCRIPTION D-Bus python bindings for use with python programs. @@ -42,5 +42,7 @@ endef

PKG_TARBALL = $(THISAPP).tar.gz

+PKG_PACKAGES += $(PKG_NAME_REAL)-devel + CONFIGURE_OPTIONS += \ --mandir=/usr/share/man diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm index 22ad408..1629bdc 100644 --- a/pkgs/core/qt/qt.nm +++ b/pkgs/core/qt/qt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = qt PKG_VER = 4.7.0 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,10 +34,20 @@ PKG_URL = http://www.qtsoftware.com/ PKG_LICENSE = LGPLv2 with exceptions or GPLv3 with exceptions PKG_SUMMARY = Qt toolkit.

-PKG_BUILD_DEPS+= fontconfig-devel gcc-c++ libjpeg-devel libpng-devel \ - libtiff-devel libX11-devel libXext-devel pcre-devel pkg-config \ +PKG_PACKAGES += $(PKG_NAME_REAL)-devel +PKG_FILES-$(PKG_NAME_REAL)-devel += \ + /usr/lib/*.prl \ + /usr/lib/qt4/q3porting.xml \ + /usr/bin \ + /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

+ define PKG_DESCRIPTION Qt is a software toolkit for developing applications. endef @@ -46,55 +56,66 @@ PKG_TARBALL = $(PKG_NAME)-everywhere-opensource-src-$(PKG_VER).tar.gz

CONFIGURE_OPTIONS = -v \ -prefix /usr \ + -datadir /usr/lib/qt4 \ + -headerdir /usr/include \ + -plugindir /usr/lib/qt4/plugins \ + -translationdir /usr/share/qt4/translations \ -confirm-license \ - -opensource \ - -optimized-qmake \ - -shared \ - -release \ + -fontconfig \ -largefile \ + -opensource \ -reduce-relocations \ - -openssl-linked \ - -fontconfig \ - -no-rpath \ - -no-pch \ - -no-qt3support \ - -no-multimedia \ + -release \ + -shared \ -no-audio-backend \ - -no-phonon \ - -no-phonon-backend \ - -no-svg \ - -no-javascript-jit \ - -no-cups \ + -no-dbus \ -no-gtkstyle \ + -no-cups \ + -no-javascript-jit \ + -no-multimedia \ -no-nas-sound \ + -no-nis \ + -no-openssl \ -no-opengl \ -no-openvg \ - -no-xinerama \ + -no-qt3support \ + -no-pch \ + -no-phonon \ + -no-phonon-backend \ + -no-rpath \ + -no-script \ + -no-scripttools \ + -no-separate-debug-info \ + -no-sm \ + -no-sql-db2 \ + -no-sql-ibase \ -no-sql-mysql \ + -no-sql-oci \ -no-sql-odbc \ + -no-sql-psql \ -no-sql-sqlite \ + -no-sql-sqlite2 \ + -no-sql-sqlite_symbian \ -no-sql-tds \ + -no-stl \ + -no-svg \ -no-webkit \ - -no-script\ - -no-scripttools \ - -no-gif \ - -no-libmng \ - -no-separate-debug-info \ - -no-sm \ + -no-xinerama \ -no-xshape \ - -no-xvideo \ -no-xsync \ + -no-xvideo \ -no-mmx \ -no-sse \ -no-sse2 \ -no-3dnow \ - -system-libpng \ -system-libjpeg \ + -system-libmng \ + -system-libpng \ -system-libtiff \ -system-zlib \ -nomake demos \ - -nomake examples \ - -nomake docs + -nomake docs \ + -nomake examples

DIR_APP = $(DIR_SRC)/$(PKG_NAME)-everywhere-opensource-src-$(PKG_VER)

@@ -104,4 +125,11 @@ endef

define STAGE_INSTALL cd $(DIR_APP) && make install INSTALL_ROOT=$(BUILDROOT) + + # Remove libs for Qt designer + rm -rvf $(BUILDROOT)/usr/lib/libQtDesigner* + + # Remove translations for Qt assistant and designer + rm -rvf $(BUILDROOT)/usr/share/qt4/translations/assistant* + rm -rvf $(BUILDROOT)/usr/share/qt4/translations/designer* endef diff --git a/pkgs/core/sqlite/sqlite.nm b/pkgs/core/sqlite/sqlite.nm index 0454942..180e72b 100644 --- a/pkgs/core/sqlite/sqlite.nm +++ b/pkgs/core/sqlite/sqlite.nm @@ -24,8 +24,11 @@

include $(PKGROOT)/Include

+# XXX need to fix rpath +QUALITY_AGENT_WHITELIST_RPATH = /usr/lib + PKG_NAME = sqlite -PKG_VER = 3.5.2 +PKG_VER = 3.7.3 PKG_REL = 0

PKG_MAINTAINER = @@ -34,7 +37,7 @@ PKG_URL = http://www.sqlite.org/ PKG_LICENSE = PublicDomain PKG_SUMMARY = A small an versative Database, that uses simple text files.

-PKG_BUILD_DEPS+= readline-devel +PKG_BUILD_DEPS+= autoconf automake libtool ncurses-devel readline-devel tcl

define PKG_DESCRIPTION SQLite is a in-process library that implements a self-contained, \ @@ -49,20 +52,16 @@ PKG_TARBALL = $(THISAPP).tar.gz

PKG_PACKAGES += $(PKG_NAME)-devel

-define STAGE_PREPARE_CMDS - -mkdir -pv $(DIR_SRC)/sqlite-build -endef - -define STAGE_BUILD - cd $(DIR_SRC)/sqlite-build && \ - $(DIR_APP)/configure \ - --prefix=/usr \ - --enable-threadsafe \ - --disable-tcl +CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 \ + -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -fno-strict-aliasing

- cd $(DIR_SRC)/sqlite-build && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --enable-threadsafe \ + --enable-threads-override-locks \ + --enable-load-extension \ + --disable-tcl

-define STAGE_INSTALL - cd $(DIR_SRC)/sqlite-build && make install DESTDIR=$(BUILDROOT) +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -vfi endef diff --git a/pkgs/core/squashfs-tools/squashfs-tools.nm b/pkgs/core/squashfs-tools/squashfs-tools.nm index 4ee5297..cae0e46 100644 --- a/pkgs/core/squashfs-tools/squashfs-tools.nm +++ b/pkgs/core/squashfs-tools/squashfs-tools.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = squashfs-tools PKG_VER = 4.1 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Filesystem @@ -36,6 +36,10 @@ PKG_SUMMARY = Utility for the creation of squashfs filesystems.

PKG_BUILD_DEPS+= libattr-devel xz-devel zlib-devel

+# XXX This package has a very weird dependency to libgcc_s.so.1. +# Can we fix this in a non-hacky way? +PKG_DEPS += libgcc_s.so.1 + define PKG_DESCRIPTION Squashfs is a highly compressed read-only filesystem for Linux. endef diff --git a/pkgs/core/swig/patches/swig-1.3.23-pylib.patch b/pkgs/core/swig/patches/swig-1.3.23-pylib.patch new file mode 100644 index 0000000..85fa1e3 --- /dev/null +++ b/pkgs/core/swig/patches/swig-1.3.23-pylib.patch @@ -0,0 +1,29 @@ +--- SWIG-1.3.23/configure.in.pylib 2004-11-02 00:45:57.000000000 +0100 ++++ SWIG-1.3.23/configure.in 2004-11-23 12:20:12.552926982 +0100 +@@ -574,9 +574,11 @@ + + # Set the include directory + ++ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` ++ + AC_MSG_CHECKING(for Python header files) + if test -r $PYPREFIX/include/$PYVERSION/Python.h; then +- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config" ++ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" + fi + if test -z "$PYINCLUDE"; then + if test -r $PYPREFIX/include/Py/Python.h; then +@@ -587,13 +589,6 @@ + + # Set the library directory blindly. This probably won't work with older versions + AC_MSG_CHECKING(for Python library) +- dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR" +- for i in $dirs; do +- if test -d $PYEPREFIX/$PYLIBDIR/$i; then +- PYLIB="$PYEPREFIX/$PYLIBDIR/$i" +- break +- fi +- done + if test -z "$PYLIB"; then + AC_MSG_RESULT(Not found) + else diff --git a/pkgs/core/swig/patches/swig200-rh623854.patch b/pkgs/core/swig/patches/swig200-rh623854.patch new file mode 100644 index 0000000..5665252 --- /dev/null +++ b/pkgs/core/swig/patches/swig200-rh623854.patch @@ -0,0 +1,92 @@ +diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg +--- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100 ++++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200 +@@ -45,8 +45,18 @@ + #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg + #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) + #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) +-#define SWIG_fail goto fail ++#define SWIG_fail goto fail + ++/* ++ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of ++ * CObjects API. ++ */ ++#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \ ++ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) ++#define USE_CAPSULES ++#define TYPE_POINTER_NAME \ ++ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) ++#endif + + /* Runtime API implementation */ + +@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) { + #ifdef SWIG_LINK_RUNTIME + type_pointer = SWIG_ReturnGlobalTypeList((void *)0); + #else ++#ifdef USE_CAPSULES ++ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0); ++#else + type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); ++#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + type_pointer = (void *)0; +@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na + SWIGRUNTIME void + SWIG_Python_DestroyModule(void *vptr) + { ++ size_t i; ++#ifdef USE_CAPSULES ++ swig_module_info *swig_module = ++ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME); ++#else + swig_module_info *swig_module = (swig_module_info *) vptr; ++#endif + swig_type_info **types = swig_module->types; +- size_t i; + for (i =0; i < swig_module->size; ++i) { + swig_type_info *ty = types[i]; + if (ty->owndata) { +@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info * + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + swig_empty_runtime_method_table); + #endif ++#ifdef USE_CAPSULES ++ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, ++ (PyCapsule_Destructor)SWIG_Python_DestroyModule); ++#else + PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); ++#endif + if (pointer && module) { ++#ifdef USE_CAPSULES ++ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); ++#else + PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); ++#endif + } else { + Py_XDECREF(pointer); + } +@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type) + PyObject *obj = PyDict_GetItem(cache, key); + swig_type_info *descriptor; + if (obj) { ++#ifdef USE_CAPSULES ++ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type); ++#else + descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); ++#endif + } else { + swig_module_info *swig_module = SWIG_Python_GetModule(); + descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); + if (descriptor) { ++#ifdef USE_CAPSULES ++ obj = PyCapsule_New(descriptor, type, NULL); ++#else + obj = PyCObject_FromVoidPtr(descriptor, NULL); ++#endif + PyDict_SetItem(cache, key, obj); + Py_DECREF(obj); + } diff --git a/pkgs/core/swig/swig.nm b/pkgs/core/swig/swig.nm new file mode 100644 index 0000000..8f0d3aa --- /dev/null +++ b/pkgs/core/swig/swig.nm @@ -0,0 +1,57 @@ +############################################################################### +# # +# 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 = swig +PKG_VER = 2.0.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Tools +PKG_URL = http://swig.sourceforge.net/ +PKG_LICENSE = GPLv3+ and BSD +PKG_SUMMARY = Connects C/C++/Objective C to some high-level programming \ + languages. + +PKG_BUILD_DEPS+= autoconf automake gcc-c++ pcre-devel perl python-devel + +define PKG_DESCRIPTION + Simplified Wrapper and Interface Generator (SWIG) is a software \ + development tool for connecting C, C++ and Objective C programs with a \ + variety of high-level programming languages. SWIG is primarily used \ + with Perl, Python and Tcl/TK, but it has also been extended to Java, \ + Eiffel and Guile. SWIG is normally used to create high-level \ + interpreted programming environments, systems integration, and as a \ + tool for building user interfaces. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --sbindir=/sbin + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && ./autogen.sh +endef diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm index 09f13e1..f5bff8d 100644 --- a/pkgs/core/xen/xen.nm +++ b/pkgs/core/xen/xen.nm @@ -72,10 +72,6 @@ define QUALITY_AGENT_WHITELIST_EXECSTACK endef

define STAGE_BUILD - # This needs to be called because the configuration routine is - # damn crappy. - ldconfig - # Following two lines are disabling HVM. HVM does not work because \ # of soem PIE errors we get when we try to build the firmware part \ # needed for different architektures. diff --git a/tools/generator b/tools/generator index 89fdbfc..9cc31b0 100755 --- a/tools/generator +++ b/tools/generator @@ -34,10 +34,14 @@ function installer_image() { # (2) squashfs.img (installer)

local i - for i in dev proc sys; do + for i in dev proc sys lib/modules; do mkdir -p ${dir}/${i} 2>/dev/null done

+ # Copy kernel modules + cp -vfr /lib/modules/${KERNEL_RELEASE} ${dir}/lib/modules/ + + # Copy overlay cp -vfr /usr/src/src/install/* ${dir}

_installer_image_ext3fs \

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