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 481f5d19f66c7cd7a1c928ed94a7e970568a4c48 (commit) via cd5a37b8e06c519b7d09db01591ef55243cbe6fd (commit) via fddeee6c6b77bd10fc4746b635488bc412bdb7db (commit) via c20ebe7c8fcbf919e64db7b2b79510b8750a1f37 (commit) via 5d6593c1218ff7d684cd008ebe0f7326d741dd6d (commit) via 54362111231780e5d832f853fb21e370d8240e3f (commit) via 3e8221838a03be8f759e5d252ec8412a5f35f3eb (commit) via 1a5b6555705cef6d0657e172c361cd992dee6fce (commit) via d3be0b53acda37240e40cafebf6941239efc2a44 (commit) via daf779d6266278b7d4ffeda9d99e4ad0d696fe72 (commit) via b2036f1588bf85fde608059ca4fdb55f4689e3cf (commit) via 66a3ac5e9f932dc557b324a1ed564f9ed3ca97b6 (commit) via f15bd751fd9c80e1e83c219379570f8581619f4b (commit) via 7ce43329ee515fd967571fe90ede0a24f528f7b5 (commit) from 73db16dd6c6541b23b5ea9eb9f3721455505d1e0 (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 481f5d19f66c7cd7a1c928ed94a7e970568a4c48 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 19:50:19 2011 +0200

gnutls: Make sure nettle>=2.4 is available at runtime.

commit cd5a37b8e06c519b7d09db01591ef55243cbe6fd Merge: fddeee6 3e82218 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 19:18:53 2011 +0200

Merge remote-tracking branch 'stevee/gnutls'

commit fddeee6c6b77bd10fc4746b635488bc412bdb7db Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Oct 13 21:25:26 2011 +0200

radvd: Add scriptlet for user / group creation and systemd interaction.

Fixes #207.

Conflicts:

radvd/radvd.nm

commit c20ebe7c8fcbf919e64db7b2b79510b8750a1f37 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 19:15:29 2011 +0200

radvd: Update to 1.8.3.

Fixes #257

Conflicts:

radvd/radvd.nm

commit 5d6593c1218ff7d684cd008ebe0f7326d741dd6d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 19:12:09 2011 +0200

unzip: Fix a zipgrep which was not owned by root.

commit 54362111231780e5d832f853fb21e370d8240e3f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 19:11:07 2011 +0200

libcap: Update to 2.22.

commit 3e8221838a03be8f759e5d252ec8412a5f35f3eb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Oct 15 17:45:54 2011 +0200

gnutls: Update to 3.0.4.

Fixes #260.

commit 1a5b6555705cef6d0657e172c361cd992dee6fce Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Oct 15 17:37:47 2011 +0200

nettle: Update to 2.4.

gnutls 3.0.4 requires at least libnettle 2.4. References #260

commit d3be0b53acda37240e40cafebf6941239efc2a44 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 11:17:39 2011 +0200

python: Update to 2.7.2.

commit daf779d6266278b7d4ffeda9d99e4ad0d696fe72 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 15 11:13:52 2011 +0200

util-linux: Remove SUID bit from mount and umount.

We can use capabilities here, which brings us some security advantages.

commit b2036f1588bf85fde608059ca4fdb55f4689e3cf Merge: 66a3ac5 f15bd75 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 12 17:20:53 2011 +0200

Merge remote-tracking branch 'stevee/xorg-x11-font-utils'

commit 66a3ac5e9f932dc557b324a1ed564f9ed3ca97b6 Merge: 73db16d 7ce4332 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 12 17:17:42 2011 +0200

Merge remote-tracking branch 'stevee/kbd'

commit f15bd751fd9c80e1e83c219379570f8581619f4b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 11 19:25:58 2011 +0200

xorg-x11-font-utils: Add xorg-x11-fonts-update-dirs.

Fixes #259

commit 7ce43329ee515fd967571fe90ede0a24f528f7b5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 11 18:46:52 2011 +0200

kbd: Update to 1.15.3.

Fixes #198

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

Summary of changes: gnutls/gnutls.nm | 7 +- kbd/kbd.nm | 42 +++++- kbd/patches/kbd-1.15-po.patch | 31 ---- kbd/patches/kbd-1.15-quiet_doc.patch | 34 ----- kbd/patches/kbd-1.15-sparc.patch | 97 ------------ kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 +++ kbd/patches/kbd-1.15.3-fix-es-translation.patch | 12 ++ libcap/libcap.nm | 7 +- .../patches/libcap-2.16-build-system-fixes.patch | 154 -------------------- libcap/patches/libcap-2.16-headerfix.patch | 12 -- nettle/nettle.nm | 6 +- python/python.nm | 8 +- radvd/radvd.nm | 41 +++++- unzip/unzip.nm | 7 +- util-linux/util-linux.nm | 8 +- xorg-x11-font-utils/xorg-x11-font-utils.nm | 6 +- xorg-x11-font-utils/xorg-x11-fonts-update-dirs | 60 ++++++++ 17 files changed, 195 insertions(+), 355 deletions(-) delete mode 100644 kbd/patches/kbd-1.15-po.patch delete mode 100644 kbd/patches/kbd-1.15-quiet_doc.patch delete mode 100644 kbd/patches/kbd-1.15-sparc.patch create mode 100644 kbd/patches/kbd-1.15.3-dumpkeys-man.patch create mode 100644 kbd/patches/kbd-1.15.3-fix-es-translation.patch delete mode 100644 libcap/patches/libcap-2.16-build-system-fixes.patch delete mode 100644 libcap/patches/libcap-2.16-headerfix.patch create mode 100644 xorg-x11-font-utils/xorg-x11-fonts-update-dirs

Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index e321030..dadca53 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -4,8 +4,8 @@ ###############################################################################

name = gnutls -version = 3.0.3 -release = 1 +version = 3.0.4 +release = 2

groups = System/Libraries url = http://www.gnu.org/software/gnutls/ @@ -25,7 +25,7 @@ sources = %{thisapp}.tar.xz build requires libtasn1-devel - nettle-devel + nettle-devel>=2.4 p11-kit-devel>=0.4 zlib-devel end @@ -45,6 +45,7 @@ end packages package %{name} requires + nettle>=2.4 p11-kit>=0.4 end end diff --git a/kbd/kbd.nm b/kbd/kbd.nm index daed6ac..e521a60 100644 --- a/kbd/kbd.nm +++ b/kbd/kbd.nm @@ -4,7 +4,7 @@ ###############################################################################

name = kbd -version = 1.15 +version = 1.15.3 release = 1 epoch = 1

@@ -14,8 +14,8 @@ license = GPLv2+ summary = Tools for configuring the console (keyboard, virtual terminals, etc.).

description - The kbd package contains tools for managing a Linux \ - system's console's behavior, including the keyboard, the screen \ + The kbd package contains tools for managing a Linux + system's console's behavior, including the keyboard, the screen fonts, the virtual terminals and font files. end

@@ -24,13 +24,43 @@ sources += kbd-latarcyrheb-16-fixed.tar.bz2 sources += kbd-latsun-fonts.tar.bz2

build + requires + bison + flex + gettext + end + configure_options += \ - --datadir=/lib/kbd - - # Adding our own fonts + --datadir=/lib/kbd \ + --disable-rpath \ + --enable-nls + prepare_cmds + # Adding our own fonts. + cd %{DIR_APP} %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2 %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2 + + # 7-bit maps are obsolete; so are non-euro maps + cd %{DIR_APP}/data/keymaps/i386 + mv qwerty/fi.map qwerty/fi-old.map + cp qwerty/fi-latin9.map qwerty/fi.map + cp qwerty/pt-latin9.map qwerty/pt.map + cp qwerty/sv-latin1.map qwerty/se-latin1.map + mv azerty/fr.map azerty/fr-old.map + cp azerty/fr-latin9.map azerty/fr.map + cp azerty/fr-latin9.map azerty/fr-latin0.map + + # Rename conflicting keymaps + mv dvorak/no.map dvorak/no-dvorak.map + mv fgGIod/trf.map fgGIod/trf-fgGIod.map + mv olpc/es.map olpc/es-olpc.map + mv olpc/pt.map olpc/pt-olpc.map + mv qwerty/cz.map qwerty/cz-qwerty.map + + # remove obsolete "gr" translation + cd %{DIR_APP}/po + rm -f gr.po gr.gmo end

install_cmds diff --git a/kbd/patches/kbd-1.15-po.patch b/kbd/patches/kbd-1.15-po.patch deleted file mode 100644 index 0221f60..0000000 --- a/kbd/patches/kbd-1.15-po.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in ---- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100 -@@ -4,10 +4,10 @@ srcdir = @srcdir@ - - prefix = @prefix@ - datarootdir = @datarootdir@ --datadir = @datadir@ --localedir = $(DESTDIR)$(datadir)/locale --gnulocaledir = $(DESTDIR)$(datadir)/locale --gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po -+datadir = $(DESTDIR)@datadir@ -+localedir = $(DESTDIR)@localedir@ -+gnulocaledir = $(DESTDIR)@localedir@ -+gettextsrcdir = $(datadir)/gettext/po - - FOREIGN = @FOREIGN@ - HAVE_XGETTEXT = @HAVE_XGETTEXT@ -@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL) - COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - - # Enter here all .po files --POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \ -+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \ - ro.po ru.po sv.po tr.po - # the same but with .gmo --GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \ -+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \ - pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo - - CATALOGS = $(GMOFILES) diff --git a/kbd/patches/kbd-1.15-quiet_doc.patch b/kbd/patches/kbd-1.15-quiet_doc.patch deleted file mode 100644 index eca867b..0000000 --- a/kbd/patches/kbd-1.15-quiet_doc.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in ---- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100 -@@ -19,6 +19,8 @@ loadkeys - load keyboard translation ta - ] [ - .I -m --mktable - ] [ -+.I -q --quiet -+] [ - .I -s --clearstrings - ] [ - .I -v --verbose -@@ -148,6 +150,10 @@ command (and does not modify the current - .B loadkeys - prints its version number and a short usage message to the programs - standard error output and exits. -+.TP -+.B -q --quiet -+.B loadkeys -+suppresses all normal output. - .SH WARNING - Note that anyone having read access to - .B /dev/console -diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c ---- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100 -@@ -1966,6 +1966,7 @@ usage(void) { - " -d --default load "%s"\n" - " -h --help display this help text\n" - " -m --mktable output a "defkeymap.c" to stdout\n" -+" -q --quiet suppress all normal output\n" - " -s --clearstrings clear kernel string table\n" - " -u --unicode implicit conversion to Unicode\n" - " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP); diff --git a/kbd/patches/kbd-1.15-sparc.patch b/kbd/patches/kbd-1.15-sparc.patch deleted file mode 100644 index a858a25..0000000 --- a/kbd/patches/kbd-1.15-sparc.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8 ---- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100 -+++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100 -@@ -22,7 +22,7 @@ Using - without any options will reset the repeat rate to 10.9 characters per second (cps) - and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. - These are the IBM defaults. On SPARC-based systems it will reset the repeat rate --to 5 cps and the delay to 200 ms. -+to 20 cps and the delay to 200 ms. - - .SH OPTIONS - .TP -@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa - .I /etc/rc.local - .br - .I /dev/port -+.br -+.I /dev/kbd -diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c ---- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100 -+++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100 -@@ -77,7 +77,6 @@ beats rebuilding the kernel! - - #ifdef __sparc__ - #include <asm/param.h> --#include <asm/kbio.h> - #endif - - #ifndef KDKBDREP -@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, - - static int - KDKBDREP_ioctl_ok(double rate, int delay, int silent) { -+#if defined(KDKBDREP) && !defined(__sparc__) - /* - * This ioctl is defined in <linux/kd.h> but is not - * implemented anywhere - must be in some m68k patches. -+ * We cannot blindly try unimplemented ioctls on sparc64 - -+ * the 32<->64bit transition layer does not like it. - * Since 2.4.9 also on i386. -- */ -+ */ -+ - struct my_kbd_repeat kbdrep_s; - - /* don't change, just test */ -@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay - rate, kbdrep_s.delay ); - - return 1; /* success! */ -+#else /* no KDKBDREP or __sparc__ */ -+ return 0; -+#endif /* KDKBDREP */ - } - - static int -@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) { - int - main( int argc, char **argv ) { - #ifdef __sparc__ -- double rate = 5.0; /* Default rate */ -+ double rate = 20.0; /* Default rate */ - int delay = 200; /* Default delay */ - #else - double rate = 10.9; /* Default rate */ -@@ -272,7 +278,9 @@ main( int argc, char **argv ) { - - - /* The ioport way */ -+ /* The ioport way - will crash on sparc */ - -+#ifndef __sparc__ - for (i = 0; i < RATE_COUNT; i++) - if (rate * 10 >= valid_rates[i]) { - value &= 0x60; -@@ -335,5 +343,7 @@ main( int argc, char **argv ) { - valid_rates[value & 0x1f] / 10.0, - valid_delays[ (value & 0x60) >> 5 ] ); - -+#endif -+ - return 0; - } -diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c ---- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100 -+++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100 -@@ -14,10 +14,6 @@ - #include "nls.h" - #include "version.h" - --#ifdef __sparc__ --#include <asm/kbio.h> --#endif -- - static void - usage(void) - { diff --git a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch new file mode 100644 index 0000000..e77718b --- /dev/null +++ b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch @@ -0,0 +1,18 @@ +diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in +--- kbd-1.15.3/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200 ++++ kbd-1.15.3/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200 +@@ -156,6 +156,14 @@ output of + .BR dumpkeys . + .LP + .TP ++.B -1 --separate-lines ++This forces ++.B dumpkeys ++to write one line per (modifier,keycode) pair. It prefixes the word ++.I plain ++for plain keycodes. ++.LP ++.TP + .B --funcs-only + When this option is given, + .B dumpkeys diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch new file mode 100644 index 0000000..9d43d8d --- /dev/null +++ b/kbd/patches/kbd-1.15.3-fix-es-translation.patch @@ -0,0 +1,12 @@ +diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po +--- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200 ++++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200 +@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/libcap/libcap.nm b/libcap/libcap.nm index 5b5f1ed..5929843 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -4,7 +4,7 @@ ###############################################################################

name = libcap -version = 2.19 +version = 2.22 release = 1

groups = System/Libraries @@ -13,7 +13,7 @@ license = LGPL2+ summary = Library for getting and setting POSIX.1e capabilities.

description - libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) \ + libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. end

@@ -45,8 +45,7 @@ end

packages package %{name} - end - + package %{name}-devel template DEVEL end diff --git a/libcap/patches/libcap-2.16-build-system-fixes.patch b/libcap/patches/libcap-2.16-build-system-fixes.patch deleted file mode 100644 index e82975b..0000000 --- a/libcap/patches/libcap-2.16-build-system-fixes.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 7ee197885e113878aedab58bdda80302e42aff4c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger vapier@gentoo.org -Date: Sun, 16 Nov 2008 09:10:31 -0500 -Subject: [PATCH] build system fixes - -This touches up the homebrewed build system to work much better "out of the -box" for people. Specifically: - - allow toolchain vars to be set via environment - - CC / BUILD_CC / AR / RANLIB - - CFLAGS / CPPFLAGS / LDFLAGS - - split CPPFLAGS out of CFLAGS - - break -fPIC out of global CFLAGS and only use where needed - - use LDLIBS for libraries, not LDFLAGS - -Signed-off-by: Mike Frysinger vapier@gentoo.org ---- - Make.Rules | 28 ++++++++++++++-------------- - libcap/Makefile | 11 ++++++----- - pam_cap/Makefile | 6 +++--- - progs/Makefile | 2 +- - 4 files changed, 24 insertions(+), 23 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index 6e63a5b..32cb5ea 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -42,27 +42,27 @@ MINOR=16 - - # Compilation specifics - --KERNEL_HEADERS := $(topdir)/libcap/include --IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -- --CC := gcc --CFLAGS := -O2 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib --DEBUG = -g #-DDEBUG --WARNINGS=-fPIC -Wall -Wwrite-strings \ -+CC ?= gcc -+BUILD_CC ?= $(CC) -+AR ?= ar -+RANLIB ?= ranlib -+CFLAGS ?= -O2 -+BUILD_CFLAGS ?= -O2 -pipe -+WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g -+LDFLAGS ?= #-g - --SYSTEM_HEADERS = /usr/include -+KERNEL_HEADERS = $(topdir)/libcap/include -+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) -+CPPFLAGS += $(LIBCAP_CPPFLAGS) -+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap --CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH) -+CPPFLAGS += -Dlinux -+CFLAGS += $(WARNINGS) - PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) - INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) -diff --git a/libcap/Makefile b/libcap/Makefile -index 8a61752..cf99523 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -16,7 +16,7 @@ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text - # no support). - ifeq ($(LIBATTR),yes) - FILES += cap_file --LDFLAGS += -lattr -+LDLIBS += -lattr - endif - - INCLS=libcap.h cap_names.h $(INCS) -@@ -24,6 +24,7 @@ OBJS=$(addsuffix .o, $(FILES)) - MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf -+CFLAGS += -fPIC - - all: $(MINLIBNAME) $(STALIBNAME) - -@@ -33,7 +34,7 @@ INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT) - endif - - _makenames: _makenames.c cap_names.list.h -- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ -+ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ - - cap_names.h: _makenames - ./_makenames > cap_names.h -@@ -50,15 +51,15 @@ $(STALIBNAME): $(OBJS) - $(RANLIB) $@ - - $(MINLIBNAME): $(OBJS) -- $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ -+ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS) - ln -sf $(MINLIBNAME) $(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBNAME) - - %.o: %.c $(INCLS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) -- $(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(INCDIR)/sys -diff --git a/pam_cap/Makefile b/pam_cap/Makefile -index eae88ed..bef59d2 100644 ---- a/pam_cap/Makefile -+++ b/pam_cap/Makefile -@@ -14,13 +14,13 @@ install: all - install -m 0755 pam_cap.so $(LIBDIR)/security - - pam_cap.so: pam_cap.o -- $(LD) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -+ $(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS) -lpam - - pam_cap.o: pam_cap.c -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - testcompile: test.c pam_cap.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS) - - clean: - rm -f *.o *.so testcompile *~ -diff --git a/progs/Makefile b/progs/Makefile -index a1542dc..612cf86 100644 ---- a/progs/Makefile -+++ b/progs/Makefile -@@ -22,7 +22,7 @@ $(BUILD): %: %.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) - - %.o: %.c $(INCS) -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - install: all - mkdir -p -m 0755 $(SBINDIR) --- -1.6.0.4 - diff --git a/libcap/patches/libcap-2.16-headerfix.patch b/libcap/patches/libcap-2.16-headerfix.patch deleted file mode 100644 index ae6eb28..0000000 --- a/libcap/patches/libcap-2.16-headerfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libcap-2.16/libcap/include/sys/capability.h.incfix libcap-2.16/libcap/include/sys/capability.h ---- libcap-2.16/libcap/include/sys/capability.h.incfix 2009-03-22 17:54:02.000000000 +0100 -+++ libcap-2.16/libcap/include/sys/capability.h 2009-03-22 17:54:09.000000000 +0100 -@@ -19,7 +19,7 @@ extern "C" { - * information for the user library. - */ - --#include <sys/types.h> -+#include <linux/types.h> - #include <stdint.h> - - /* diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 940191e..b34378c 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,8 +4,8 @@ ###############################################################################

name = nettle -version = 2.2 -release = 2 +version = 2.4 +release = 1

groups = System/Libraries url = http://www.lysator.liu.se/~nisse/nettle/ @@ -19,7 +19,7 @@ description or even in kernel space. end

-source_dl = +source_dl = http://www.lysator.liu.se/~nisse/archive/

build requires diff --git a/python/python.nm b/python/python.nm index 295f6dc..7ca7f0c 100644 --- a/python/python.nm +++ b/python/python.nm @@ -4,8 +4,8 @@ ###############################################################################

name = python -version = 2.7.1 -release = 4 +version = 2.7.2 +release = 1 thisapp = Python-%{version}

groups = Development/Languages @@ -21,8 +21,8 @@ description libraries, as well as to various windowing systems. end

-source_dl = -sources = %{thisapp}.tgz +source_dl = http://python.org/ftp/python/%%7Bversion%7D/ +sources = %{thisapp}.tar.xz

build requires diff --git a/radvd/radvd.nm b/radvd/radvd.nm index 32a912c..89d91a2 100644 --- a/radvd/radvd.nm +++ b/radvd/radvd.nm @@ -4,8 +4,8 @@ ###############################################################################

name = radvd -version = 1.8 -release = 4 +version = 1.8.3 +release = 2

groups = System/Daemons url = http://www.litech.org/radvd/ @@ -41,6 +41,41 @@ end

packages package %{name} - reuires = /lib/network/network-radvd-config + requires = /lib/network/network-radvd-config + + prerequires += shadow-utils + + script prein + getent group radvd >/dev/null || groupadd -r radvd + + # The radvd user also needs to be in the wheel group to get access to + # /proc. + getent passwd radvd >/dev/null || \ + useradd -r -g radvd -G wheel -d / -s /sbin/nologin \ + -c "User for the Router Advertisement daemon." radvd + exit 0 + end + + # Just search for new unit files that were just installed. + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + # Disable the service that is to be removed and stop it if it is still running. + script preun + /bin/systemctl --no-reload disable radvd.service >/dev/null 2>&1 || : + /bin/systemctl stop radvd.service >/dev/null 2>&1 || : + end + + # Just tell systemd that unitfiles have been removed. + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + # Try to restart the service if it is running. + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart radvd.service >/dev/null 2>&1 || : + end end end diff --git a/unzip/unzip.nm b/unzip/unzip.nm index 68ab00a..a385946 100644 --- a/unzip/unzip.nm +++ b/unzip/unzip.nm @@ -5,7 +5,7 @@

name = unzip version = 6.0 -release = 2 +release = 3

groups = Applications/Archiving url = ftp://ftp.info-zip.org/pub/infozip/src/ @@ -44,9 +44,12 @@ build prefix=%{BUILDROOT}/usr \ MANDIR=/usr/share/man/man1 \ INSTALL="cp -p" + + install_cmds + chown -v root.root %{BUILDROOT}/usr/bin/zipgrep + end end

packages package %{name} - end end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 681de64..4247cab 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux version = 2.19 major_ver = 2.19 -release = 5 +release = 6

groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -85,6 +85,12 @@ build # Create /etc/mtab symlink mkdir -pv %{BUILDROOT}/etc ln -svf /proc/mounts %{BUILDROOT}/etc/mtab + + # Set capabilities + chmod -v -s %{BUILDROOT}/bin/mount + setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/mount + chmod -v -s %{BUILDROOT}/bin/umount + setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/umount end end

diff --git a/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm index df9c317..8bf368f 100644 --- a/xorg-x11-font-utils/xorg-x11-font-utils.nm +++ b/xorg-x11-font-utils/xorg-x11-font-utils.nm @@ -5,7 +5,7 @@

name = xorg-x11-font-utils version = 7.4 -release = 2 +release = 3

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = X/Fonts @@ -66,6 +66,10 @@ build make install DESTDIR=%{BUILDROOT} fi done + + # Install xorg-x11-fonts-update-dirs + install -m 0744 %{DIR_SOURCE}/xorg-x11-fonts-update-dirs %{BUILDROOT}/usr/bin/ + sed -i "s:@DATADIR@:/usr/share:" %{BUILDROOT}/usr/bin/xorg-x11-fonts-update-dirs end end

diff --git a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs b/xorg-x11-font-utils/xorg-x11-fonts-update-dirs new file mode 100644 index 0000000..536bfe8 --- /dev/null +++ b/xorg-x11-font-utils/xorg-x11-fonts-update-dirs @@ -0,0 +1,60 @@ +#!/bin/sh +# This script is used by the xorg-x11-fonts package in the %post stage for +# some fonts to generate the right encodings. + +fontdir="" +encodingsdir="@DATADIR@/X11/fonts/encodings" + +# some fonts need to skip mkfontscale, set to "yes" to skip +skip_fontscale="" +# some fonts need to run ttmkfdir, set to "yes" to run +need_ttmkfdir="" + +if [ $# -lt 1 ]; then + echo "Need at least one parameter for font dir." + exit 1 +fi + +while [ $# != 0 ]; do + case $1 in + --skip-fontscale) + skip_fontscale="yes" + ;; + --need-ttmkfdir) + need_ttmkfdir="yes" + ;; + --encodingsdir) + shift + encodingsdir="$1" + ;; + *) + fontdir="$1" + + if [ $# != 1 ]; then + echo "Too many parameters." + exit 1 + fi + ;; + esac + shift +done + +if [ "$skip_fontscale" != "yes" ]; then + mkfontscale $fontdir +fi +if [ "$need_ttmkfdir" = "yes" ]; then + ttmkfdir $fontdir +fi + +mkfontdir $fontdir +fc-cache $fontdir + +if ! [ -z "$encodingsdir" ]; then + [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir" + oldpwd=$(pwd) + cd "$encodingsdir" + mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large" + cd ${oldpwd} +fi + +

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