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 12e2540008a1b39ace1b3deb498475005211f908 (commit) via b0ceec2e5963334a59de36298713441b612a974c (commit) via 68550639d6c675061230671a716013986c2ef41e (commit) via 2eacd10d7fd123fe71fbadeca7c202f0ff2a0135 (commit) via 7e57e8ab1f3ff1905352902a8a1ff82cca7b273a (commit) via 53a5c3cefd6f9e1f9e7e2a3bc3e133ea4c16410b (commit) via 7b680fa9aa1ae29ed3f1228d643d5ef818cae84d (commit) via 3fe235b625d8fc8326080dc5b90612997575f650 (commit) via 29055d7be707f82c467af6cf0c6faa6c69f0407d (commit) via 235a4f105d7f6da95fdf91f72dfc8a098f6897fa (commit) via 11f2d9667d773093fb65ce30c6c24189c5cc7a3c (commit) via 145cb4c128ff6e53a2788a8e40b1b350dd297ed0 (commit) via 567ee45a1f97903a7f6a08aa7b4a747869445a8e (commit) via 5d5f87ed8b577f75ba77c88939a0db93ed14ef56 (commit) via 2a7447d2cebd9b52af0aa34cb1af1c6995fba9a5 (commit) via 802e544c2aa36a829ce26b85970f9fa03d13dfeb (commit) via a2f6b534c6a0ea2238ce203b1eac13e5a8d7a5d2 (commit) via 14878f94aff07e67252fb4acdb7896e81ae5304b (commit) via ccf958e02b6f80b1c5825738f620a358e4051304 (commit) via 91dedbd39550702a058d01c0592880a15e4745c7 (commit) via 59bc59cd08019b76df2ff4f7647ed86f2668af74 (commit) via 0950c75223e47c4c1e177a4fb47e3296451ab640 (commit) via acc505bd35601bdfce0ad716a75e9a469c2b4e3b (commit) via da0362d97758835197198f3712e68f92020399aa (commit) via 16861f8ea35be41868ee8f846774ef8d05c78ec2 (commit) from 6142f9c9bb8019925cfb84c34804913803480f0a (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 12e2540008a1b39ace1b3deb498475005211f908 Merge: b0ceec2e5963334a59de36298713441b612a974c 802e544c2aa36a829ce26b85970f9fa03d13dfeb Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:32:07 2010 +0200

Merge remote branch 'stevee/upstart-jobs' into next

commit b0ceec2e5963334a59de36298713441b612a974c Merge: 68550639d6c675061230671a716013986c2ef41e 145cb4c128ff6e53a2788a8e40b1b350dd297ed0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:23:28 2010 +0200

Merge remote branch 'stevee/squid' into next

commit 68550639d6c675061230671a716013986c2ef41e Merge: 2eacd10d7fd123fe71fbadeca7c202f0ff2a0135 29055d7be707f82c467af6cf0c6faa6c69f0407d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:21:16 2010 +0200

Merge remote branch 'stevee/vsftpd' into next

commit 2eacd10d7fd123fe71fbadeca7c202f0ff2a0135 Merge: 7e57e8ab1f3ff1905352902a8a1ff82cca7b273a 567ee45a1f97903a7f6a08aa7b4a747869445a8e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:12:10 2010 +0200

Merge branch 'qemu' into next

commit 7e57e8ab1f3ff1905352902a8a1ff82cca7b273a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:11:05 2010 +0200

qemu: Remove -pipe from CFLAGS.

GCC consumes lots of memory when building qemu >2GB. This will make the build a little bit slower but works with less than 1GB of memory.

commit 53a5c3cefd6f9e1f9e7e2a3bc3e133ea4c16410b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:10:09 2010 +0200

libvirt: Don't build static libs.

Save buildtime.

commit 7b680fa9aa1ae29ed3f1228d643d5ef818cae84d Merge: 5d5f87ed8b577f75ba77c88939a0db93ed14ef56 3fe235b625d8fc8326080dc5b90612997575f650 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 14:07:12 2010 +0200

Merge branch 'libvirt' into next

commit 3fe235b625d8fc8326080dc5b90612997575f650 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 2 13:53:04 2010 +0200

libvirt: Update to version 0.8.1.

Conflicts:

pkgs/core/libvirt/libvirt.nm

commit 29055d7be707f82c467af6cf0c6faa6c69f0407d Author: Schantl Stefan Stevee@ipfire.org Date: Sat May 1 20:10:39 2010 +0200

vsftpd: Update to version 2.2.2.

commit 235a4f105d7f6da95fdf91f72dfc8a098f6897fa Author: Schantl Stefan Stevee@ipfire.org Date: Sat May 1 20:10:00 2010 +0200

vsftpd: Clean up naoki-makefile.

commit 11f2d9667d773093fb65ce30c6c24189c5cc7a3c Author: Schantl Stefan Stevee@ipfire.org Date: Sat May 1 20:08:24 2010 +0200

vsftpd: Build is using our CFLAGS now.

Fixes issue #564.

commit 145cb4c128ff6e53a2788a8e40b1b350dd297ed0 Author: Schantl Stefan Stevee@ipfire.org Date: Sat May 1 18:12:15 2010 +0200

squid: Update to version 3 STABLE25.

Fixes issue #506.

commit 567ee45a1f97903a7f6a08aa7b4a747869445a8e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 1 13:51:36 2010 +0200

qemu: Update to 0.12.3.

commit 5d5f87ed8b577f75ba77c88939a0db93ed14ef56 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 1 01:32:30 2010 +0200

naoki: Minor code cleanup.

commit 2a7447d2cebd9b52af0aa34cb1af1c6995fba9a5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 1 01:30:40 2010 +0200

naoki: Cron needs to rebuild packages that have been altered since last build.

commit 802e544c2aa36a829ce26b85970f9fa03d13dfeb Author: Schantl Stefan Stevee@ipfire.org Date: Fri Apr 30 17:42:27 2010 +0200

cups: Fix wrong path for config file in upstart job file.

commit a2f6b534c6a0ea2238ce203b1eac13e5a8d7a5d2 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Apr 30 17:39:56 2010 +0200

firewall: Also stop on reboot.

commit 14878f94aff07e67252fb4acdb7896e81ae5304b Author: Schantl Stefan Stevee@ipfire.org Date: Fri Apr 30 17:39:06 2010 +0200

network: Also stop network on reboot.

commit ccf958e02b6f80b1c5825738f620a358e4051304 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Apr 30 17:37:45 2010 +0200

initscripts: Services should also stop on reboot.

commit 91dedbd39550702a058d01c0592880a15e4745c7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 29 23:51:46 2010 +0200

libatasmart: New package.

commit 59bc59cd08019b76df2ff4f7647ed86f2668af74 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 29 23:24:46 2010 +0200

sqlite: Build a threadsafe libary.

In the documentation it is claimed to be the default, but it isn't.

commit 0950c75223e47c4c1e177a4fb47e3296451ab640 Merge: acc505bd35601bdfce0ad716a75e9a469c2b4e3b fa2f304297b2a1d751d2e2cd49e9b7b0401a2ec5 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 23 10:04:38 2010 +0200

Merge branch 'next' into libvirt

commit acc505bd35601bdfce0ad716a75e9a469c2b4e3b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 12 17:25:21 2010 +0200

libvirt: Remove duplicate dependency udev.

commit da0362d97758835197198f3712e68f92020399aa Author: Ben Schweikert trikolon@ipfire.org Date: Sun Apr 11 15:49:13 2010 +0200

libvirt: Reactived libvirt package.

We now are able to build this package again. Got additional dependecy to libpciaccess.

commit 16861f8ea35be41868ee8f846774ef8d05c78ec2 Author: Ben Schweikert trikolon@ipfire.org Date: Sun Apr 11 15:48:32 2010 +0200

libpciaccess: New package.

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

Summary of changes: naoki/__init__.py | 15 ++++++++------- naoki/backend.py | 14 +++++++++++++- pkgs/core/cups/cups.init | 2 +- pkgs/core/firewall/firewall.init | 2 +- pkgs/core/initscripts/init/tty1.conf | 2 +- pkgs/core/initscripts/init/tty2.conf | 2 +- pkgs/core/initscripts/init/tty3.conf | 2 +- pkgs/core/initscripts/init/tty4.conf | 2 +- pkgs/core/initscripts/init/udev.conf | 8 +++----- .../libatasmart.nm} | 18 ++++++++---------- .../libart.nm => libpciaccess/libpciaccess.nm} | 19 ++++++++++--------- pkgs/core/libvirt/{libvirt.nm.off => libvirt.nm} | 14 +++++++++++--- pkgs/core/network/network.init | 2 +- pkgs/core/qemu/qemu.nm | 5 +++-- pkgs/core/sqlite/sqlite.nm | 1 + pkgs/core/squid/squid.nm | 2 +- .../core/vsftpd/patches/vsftpd-2.2.0-openssl.patch | 15 +++++++++++++++ pkgs/core/vsftpd/vsftpd.nm | 8 +++----- 18 files changed, 83 insertions(+), 50 deletions(-) copy pkgs/core/{libusb-compat/libusb-compat.nm => libatasmart/libatasmart.nm} (84%) copy pkgs/core/{libart/libart.nm => libpciaccess/libpciaccess.nm} (84%) rename pkgs/core/libvirt/{libvirt.nm.off => libvirt.nm} (88%) create mode 100644 pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch

Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index c95a528..3bf5704 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -343,25 +343,26 @@ Release : %(release)s

def call_batch_cron(self, args): packages = [] - packages_must = [] packages_may = [] for package in backend.parse_package_info(backend.get_package_names()): if not package.built and package.buildable: - packages_must.append(package) + packages.append(package) + continue + + # If package was altered since last build + if package.last_change >= package.last_build: + packages.append(package) continue

if package.buildable: packages_may.append(package)

- packages += packages_must + packages_may = sorted(packages_may, key=lambda p: p.last_build)

while len(packages) < 10 and packages_may: - package = random.choice(packages_may) - packages_may.remove(package) + package = packages_may.pop(0) packages.append(package)

- random.shuffle(packages) - # Bad hack because we lack a _build method args.packages = [p.name for p in packages] args.onlydeps = False diff --git a/naoki/backend.py b/naoki/backend.py index 1c7f690..ca12b3a 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -353,7 +353,7 @@ class PackageInfo(object):

@property def fingerprint(self): - return "%d" % os.stat(self.filename).st_mtime + return "%d" % self.last_change

@property def group(self): @@ -364,6 +364,18 @@ class PackageInfo(object): return "%s-%s-%s" % (self.name, self.version, self.release)

@property + def last_build(self): + file = os.path.join(PACKAGESDIR, self.package_files[0]) + if not os.path.exists(file): + return 0 + + return os.stat(file).st_mtime + + @property + def last_change(self): + return os.stat(self.filename).st_mtime + + @property def license(self): return self._data.get("PKG_LICENSE")

diff --git a/pkgs/core/cups/cups.init b/pkgs/core/cups/cups.init index 435ddbe..c74f5ef 100644 --- a/pkgs/core/cups/cups.init +++ b/pkgs/core/cups/cups.init @@ -4,6 +4,6 @@ author "IPFire Team" start on started network stop on stopping network

-exec /usr/sbin/cupsd -c /etc/cupsd.conf +exec /usr/sbin/cupsd -c /etc/cups/cupsd.conf expect daemon respawn diff --git a/pkgs/core/firewall/firewall.init b/pkgs/core/firewall/firewall.init index 8c5d893..b7b15c9 100644 --- a/pkgs/core/firewall/firewall.init +++ b/pkgs/core/firewall/firewall.init @@ -2,7 +2,7 @@ description "Starts the firewall" author "IPFire Team"

start on starting network -stop on stopped network +stop on stopped network or starting reboot

pre-start script firewall start diff --git a/pkgs/core/initscripts/init/tty1.conf b/pkgs/core/initscripts/init/tty1.conf index 04d0c91..7f9ae30 100644 --- a/pkgs/core/initscripts/init/tty1.conf +++ b/pkgs/core/initscripts/init/tty1.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"

start on stopped mountfs -stop on starting shutdown +stop on starting shutdown or starting reboot

respawn exec /sbin/agetty 9600 tty1 diff --git a/pkgs/core/initscripts/init/tty2.conf b/pkgs/core/initscripts/init/tty2.conf index af5458a..d6c0935 100644 --- a/pkgs/core/initscripts/init/tty2.conf +++ b/pkgs/core/initscripts/init/tty2.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"

start on stopped mountfs -stop on starting shutdown +stop on starting shutdown or starting reboot

respawn exec /sbin/agetty 9600 tty2 diff --git a/pkgs/core/initscripts/init/tty3.conf b/pkgs/core/initscripts/init/tty3.conf index 2903dd1..aa13926 100644 --- a/pkgs/core/initscripts/init/tty3.conf +++ b/pkgs/core/initscripts/init/tty3.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"

start on stopped mountfs -stop on starting shutdown +stop on starting shutdown or starting reboot

respawn exec /sbin/agetty 9600 tty3 diff --git a/pkgs/core/initscripts/init/tty4.conf b/pkgs/core/initscripts/init/tty4.conf index 0480207..ec4962c 100644 --- a/pkgs/core/initscripts/init/tty4.conf +++ b/pkgs/core/initscripts/init/tty4.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team"

start on stopped mountfs -stop on starting shutdown +stop on starting shutdown or starting reboot

respawn exec /sbin/agetty 9600 tty4 diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/core/initscripts/init/udev.conf index 3d75755..f35c86a 100644 --- a/pkgs/core/initscripts/init/udev.conf +++ b/pkgs/core/initscripts/init/udev.conf @@ -2,10 +2,7 @@ description "Start Udev Daemon" author "IPFire Team"

start on stopped mount-kernel-filesystems -stop on starting shutdown - -emits block-device-added block-device-removed -emits network-device-added network-device-removed +stop on starting shutdown or starting reboot

console output

@@ -28,5 +25,6 @@ pre-start script ls -lah /dev end script

-exec /sbin/udevd +expect fork +exec /sbin/udevd --daemon respawn diff --git a/pkgs/core/libatasmart/libatasmart.nm b/pkgs/core/libatasmart/libatasmart.nm new file mode 100644 index 0000000..d1852fc --- /dev/null +++ b/pkgs/core/libatasmart/libatasmart.nm @@ -0,0 +1,45 @@ +############################################################################### +# # +# 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 = libatasmart +PKG_VER = 0.17 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Statistics +PKG_URL = http://git.0pointer.de/?p=libatasmart.git;a=summary +PKG_LICENSE = LGPLv2+ +PKG_SUMMARY = ATA S.M.A.R.T. Disk Health Monitoring Library. + +PKG_BUILD_DEPS+= pkg-config +PKG_DEPS += udev + +define PKG_DESCRIPTION + A scmall and lightweight parser library for ATA S.M.A.R.T. hard disk \ + health monitoring. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/libpciaccess/libpciaccess.nm b/pkgs/core/libpciaccess/libpciaccess.nm new file mode 100644 index 0000000..b444343 --- /dev/null +++ b/pkgs/core/libpciaccess/libpciaccess.nm @@ -0,0 +1,45 @@ +############################################################################### +# # +# 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 = libpciaccess +PKG_VER = 0.11.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/Virtualization +PKG_URL = http://cgit.freedesktop.org/xorg/lib/libpciaccess/ +PKG_LICENSE = LGPLv2.1+ +PKG_SUMMARY = Generic PCI access library. + +PKG_BUILD_DEPS+= pkg-config + +define PKG_DESCRIPTION + A toolkit to interact with the virtualization capabilities of recent \ + versions of Linux. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + diff --git a/pkgs/core/libvirt/libvirt.nm b/pkgs/core/libvirt/libvirt.nm new file mode 100644 index 0000000..678ee6a --- /dev/null +++ b/pkgs/core/libvirt/libvirt.nm @@ -0,0 +1,64 @@ +############################################################################### +# # +# 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 = libvirt +PKG_VER = 0.8.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/Virtualization +PKG_URL = http://www.libvirt.org/ +PKG_LICENSE = LGPLv2.1+ +PKG_SUMMARY = A library for controlling VMs. + +PKG_BUILD_DEPS+= libtool pkg-config +PKG_DEPS += avahi curl cyrus-sasl gnutls libpciaccess libssh2 libxml2 lvm2 parted readline udev + +define PKG_DESCRIPTION + A toolkit to interact with the virtualization capabilities of recent \ + versions of Linux. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --disable-static \ + --with-qemu \ + --without-esx \ + --without-hal \ + --without-lxc \ + --without-openvz \ + --without-polkit \ + --without-uml \ + --without-vbox \ + --without-xen \ + --with-storage-fs \ + --with-storage-lvm \ + --with-storage-mpath \ + --with-storage-disk \ + --with-avahi \ + --with-udev \ + --with-libvirtd diff --git a/pkgs/core/libvirt/libvirt.nm.off b/pkgs/core/libvirt/libvirt.nm.off deleted file mode 100644 index 50704ef..0000000 --- a/pkgs/core/libvirt/libvirt.nm.off +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################### -# # -# 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 = libvirt -PKG_VER = 0.7.2 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = Applications/Virtualization -PKG_URL = http://www.libvirt.org/ -PKG_LICENSE = LGPLv2.1+ -PKG_SUMMARY = A library for controlling VMs. - -PKG_BUILD_DEPS+= pkg-config -PKG_DEPS += avahi curl cyrus-sasl gnutls libssh2 libxml2 lvm2 readline udev - -define PKG_DESCRIPTION - A toolkit to interact with the virtualization capabilities of recent \ - versions of Linux. -endef - -PKG_TARBALL = $(THISAPP).tar.gz - -CONFIGURE_OPTIONS += \ - --with-qemu \ - --without-esx \ - --without-hal \ - --without-lxc \ - --without-openvz \ - --without-polkit \ - --without-uml \ - --without-vbox \ - --without-xen \ diff --git a/pkgs/core/network/network.init b/pkgs/core/network/network.init index 06a96ef..3320067 100644 --- a/pkgs/core/network/network.init +++ b/pkgs/core/network/network.init @@ -2,7 +2,7 @@ description "Control the networking" author "IPFire Team"

start on stopped mountfs -stop on starting shutdown +stop on starting shutdown or starting reboot

pre-start script network start diff --git a/pkgs/core/qemu/qemu.nm b/pkgs/core/qemu/qemu.nm index ce4d203..b3754e2 100644 --- a/pkgs/core/qemu/qemu.nm +++ b/pkgs/core/qemu/qemu.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = qemu-kvm -PKG_VER = 0.12.2 +PKG_VER = 0.12.3 PKG_REL = 0

PKG_MAINTAINER = @@ -44,12 +44,13 @@ endef

PKG_TARBALL = $(THISAPP).tar.gz

+CFLAGS := $(filter-out -pipe,$(CFLAGS)) + define QUALITY_AGENT_WHITELIST_EXECSTACK /usr/share/qemu/openbios* endef

CONFIGURE_OPTIONS += \ - --prefix=/usr \ --enable-kvm \ --disable-strip \ --disable-xen diff --git a/pkgs/core/sqlite/sqlite.nm b/pkgs/core/sqlite/sqlite.nm index ba09dd0..64cd6c7 100644 --- a/pkgs/core/sqlite/sqlite.nm +++ b/pkgs/core/sqlite/sqlite.nm @@ -55,6 +55,7 @@ define STAGE_BUILD cd $(DIR_SRC)/sqlite-build && \ $(DIR_APP)/configure \ --prefix=/usr \ + --enable-threadsafe \ --disable-tcl

cd $(DIR_SRC)/sqlite-build && make $(PARALLELISMFLAGS) diff --git a/pkgs/core/squid/squid.nm b/pkgs/core/squid/squid.nm index 8ccd56a..5a341e6 100644 --- a/pkgs/core/squid/squid.nm +++ b/pkgs/core/squid/squid.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = squid -PKG_VER = 3.0.STABLE18 +PKG_VER = 3.0.STABLE25 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch b/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch new file mode 100644 index 0000000..23dc498 --- /dev/null +++ b/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch @@ -0,0 +1,15 @@ +diff -up vsftpd-2.2.0/ssl.c.openssl vsftpd-2.2.0/ssl.c +--- vsftpd-2.2.0/ssl.c.openssl 2009-01-09 21:47:05.000000000 +0100 ++++ vsftpd-2.2.0/ssl.c 2009-08-22 20:41:58.000000000 +0200 +@@ -537,7 +537,11 @@ get_ssl(struct vsf_session* p_sess, int + if (tunable_debug_ssl) + { + const char* p_ssl_version = SSL_get_cipher_version(p_ssl); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl); ++#else + SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl); ++#endif + const char* p_cipher_name = SSL_CIPHER_get_name(p_ssl_cipher); + X509* p_ssl_cert = SSL_get_peer_certificate(p_ssl); + int reused = SSL_session_reused(p_ssl); diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm index 54e9539..c26ec54 100644 --- a/pkgs/core/vsftpd/vsftpd.nm +++ b/pkgs/core/vsftpd/vsftpd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = vsftpd -PKG_VER = 2.2.1 +PKG_VER = 2.2.2 PKG_REL = 0

PKG_MAINTAINER = @@ -43,12 +43,10 @@ endef

PKG_TARBALL = $(THISAPP).tar.gz

-############################################################################### -# Installation Details -############################################################################### +CFLAGS += -Wall -W -Wshadow -fstack-protector -fpie -Wextra -Werror

define STAGE_BUILD - cd $(DIR_APP) && make $(PARALLELISMFLAGS) + cd $(DIR_APP) && make CFLAGS='$(CFLAGS)' $(PARALLELISMFLAGS) endef

define STAGE_INSTALL

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