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 2bc2870cf13582675bad5e1da501e4ba5d07f2b7 (commit) via b8b27784d9587bb48cf9e444d7b6e91043005827 (commit) via 2e5078c86b9e5de118823cc6fafac74b5d539894 (commit) via 0381bbb665a2162d0d432d6ee5c3b4dcc8734920 (commit) via 84450d17ae252f2a16157b8942d399aec5641d1b (commit) via 6137af442e10fce0c7cbd49182fd4bba84491174 (commit) via f0f432c435e83d2a3ffc37c1b673a742a2e09375 (commit) via da1affd6795cd57a84449d39b54a41e6a1542d60 (commit) via 1d40b321dd2452bed6aa153df12f87d877b0275a (commit) via 119f8a8367ded406c9f0053d0ed00cb467b06bbd (commit) from a076af08b495d06477f98525f48512dd2207a7c1 (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 2bc2870cf13582675bad5e1da501e4ba5d07f2b7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 2 16:19:18 2011 +0200

elinks: Remove weird file.

commit b8b27784d9587bb48cf9e444d7b6e91043005827 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 2 15:15:01 2011 +0200

paxtest: Fix syntax error in makefile.

commit 2e5078c86b9e5de118823cc6fafac74b5d539894 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 18:30:07 2011 +0200

glib2: Fix that ugly makefile.

commit 0381bbb665a2162d0d432d6ee5c3b4dcc8734920 Merge: 84450d1 1d40b32 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 16:59:39 2011 +0200

Merge remote-tracking branch 'stevee/systemd'

commit 84450d17ae252f2a16157b8942d399aec5641d1b Merge: 6137af4 119f8a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 16:57:35 2011 +0200

Merge remote-tracking branch 'stevee/glib2'

commit 6137af442e10fce0c7cbd49182fd4bba84491174 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 13:07:51 2011 +0200

readline: Remove configuration files that are already provided by setup.

commit f0f432c435e83d2a3ffc37c1b673a742a2e09375 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 13:07:29 2011 +0200

pam: Remove configuration files that are already provided by setup.

commit da1affd6795cd57a84449d39b54a41e6a1542d60 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 1 13:07:02 2011 +0200

beep: Update to 1.3.

commit 1d40b321dd2452bed6aa153df12f87d877b0275a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Sep 29 22:26:13 2011 +0200

systemd: Add scriptlet.

commit 119f8a8367ded406c9f0053d0ed00cb467b06bbd Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Sep 29 19:37:26 2011 +0200

glib2: Update to 2.30.0.

Fixes #254

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

Summary of changes: beep/beep.nm | 2 +- elinks/elinks.nm | 7 ++++++- glib2/glib2.nm | 25 +++++++++++++------------ pam/pam.nm | 9 ++++++--- pam/securetty | 22 ---------------------- paxtest/paxtest.nm | 3 ++- readline/inputrc | 42 ------------------------------------------ readline/readline.nm | 7 ++----- systemd/systemd.nm | 45 +++++++++++++++++++++++++++++++++++++++++++-- 9 files changed, 73 insertions(+), 89 deletions(-) delete mode 100644 pam/securetty delete mode 100644 readline/inputrc

Difference in files: diff --git a/beep/beep.nm b/beep/beep.nm index d4da7d2..6de82ee 100644 --- a/beep/beep.nm +++ b/beep/beep.nm @@ -4,7 +4,7 @@ ###############################################################################

name = beep -version = 1.2.2 +version = 1.3 release = 1

groups = Applications/System diff --git a/elinks/elinks.nm b/elinks/elinks.nm index 1e846eb..b17764b 100644 --- a/elinks/elinks.nm +++ b/elinks/elinks.nm @@ -5,7 +5,7 @@

name = elinks version = 0.11.7 -release = 1 +release = 2

groups = Applications/Internet url = http://elinks.or.cz/ @@ -34,6 +34,11 @@ build configure_options += \ --enable-bittorrent \ --enable-256-colors + + install_cmds + # Remove some weird file. + rm -f %{BUILDROOT}/usr/share/locale/locale.alias + end end

packages diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 08c056a..792c03b 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -3,9 +3,11 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################

-name = glib -version = 2.29.14 -release = 1 +name = glib2 +ver_major = 2.30 +version = %{ver_major}.0 +release = 2 +thisapp = glib-%{version}

groups = System/Libraries url = http://www.gtk.org @@ -13,14 +15,14 @@ license = LGPLv2+ summary = A library of handy utility functions.

description - GLib is the low-level core library that forms the basis \ - for projects such as GTK+ and GNOME. It provides data structure \ - handling for C, portability wrappers, and interfaces for such runtime \ - functionality as an event loop, threads, dynamic loading, and an \ + GLib is the low-level core library that forms the basis + for projects such as GTK+ and GNOME. It provides data structure + handling for C, portability wrappers, and interfaces for such runtime + functionality as an event loop, threads, dynamic loading, and an object system. end

-source_dl = +source_dl = http://ftp.gnome.org/pub/gnome/sources/glib/%%7Bversion_major%7D/ sources = %{thisapp}.tar.xz

build @@ -50,10 +52,9 @@ build end

packages - package %{name}2 - end - - package %{name}2-devel + package %{name} + + package %{name}-devel template DEVEL end end diff --git a/pam/pam.nm b/pam/pam.nm index a883768..3772519 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -5,7 +5,7 @@

name = pam version = 1.1.0 -release = 2 +release = 3 thisapp = Linux-PAM-%{version}

groups = System/Base @@ -54,7 +54,10 @@ build #sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd mkdir -pv %{BUILDROOT}/etc/security install -v -m644 %{DIR_SOURCE}/pam_env.conf %{BUILDROOT}/etc/security/pam_env.conf - cp -vf %{DIR_SOURCE}/{login.defs,securetty} %{BUILDROOT}/etc + cp -vf %{DIR_SOURCE}/login.defs %{BUILDROOT}/etc + + # Included in setup package + rm -f %{BUILDROOT}/etc/environment end end

@@ -64,7 +67,7 @@ packages pam_ldap end end - + package %{name}-devel template DEVEL end diff --git a/pam/securetty b/pam/securetty deleted file mode 100644 index f176d04..0000000 --- a/pam/securetty +++ /dev/null @@ -1,22 +0,0 @@ -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyp0 -ttyp1 -ttyp2 -ttyp3 -ttyp4 -ttyp5 -ttyp6 -ttyp7 -ttyp8 -ttyp9 -ttypa -ttypb -ttypc -ttypd -ttype -ttypf diff --git a/paxtest/paxtest.nm b/paxtest/paxtest.nm index 60840aa..925b717 100644 --- a/paxtest/paxtest.nm +++ b/paxtest/paxtest.nm @@ -5,7 +5,7 @@

name = paxtest version = 0.9.9 -release = 1 +release = 2

groups = Security/Tools url = http://pax.grsecurity.org/ @@ -20,6 +20,7 @@ end source_dl = sources = %{thisapp}.tgz

+build build make -f Makefile.psm RUNDIR=/usr/lib/paxtest \ %{PARALLELISMFLAGS} diff --git a/readline/inputrc b/readline/inputrc deleted file mode 100644 index 7a7908c..0000000 --- a/readline/inputrc +++ /dev/null @@ -1,42 +0,0 @@ -# Begin /etc/inputrc - -# Allow the command prompt to wrap to the next line -set horizontal-scroll-mode Off - -# Enable 8bit input -set meta-flag On -set input-meta On - -# Turns off 8th bit stripping -set convert-meta Off - -# Keep the 8th bit for display -set output-meta On - -# none, visible or audible -set bell-style none - -# All of the following map the escape sequence of the -# value contained inside the 1st argument to the -# readline specific functions - -"\eOd": backward-word -"\eOc": forward-word - -# for linux console -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[3~": delete-char -"\e[2~": quoted-insert - -# for xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for Konsole -"\e[H": beginning-of-line -"\e[F": end-of-line - -# End /etc/inputrc diff --git a/readline/readline.nm b/readline/readline.nm index 33d4a25..1d9095d 100644 --- a/readline/readline.nm +++ b/readline/readline.nm @@ -5,7 +5,7 @@

name = readline version = 6.2 -release = 3 +release = 4

groups = System/Libraries url = ftp://ftp.gnu.org/gnu/readline/ @@ -46,15 +46,12 @@ build

mkdir -pv %{BUILDROOT}/etc/profile.d cp -vf %{DIR_SOURCE}/readline.sh %{BUILDROOT}/etc/profile.d/ - - cp -vf %{DIR_SOURCE}/inputrc %{BUILDROOT}/etc/ end end

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

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

maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -109,9 +109,31 @@ packages requires dbus python-cairo - python-dbus udev>=172 + python-dbus + udev>=172 util-linux>=2.19 end + + script postin + # Generate Machine ID. + /bin/systemd-machine-id-setup > /dev/null 2>&1 || : + + # Reexec systemd daemon. + /bin/systemctl daemon-reexec > /dev/null 2>&1 || : + + # Make sure pam_systemd is enabled + if ! /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac ; then + /usr/sbin/authconfig --update --nostart >/dev/null 2>&1 || : + + # Try harder + /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac || /usr/sbin/authconfig --updateall --nostart >/dev/null 2>&1 || : + fi + end + + script postup + # Restart login service after update + /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : + end end # Package information for systemd-units @@ -131,6 +153,25 @@ packages /bin/systemd-tmpfiles /usr/share/man/man1/systemctl.* end + + script postin + # Enable default services. + systemctl enable \ + getty@.service \ + remote-fs.target > /dev/null 2>&1 || : + end + + script preun + # Disable default services. + systemctl disable \ + getty@.service \ + remote-fs.target > /dev/null 2>&1 || : + end + + script postup + # Reload service files + systemctl daemon-reload > /dev/null 2>&1 || : + end end package %{name}-devel

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