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 a165d841bcef6e6b20aa5a29f22cbd9f3170913b (commit) via 5a6cfb9027299841fe177ce0d5c528b933740f42 (commit) via 2a824e905630b49b2ea86ad9a0d37d923e52d565 (commit) via 7b28d8be5c97db0468348b01c39343c79ea73b0c (commit) via 7d29110552cb120d5f4d4ddd9dc642a97c505e0f (commit) via aefd85910d000fdff3b823e0ab3ca8d8f912ffa6 (commit) via d1935f86e8b582caeea5ae25311a5fae6b69b2d4 (commit) via 76e1849a973b8f65ca1ae5a73553f12e500c088a (commit) via 58397358aa377dcbf2b74bc078a3ffab1bfddea8 (commit) via cadb2dbb513d8aadd5bf14a235ec39ea8e6eeae8 (commit) via 2af18b566502d1346280c88cdabb960aa4fbf76d (commit) via 44ed57ab9a777616303cff8191ba379910ff3c8a (commit) via a5b296faa95487cf2801625a77233ad1a91786a4 (commit) via 6dcdb90d9c3a6abffaa630d8135f52ef4d3aead2 (commit) via 216671a78280308a02de20b392d2f3cbce8d6d9a (commit) via ef4383756eb71e5a89e61af59d702e3b65017268 (commit) via 46afdf4e6c29eee119bc11938c2687e91d4b9492 (commit) via d265d3679a5a025dfa9b174fdfd045070f705cce (commit) via 6d84aaf1aedea20a93f649c116ae0786b03e3f58 (commit) via 0b00d981d4925afdf0088515c181e4c53197deda (commit) via fcd5ee97a3999517a08e866a8751301510a45495 (commit) from b16fe5e8ffd64b110d1fb575d1d14f7c817bed6a (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 a165d841bcef6e6b20aa5a29f22cbd9f3170913b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 22:38:16 2011 +0200

rsyslog: Adding scripts to enable service and create files.

commit 5a6cfb9027299841fe177ce0d5c528b933740f42 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 22:37:48 2011 +0200

pakfire: Update to 0.9.13.

commit 2a824e905630b49b2ea86ad9a0d37d923e52d565 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 17:21:52 2011 +0200

systemd: Add ACL support.

commit 7b28d8be5c97db0468348b01c39343c79ea73b0c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 17:02:11 2011 +0200

shadow-utils: Fix installation of /etc/default/useradd.

commit 7d29110552cb120d5f4d4ddd9dc642a97c505e0f Merge: aefd859 ef43837 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 16:27:40 2011 +0200

Merge remote-tracking branch 'stevee/systemd'

commit aefd85910d000fdff3b823e0ab3ca8d8f912ffa6 Merge: d1935f8 216671a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 16:27:36 2011 +0200

Merge remote-tracking branch 'stevee/dbus'

commit d1935f86e8b582caeea5ae25311a5fae6b69b2d4 Merge: 76e1849 a5b296f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:57:40 2011 +0200

Merge remote-tracking branch 'ms/bird'

commit 76e1849a973b8f65ca1ae5a73553f12e500c088a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:55:03 2011 +0200

openssl: Rename man pages to not conflict with system man pages.

commit 58397358aa377dcbf2b74bc078a3ffab1bfddea8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:53:58 2011 +0200

udev: Remove console_init.

commit cadb2dbb513d8aadd5bf14a235ec39ea8e6eeae8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:53:35 2011 +0200

shadow-utils: Remove duplicate man pages.

commit 2af18b566502d1346280c88cdabb960aa4fbf76d Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:49:50 2011 +0200

grub: Fix installation of default configuration.

commit 44ed57ab9a777616303cff8191ba379910ff3c8a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 15:46:45 2011 +0200

util-linux: Remove man pages from tools we do not want to use.

commit a5b296faa95487cf2801625a77233ad1a91786a4 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 01:15:26 2011 +0200

bird: Add scriptlets.

commit 6dcdb90d9c3a6abffaa630d8135f52ef4d3aead2 Merge: fcd5ee9 b16fe5e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 11 01:15:04 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 216671a78280308a02de20b392d2f3cbce8d6d9a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 9 21:02:48 2011 +0200

dbus: Fix scriptlet.

commit ef4383756eb71e5a89e61af59d702e3b65017268 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 9 19:25:46 2011 +0200

systemd: Update to 36.

commit 46afdf4e6c29eee119bc11938c2687e91d4b9492 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 9 19:24:40 2011 +0200

dbus: Update to 1.4.14.

commit d265d3679a5a025dfa9b174fdfd045070f705cce Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 9 19:23:51 2011 +0200

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

commit 6d84aaf1aedea20a93f649c116ae0786b03e3f58 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 9 17:02:42 2011 +0200

initscripts: Drop console_init and 10-console.rules.

commit 0b00d981d4925afdf0088515c181e4c53197deda Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 9 17:02:18 2011 +0200

man-pages: Update to 3.35.

commit fcd5ee97a3999517a08e866a8751301510a45495 Merge: 9d31794 f85ecfc Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 4 00:05:25 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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

Summary of changes: bird/bird.nm | 25 +++- dbus/dbus.nm | 44 +++++- grub/{grub.default => default/grub} | 0 grub/grub.nm | 11 ++- initscripts/initscripts.nm | 2 +- initscripts/src/Makefile | 6 +- initscripts/src/console_init.c | 168 -------------------- initscripts/udev/10-console.rules | 15 -- man-pages/man-pages.nm | 2 +- openssl/openssl.nm | 19 ++- pakfire/pakfire.nm | 2 +- rsyslog/rsyslog.log | 2 +- rsyslog/rsyslog.nm | 36 ++++- shadow-utils/{useradd.default => default/useradd} | 0 shadow-utils/shadow-utils.nm | 9 +- ...manpages.patch => systemd-36-no_manpages.patch} | 16 +- systemd/systemd.nm | 7 +- udev/console_init | 56 ------- udev/rules/10-console.rules | 9 - udev/udev.nm | 13 +-- util-linux/util-linux.nm | 22 ++-- 21 files changed, 161 insertions(+), 303 deletions(-) rename grub/{grub.default => default/grub} (100%) delete mode 100644 initscripts/src/console_init.c delete mode 100644 initscripts/udev/10-console.rules rename shadow-utils/{useradd.default => default/useradd} (100%) rename systemd/patches/{systemd-33-no_manpages.patch => systemd-36-no_manpages.patch} (91%) delete mode 100644 udev/console_init delete mode 100644 udev/rules/10-console.rules

Difference in files: diff --git a/bird/bird.nm b/bird/bird.nm index e86eda2..b6bcb7f 100644 --- a/bird/bird.nm +++ b/bird/bird.nm @@ -5,7 +5,7 @@

name = bird version = 1.3.1 -release = 1 +release = 2

groups = Networking/Routing url = http://bird.network.cz/ @@ -57,5 +57,28 @@ end

packages package %{name} + prerequires = systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable bird.service > /dev/null 2>&1 || : + /bin/systemctl stop bird.service > /dev/null 2>&1 || : + + /bin/systemctl --no-reload disable bird6.service > /dev/null 2>&1 || : + /bin/systemctl stop bird6.service > /dev/null 2>&1 || : + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload 2>&1 || : + /bin/systemctl reload-or-try-restart bird.service >/dev/null 2>&1 || : + /bin/systemctl reload-or-try-restart bird6.service >/dev/null 2>&1 || : + end end end diff --git a/dbus/dbus.nm b/dbus/dbus.nm index 9592194..93b7750 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -4,8 +4,8 @@ ###############################################################################

name = dbus -version = 1.4.0 -release = 3 +version = 1.4.14 +release = 2

groups = System/Daemons url = http://www.freedesktop.org/software/dbus/ @@ -13,12 +13,12 @@ license = GPLv2+ AFL summary = D-BUS message bus.

description - D-BUS is a system for sending messages between applications. It is \ - used both for the system-wide message bus service, and as a \ + D-BUS is a system for sending messages between applications. It is + used both for the system-wide message bus service, and as a per-user-login-session messaging facility. end

-source_dl = +source_dl = http://dbus.freedesktop.org/releases/dbus/

build requires @@ -55,6 +55,40 @@ end

packages package %{name} + prerequires += shadow-utils + + script prein + getent group dbus >/dev/null || groupadd -r dbus + getent passwd dbus >/dev/null || \ + useradd -r -g dbus -d / -s /sbin/nologin \ + -c "User for dbus service" dbus + exit 0 + end + + # Just search for new unit files that were just installed. + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + + # The dbus service should be started on default. + /bin/systemctl enable dbus.service > /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 dbus.service >/dev/null 2>&1 || : + /bin/systemctl stop dbus.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 dbus.service >/dev/null 2>&1 || : + end end package %{name}-libs diff --git a/grub/default/grub b/grub/default/grub new file mode 100644 index 0000000..fe159a6 --- /dev/null +++ b/grub/default/grub @@ -0,0 +1,27 @@ +# If you change this file, run 'update-grub' afterwards to update +# /boot/grub/grub.cfg. + +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=0 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 +GRUB_DISTRIBUTOR=$(sed -n 's/([A-Za-z0-9]*) release ([0-9A-Za-z.-]*) .*/\1 \2/p' < /etc/system-release) +GRUB_CMDLINE_LINUX_DEFAULT="quiet selinux=0" +GRUB_CMDLINE_LINUX="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +#GRUB_GFXMODE=640x480 + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_LINUX_RECOVERY="true" + +# Uncomment to get a beep at grub start +#GRUB_INIT_TUNE="480 440 1" diff --git a/grub/grub.default b/grub/grub.default deleted file mode 100644 index fe159a6..0000000 --- a/grub/grub.default +++ /dev/null @@ -1,27 +0,0 @@ -# If you change this file, run 'update-grub' afterwards to update -# /boot/grub/grub.cfg. - -GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=0 -GRUB_HIDDEN_TIMEOUT_QUIET=true -GRUB_TIMEOUT=10 -GRUB_DISTRIBUTOR=$(sed -n 's/([A-Za-z0-9]*) release ([0-9A-Za-z.-]*) .*/\1 \2/p' < /etc/system-release) -GRUB_CMDLINE_LINUX_DEFAULT="quiet selinux=0" -GRUB_CMDLINE_LINUX="" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -#GRUB_GFXMODE=640x480 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_LINUX_RECOVERY="true" - -# Uncomment to get a beep at grub start -#GRUB_INIT_TUNE="480 440 1" diff --git a/grub/grub.nm b/grub/grub.nm index 4adffac..409ce33 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,8 @@

name = grub version = 1.99 -release = 1 +release = 2 +sup_arches = i686

groups = Base System/Boot url = http://www.gnu.org/software/grub/ @@ -51,6 +52,9 @@ build # Install splash background mkdir -pv %{BUILDROOT}/boot/grub install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub + + # Install empty configuration file. + touch %{BUILDROOT}/boot/grub/grub.cfg end end

@@ -68,6 +72,11 @@ packages /usr/share/X11/fonts/misc/unifont.pcf.gz end

+ configfiles + /boot/grub/grub.cfg + /etc/default/grub + end + # Generate grub compatible font for graphical boot menu # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters script postin diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index ca0e7af..44ed337 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 6 +release = 7

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

-PROGS = console_init ipcalc securetty +PROGS = 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_init $(DESTDIR)/lib/udev/ install -v -m 755 ipcalc $(DESTDIR)/bin install -v -m 755 securetty $(DESTDIR)/sbin

@@ -25,9 +24,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_init: console_init.o shvar.o - $(CC) $(LDFLAGS) $(shell pkg-config --libs glib-2.0) -o $@ $? - ipcalc: ipcalc.o $(CC) $(LDFLAGS) -o $@ $< -lpopt

diff --git a/initscripts/src/console_init.c b/initscripts/src/console_init.c deleted file mode 100644 index 22083a8..0000000 --- a/initscripts/src/console_init.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (c) 2008-2009 Red Hat, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - */ - -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> - -#include <sys/ioctl.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <sys/wait.h> - -#include <linux/kd.h> - -#include "shvar.h" - -static char *lang = NULL; -static char *font = NULL; -static char *acm = NULL; -static char *unimap = NULL; -static char *keymap = NULL; - -static int linux_console(int fd) { - unsigned char twelve = 12; - - if (ioctl(fd, TIOCLINUX, &twelve) >= 0) - return 1; - return 0; -} - -static int configured_as_utf8() { - shvarFile *i18nfile = NULL; - - if ((i18nfile = svNewFile("/etc/sysconfig/i18n")) == NULL) - return 1; /* assume UTF-8 */ - - lang = svGetValue(i18nfile, "LANG"); - font = svGetValue(i18nfile, "SYSFONT"); - acm = svGetValue(i18nfile, "SYSFONTACM"); - unimap = svGetValue(i18nfile, "UNIMAP"); - svCloseFile(i18nfile); - if (!lang) - return 1; - if (g_str_has_suffix(lang,".utf8") || g_str_has_suffix(lang,".UTF-8")) - return 1; - return 0; -} - -static int read_keymap() { - shvarFile *keyboard = NULL; - char *tmp; - struct stat sb; - - if (!stat("/etc/sysconfig/console/default.kmap",&sb)) { - keymap = "/etc/sysconfig/console/default.kmap"; - return 0; - } - - if ((keyboard = svNewFile("/etc/sysconfig/keyboard")) == NULL) - return 0; - - tmp = svGetValue(keyboard, "KEYMAP"); - if (tmp) - keymap = tmp; - tmp = svGetValue(keyboard, "KEYTABLE"); - if (tmp) { - if (keymap) free(keymap); - asprintf(&keymap, "%s.map", tmp); - } - return 0; -} - -static void set_font(char *device) { - int pid; - - if ( (pid = fork()) == 0) { - char *args[] = { "setfont", "latarcyrheb-sun16", "-C", NULL, - NULL, NULL, NULL, NULL, NULL }; - - if (font) - args[1] = font; - args[3] = device; - if (acm) { - args[4] = "-m"; - args[5] = acm; - if (unimap) { - args[6] = "-u"; - args[7] = unimap; - } - } else if (unimap) { - args[4] = "-u"; - args[5] = unimap; - } - execv("/bin/setfont", args); - exit(1); - } -} - -static void set_keyboard(int fd, int utf8) { - if (ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE)) - perror("could not set keyboard mode"); -} - -static void set_terminal(int fd, int utf8) { - if (utf8) - write(fd, "\033%G", 3); - else - write(fd, "\033%@", 3); -} - -static void set_keymap(int fd, int utf8) { - int pid; - - if ((pid = fork()) == 0) { - char *args[] = { "loadkeys", "-q", NULL, NULL, NULL }; - dup2(fd, 0); - dup2(fd, 1); - - if (utf8) { - args[2] = "-u"; - args[3] = keymap; - } else { - args[2] = keymap; - } - execv("/bin/loadkeys", args); - exit(1); - } -} - -int main(int argc, char **argv) { - char *device; - int dev; - - if (argc < 2) { - printf("usage: console_init <device>\n"); - exit(1); - } - chdir("/dev"); - device = argv[1]; - dev = open(device, O_RDWR); - if (linux_console(dev)) { - int utf8 = configured_as_utf8(); - - set_keyboard(dev, utf8); - set_terminal(dev, utf8); - set_font(device); - read_keymap(); - if (keymap) - set_keymap(dev,utf8); - } - return 0; -} diff --git a/initscripts/udev/10-console.rules b/initscripts/udev/10-console.rules deleted file mode 100644 index e7609c5..0000000 --- a/initscripts/udev/10-console.rules +++ /dev/null @@ -1,15 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION!="add", GOTO="console_end" - -# Console initialization - keyboard, font, etc. -KERNEL=="tty0", RUN+="/lib/udev/console_init %k" - -# Check and set up serial and serial-like consoles if necessary -KERNEL=="console", RUN+="/lib/udev/console_check %k" -KERNEL=="ttySG*", RUN+="/lib/udev/console_check %k" -KERNEL=="xvc*", RUN+="/lib/udev/console_check %k" -KERNEL=="hvsi*", RUN+="/lib/udev/console_check %k" -KERNEL=="hvc*", RUN+="/lib/udev/console_check %k" - -LABEL="console_end" diff --git a/man-pages/man-pages.nm b/man-pages/man-pages.nm index 8f05558..2728fa7 100644 --- a/man-pages/man-pages.nm +++ b/man-pages/man-pages.nm @@ -4,7 +4,7 @@ ###############################################################################

name = man-pages -version = 3.23 +version = 3.35 release = 1 arch = noarch

diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 278f3e1..cffef40 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -5,7 +5,7 @@

name = openssl version = 1.0.0e -release = 1 +release = 2

maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -26,6 +26,7 @@ build bc gnutls-devel perl + util-linux zlib-devel end

@@ -96,6 +97,22 @@ build mkdir -pv %{BUILDROOT}/etc/pki/tls install -m 0644 %{DIR_SOURCE}/openssl.cnf %{BUILDROOT}/etc/pki/tls cp -v -r certs %{BUILDROOT}/etc/pki/tls + + # Rename man pages so that they don't conflict with other system man pages. + pushd ${BUILDROOT}/usr/share/man + for manpage in man*/*; do + if [ -L ${manpage} ]; then + TARGET=`ls -l ${manpage} | awk '{ print $NF }'` + ln -snf ${TARGET}ssl ${manpage}ssl + rm -f ${manpage} + else + mv ${manpage} ${manpage}ssl + fi + done + + mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1 + mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1 + popd end end

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 98b742a..3756da9 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,7 +4,7 @@ ###############################################################################

name = pakfire -version = 0.9.12 +version = 0.9.13 release = 1

maintainer = Michael Tremer michael.tremer@ipfire.org diff --git a/rsyslog/rsyslog.log b/rsyslog/rsyslog.log index b2d41f1..674e9d0 100644 --- a/rsyslog/rsyslog.log +++ b/rsyslog/rsyslog.log @@ -1,4 +1,4 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { +/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/cron { sharedscripts postrotate /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm index cb19dc4..70362ae 100644 --- a/rsyslog/rsyslog.nm +++ b/rsyslog/rsyslog.nm @@ -5,7 +5,7 @@

name = rsyslog version = 5.8.0 -release = 2 +release = 3

groups = Base System/Daemons url = http://www.rsyslog.com/ @@ -21,13 +21,8 @@ description relay chains. end

-provides += syslog - source_dl = http://www.rsyslog.com/files/download/rsyslog/

-CFLAGS += \ - -DSYSLOGD_PIDNAME="syslogd.pid" - build requires gnutls-devel @@ -36,6 +31,9 @@ build zlib-devel end

+ CFLAGS += \ + -DSYSLOGD_PIDNAME="syslogd.pid" + configure_options += \ --exec-prefix= \ --libdir=/lib \ @@ -69,5 +67,31 @@ end packages package %{name} requires = logrotate + provides += syslog + + prerequires = systemd-units + + script postin + for n in /var/log/{messages,secure,maillog,spooler}; do + [ -f "${n}" ] && continue + umask 066 && touch ${n} + done + + /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || : + /bin/systemctl stop rsyslog.service 2>&1 || : + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || : + end end end diff --git a/shadow-utils/default/useradd b/shadow-utils/default/useradd new file mode 100644 index 0000000..4e81146 --- /dev/null +++ b/shadow-utils/default/useradd @@ -0,0 +1,9 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel +CREATE_MAIL_SPOOL=yes + diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm index 2106e5d..e6fbf60 100644 --- a/shadow-utils/shadow-utils.nm +++ b/shadow-utils/shadow-utils.nm @@ -5,7 +5,7 @@

name = shadow-utils version = 4.1.4.3 -release = 3 +release = 5 thisapp = shadow-%{version}

maintainer = Michael Tremer michael.tremer@ipfire.org @@ -60,6 +60,9 @@ build install_cmds # Remove man pages in other languages rm -rfv %{BUILDROOT}/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr} + + # Remove duplicate man pages. + rm -vf %{BUILDROOT}/usr/share/man/man*/{getspnam,nologin,passwd}.* end end

@@ -71,5 +74,9 @@ packages conflicts pam<1.1.0-4 end + + configfiles + /etc/default/useradd + end end end diff --git a/shadow-utils/useradd.default b/shadow-utils/useradd.default deleted file mode 100644 index 4e81146..0000000 --- a/shadow-utils/useradd.default +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=yes - diff --git a/systemd/patches/systemd-33-no_manpages.patch b/systemd/patches/systemd-33-no_manpages.patch deleted file mode 100644 index b416d80..0000000 --- a/systemd/patches/systemd-33-no_manpages.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -Nur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-08-03 04:19:53.000000000 +0200 -+++ b/Makefile.am 2011-08-05 19:41:33.923993685 +0200 -@@ -692,81 +692,18 @@ - src/dbus-loop.h \ - src/spawn-agent.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/systemd-logind.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 \ -- man/systemd-loginctl.1 -+MANPAGES = - - if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 -+MANPAGES += -+ - endif - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+MANPAGES_ALIAS = -+ -+dist_man_MANS = - --nodist_man_MANS = \ -- man/systemd.special.7 -+nodist_man_MANS = - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/systemd/patches/systemd-36-no_manpages.patch b/systemd/patches/systemd-36-no_manpages.patch new file mode 100644 index 0000000..5c5480f --- /dev/null +++ b/systemd/patches/systemd-36-no_manpages.patch @@ -0,0 +1,90 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2011-09-23 18:30:02.000000000 +0200 ++++ b/Makefile.am 2011-10-09 16:44:18.293116056 +0200 +@@ -749,82 +749,13 @@ + src/dbus-loop.h \ + src/spawn-agent.h + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- man/shutdown.8 \ +- man/pam_systemd.8 \ +- man/systemd.conf.5 \ +- man/systemd-logind.conf.5 \ +- man/tmpfiles.d.5 \ +- man/hostname.5 \ +- man/timezone.5 \ +- man/machine-id.5 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 \ +- man/systemd-loginctl.1 ++MANPAGES = + +-if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 +-endif ++MANPAGES_ALIAS = + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++dist_man_MANS = + +-nodist_man_MANS = \ +- man/systemd.special.7 ++nodist_man_MANS = + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 1ffaf3b..9dac8a9 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ###############################################################################

name = systemd -version = 33 -release = 3 +version = 36 +release = 2

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -31,6 +31,7 @@ build dbus-devel gperf intltool + libacl-devel libcap-devel libselinux-devel libtool @@ -114,6 +115,8 @@ packages util-linux>=2.19 end

+ prerequires += authconfig + script postin # Generate Machine ID. /bin/systemd-machine-id-setup > /dev/null 2>&1 || : diff --git a/udev/console_init b/udev/console_init deleted file mode 100644 index 1aaaf4d..0000000 --- a/udev/console_init +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 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/. # -# # -############################################################################### - -is_true() { - [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ] -} - -# Native English speakers probably don't have /etc/sysconfig/console at all -if [ -f /etc/sysconfig/console ]; then - . /etc/sysconfig/console -fi - -# Setting default values -[ -z "$UNICODE" ] && UNICODE=1 -[ -z "$FONT" ] && FONT="LatArCyrHeb-16" - -device="/dev/$1" - -# Figure out the mode to set the console into -if is_true "${UNICODE}"; then - echo -en '\033%G' > $device -else - echo -en '\033%@' > $device -fi - -# Setting font -setfont ${FONT} -C $device - -# Setting up keyboard -if [ -n "$KEYMAP" ]; then - if is_true "${UNICODE}"; then - loadkeys -u $KEYMAP >/dev/null - else - loadkeys $KEYMAP >/dev/null - fi - [ -n "$KEYMAP_CORRECTIONS" ] && \ - loadkeys $KEYMAP_CORRECTIONS >/dev/null -fi diff --git a/udev/rules/10-console.rules b/udev/rules/10-console.rules deleted file mode 100644 index 6e8c458..0000000 --- a/udev/rules/10-console.rules +++ /dev/null @@ -1,9 +0,0 @@ -# Console initialization - keyboard, font, etc. -KERNEL=="tty0", RUN+="/lib/udev/console_init %k" - -# Check and set up serial and serial-like consoles if necessary -KERNEL=="console", RUN+="/lib/udev/console_check %k" -KERNEL=="ttySG*", RUN+="/lib/udev/console_check %k" -KERNEL=="xvc*", RUN+="/lib/udev/console_check %k" -KERNEL=="hvsi*", RUN+="/lib/udev/console_check %k" -KERNEL=="hvc*", RUN+="/lib/udev/console_check %k" diff --git a/udev/udev.nm b/udev/udev.nm index d7176ff..9e9416e 100644 --- a/udev/udev.nm +++ b/udev/udev.nm @@ -5,7 +5,7 @@

name = udev version = 172 -release = 2 +release = 3

groups = Base System/Base url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ @@ -45,10 +45,6 @@ build --with-systemdsystemunitdir=/lib/systemd/system

install_cmds - # Install rules - mkdir -pv %{BUILDROOT}/lib/udev/rules.d/ - install -m644 -v %{DIR_SOURCE}/rules/*.rules %{BUILDROOT}/lib/udev/rules.d/ - # Install pkg-config files correctly mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib

@@ -59,8 +55,6 @@ build ln -svf ../../../../lib/udev/udev-acl \ %{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck

- install -m 755 %{DIR_SOURCE}/console_init %{BUILDROOT}/lib/udev/ - # Remove network rules. We have our own in the network package. rm -v %{BUILDROOT}/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules} end @@ -68,12 +62,11 @@ end

packages package %{name} - end - + package lib%{name} template LIBS end - + package lib%{name}-devel template DEVEL end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 8794233..681de64 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 = 4 +release = 5

groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -76,8 +76,10 @@ build

# Remove deprecated commands rm -fv %{BUILDROOT}/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \ - %{BUILDROOT}/usr/bin/chkdupexe %{BUILDROOT}/usr/bin/vi{gr,pw} \ - %{BUILDROOT}/sbin/{sln,shutdown} %{BUILDROOT}/bin/{line,newgrp,pg} + %{BUILDROOT}/usr/{,s}bin/{chkdupexe,newgrp,vi{gr,pw}} \ + %{BUILDROOT}/sbin/{sln,shutdown} %{BUILDROOT}/bin/{line,pg} + rm -fv %{BUILDROOT}/usr/share/man/man1/{chkdupexe,line,pg,newgrp}.* \ + %{BUILDROOT}/usr/share/man/man8/{vipw,vigr}.* rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh

# Create /etc/mtab symlink @@ -110,7 +112,7 @@ packages util-linux-ng end end - + # Package information for libblkid package libblkid summary = Block device ID library. @@ -123,9 +125,9 @@ packages /lib/libblkid.* end end - + # Package information for libblkid-devel - package libblikid-devel + package libblkid-devel summary = Development library and header of libblkid. description = %{summary} @@ -136,7 +138,7 @@ packages /usr/share/man/man3/*blkid* end end - + # Package information for libuuid package libuuid summary = Universally unique ID library. @@ -149,7 +151,7 @@ packages /lib/libuuid.* end end - + # Package information for libuuid-devel package libuuid-devel summary = Development library and header of libuuid. @@ -162,7 +164,7 @@ packages /usr/share/man/man3/*uuid* end end - + # Package information for libmount package libmount summary = Device mounting library. @@ -175,7 +177,7 @@ packages /lib/libmount.* end end - + # Package information for libmount-devel package libmount-devel summary = Development library and header of libmount.

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