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

Conflicts:
	gcc/gcc.nm

diff --git a/audit/audit.nm b/audit/audit.nm
index 5e36fbb1b5cdd2ee2c263f21af2ad02240f22630..66017be7b8f9c46a6a6bb781cc9b7ee994462c2c 100644 (file)
--- a/audit/audit.nm
+++ b/audit/audit.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = audit
-version    = 2.0.5
-release    = 1
+version    = 2.1.3
+release    = 7
 
 groups     = System/Daemons
 url        = http://people.redhat.com/sgrubb/audit/
@@ -44,6 +44,10 @@ build
                autoreconf -fvi
        end
 
+       test
+               make check
+       end
+
        install_cmds
                rm -vf %{BUILDROOT}/lib/libau{dit,parse}.so
                ln -svf ../../lib/libaudit.so.1 %{BUILDROOT}/usr/lib/libaudit.so
@@ -52,12 +56,33 @@ build
                mkdir -pv %{BUILDROOT}/usr/sbin/
                mv -v %{BUILDROOT}/sbin/audisp*remote %{BUILDROOT}/usr/sbin/
 
+               mkdir -pv %{BUILDROOT}/var/log/audit
+
                rm -rfv %{BUILDROOT}/etc/{rc.d,sysconfig}
        end
 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 auditd.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop auditd.service >/dev/null 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 auditd.service >/dev/null 2>&1 || :
+               end
        end
 
        package %{name}-libs
@@ -68,6 +93,15 @@ packages
                template DEVEL
        end
 
+       package python-%{name}
+               summary = Python bindings for libaudit.
+               description = %{summary}
+
+               files
+                       /usr/lib/python*/
+               end
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end

diff --git a/audit/systemd/auditd.service b/audit/systemd/auditd.service
new file mode 100644 (file)
index 0000000..04b0b36
--- /dev/null
+++ b/audit/systemd/auditd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Security Auditing Service
+After=syslog.target
+
+[Service]
+ExecStart=/sbin/auditd -n
+ExecStartPost=/sbin/auditctl -R /etc/audit/audit.rules
+
+[Install]
+WantedBy=multi-user.target
+

diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm
index 9d676c37fee203d0d17502865512106efdb71b34..ac42c0381eaf81d6135cfb3d58ec07f7a054adfa 100644 (file)
--- a/diffutils/diffutils.nm
+++ b/diffutils/diffutils.nm
@@ -5,7 +5,7 @@
 
 name       = diffutils
 version    = 3.2
-release    = 2
+release    = 3
 
 groups     = Development/Tools
 url        = http://www.gnu.org/software/diffutils/diffutils.html
@@ -23,11 +23,11 @@ source_dl  = http://ftp.gnu.org/gnu/diffutils/
 
 build
        configure_options += \
-               --mandir=/usr/share
+               --mandir=/usr/share/man
 
-       #test
-       #       make check
-       #end
+       test
+               make check
+       end
 end
 
 packages

diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index c650b71946ca23913c50bd806f8b9afc15c80971..7ec6485e4b61335eb726dbf57316cc1af67d18b2 100644 (file)
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -8,7 +8,7 @@ build_cloog_ppl = 1
 
 name       = gcc
 version    = 4.6.2
-release    = 6
+release    = 7
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -255,7 +255,7 @@ build
 
                # libquadmath
                if [ "%{build_libquadmath}" = "1" ]; then
-                       ln -svf ../../../libquadmath.so.0.* ${FULLPATH}/libquadmath.so
+                       ln -svf ../../../libquadmath.so.0.0.0 ${FULLPATH}/libquadmath.so
                        chmod 755 %{BUILDROOT}/usr/lib/libquadmath.so.0.*
                fi
        end
@@ -279,6 +279,10 @@ packages
                        libgomp=%{thisver}
                end
 
+               # We do not ship libgcc-devel anymore.
+               provides += libgcc-devel=%{thisver}
+               obsoletes += libgcc-devel<%{thisver}
+
                if "%{build_cloog_ppl}" == "1"
                        requires += cloog-ppl>=0.15
                end

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index f06c66c4b0197388826bb132751b0747b362cb74..2b94537d4a69d8c45708909d8d01ec3dc52fa01b 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = suricata
-version    = 1.1
-release    = 2
+version    = 1.1.1
+release    = 1
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/

diff --git a/systemd/patches/systemd-ipfire.patch b/systemd/patches/systemd-ipfire.patch
new file mode 100644 (file)
index 0000000..4cf071a
--- /dev/null
+++ b/systemd/patches/systemd-ipfire.patch
@@ -0,0 +1,42 @@
+diff -Nur systemd-37_orig/configure.ac systemd-37/configure.ac
+--- systemd-37_orig/configure.ac       2011-10-11 20:46:56.000000000 +0200
++++ systemd-37/configure.ac    2011-12-17 21:57:31.748682566 +0100
+@@ -355,7 +355,7 @@
+ 
+ AC_PATH_PROG([M4], [m4])
+ 
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, ipfire or other]))
+ if test "z$with_distro" = "z"; then
+         if test "$cross_compiling" = yes; then
+                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
+@@ -374,6 +374,7 @@
+                 if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then
+                         with_distro="ubuntu"
+                 fi
++              test -f "/etc/ipfire-release" && with_distro="ipfire"
+         fi
+         if test "z$with_distro" = "z"; then
+                 with_distro=`uname -s`
+@@ -458,6 +459,13 @@
+                 AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
+                 M4_DEFINES=-DTARGET_ANGSTROM=1
+                 ;;
++      ipfire)
++              SYSTEM_SYSVINIT_PATH=
++              SYSTEM_SYSVRCND_PATH=
++              AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire])
++              M4_DEFINES=-DTARGET_IPFIRE=1
++              have_plymouth=yes
++              ;;
+         other)
+                 ;;
+         *)
+@@ -515,6 +523,7 @@
+ AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
+ AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
+ AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
++AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire)
+ 
+ AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
+ AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index d8032c298fc08b307c3865d325a3228a2625531f..50b38d90030b9a0e001990b0e481f0241e8397e5 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 36
-release    = 5
+version    = 37
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -30,6 +30,7 @@ build
                docbook-utils
                docbook-xsl
                gperf
+               gettext-devel
                intltool
                libacl-devel
                libcap-devel
@@ -44,9 +45,7 @@ build
                --sysconfdir=/etc \
                --libexecdir=/usr/lib \
                --with-rootdir= \
-               --with-distro=other \
-               --with-sysvinit-path= \
-               --with-sysvrcd-path= \
+               --with-distro=ipfire \
                --with-udevrulesdir=/lib/udev/rules.d/ \
                --with-pamlibdir=/lib/security
 

diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
index b3c22ef25017526154e8b2d213acf916d10f15f5..8e6881d51c250c708e0d8b5ccbd37c0711765fd8 100644 (file)
--- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
+++ b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
@@ -1,6 +1,6 @@
---- sysvinit-2.86/src/Makefile.old     2009-08-05 17:57:57.000000000 +0200
-+++ sysvinit-2.86/src/Makefile 2009-08-05 19:03:04.000000000 +0200
-@@ -10,32 +10,26 @@
+--- sysvinit-2.86/src/Makefile.old     2004-06-09 14:47:45.000000000 +0200
++++ sysvinit-2.86/src/Makefile 2011-12-17 18:20:12.067186698 +0100
+@@ -10,32 +10,30 @@
  
  CC    = gcc
  CFLAGS        = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
@@ -26,19 +26,23 @@
 -USRBIN        += utmpdump wall
 -MAN1  += mountpoint.1 wall.1
 -MAN8  += sulogin.8 bootlogd.8
++SBIN  += sulogin
 +USRBIN        += utmpdump
 +MAN1  += mountpoint.1
++MAN8  += sulogin.8
  endif
  
  ifeq ($(DISTRO),Debian)
  BIN   += mountpoint
 -SBIN  += sulogin bootlogd
++SBIN  += sulogin
  MAN1  += mountpoint.1
 -MAN8  += sulogin.8 bootlogd.8
++MAN8  += sulogin.8
  endif
  
  ifeq ($(DISTRO),Owl)
-@@ -50,7 +44,7 @@
+@@ -50,7 +48,7 @@
  MANDIR                = /usr/share/man
  
  # Additional libs for GNU libc.
@@ -47,7 +51,7 @@
  LCRYPT                = -lcrypt
  endif
  
-@@ -120,14 +114,10 @@
+@@ -120,14 +118,10 @@
                        $(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
                done
                # $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc/
@@ -62,7 +66,7 @@
                for i in $(MAN1); do \
                        $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
                done
-@@ -137,12 +127,3 @@
+@@ -137,12 +131,3 @@
                for i in $(MAN8); do \
                        $(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
                done

diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm
index cdbed7f697c1ab33cccb97b638fa1aa2f5995347..5627f76c61542965b2fe1da69fb393a94f9149e2 100644 (file)
--- a/sysvinit/sysvinit.nm
+++ b/sysvinit/sysvinit.nm
@@ -5,7 +5,7 @@
 
 name       = sysvinit
 version    = 2.86
-release    = 3
+release    = 4
 
 groups     = System/Base
 url        = https://alioth.debian.org/projects/pkg-sysvinit/