update: zlib, libpng, xz, proftpd

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6953 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libp/libpng/libpng-vl.spec

@@ -3,17 +3,14 @@
 Summary: A library of functions for manipulating PNG image format files.
 Summary(ja): PNG画像形式ファイル操作用の関数ライブラリ
 Name: libpng
-Version: 1.2.46
+Version: 1.2.50
-Release: 3%{_dist_release}
+Release: 1%{_dist_release}
 License: distributable
 Group: System Environment/Libraries
-Source: ftp://ftp.simplesystems.org/pub/libpng/png/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.simplesystems.org/pub/libpng/png/src/%{name}-%{version}.tar.xz
-Patch100: libpng-1.2.xx_CVE-2011-3026.patch
-Patch110: libpng-1.2.xx_CVE-2011-3045.patch
-Patch120: libpng-1.2.xx_CVE-2011-3048.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: zlib-devel
+BuildRequires: zlib-devel
 Requires: zlib
 URL: http://www.libpng.org/pub/png/
 %define LIBVER 3.%{version}
@@ -103,9 +100,6 @@ the libpng package.
 #'
 %prep
 %setup -q
-%patch100 -p1 -b .CVE-2011-3026
-%patch110 -p1 -b .CVE-2011-3045
-%patch120 -p1 -b .CVE-2011-3048
 
 %build
 #./autogen.sh
@@ -163,6 +157,10 @@ the libpng package.
 %endif
 
 %changelog
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2:1.2.50-1
+- new upstream release
+- drop old patches (are included in new release)
+
 * Sat Apr 28 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2:1.2.46-3vl6
 - add patch110 for fix CVE-2011-3045 
 - add patch120 for fix CVE-2011-3048 (png_set_text2())

p/proftpd/proftpd-vl.spec

@@ -2,33 +2,37 @@
 %define _localstatedir	/var/run
 %define _sysconfdir	/etc
 %define _rundir		/var/run/proftpd
-%define tarballversion	1.3.3e
+%define tarballversion	1.3.4b
-%define origversion	1.3.3e
+%define origversion	1.3.4b
 
 Summary: ProFTPd -- Professional FTP Server.
 Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
 Name: proftpd
 Epoch: 1
 Version: %{origversion}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
 
-Source0: ftp://ftp.proftpd.org/distrib/%{name}-%{origversion}.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/%{name}-%{origversion}.tar.gz
 Source1: proftpd.vine.conf
 Source2: ftpusers.vine
 Source3: proftpd.init
 Source5: welcome.msg
 
 # upstream bug fixes & security fixes
+Patch14: proftpd-1.3.4a-bug3720.patch
+Patch23: proftpd-1.3.4a-bug3744.patch
+Patch24: proftpd-1.3.4a-bug3745.patch
+Patch25: proftpd-1.3.4a-bug3746.patch
 
 # auth 
 Patch201: proftpd-1.3.1-use-system-auth-instead-of-pam_pwdb.patch
 
 # iconv patch (CharsetLocal/CharsetRemote)
 # Patch300: http://www.hakusan.tsg.ne.jp/tjkawa/software/misc/proftpd-iconv/pack/proftpd-1.3.0-iconv.patch.gz
-Patch300: proftpd-1.3.3e-iconv.patch
+Patch300: proftpd-1.3.4b-iconv.patch
 
 # fix build on recent kernel headers
 # Patch400: proftpd-1.3.1-umode.patch
@@ -60,12 +64,45 @@ FTP サーバです。Apache に似た構文による設定や、複数の仮想
 anonymous FTP, パーミッションベースのディレクトリ可視性のサポートを含む、
 高度にカスタマイズ可能なサーバ・インターフェイスを特徴としています。
 
+
+%package utils
+Summary: ProFTPD - Additional utilities
+Group:	 	 System Environment/Daemons
+Requires:	 %{name} = %{epoch}:%{version}-%{release}
+
+%description utils
+This package contains additional utilities for monitoring and configuring the
+ProFTPD server:
+
+* ftpasswd: generate passwd(5) files for use with AuthUserFile
+* ftpcount: show the current number of connections per server/virtualhost
+* ftpmail: monitor transfer log and send email when files uploaded
+* ftpquota: manipulate quota tables
+* ftptop: show the current status of FTP sessions
+* ftpwho: show the current process information for each FTP session
+
 %prep
 %setup -q -n %{name}-%{tarballversion}
 find . -type d -name CVS | xargs -r rm -frv
 
 # upstream fixes
 
+# Various module logfile permissions are 0600 instead of 0640
+# http://bugs.proftpd.org/show_bug.cgi?id=3720
+%patch14 -p0
+
+# Support ls(1) -1 option for LIST command
+# http://bugs.proftpd.org/show_bug.cgi?id=3744
+%patch23 -p0
+
+# Reject PASV command if no IPv4 address available
+# http://bugs.proftpd.org/show_bug.cgi?id=3745
+%patch24 -p0
+
+# Support applying ListOptions only to NLST or to LIST commands
+# http://bugs.proftpd.org/show_bug.cgi?id=3746
+%patch25 -p0
+
 ## patches from mdk
 # use system-auth instaed of pam_pwdb
 %patch201 -p1
@@ -88,6 +125,7 @@ find . -type d -name CVS | xargs -r rm -frv
     --enable-ctrls \
     --enable-facl \
     --enable-dso \
+    --enable-nls \
     --enable-ipv6 \
     --with-modules=mod_readme:mod_auth_pam:mod_tls:mod_codeconv:mod_df:\
 mod_ban:mod_dynmasq:mod_load:mod_ratio:mod_rewrite \
@@ -163,11 +201,17 @@ rm -rf %{buildroot}
 %doc contrib/README contrib/xferstats.holger-preiss
 %doc sample-configurations/
 %{_sbindir}/*
-%{_bindir}/*
+%{_bindir}/ftpdctl
-%{_mandir}/*/*
+%{_bindir}/prxs
+%{_mandir}/man5/xferlog.5*
+%{_mandir}/man8/ftpdctl.8*
+%{_mandir}/man8/ftpscrub.8*
+%{_mandir}/man8/ftpshut.8*
+%{_mandir}/man8/proftpd.8*
 %{_var}/ftp/welcome.msg
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_*
+%{_localedir}/*
 %dir %{_rundir}
 %dir %{_var}/ftp
 %config %{_sysconfdir}/rc.d/init.d/proftpd
@@ -176,8 +220,33 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ftpusers
 %config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 
+%files utils
+%doc contrib/xferstats.holger-preiss
+%{_bindir}/ftpasswd
+%{_bindir}/ftpcount
+%{_bindir}/ftpmail
+%{_bindir}/ftpquota
+%{_bindir}/ftptop
+%{_bindir}/ftpwho
+%{_mandir}/man1/ftpasswd.1*
+%{_mandir}/man1/ftpcount.1*
+%{_mandir}/man1/ftpmail.1*
+%{_mandir}/man1/ftpquota.1*
+%{_mandir}/man1/ftptop.1*
+%{_mandir}/man1/ftpwho.1*
+
 
 %changelog
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.4b-2
+- fix util package dependency
+
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.4b-1
+- new upstream release
+- util tools in util subpackage
+- update patch300 to fit new version
+- add patch14, 23, 24, 25 from fc18 (thanks to fc team)
+- add enable-nls in configure
+
 * Sun Apr 24 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.3e-1
 - new upstream release
 - update patch300 to fit new version

x/xz/xz-vl.spec

@@ -1,7 +1,7 @@
 Summary:	LZMA compression utilities
 Summary(ja):	LZMA 圧縮ユーティリティ
 Name:		xz
-Version:        5.0.2
+Version:        5.0.4
 Release:        1%{?_dist_release}
 License:	LGPLv2+
 Group:		Applications/Archiving
@@ -111,6 +111,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*lz*
 
 %changelog
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.0.4-1
+- new upstream release 
+
 * Thu Apr 14 2011 IWAI, Masaharu <iwai@alib.jp> 5.0.2-1
 - new upstream release
 - fix Group: <BTS:VineLinux:1119>

z/zlib/zlib-vl.spec

@@ -2,11 +2,11 @@
 Summary: The zlib compression and decompression library.
 Summary(ja): zlib 圧縮/展開ライブラリ
 Name: zlib
-Version: 1.2.5
+Version: 1.2.7
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.bz2
-Patch0: zlib-1.2.5-lfs-decls.patch
+# Patch0: zlib-1.2.5-lfs-decls.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -94,7 +94,7 @@ will use the zlib library.
 
 %prep
 %setup -q
-%patch0 -p1
+# %patch0 -p1
 
 %build
 mkdir static shared
@@ -102,12 +102,12 @@ mkdir static shared
 # build shared lib
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
 
-make
+make %{?_smp_mflags}
 mv -f Makefile zconf.h *.o *.so* shared/
 
 # build static lib
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-make
+make %{?_smp_mflags}
 mv -f Makefile zconf.h *.o *.a static/
 
 
@@ -172,6 +172,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> - 1.2.7-1
+- new upstream release
+- drop patch0 (resolved by upstream)
+- use smp flag in make section
+
 * Fri Oct 1 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.2.5-2
 - added patch0 from gentoo to fix zlib.h errors on i686 compiling some applications