[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d58a8ffee17f2a4867c0653b4d33666ec40f5b69 - IPFire-SCM

27 Oct 2012

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  d58a8ffee17f2a4867c0653b4d33666ec40f5b69 (commit)
       via  be9485b2dbd33570816d0a7ed04ff37d51d31f58 (commit)
       via  1b9693a9d964884e3236e8ee8d5d6dc3d367ef2f (commit)
       via  e149c24288f1fdb56f9b512891124c617a498503 (commit)
       via  e8a8cf219c0daf68ef78a0936e045cb5663df978 (commit)
       via  e3399d19616a9e8e6bce0675f1ce2a84030fb942 (commit)
       via  989f12ada35a58ac799d8cbea54da62a59b7ddc2 (commit)
       via  97dc700dcac04f24b52cfd2f098c896455041d11 (commit)
       via  4d811cc066066c3eb2e8ca4ba0076f93ac1f8daf (commit)
       via  3b3941e469685a4292bbb6f9cdc6131306c2b3e5 (commit)
       via  bdc400af2f0d4bcd8dc535770eb460e9847f4010 (commit)
       via  79fdc28c787d13d1a15ca852b8e8c1a512a56ed4 (commit)
       via  5d25f1b351395ff5e2d286f550270e810137c58c (commit)
       via  e8e9e8e7c3a0df0915aec6d3a40f7fbea59927c3 (commit)
       via  99f1d55ba7759dffb7ac2ac451a895f6cda4e5fe (commit)
       via  1205840b8d5e310ad05ce88fe33e14603f870544 (commit)
       via  23503b40ba0d620d2429c826721b9bbff0434489 (commit)
       via  7d270ad90075a8ab05526ee24d2feb8d1bc461ca (commit)
       via  9edaaeab91fc862b244f3f3712adee83e1564705 (commit)
      from  d42d84221801e4f266bf4c4c1ad0a646ca3a6a35 (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 d58a8ffee17f2a4867c0653b4d33666ec40f5b69
Merge: be9485b bdc400a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:20:39 2012 +0200
Merge remote-tracking branch 'stevee/dracut'
commit be9485b2dbd33570816d0a7ed04ff37d51d31f58
Merge: 1b9693a e8e9e8e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:19:43 2012 +0200
Merge remote-tracking branch 'stevee/pdns-datafiles'
commit 1b9693a9d964884e3236e8ee8d5d6dc3d367ef2f
Merge: e149c24 3b3941e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:19:04 2012 +0200
Merge remote-tracking branch 'stevee/plymouth-update'
commit e149c24288f1fdb56f9b512891124c617a498503
Merge: e8a8cf2 9edaaea
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:18:44 2012 +0200
Merge remote-tracking branch 'ummeegge/glib2-update'
commit e8a8cf219c0daf68ef78a0936e045cb5663df978
Merge: e3399d1 7d270ad
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:18:17 2012 +0200
Merge remote-tracking branch 'ummeegge/nmap-update'
commit e3399d19616a9e8e6bce0675f1ce2a84030fb942
Merge: 989f12a 23503b4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:17:46 2012 +0200
Merge remote-tracking branch 'ummeegge/tcpdump-update'
commit 989f12ada35a58ac799d8cbea54da62a59b7ddc2
Merge: 97dc700 1205840
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:16:52 2012 +0200
Merge remote-tracking branch 'ummeegge/libssh2-update'
commit 97dc700dcac04f24b52cfd2f098c896455041d11
Merge: 4d811cc 99f1d55
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:16:38 2012 +0200
Merge remote-tracking branch 'ummeegge/mdadm-update'
commit 4d811cc066066c3eb2e8ca4ba0076f93ac1f8daf
Merge: d42d842 5d25f1b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 27 14:16:17 2012 +0200
Merge remote-tracking branch 'ummeegge/dos2unix-update'
commit 3b3941e469685a4292bbb6f9cdc6131306c2b3e5
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Oct 26 23:03:04 2012 +0200
plymouth: Update to 0.8.8.
commit bdc400af2f0d4bcd8dc535770eb460e9847f4010
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Oct 26 23:00:11 2012 +0200
dracut: Enable systemd support in initramfs.
From now we also will use systemd inside the initramfs, that gives us a faster
    startup and full debugging/logging into the system journal.
commit 79fdc28c787d13d1a15ca852b8e8c1a512a56ed4
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Oct 26 22:56:54 2012 +0200
dracut: Update to 024.
Fix installation on x86_64 and clean up nm file.
commit 5d25f1b351395ff5e2d286f550270e810137c58c
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Fri Oct 26 16:44:38 2012 +0200
dos2unix: Update to 6.0.2.
commit e8e9e8e7c3a0df0915aec6d3a40f7fbea59927c3
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Fri Oct 26 16:11:52 2012 +0200
pdns: Don't overwrite database file on update.
commit 99f1d55ba7759dffb7ac2ac451a895f6cda4e5fe
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Thu Oct 25 21:42:43 2012 +0200
mdadm: Update to 3.2.6
commit 1205840b8d5e310ad05ce88fe33e14603f870544
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Thu Oct 25 21:39:47 2012 +0200
libssh2: Update to 1.4.2
commit 23503b40ba0d620d2429c826721b9bbff0434489
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Thu Oct 25 21:34:47 2012 +0200
tcpdump: Update to 4.3.0
commit 7d270ad90075a8ab05526ee24d2feb8d1bc461ca
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Thu Oct 25 21:29:36 2012 +0200
nmap: Update to 6.01.
commit 9edaaeab91fc862b244f3f3712adee83e1564705
Author: Erik Kapfer erik.kapfer@ipfire.org
Date:   Thu Oct 25 20:14:25 2012 +0200
glib2: Update to 2.35.1
Fixes #10235
-----------------------------------------------------------------------
Summary of changes:
 dos2unix/dos2unix.nm                               |    6 +-
 dracut/dracut.nm                                   |   11 ++-
 dracut/ipfire.conf                                 |    8 ++-
 glib2/glib2.nm                                     |    8 ++-
 libssh2/libssh2.nm                                 |   10 ++--
 mdadm/mdadm.nm                                     |    7 +-
 nmap/nmap.nm                                       |    4 +-
 pdns/pdns.conf                                     |    1 +
 pdns/pdns.nm                                       |    6 ++-
 ...-create-missing-links-for-systemd-targets.patch |   71 --------------------
 plymouth/plymouth.nm                               |    2 +-
 tcpdump/tcpdump.nm                                 |    4 +-
 12 files changed, 42 insertions(+), 96 deletions(-)
 delete mode 100644 plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch
Difference in files:

diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm
index 55da321..1fde0d0 100644
--- a/dos2unix/dos2unix.nm
+++ b/dos2unix/dos2unix.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = dos2unix
-version    = 5.1.1
+version    = 6.0.2
 release    = 1
groups     = Applications/Text
@@ -13,11 +13,11 @@ license    = BSD
 summary    = Text file format converters.
description
-	Convert text files with DOS or Mac line endings to Unix line endings and \
+	Convert text files with DOS or Mac line endings to Unix line endings and
    vice versa.
 end
-source_dl  =
+source_dl  = http://waterlan.home.xs4all.nl/dos2unix/
build
    requires
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 18d9329..ecc26c7 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = dracut
-version    = 019
+version    = 024
 release    = 2
 arch       = noarch
@@ -39,10 +39,12 @@ build
dracutlibdir = %{prefix}/lib/dracut
-	install
-		make install DESTDIR=%{BUILDROOT} \
-			sysconfdir=/etc mandir=/usr/share/man
+	make_install_targets += \
+		sysconfdir=%{sysconfdir} \
+		libdir=%{dracutlibdir} \
+		mandir=%{mandir}
+	install_cmds
    	# Install local configuration.
    	mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
    	cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
@@ -84,6 +86,7 @@ packages
    		lvm2
    		mdadm
    		sysvinit
+			systemd >= 187
    		udev
    		util-linux
    		which
diff --git a/dracut/ipfire.conf b/dracut/ipfire.conf
index b27d624..a6b717c 100644
--- a/dracut/ipfire.conf
+++ b/dracut/ipfire.conf
@@ -4,4 +4,10 @@
 i18n_vars="/etc/vconsole.conf:KEYTABLE-KEYMAP,SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
 #add_dracutmodules+=" "
 stdloglvl=3
-prefix=/run/initramfs
+prefix="/"
+systemdutildir=/usr/lib/systemd
+systemdsystemunitdir=/usr/lib/systemd/system
+udevdir=/usr/lib/udev
+add_dracutmodules+=" systemd "
+realinitpath="/usr/lib/systemd/systemd"
+kernel_cmdline+=" rd.auto=1 "
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 62e04f0..d08a1b5 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,11 +4,13 @@
 ###############################################################################
name       = glib2
-ver_major  = 2.31
-version    = %{ver_major}.2
-release    = 2
+ver_major  = 2.35
+ver_minor  = 1
+version    = %{ver_major}.%{ver_minor}
+release    = 1
 thisapp    = glib-%{version}
+maintainer = Erik Kapfer erik.kapfer@ipfire.org
 groups     = System/Libraries
 url        = http://www.gtk.org
 license    = LGPLv2+
diff --git a/libssh2/libssh2.nm b/libssh2/libssh2.nm
index 16312fc..901886f 100644
--- a/libssh2/libssh2.nm
+++ b/libssh2/libssh2.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = libssh2
-version    = 1.2.7
+version    = 1.4.2
 release    = 1
groups     = System/Libraries
@@ -13,13 +13,13 @@ license    = BSD
 summary    = A library implementing the SSH2 protocol.
description
-	libssh2 is a library implementing the SSH2 protocol as defined by \
-	Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), \
-	SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, \
+	libssh2 is a library implementing the SSH2 protocol as defined by
+	Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25),
+	SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*,
    SECSH-DHGEX(04), and SECSH-NUMBERS(10).
 end
-source_dl  =
+source_dl  = http://www.libssh2.org/download/
build
    requires
diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm
index a166010..159034c 100644
--- a/mdadm/mdadm.nm
+++ b/mdadm/mdadm.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = mdadm
-version    = 3.2.2
-release    = 2
+version    = 3.2.6
+release    = 1
groups     = System/Base
 url        = http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@ -20,7 +20,8 @@ description
    file can be used to help with some common tasks.
 end
-source_dl  =
+source_dl  = https://www.kernel.org/pub/linux/utils/raid/mdadm/
+sources	   = %{thisapp}.tar.xz
build
    requires
diff --git a/nmap/nmap.nm b/nmap/nmap.nm
index 4df52f7..c57bf72 100644
--- a/nmap/nmap.nm
+++ b/nmap/nmap.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = nmap
-version    = 5.51
+version    = 6.01
 release    = 1
groups     = Networking/Sniffer
@@ -20,7 +20,7 @@ description
    predictability characteristics, reverse-identd scanning, and more.
 end
-source_dl  =
+source_dl  = http://nmap.org/dist/
 sources    = %{thisapp}.tar.bz2
build
diff --git a/pdns/pdns.conf b/pdns/pdns.conf
index 0630ed5..7c43c0a 100644
--- a/pdns/pdns.conf
+++ b/pdns/pdns.conf
@@ -22,3 +22,4 @@ gsqlite3-database=/var/lib/pdns/pdns.db
 # All queries that could not be answered by ourself get sent to
 # the local recursor.
 recursor=[::1]:54
+allow-recursion=127.0.0.1 ::1
diff --git a/pdns/pdns.nm b/pdns/pdns.nm
index 35f5697..5c01ec1 100644
--- a/pdns/pdns.nm
+++ b/pdns/pdns.nm
@@ -5,7 +5,7 @@
name       = pdns
 version    = 3.1
-release    = 4
+release    = 5
groups     = Networking/DNS
 url        = http://powerdns.com/
@@ -111,6 +111,10 @@ packages
    		%{sysconfdir}/pdns/pdns.conf
    	end
+		datafiles
+			%{sharedstatedir}/pdns/pdns.db
+		end
+
    	script prein
    		%{create_user}
    	end
diff --git a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch
deleted file mode 100644
index 1e1aa95..0000000
--- a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From edde4e0f2b85c6f298569fe219a08361b99b016b Mon Sep 17 00:00:00 2001
-From: Frederic Crozat fcrozat@suse.com
-Date: Fri, 20 Jul 2012 13:28:31 +0000
-Subject: systemd: create missing links various targets
-
----
-diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
-index 1545a04..2f5e61f 100644
---- a/systemd-units/Makefile.am
-+++ b/systemd-units/Makefile.am
-@@ -13,6 +13,58 @@ systemd_unit_templates =                                                     \
- if ENABLE_SYSTEMD_INTEGRATION
- systemdunitdir=$(SYSTEMD_UNIT_DIR)
- systemdunit_DATA = $(systemd_unit_templates:.in=)
-+
-+install-data-hook:
-+	$(MKDIR_P) -m 0755                                                   \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants           \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants        \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
-+		rm -f plymouth-start.service plymouth-read-write.service &&  \
-+		$(LN_S) ../plymouth-start.service &&                         \
-+		$(LN_S) ../plymouth-read-write.service)
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants &&         \
-+		rm -f plymouth-quit.service plymouth-quit-wait.service &&    \
-+		$(LN_S) ../plymouth-quit.service &&                          \
-+		$(LN_S) ../plymouth-quit-wait.service)
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants &&             \
-+		rm -f plymouth-reboot.service &&                             \
-+		$(LN_S) ../plymouth-reboot.service)
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants &&              \
-+		rm -f plymouth-kexec.service &&                              \
-+		$(LN_S) ../plymouth-kexec.service)
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants &&           \
-+		rm -f plymouth-poweroff.service &&                           \
-+		$(LN_S) ../plymouth-poweroff.service)
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants &&               \
-+		rm -f plymouth-halt.service &&                               \
-+		$(LN_S) ../plymouth-halt.service)
-+
-+uninstall-hook:
-+	rm -f \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants &&            \
-+		rm -f plymouth-start.service plymouth-read-write.service)    \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants &&         \
-+		rm -f plymouth-quit.service plymouth-quit-wait.service)      \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants &&             \
-+		rm -f plymouth-reboot.service)                               \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants &&              \
-+		rm -f plymouth-kexec.service)                                \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants &&           \
-+		rm -f plymouth-poweroff.service)                             \
-+	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants &&               \
-+		rm -f plymouth-halt.service)                                 \
-+	rmdir --ignore-fail-on-non-empty                                     \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants           \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants        \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
-+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
-+
- endif
- 
- EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index 96507de..cbecf07 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = plymouth
-version    = 0.8.6.1
+version    = 0.8.8
 release    = 1
groups     = System/Base
diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
index 2a81d25..201426e 100644
--- a/tcpdump/tcpdump.nm
+++ b/tcpdump/tcpdump.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = tcpdump
-version    = 4.1.1
-release    = 2
+version    = 4.3.0
+release    = 1
groups     = Networking/Sniffer
 url        = http://www.tcpdump.org/
hooks/post-receive
--
IPFire 3.x development tree

    