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 dc6c855c8e61b378e26a16e1c8211d75514561fb (commit) via 5416a00f95ac532f501731424b1cd9c16bb10ad5 (commit) via 7a68347010038fe340e7c265d1884883830f9974 (commit) via 9b7686664d32751e5d8c0852431625428e439c8b (commit) via 94eaa56e0c0ebc10b13c29abce7bca256acb1c8d (commit) via 54cafc1c7051f0fa291b3bf1e074811887a001b1 (commit) via ea87fbec74d732f5831f290a4a33622887e9767b (commit) via 0c5ad1a5917c595adb9fac9504a24bcc4649d602 (commit) via bbe0fd950f9ee0f63a83d7995da03a08c23f0276 (commit) via 99a91f2af618b1c1f6e249af6e916cc2636768d8 (commit) via fc15140b59e6a781b89694a404635d003cb43c88 (commit) via 514357ad91e48320fe6d93ebb0573aea1392fdd6 (commit) via 3dd085a5f31dd067a818e60cd636ae2fcb796598 (commit) from 004ab5b94d6ef5243db026772324e232f41b93c9 (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 dc6c855c8e61b378e26a16e1c8211d75514561fb Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 14:46:50 2011 +0200

gdb: Update to 7.3.1.

Fixes #250.

commit 5416a00f95ac532f501731424b1cd9c16bb10ad5 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 14:43:46 2011 +0200

openssl: Update to 1.0.0e.

Fixes #259, CVE-2011-3207 and CVE-2011-3210. More information at: http://openssl.org/news/secadv_20110906.txt

commit 7a68347010038fe340e7c265d1884883830f9974 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 14:09:41 2011 +0200

gnutls: Update to 3.0.3.

Fixes #252.

commit 9b7686664d32751e5d8c0852431625428e439c8b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 14:05:46 2011 +0200

p11-kit: Update to 0.7.

This is required by gnutls which requires p11-kit 0.4 or later.

commit 94eaa56e0c0ebc10b13c29abce7bca256acb1c8d Merge: 54cafc1 bbe0fd9 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 13:13:02 2011 +0200

Merge remote-tracking branch 'trikolon/libvirt'

commit 54cafc1c7051f0fa291b3bf1e074811887a001b1 Merge: ea87fbe 3dd085a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 13:12:42 2011 +0200

Merge remote-tracking branch 'stevee/dhcpd'

commit ea87fbec74d732f5831f290a4a33622887e9767b Merge: 0c5ad1a 514357a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 13:12:39 2011 +0200

Merge remote-tracking branch 'stevee/systemd'

commit 0c5ad1a5917c595adb9fac9504a24bcc4649d602 Merge: 99a91f2 fc15140 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 28 13:12:01 2011 +0200

Merge remote-tracking branch 'stevee/console_check'

commit bbe0fd950f9ee0f63a83d7995da03a08c23f0276 Author: Ben Schweikert trikolon@ipfire.org Date: Mon Sep 26 20:39:42 2011 +0200

Libvirt: Version update.

commit 99a91f2af618b1c1f6e249af6e916cc2636768d8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Sep 25 14:11:09 2011 +0200

fuse: Update to 2.8.6.

commit fc15140b59e6a781b89694a404635d003cb43c88 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Sep 25 13:39:40 2011 +0200

initscripts: Remove console_check.

We don't need this binary anymore, because systemd is able to detect serial consoles and start a getty on it.

commit 514357ad91e48320fe6d93ebb0573aea1392fdd6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Sep 25 13:34:50 2011 +0200

systemd: Requires util-linux >= 2.19 to run.

commit 3dd085a5f31dd067a818e60cd636ae2fcb796598 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Sep 25 12:20:50 2011 +0200

dhcp: Move pid files, create runtime dirs and lease files.

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

Summary of changes: dhcp/dhcp.nm | 15 ++- fuse/fuse.nm | 11 +- gdb/gdb.nm | 6 +- gnutls/gnutls.nm | 10 +- initscripts/initscripts.nm | 2 +- initscripts/src/Makefile | 6 +- initscripts/src/console_check.c | 180 -------------------- libvirt/libvirt.nm | 4 +- openssl/openssl.nm | 6 +- ...-version.patch => openssl-1.0.0e-version.patch} | 12 +- p11-kit/p11-kit.nm | 11 +- systemd/systemd.nm | 9 +- 12 files changed, 55 insertions(+), 217 deletions(-) delete mode 100644 initscripts/src/console_check.c rename openssl/patches/{openssl-1.0.0d-version.patch => openssl-1.0.0e-version.patch} (57%)

Difference in files: diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm index 643d35b..a60868d 100644 --- a/dhcp/dhcp.nm +++ b/dhcp/dhcp.nm @@ -5,7 +5,7 @@

name = dhcp version = 4.2.1-P1 -release = 1 +release = 2

groups = Networking/Daemons url = http://isc.org/products/DHCP/ @@ -27,9 +27,9 @@ build --sysconfdir=/etc \ --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \ --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \ - --with-srv-pid-file=/var/run/dhcpd.pid \ - --with-cli-pid-file=/var/run/dhclient.pid \ - --with-relay-pid-file=/var/run/dhcrelay.pid + --with-srv-pid-file=/run/dhcpd.pid \ + --with-cli-pid-file=/run/dhclient.pid \ + --with-relay-pid-file=/run/dhcrelay.pid

install_cmds rm -vf %{BUILDROOT}/etc/dhclient.conf @@ -41,7 +41,14 @@ build

install -v -m 755 %{DIR_SOURCE}/dhclient-script \ %{BUILDROOT}/sbin/dhclient-script + + # Create runtime folders. mkdir -pv %{BUILDROOT}/var/lib/dhclient + mkdir -pv %{BUILDROOT}/var/lib/dhcpd + + # Create empty lease files. + touch %{BUILDROOT}/var/lib/dhclient/dhclient.leases + touch %{BUILDROOT}/var/lib/dhcpd/dhcpd.leases

# Remove header files. # There is nothing that makes use out of them. diff --git a/fuse/fuse.nm b/fuse/fuse.nm index 35c30d5..e8fe47d 100644 --- a/fuse/fuse.nm +++ b/fuse/fuse.nm @@ -4,7 +4,7 @@ ###############################################################################

name = fuse -version = 2.8.5 +version = 2.8.6 release = 1

groups = System/Filesystems @@ -13,23 +13,26 @@ license = GPL+ summary = File System in Userspace (FUSE) utilities.

description - With FUSE it is possible to implement a fully functional \ - filesystem in a userspace program. This package contains the \ + With FUSE it is possible to implement a fully functional + filesystem in a userspace program. This package contains the FUSE userspace tools to mount a FUSE filesystem. end

-source_dl = +source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bthisapp...

build requires libselinux-devel end

+ CFLAGS += -D_GNU_SOURCE + configure_options += \ --disable-static \ --disable-rpath

install_cmds + # Remove old sysvinit directory. rm -vrf %{BUILDROOT}/etc/init.d

# Remove /dev/fuse which cannot be packaged. diff --git a/gdb/gdb.nm b/gdb/gdb.nm index f09032e..7c37758 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -4,7 +4,7 @@ ###############################################################################

name = gdb -version = 7.2 +version = 7.3.1 release = 1

groups = Development/Debuggers @@ -18,8 +18,8 @@ description and printing their data. end

-source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = ftp://ftp.gnu.org/gnu/gdb/ +sources = %{thisapp}.tar.gz

build requires diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 04376dc..e321030 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -4,7 +4,7 @@ ###############################################################################

name = gnutls -version = 3.0.0 +version = 3.0.3 release = 1

groups = System/Libraries @@ -19,14 +19,14 @@ description TLS working group. end

-source_dl = +source_dl = ftp://ftp.gnu.org/gnu/gnutls/ sources = %{thisapp}.tar.xz

build requires libtasn1-devel nettle-devel - p11-kit-devel + p11-kit-devel>=0.4 zlib-devel end

@@ -44,6 +44,10 @@ end

packages package %{name} + requires + p11-kit>=0.4 + end + end

package %{name}-devel template DEVEL diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index c4fe572..ca0e7af 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 5 +release = 6

groups = Base System/Boot url = diff --git a/initscripts/src/Makefile b/initscripts/src/Makefile index 92fc670..9a979e4 100644 --- a/initscripts/src/Makefile +++ b/initscripts/src/Makefile @@ -1,5 +1,5 @@

-PROGS = console_check console_init ipcalc securetty +PROGS = console_init ipcalc securetty

CC = gcc CFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) @@ -15,7 +15,6 @@ test: ipcalc install: $(PROGS) # Install binaries -mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/{,s}bin - install -v -m 755 console_check $(DESTDIR)/lib/udev/ install -v -m 755 console_init $(DESTDIR)/lib/udev/ install -v -m 755 ipcalc $(DESTDIR)/bin install -v -m 755 securetty $(DESTDIR)/sbin @@ -26,9 +25,6 @@ install: $(PROGS) install -v -m 644 ipcalc.1 $(DESTDIR)/usr/share/man/man1 install -v -m 644 securetty.8 $(DESTDIR)/usr/share/man/man8

-console_check: console_check.o - $(CC) $(LDFLAGS) -o $@ $< - console_init: console_init.o shvar.o $(CC) $(LDFLAGS) $(shell pkg-config --libs glib-2.0) -o $@ $?

diff --git a/initscripts/src/console_check.c b/initscripts/src/console_check.c deleted file mode 100644 index 740f2a8..0000000 --- a/initscripts/src/console_check.c +++ /dev/null @@ -1,180 +0,0 @@ - -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <termios.h> -#include <unistd.h> - -#include <sys/ioctl.h> - -#include <linux/serial.h> -#include <linux/serial_core.h> - -struct speeds -{ - speed_t speed; - unsigned long value; -}; - -struct speeds speed_map[] = -{ - {B50, 50}, - {B75, 75}, - {B110, 110}, - {B134, 134}, - {B150, 150}, - {B200, 200}, - {B300, 300}, - {B600, 600}, - {B1200, 1200}, - {B1800, 1800}, - {B2400, 2400}, - {B4800, 4800}, - {B9600, 9600}, - {B19200, 19200}, - {B38400, 38400}, -#ifdef B57600 - {B57600, 57600}, -#endif -#ifdef B115200 - {B115200, 115200}, -#endif -#ifdef B230400 - {B230400, 230400}, -#endif -#ifdef B460800 - {B460800, 460800}, -#endif - {0, 0} -}; - -int termcmp(struct termios *a, struct termios *b) { - if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || - a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag || - cfgetispeed(a) != cfgetispeed(b) || cfgetospeed(a) != cfgetospeed(b)) - return 1; - return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); -} - -int get_serial_speed(int fd) { - struct termios mode; - - if (!tcgetattr(fd, &mode)) { - int i; - speed_t speed; - - speed = cfgetospeed(&mode); - for (i = 0; speed_map[i].value != 0; i++) - if (speed_map[i].speed == speed) - return speed_map[i].value; - } - return 0; -} - -int compare_termios_to_console(char *dev, int *speed) { - struct termios cmode, mode; - int fd, cfd; - - cfd = open ("/dev/console", O_RDONLY); - tcgetattr(cfd, &cmode); - close(cfd); - - fd = open(dev, O_RDONLY|O_NONBLOCK); - tcgetattr(fd, &mode); - - if (!termcmp(&cmode, &mode)) { - *speed = get_serial_speed(fd); - close(fd); - return 1; - } - close(fd); - return 0; -} - -char *serial_tty_name(int type) { - switch (type) { - case PORT_8250...PORT_MAX_8250: - return "ttyS"; - case PORT_PMAC_ZILOG: - return "ttyPZ"; - case PORT_MPSC: - return "ttyMM"; - case PORT_CPM: - return "ttyCPM"; - case PORT_MPC52xx: - return "ttyPSC"; - default: - return NULL; - } -} - -char *check_serial_console(int *speed) { - int fd; - char *ret = NULL, *device; - char twelve = 12; - struct serial_struct si, si2; - char *tty_name; - - memset(&si, 0, sizeof(si)); - memset(&si2, 0, sizeof(si)); - - fd = open("/dev/console", O_RDWR); - if (ioctl (fd, TIOCLINUX, &twelve) >= 0) - goto out; - - if (ioctl(fd, TIOCGSERIAL, &si) < 0) - goto out; - close(fd); - - tty_name = serial_tty_name(si.type); - if (!tty_name) - goto out; - - asprintf(&device, "%s%d", tty_name, si.line); - fd = open(device, O_RDWR|O_NONBLOCK); - if (fd == -1) - goto out; - - if (ioctl(fd, TIOCGSERIAL, &si2) < 0) - goto out; - - if (memcmp(&si,&si2, sizeof(si))) - goto out; - - *speed = get_serial_speed(fd); - ret = device; -out: - close(fd); - return ret; -} - -int emit_console_event(char *dev, int speed) { - char *args[] = { "initctl", "emit", "--no-wait", "serial-console-available", NULL, NULL, NULL }; - - asprintf(&args[4],"DEV=%s", dev); - if (speed) - asprintf(&args[5],"SPEED=%d", speed); - execv("/sbin/initctl", args); - return 1; -} - -int main(int argc, char **argv) { - char *device; - int speed; - - if (argc < 2) { - printf("usage: console_check <device>\n"); - exit(1); - } - chdir("/dev"); - device = argv[1]; - if (!strcmp(device, "console")) { - device = check_serial_console(&speed); - if (device) - return emit_console_event(device, speed); - } else if (compare_termios_to_console(device, &speed)) { - return emit_console_event(device, speed); - } - return 0; -} diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index 7618b54..90d50a6 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -4,8 +4,8 @@ ###############################################################################

name = libvirt -version = 0.9.0 -release = 3 +version = 0.9.6 +release = 1

groups = Applications/Virtualization url = http://www.libvirt.org/ diff --git a/openssl/openssl.nm b/openssl/openssl.nm index fd66c78..278f3e1 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,8 +4,8 @@ ###############################################################################

name = openssl -version = 1.0.0d -release = 3 +version = 1.0.0e +release = 1

maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -19,7 +19,7 @@ description libraries which provide various cryptographic algorithms and protocols. end

-source_dl = +source_dl = http://openssl.org/source/

build requires diff --git a/openssl/patches/openssl-1.0.0d-version.patch b/openssl/patches/openssl-1.0.0d-version.patch deleted file mode 100644 index da50fb4..0000000 --- a/openssl/patches/openssl-1.0.0d-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up openssl-1.0.0d/crypto/opensslv.h.version openssl-1.0.0d/crypto/opensslv.h ---- openssl-1.0.0d/crypto/opensslv.h.version 2011-02-10 14:24:52.000000000 +0100 -+++ openssl-1.0.0d/crypto/opensslv.h 2011-02-10 14:48:00.000000000 +0100 -@@ -25,7 +25,8 @@ - * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for - * major minor fix final patch/beta) - */ --#define OPENSSL_VERSION_NUMBER 0x1000004fL -+/* we have to keep the version number to not break the abi */ -+#define OPENSSL_VERSION_NUMBER 0x10000003 - #ifdef OPENSSL_FIPS - #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0d-fips 8 Feb 2011" - #else -@@ -83,7 +84,7 @@ - * should only keep the versions that are binary compatible with the current. - */ - #define SHLIB_VERSION_HISTORY "" --#define SHLIB_VERSION_NUMBER "1.0.0" -+#define SHLIB_VERSION_NUMBER "1.0.0d" - - - #endif /* HEADER_OPENSSLV_H */ diff --git a/openssl/patches/openssl-1.0.0e-version.patch b/openssl/patches/openssl-1.0.0e-version.patch new file mode 100644 index 0000000..0a45f74 --- /dev/null +++ b/openssl/patches/openssl-1.0.0e-version.patch @@ -0,0 +1,22 @@ +diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h +--- openssl-1.0.0e/crypto/opensslv.h.version 2011-09-07 13:55:52.000000000 +0200 ++++ openssl-1.0.0e/crypto/opensslv.h 2011-09-07 13:59:28.000000000 +0200 +@@ -25,7 +25,8 @@ + * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for + * major minor fix final patch/beta) + */ +-#define OPENSSL_VERSION_NUMBER 0x1000005fL ++/* we have to keep the version number to not break the abi */ ++#define OPENSSL_VERSION_NUMBER 0x10000003 + #ifdef OPENSSL_FIPS + #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0e-fips 6 Sep 2011" + #else +@@ -83,7 +84,7 @@ + * should only keep the versions that are binary compatible with the current. + */ + #define SHLIB_VERSION_HISTORY "" +-#define SHLIB_VERSION_NUMBER "1.0.0" ++#define SHLIB_VERSION_NUMBER "1.0.0e" + + + #endif /* HEADER_OPENSSLV_H */ diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm index 7bd7b23..a805983 100644 --- a/p11-kit/p11-kit.nm +++ b/p11-kit/p11-kit.nm @@ -4,7 +4,7 @@ ###############################################################################

name = p11-kit -version = 0.3 +version = 0.7 release = 1

groups = System/Libraries @@ -21,12 +21,15 @@ description components or libraries living in the same process. end

-source_dl = +source_dl = http://p11-glue.freedesktop.org/releases/ + +build + configure_options += --sysconfdir=/etc +end

packages package %{name} - end - + package %{name}-devel template DEVEL end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 51aa583..1af5065 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@

name = systemd version = 33 -release = 1 +release = 2

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -106,7 +106,12 @@ end

packages package %{name} - requires = dbus python-cairo python-dbus udev>=172 + requires + dbus + python-cairo + python-dbus udev>=172 + util-linux>=2.19 + end end # Package information for systemd-units

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