Merge remote-tracking branch 'stevee/ppp-update'

diff --git a/compat-libpng/compat-libpng.nm b/compat-libpng/compat-libpng.nm
new file mode 100644 (file)
index 0000000..44b424b
--- /dev/null
+++ b/compat-libpng/compat-libpng.nm
@@ -0,0 +1,61 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-libpng
+version    = 1.5.18
+release    = 1
+thisapp    = libpng-%{version}
+
+groups     = System/Libraries
+url        = http://www.libpng.org/pub/png/
+license    = zlib
+summary    = A library of functions for manipulating PNG image format files.
+
+description
+       The libpng package contains a library of functions for creating and
+       manipulating PNG (Portable Network Graphics) image format files.
+       PNG is a bit-mapped graphics format similar to the GIF format. PNG
+       was created to replace the GIF format, since GIF uses a patented
+       data compression algorithm.
+end
+
+source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/
+source_dl +=  http://downloads.sourceforge.net/project/libpng/history/libpng15/%{version}/
+
+sources    = %{thisapp}.tar.xz
+
+build
+       requires
+               pkg-config
+               zlib-devel
+       end
+
+       install
+               # Install just the library and no headers.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 755 .libs/libpng15.so.15.18.0 %{BUILDROOT}%{libdir}
+               ln -svf libpng15.so.15.18.0 %{BUILDROOT}%{libdir}/libpng15.so.15
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       libpng = %{thisver}
+               end
+
+               obsoletes
+                       libpng-compat
+               end
+
+               conflicts
+                       libpng <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm
new file mode 100644 (file)
index 0000000..d9cfbb6
--- /dev/null
+++ b/compat-mpfr/compat-mpfr.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-mpfr
+version    = 2.4.2
+release    = 1
+
+thisapp    = mpfr-%{version}
+
+groups     = System/Libraries
+url        = http://www.mpfr.org/
+license    = LGPLv2+ and GPLv2+ and GFDL
+summary    = A C library for multiple-precision floating-point computations.
+
+description
+       The MPFR library is a C library for multiple-precision floating-point
+       computations with correct rounding. The MPFR is efficient and
+       also has a well-defined semantics. It copies the good ideas from the
+       ANSI/IEEE-754 standard for double-precision floating-point arithmetic
+       (53-bit mantissa). MPFR is based on the GMP multiple-precision
+       library.
+end
+
+source_dl  = http://ftp.gnu.org/gnu/mpfr/
+
+build
+       requires
+               gmp-devel >= 4.3.2
+               gmp-devel < 6.0.0
+       end
+
+       configure_options += \
+               --enable-thread-safe \
+               --disable-assert
+
+       test
+               export LD_LIBRARY_PATH=$(pwd)/.libs
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
+               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       mpfr = %{thisver}
+               end
+
+               obsoletes
+                       mpfr-compat
+               end
+
+               conflicts
+                       mpfr <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm
new file mode 100644 (file)
index 0000000..5251971
--- /dev/null
+++ b/compat-pcre/compat-pcre.nm
@@ -0,0 +1,74 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-pcre
+version    = 8.21
+release    = 1
+
+thisapp    = pcre-%{version}
+
+groups     = System/Libraries
+url        = http://www.pcre.org/
+license    = BSD
+summary    = Perl-compatible regular expression library.
+
+description
+       Perl-compatible regular expression library. PCRE has its own native
+       API, but a set of "wrapper" functions that are based on the POSIX
+       API are also supplied in the library libpcreposix.
+end
+
+source_dl  = http://sourceforge.net/projects/pcre/files/pcre/%{version}/
+
+build
+       requires
+               bzip2-devel
+               gcc-c++
+               readline-devel
+               zlib-devel
+       end
+
+       configure_options += \
+               --disable-static \
+               --docdir=/usr/share/doc/pcre-%{version} \
+               --disable-jit \
+               --enable-pcre8 \
+               --enable-pcre16 \
+               --enable-pcre32 \
+               --enable-utf \
+               --enable-unicode-properties \
+               --enable-pcretest-libreadline
+
+       test
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
+               ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       pcre = %{thisver}
+               end
+
+               obsoletes
+                       pcre-compat
+               end
+
+               conflicts
+                       pcre <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
index 2d6220550852eb629df23484af82bfd322835a78..c319532a30bc4ffa69294be03595ab1a0d86071e 100644 (file)
--- a/dosfstools/dosfstools.nm
+++ b/dosfstools/dosfstools.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dosfstools
-version    = 3.0.25
+version    = 3.0.26
 release    = 1
 
 groups     = System/Filesystems

diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
index b8c52079621de592bc9e511cb7902d07b2864718..9bda9826ff3a0c568bdc19f9c2f8a0a9dd44c348 100644 (file)
--- a/ghostscript/ghostscript.nm
+++ b/ghostscript/ghostscript.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = ghostscript
-version    = 9.05
-release    = 2.1
+version    = 9.14
+release    = 1
 
 groups     = Applications/Printing
 url        = http://ghostscript.com
@@ -30,9 +30,14 @@ source_dl  = http://downloads.ghostscript.com/public/
 
 build
        requires
+               autoconf
+               automake
+               cups-devel >= 1.1.13
                dbus-devel
                expat-devel
+               freetype-devel
                glib2-devel
+               lcms2-devel >= 2.4
                libidn-devel
                libjpeg-devel
                libpng-devel
@@ -44,7 +49,14 @@ build
        end
 
        prepare_cmds
-               rm -rvf libpng zlib jpeg jasper expat
+               # Fix build with local zlib.
+               sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' configure.ac
+
+               # Remove shipped source code.
+               rm -rvf expat freetype icclib jasper jpeg jpegxr lcms lcms2 \
+                       libpng openjpeg zlib cups/libs
+
+               autoconf --force
        end
 
        CFLAGS += -fno-strict-aliasing
@@ -55,7 +67,9 @@ build
                --with-drivers=ALL \
                --disable-compile-inits \
                --with-system-libtiff \
-               --with-install-cups
+               --with-install-cups \
+               \
+               CFLAGS="%{CFLAGS}"
 
        PARALLELISMFLAGS = # Disable this
 end

diff --git a/htop/htop.nm b/htop/htop.nm
index 6e8dc5645a60cc6ce8c22e8e3e4ff717de6c7da3..1863351574934408345ab519dc0f6626026f0751 100644 (file)
--- a/htop/htop.nm
+++ b/htop/htop.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = htop
-version    = 1.0.2
+version    = 1.0.3
 release    = 1
 
 groups     = Applications/System
@@ -17,18 +17,16 @@ description
        top(1).
 end
 
-source_dl  = http://sourceforge.net/projects/htop/files
+source_dl  = http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/
+source_dl += http://hisham.hm/htop/releases/%{version}/
 
 build
        requires
                ncurses-devel
        end
 
-       configure_options += \
-               --sysconfdir=/etc
-
        install_cmds
-               rm -rf %{BUILDROOT}/usr/share/{applications,pixmaps}
+               rm -rf %{BUILDROOT}%{datadir}/{applications,pixmaps}
        end
 end
 

diff --git a/lcms2/lcms2.nm b/lcms2/lcms2.nm
new file mode 100644 (file)
index 0000000..4f34961
--- /dev/null
+++ b/lcms2/lcms2.nm
@@ -0,0 +1,59 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = lcms2
+version    = 2.6
+release    = 1
+
+groups     = System/Tools
+url        = http://www.littlecms.com/
+license    = MIT
+summary    = Color Management Engine.
+
+description
+       LittleCMS intends to be a small-footprint, speed optimized color management
+       engine in open source form. LCMS2 is the current version of LCMS, and can be
+       parallel installed with the original (deprecated) lcms.
+end
+
+source_dl  = http://www.littlecms.com/
+
+build
+       requires
+               libjpeg-devel
+               libtiff-devel
+               zlib-devel
+       end
+
+       configure_options +=\
+               --disable-static \
+               --program-suffix=2
+
+       test
+               make check
+       end
+
+       install_cms
+               # Install missing header files.
+               install -D -m 644 include/lcms2.h %{BUILDROOT}/usr/include/lcms2.h
+               install -D -m 644 include/lcms2_plugin.h %{BUILDROOT}/usr/include/lcms2_plugin.h
+       end
+end
+
+packages
+       package %{name}
+
+       package %{name}-libs
+               template LIBS
+       end
+
+       package %{name}-devel
+               template DEVEL
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/libhtp/libhtp.nm b/libhtp/libhtp.nm
index e42cc1e0edcf07949abd54ab858202e46b014228..e6604ad176c6fdcaec37bf3385f6b1ff69c7b4cf 100644 (file)
--- a/libhtp/libhtp.nm
+++ b/libhtp/libhtp.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libhtp
-version    = 0.2.9
+version    = 0.5.10
 release    = 1
 
 groups     = System/Libraries
@@ -19,7 +19,7 @@ end
 
 thisapp = htp-%{version}
 
-source_dl  = http://www.openinfosecfoundation.org/download/
+source_dl  = https://github.com/ironbee/%{name}/releases/download/%{version}/
 sources    = %{thisapp}.tar.gz
 
 build
@@ -38,7 +38,6 @@ end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL

diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm
index b8fdcd0c553a530c163f3260d5229b544f89349f..3edf5ba6071781d7cc3670394f45c2dab3aea3e4 100644 (file)
--- a/libnetfilter_conntrack/libnetfilter_conntrack.nm
+++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libnetfilter_conntrack
-version    = 1.0.3
+version    = 1.0.4
 release    = 1
 
 groups     = System/Libraries

diff --git a/libnetfilter_queue/libnetfilter_queue.nm b/libnetfilter_queue/libnetfilter_queue.nm
index e2147ead0b8192a600c1b79a7023d436847e80d7..d7b3c7ee28a819977294f5454f3d9f8417d079dc 100644 (file)
--- a/libnetfilter_queue/libnetfilter_queue.nm
+++ b/libnetfilter_queue/libnetfilter_queue.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libnetfilter_queue
-version    = 1.0.1
+version    = 1.0.2
 release    = 1
 
 groups     = System/Libraries
@@ -24,6 +24,7 @@ sources    = %{thisapp}.tar.bz2
 
 build
        requires
+               libmnl-devel >= 1.0.3
                libnfnetlink-devel
                pkg-config
        end

diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 688151fefa49d0236882804dd3ccfcf052c80b6a..50c44f26626f13a68e839689f920b83a24e1e849 100644 (file)
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -5,9 +5,7 @@
 
 name       = libpng
 version    = 1.6.10
-release    = 1
-
-compat_ver = 1.5.17
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.libpng.org/pub/png/
@@ -25,35 +23,11 @@ end
 source_dl  = http://downloads.sourceforge.net/project/libpng/libpng16/%{version}/
 source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng16/%{version}/
 
-# Source URL for comat package.
-source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{compat_ver}/
-source_dl +=  http://downloads.sourceforge.net/project/libpng/history/libpng15/%{compat_ver}/
-
-sources    = %{thisapp}.tar.xz
-
-# File for compat package.
-sources   += %{name}-%{compat_ver}.tar.xz
-
 build
        requires
                pkg-config
                zlib-devel
        end
-
-       # Build compat package.
-       build_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_ver}
-               ./configure %{configure_options}
-
-               make %{PARALLELISMFLAGS}
-       end
-
-       # Install compat package.
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_ver}
-               install -m 755 .libs/libpng15.so.15.17.0 %{BUILDROOT}%{libdir}
-               ln -svf libpng15.so.15.17.0 %{BUILDROOT}%{libdir}/libpng15.so.15
-       end
 end
 
 packages
@@ -65,14 +39,6 @@ packages
                requires = zlib-devel
        end
 
-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/%{name}15.so*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end

diff --git a/lighttpd/lighttpd.nm b/lighttpd/lighttpd.nm
index 4d137deeb8b5d0dffe3eedcba498c225cb519a8c..2b348b5dc1b3d1873c3658afeb4f974d6ae1962e 100644 (file)
--- a/lighttpd/lighttpd.nm
+++ b/lighttpd/lighttpd.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = lighttpd
-version    = 1.4.30
+version    = 1.4.35
 ver_major  = 1.4
 release    = 2
 

diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm
index 8ab6c3862b5623004d7f99112acf402e6ace00ab..a1a01bdad9e84528e2651f43fa98cee8df8b4f82 100644 (file)
--- a/lm-sensors/lm-sensors.nm
+++ b/lm-sensors/lm-sensors.nm
@@ -4,8 +4,9 @@
 ###############################################################################
 
 name       = lm-sensors
-version    = 3.3.3
-release    = 2
+version    = 3.3.5
+release    = 1
+
 thisapp    = lm_sensors-%{version}
 
 groups     = Applications/Statistics

diff --git a/mc/mc.nm b/mc/mc.nm
index 7e37f53fe24be3041c253fbe8337ef180df9368a..e0978f7f9981ab7794ea62b7ff867ab8e8319830 100644 (file)
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = mc
-version    = 4.8.8
+version    = 4.8.12
 release    = 1
 epoch      = 1
 

diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm
index 0615b74b04337e97856f1adc0a494884f953d826..981bd8f13908636698e44b8ac8d875e3048981e7 100644 (file)
--- a/mpfr/mpfr.nm
+++ b/mpfr/mpfr.nm
@@ -4,10 +4,8 @@
 ###############################################################################
 
 name       = mpfr
-version    = 3.1.0
-release    = 2
-
-compat_version = 2.4.2
+version    = 3.1.2
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.mpfr.org/
@@ -24,41 +22,20 @@ description
 end
 
 source_dl  = http://mpfr.loria.fr/mpfr-%{version}/
-sources   += %{name}-%{compat_version}.tar.bz2
 
 build
        requires
-               gmp-devel>=4.3.2
+               gmp-devel >= 4.3.2
        end
 
        configure_options += \
                --enable-thread-safe \
                --disable-assert
 
-       build_cmds
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               ./configure \
-                       %{configure_options}
-
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make %{PARALLELISMFLAGS}
-       end
-
        test
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make check
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               export LD_LIBRARY_PATH=$(pwd)/.libs
+               export LD_LIBRARY_PATH=$(pwd)/src/.libs
                make check
        end
-
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
-               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
-       end
 end
 
 packages
@@ -68,14 +45,6 @@ packages
                template DEVEL
        end
 
-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/libmpfr.so.1*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end

diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index a9cc86c3806f90910bc4575c2fac42e09fd379fb..112df6aeaeddf46793abf8b42138a591238693c5 100644 (file)
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -5,9 +5,7 @@
 
 name       = pcre
 version    = 8.35
-release    = 2
-
-compat_version = 8.21
+release    = 3
 
 groups     = System/Libraries
 url        = http://www.pcre.org/
@@ -21,7 +19,6 @@ description
 end
 
 source_dl  = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-sources   += %{name}-%{compat_version}.tar.gz
 
 build
        requires
@@ -42,25 +39,8 @@ build
                --enable-unicode-properties \
                --enable-pcretest-libreadline
 
-       build_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               ./configure \
-                       %{configure_options}
-
-               make %{PARALLELISMFLAGS}
-       end
-
        test
                make check
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               make check
-       end
-
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
-               ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0
        end
 end
 
@@ -71,14 +51,6 @@ packages
                template DEVEL
        end
 
-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/libpcre.so.0*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end

diff --git a/sudo/sudo.nm b/sudo/sudo.nm
index e64071f710c94ebe7950047aac336a616d8e7504..cef02e58db6c391adbe47a8e2fa24a7d541b6e97 100644 (file)
--- a/sudo/sudo.nm
+++ b/sudo/sudo.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = sudo
-version    = 1.8.5
+version    = 1.8.10
 release    = 1
 
 groups     = Applications/System

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 84671bafa0e260e62a18a05e8c712f255d1e26f7..13941669761ca9f6ff21cf7af3467ba4d02fe796 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = suricata
-version    = 1.3.2
-release    = 3
+version    = 2.0
+release    = 1
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/
@@ -29,10 +29,10 @@ build
                libnet-devel
                libpcap-devel
                libyaml-devel
-               libhtp-devel
+               libhtp-devel >= 0.5.5
                pcre-devel
                pkg-config
-               zlib-devel>=1.2.5-2
+               zlib-devel >= 1.2.5-2
        end
 
        configure_options += \
@@ -61,7 +61,7 @@ packages
                prerquires = systemd-units
 
                configfiles
-                       %{BUILDROOT}%{sysconfdir}/suricata/suricata.conf
+                       %{sysconfdir}/suricata/suricata.conf
                end
 
                script postin

diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm
index 621327f545a15674d8b3d35034f1d8008ba860f5..5a153a2021c7ef807f6a9e198bbe161c9e564ee9 100644 (file)
--- a/ulogd2/ulogd2.nm
+++ b/ulogd2/ulogd2.nm
@@ -4,9 +4,10 @@
 ###############################################################################
 
 name       = ulogd2
-version    = 2.0.2
+version    = 2.0.4
 release    = 1
 epoch      = 1
+
 thisapp    = ulogd-%{version}
 
 groups     = Networking/Statistics