From 1cd2a5f6b60f85be880bb56d4a61351dc62bb06f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:43:04 -0500 Subject: smplayer: Bump to latest. --- abs/extra/community/smplayer/ChangeLog | 12 ++++++++++++ abs/extra/community/smplayer/PKGBUILD | 29 +++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/abs/extra/community/smplayer/ChangeLog b/abs/extra/community/smplayer/ChangeLog index a40f9a4..e8397b3 100644 --- a/abs/extra/community/smplayer/ChangeLog +++ b/abs/extra/community/smplayer/ChangeLog @@ -1,3 +1,15 @@ +2010-02-23 Ionut Biru + * smplayer 0.6.9-2 + * changed exec argument from %U to %F in smplayer.desktop + +2010-02-22 Ionut Biru + * smplayer 0.6.9-1 + * Upstream update + +2009-07-25 Allan McRae + * smplayer 0.6.8-1 + * Upstream update + 2009-03-13 Allan McRae * smplayer 0.6.7-1 * Upstream update diff --git a/abs/extra/community/smplayer/PKGBUILD b/abs/extra/community/smplayer/PKGBUILD index 3aa1d3d..0928e4b 100644 --- a/abs/extra/community/smplayer/PKGBUILD +++ b/abs/extra/community/smplayer/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 29947 2009-03-14 00:58:48Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer : Ionut Biru +# Contributor: Allan McRae # Contributor: Alessio 'mOLOk' Bolognino # Contributor: shamrok - + pkgname=smplayer -pkgver=0.6.7 -pkgrel=2 -pkgdesc="A complete front-end for MPlayer" +pkgver=0.6.9 +pkgrel=3 +pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') -url="http://smplayer.sourceforge.net/" +url="http://smplayer.sourceforge.net/" license=('GPL') -depends=('qt' 'mplayer') +depends=('qt>=4.7.1' 'mplayer') source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2) -md5sums=('306b99374ad89cee93f1ad6fa94dea71') +md5sums=('dfe874b386509de5df78537489f95004') -build() { +build() { cd ${srcdir}/${pkgname}-${pkgver} # remove broken translation sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro - make PREFIX=/usr || return 1 - make PREFIX=${pkgdir}/usr install || return 1 + make PREFIX=/usr + make PREFIX=${pkgdir}/usr install install -dm755 ${pkgdir}/usr/share/pixmaps ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \ ${pkgdir}/usr/share/pixmaps/ + + sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop + sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \ + ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop } -- cgit v0.12 From ad2f28b7bca8b2664f47284739e95af7a47882fc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:48:18 -0500 Subject: zvbi: Bump to latest. --- abs/extra/community/zvbi/PKGBUILD | 30 +++++++++++++----------- abs/extra/community/zvbi/fix-includes.patch | 36 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 abs/extra/community/zvbi/fix-includes.patch diff --git a/abs/extra/community/zvbi/PKGBUILD b/abs/extra/community/zvbi/PKGBUILD index f638f29..9bc150c 100644 --- a/abs/extra/community/zvbi/PKGBUILD +++ b/abs/extra/community/zvbi/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Alexander Baldeck +# $Id$ +# Maintainer: +# Contributor: Alexander Baldeck # Contributor: dorphell pkgname=zvbi -pkgver=0.2.26 -pkgrel=1 -pkgdesc="zvbi is needed for zapping" +pkgver=0.2.33 +pkgrel=3 +pkgdesc="VBI capture and decoding library" +url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=(i686 x86_64) -depends=('libpng') +depends=('libpng' 'libx11') license=('GPL') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/zapping/$pkgname-$pkgver.tar.bz2) -url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" +source=(http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2 + fix-includes.patch) +md5sums=('1741a6045c3eedfb611d645f2da69ac8' + '38766bc59e1571133d0399f0102da653') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-includes.patch" + ./configure --prefix=/usr --disable-static --mandir=/usr/share/man + make + make DESTDIR="${pkgdir}" install } -md5sums=('82805319ca61f6ffd7b7bb64d7433448') diff --git a/abs/extra/community/zvbi/fix-includes.patch b/abs/extra/community/zvbi/fix-includes.patch new file mode 100644 index 0000000..2825264 --- /dev/null +++ b/abs/extra/community/zvbi/fix-includes.patch @@ -0,0 +1,36 @@ +Add proper #includes so that we do not get undef errors to S_ISCHR +during linking. + +Signed-off-by: Alex Chiang +--- +--- zvbi-0.2.33.orig/src/io-dvb.c ++++ zvbi-0.2.33/src/io-dvb.c +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + #ifndef HAVE_S64_U64 + /* Linux 2.6.x asm/types.h defines __s64 and __u64 only +--- zvbi-0.2.33.orig/src/io-v4l.c ++++ zvbi-0.2.33/src/io-v4l.c +@@ -42,6 +42,7 @@ static const char rcsid [] = + #include + #include /* timeval */ + #include /* fd_set, uid_t */ ++#include /* S_ISCHR */ + #include /* for (_)videodev.h */ + #include + +--- zvbi-0.2.33.orig/contrib/ntsc-cc.c ++++ zvbi-0.2.33/contrib/ntsc-cc.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_GETOPT_LONG + # include -- cgit v0.12 From f7a2bfb73c6ce06100f4d0934739168288224dae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:52:07 -0500 Subject: libart-lgpl: Bump to latest. --- abs/core/libart-lgpl/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/libart-lgpl/PKGBUILD b/abs/core/libart-lgpl/PKGBUILD index f56c0b3..92d659f 100644 --- a/abs/core/libart-lgpl/PKGBUILD +++ b/abs/core/libart-lgpl/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# $Id$ # Maintainer: Jan de Groot pkgname=libart-lgpl -pkgver=2.3.20 +pkgver=2.3.21 pkgrel=1 pkgdesc="A library for high-performance 2D graphics" url="http://www.levien.com/libart/" @@ -9,8 +9,8 @@ arch=(i686 x86_64) license=('LGPL') depends=('glibc') source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2) -md5sums=('d0ce67f2ebcef1e51a83136c69242a73') options=('!libtool') +sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa') build() { cd ${startdir}/src/libart_lgpl-${pkgver} -- cgit v0.12 From c617d53e582f72632481607391100049553eb9b6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:53:55 -0500 Subject: libxi: Bump to latest. --- abs/core/libxi/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD index 6abbf85..42fabdc 100644 --- a/abs/core/libxi/PKGBUILD +++ b/abs/core/libxi/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 57676 2009-11-01 14:14:29Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libxi -pkgver=1.3 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" -depends=('libxext>=1.1' 'inputproto>=2.0') -makedepends=('pkgconfig') -options=(!libtool force) +depends=('libxext' 'inputproto') +makedepends=('pkgconfig' 'xorg-util-macros') +options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -md5sums=('8df4ece9bd1efb02c28acb2b6f485e09') +sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') build() { cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/libXi-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -- cgit v0.12 From 0e32f8fd433f06daab293116512e20d76fa4a5f7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 21:58:54 -0500 Subject: libdrm: Bump to latest. --- abs/core/libdrm/PKGBUILD | 10 +++++----- abs/core/libdrm/no-pthread-stubs.patch | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index b93c2dd..aa350d5 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.25 +pkgver=2.4.26 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') -depends=('glibc') +depends=('glibc' 'libpciaccess') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) -sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' - 'af2d9871565ea4cf524873f897691a18b2bba944' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') +md5sums=('062569426773f69b11a47a7712bba770' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch index 6602f87..348c2a7 100644 --- a/abs/core/libdrm/no-pthread-stubs.patch +++ b/abs/core/libdrm/no-pthread-stubs.patch @@ -1,34 +1,35 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ +@@ -26,14 +26,13 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_atomic.h \ + intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ -- cgit v0.12 From e7d2326eb2251c13ada5812e2f0e213d75bac884 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:01:03 -0500 Subject: apr-util: Bump to latest. --- abs/core/apr-util/PKGBUILD | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/abs/core/apr-util/PKGBUILD b/abs/core/apr-util/PKGBUILD index b44720c..0af3cc8 100644 --- a/abs/core/apr-util/PKGBUILD +++ b/abs/core/apr-util/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 72241 2010-03-13 20:27:07Z jgc $ +# $Id$ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util -pkgver=1.3.9 -pkgrel=4 +pkgver=1.3.12 +pkgrel=2 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" -depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc') +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('29dd557f7bd891fc2bfdffcfa081db59') +md5sums=('0f671b037ca62751a8a7005578085560') build() { - cd "${srcdir}/apr-util-${pkgver}" + cd "${srcdir}/apr-util-${pkgver}" + ./configure --prefix=/usr --with-apr=/usr \ + --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + make +} - ./configure --prefix=/usr --with-apr=/usr \ - --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 +package() { + cd "${srcdir}/apr-util-${pkgver}" + make DESTDIR="${pkgdir}" install } -- cgit v0.12 From 3c4ac9c70b9d9c27327efd580d54e9738b79a108 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:09:46 -0500 Subject: dcraw: Bump to latest. --- abs/extra/dcraw/PKGBUILD | 53 ++++++++++++++++++++++++------------------- abs/extra/dcraw/dcraw.install | 6 +---- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/abs/extra/dcraw/PKGBUILD b/abs/extra/dcraw/PKGBUILD index 8468c92..8ae9657 100644 --- a/abs/extra/dcraw/PKGBUILD +++ b/abs/extra/dcraw/PKGBUILD @@ -1,41 +1,48 @@ -# $Id: PKGBUILD 84664 2010-07-03 05:41:46Z allan $ +# $Id$ # Maintainer: tobias # Contributor: Tobias Kieslich -# Note for rebuilders: -# dcraw.c is released as pure C file, not as a package with a changing version -# number in the name. The name of the file to be downloaded is always the same! -# So if you are a bad boy (Santa knows everything!) and build as root, this file -# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version -# likely will fail due to an MD5 error. If so, delete the files from the cache -# to force a new download. - pkgname=dcraw -pkgver=1.438 +pkgver=9.08 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms') -source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.c - http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.1 +source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) +md5sums=('eb1d365c27495a513c0768b2f696ba66' + '110b4604a6dacd5537339c4082e9e12a') +sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e' + '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { - cd "${srcdir}" - gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms + cd "${srcdir}/${pkgname}" + gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" } package() { - cd "${srcdir}" - install -Dm755 ${pkgname} "${pkgdir}"/usr/bin/${pkgname} - - # install a manpage, provided separately on authors homepage - install -Dm644 ${pkgname}.1 "${pkgdir}"/usr/share/man/man1/${pkgname}.1 + cd "${srcdir}/${pkgname}" + install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw + install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 - install -Dm644 license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + for langchar in \ + fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ + ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ + zh_TW.big5 zh_CN.gb2312 + do + lang=$(echo $langchar | cut -d. -f1) + char=$(echo $langchar | cut -d. -f2-) + if [ -f dcraw_${lang}.1 ]; then + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 + iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 + cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 + fi + mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES + msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po + done + + install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } -md5sums=('108f0c14a5be4d092c7ffa8460044fb3' - '6ba2a797c4ad698589f83171d6b36396' - '110b4604a6dacd5537339c4082e9e12a') diff --git a/abs/extra/dcraw/dcraw.install b/abs/extra/dcraw/dcraw.install index 0b3d1bf..2635964 100644 --- a/abs/extra/dcraw/dcraw.install +++ b/abs/extra/dcraw/dcraw.install @@ -1,7 +1,7 @@ post_install() { cat << EOF -NOTE for drcaw: +NOTE for dcraw: ---- ==> dcraw provides the simple commandline tools for raw conversion. If you ==> are looking for a more sophisticated way consider gimp-ufraw, which @@ -11,7 +11,3 @@ NOTE for drcaw: EOF } - -post_upgrade() { - post_install $1 -} -- cgit v0.12 From 5b37c394102e30e4751fd925dae8c299bc4432df Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Aug 2011 22:16:13 -0500 Subject: vsftpd: Bump to latest. --- abs/extra/community/vsftpd/PKGBUILD | 62 +++++++++------------ abs/extra/community/vsftpd/__changelog | 1 + abs/extra/community/vsftpd/vsftpd.d | 93 ++++++++++++++++++++----------- abs/extra/community/vsftpd/vsftpd.install | 5 -- 4 files changed, 88 insertions(+), 73 deletions(-) create mode 100644 abs/extra/community/vsftpd/__changelog diff --git a/abs/extra/community/vsftpd/PKGBUILD b/abs/extra/community/vsftpd/PKGBUILD index 32a4007..78ba1c5 100644 --- a/abs/extra/community/vsftpd/PKGBUILD +++ b/abs/extra/community/vsftpd/PKGBUILD @@ -1,52 +1,44 @@ -# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $ +# $Id$ # Maintainer: Andreas Radke # Contributor: judd pkgname=vsftpd -pkgver=2.1.0 -pkgrel=4 +pkgver=2.3.4 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') -license=('GPL') -backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd) -url="http://vsftpd.beasts.org/" -#makedepends=('vim') -depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16') +url="https://security.appspot.com/vsftpd.html" +license=('GPL2') +depends=('openssl') +backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install -source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \ - vsftpd.xinetd vsftpd.d run) -md5sums=('7890b54e7ffa6106ffbdfda53f47fa41' - 'b07fd4609c70063c1d6b20142910c1a6' - 'e46ed8e4c4a6e6a3de59f60b98e4f569' - '8abbed7cc75f9a9d2944e0e83c8dd90d') +source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" + 'vsftpd.xinetd' 'vsftpd.d' 'run') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # build-time config sed \ - -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \ -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h - make CFLAGS="${CFLAGS}" || return 1 - install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1 - install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1 - install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1 - install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1 - install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd || return 1 - install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1 - mkdir -p $startdir/pkg/usr/share/empty -# ex ${pkgdir}/etc/vsftpd.conf <<_EOF -#2 -#i -## -## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd -##listen=YES -#. -#w -#q -#_EOF -#} # Below added for LinHES mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/ + make CFLAGS="${CFLAGS}" } + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd" + install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf" + install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8" + install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5" + install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd" + install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd" + + install -d -m755 "${pkgdir}/usr/share/empty" +} +md5sums=('2ea5d19978710527bb7444d93b67767a' + 'b07fd4609c70063c1d6b20142910c1a6' + '60060a6c7db3b3b7baa1561a302e6923' + '8abbed7cc75f9a9d2944e0e83c8dd90d') diff --git a/abs/extra/community/vsftpd/__changelog b/abs/extra/community/vsftpd/__changelog new file mode 100644 index 0000000..82615f6 --- /dev/null +++ b/abs/extra/community/vsftpd/__changelog @@ -0,0 +1 @@ +-Add back run file and modify PKGBUILD to install run diff --git a/abs/extra/community/vsftpd/vsftpd.d b/abs/extra/community/vsftpd/vsftpd.d index b43a6d0..2731085 100644 --- a/abs/extra/community/vsftpd/vsftpd.d +++ b/abs/extra/community/vsftpd/vsftpd.d @@ -1,40 +1,67 @@ #!/bin/bash +daemon_name=vsftpd + . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/vsftpd` +get_pid() { + pidof -o %PPID $daemon_name +} + case "$1" in - start) - stat_busy "Starting vsftpd FTP Daemon" - if [ -z "$PID" ]; then - /usr/sbin/vsftpd & - PID=`pidof -o %PPID /usr/sbin/vsftpd` - if [ -z $PID ]; then - stat_fail - else - add_daemon vsftpd - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping vsftpd FTP Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon vsftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name & + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" esac + +exit 0 diff --git a/abs/extra/community/vsftpd/vsftpd.install b/abs/extra/community/vsftpd/vsftpd.install index 3bbb2cc..48f134e 100644 --- a/abs/extra/community/vsftpd/vsftpd.install +++ b/abs/extra/community/vsftpd/vsftpd.install @@ -9,14 +9,9 @@ post_install() { echo ">>> Also, you should add it to your MODULES array in rc.conf, so" echo ">>> it will be activated automatically at boot-up." fi -# Below added for LinHES - add_service.sh vsftpd } post_upgrade() { post_install $1 } -post_remove() { - remove_service.sh vsftpd -} -- cgit v0.12