Merge remote-tracking branch 'stevee/pdns-datafiles'

diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm
index 55da32154e7a8f836108aaf26950b4b9e9a07a78..1fde0d0c27d1a8c2d7f1d4275190b9924a547d1b 100644 (file)
--- 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/glib2/glib2.nm b/glib2/glib2.nm
index 62e04f0b47a6e05236961da3a0b64db89530eeac..d08a1b527376efcb0ddfb2e6ea40a3c7f0d3c158 100644 (file)
--- 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/glibc/glibc.nm b/glibc/glibc.nm
index 8a12d01f7c1137bc7c9160f4f53e15f19e4ecfa0..23ac9c7fde08c6faef0431992ce9b906a65dc9f4 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
 
 name       = glibc
 version    = 2.16.0
-release    = 3
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -155,7 +155,8 @@ build
                --with-selinux \
                --disable-werror \
                --enable-bind-now \
-               --enable-nss-crypt
+               --enable-nss-crypt \
+               --enable-obsolete-rpc
 
        if "%{DISTRO_ARCH}" == "armv5tel"
                # Disable hardware FP for ARM.

diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index aac269c3397c93261a73e9141c8eaa749ff3a4be..2f9b5fb7e75ea9fdbad744e070a53e517c1c3dd3 100644 (file)
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -22,7 +22,7 @@ source_dl  = http://sourceforge.net/projects/%{name}/files/%{name}/
 
 build
        build
-               CFLAGS="%{CFLAGS}" make %{PARALELLIAMFLAGS} \
+               CFLAGS="%{CFLAGS}" make %{PARALLELISMFLAGS} \
                        STRIP=/bin/true LDFLAGS=
        end
 

diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm
index d423d5910a2863041b8ef2e0b8064f81a8cf54b0..2d4e756408f00c7f23e4b5bfd83c2141d52e4230 100644 (file)
--- a/libnetfilter_conntrack/libnetfilter_conntrack.nm
+++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm
@@ -5,7 +5,7 @@
 
 name       = libnetfilter_conntrack
 version    = 1.0.2
-release    = 2
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.netfilter.org/projects/libnetfilter_conntrack/index.html
@@ -22,15 +22,16 @@ source_dl  = http://www.netfilter.org/projects/libnetfilter_conntrack/files/
 sources    = %{thisapp}.tar.bz2
 
 build
-       # Disable any optimization.
-       if "%{DISTRO_ARCH}" == "i686"
-               CFLAGS += -O0
-       end
-
        requires
+               autoconf
+               automake
                libmnl-devel >= 1.0.3
                libnfnetlink-devel
-               pkg-config
+       end
+
+       prepare_cmds
+               sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile*
+               autoreconf -vfi
        end
 
        make_build_targets += V=1

diff --git a/libnetfilter_log/libnetfilter_log.nm b/libnetfilter_log/libnetfilter_log.nm
index 0d6f07928e42934bca7a6ce797fef99e9e8532e2..22c5b3f6e5dc68e044ffb6f95b77f7bf1ce9797c 100644 (file)
--- a/libnetfilter_log/libnetfilter_log.nm
+++ b/libnetfilter_log/libnetfilter_log.nm
@@ -5,7 +5,7 @@
 
 name       = libnetfilter_log
 version    = 1.0.1
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.netfilter.org/projects/libnetfilter_log/downloads.html
@@ -24,13 +24,14 @@ sources    = %{thisapp}.tar.bz2
 
 build
        requires
+               autoconf
+               automake
                libnfnetlink-devel
        end
 
-       # Disable any optimization because of
-       # https://bugzilla.ipfire.org/show_bug.cgi?id=10018
-       if "%{DISTRO_ARCH}" == "i686"
-               CFLAGS += -O0
+       prepare_cmds
+               sed -e "s/-Wc,-nostartfiles//g" -i src/Makefile*
+               autoreconf -vfi
        end
 
        make_build_targets += CFLAGS="%{CFLAGS}" 

diff --git a/libssh2/libssh2.nm b/libssh2/libssh2.nm
index 16312fc5fcd9bb8ed424f6d7d35231ff4ee6eda1..901886f66ddcf214a46d1f51e2e1b838ef642aea 100644 (file)
--- 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 a166010a84a7411d1815c088833650eb8d51ce4c..159034c7530ae11413cfc64e1697b37804021e4b 100644 (file)
--- 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/mstpd/mstpd.nm b/mstpd/mstpd.nm
index db54c5cf799321720f6ef0b8aeca5171b359da83..e828663c02a4fba90a7667c8948e8d4e31f3cd19 100644 (file)
--- a/mstpd/mstpd.nm
+++ b/mstpd/mstpd.nm
@@ -5,8 +5,8 @@
 
 name       = mstpd
 version    = 0.01
-svn_ver    = 30
-release    = 0.5-svn%{svn_ver}.1
+svn_ver    = 35
+release    = 0.6-svn%{svn_ver}.1
 thisapp    = %{name}-%{version}-svn%{svn_ver}
 
 groups     = Networking/Tools
@@ -45,7 +45,7 @@ packages
 
                script preun
                        /bin/systemctl --no-reload disable mstpd.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop rstp.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop mstpd.service >/dev/null 2>&1 || :
                end
 
                script postup

diff --git a/nmap/nmap.nm b/nmap/nmap.nm
index 4df52f7514b924027191c20625a2831d2cbf27a2..c57bf72c7507ca87d9622d5e9c4f33a9967b0df2 100644 (file)
--- 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/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 (file)
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 96507de39c09a3d5ee5055011611b95f369131eb..cbecf07f8a0c960436d0a8a5771a8eecda225953 100644 (file)
--- 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/python/python-2.7-lib64-sysconfig.patch b/python/patches/x86_64/python-2.7-lib64-sysconfig.patch
similarity index 100%
rename from python/python-2.7-lib64-sysconfig.patch
rename to python/patches/x86_64/python-2.7-lib64-sysconfig.patch

diff --git a/python/python-2.7.3-lib64.patch b/python/patches/x86_64/python-2.7.3-lib64.patch
similarity index 100%
rename from python/python-2.7.3-lib64.patch
rename to python/patches/x86_64/python-2.7.3-lib64.patch

diff --git a/python/python.nm b/python/python.nm
index d5c1a2d7b12e956cf75179c3d8cb981a0c564aba..8aff9240d2af133b3df06f4b500499a603529336 100644 (file)
--- a/python/python.nm
+++ b/python/python.nm
@@ -6,7 +6,7 @@
 name       = python
 major_ver  = 2.7
 version    = %{major_ver}.3
-release    = 1
+release    = 2
 thisapp    = Python-%{version}
 
 groups     = Development/Languages
@@ -32,11 +32,12 @@ build
                bzip2-devel
                db4-devel >= 1:4.8
                expat-devel
+               glibc-headers >= 2.16-4
                libffi-devel
                libselinux-devel
                ncurses-devel
                openssl-devel
-               pkg-config
+               pakfire-builder >= 0.9.23-4
                readline-devel
                sqlite-devel
                tar
@@ -46,12 +47,6 @@ build
        export CFLAGS  += -D_GNU_SOURCE -fwrapv
 
        prepare_cmds
-               # Apply patches for x86_64.
-               if [ "$(uname -m)" = "x86_64" ]; then
-                       patch -Np1 -i %{DIR_SOURCE}/python-2.7.3-lib64.patch
-                       patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch
-               fi
-
                # Remove embedded copies of expat, zlib and libffi
                rm -rf Modules/{expat,zlib}
                rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}

diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm
index 2a81d25af078324133817cf2838358e9e9d01112..201426e7bbce519d708fa573e61555d7f6b891b2 100644 (file)
--- 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/