[arch-commits] Commit in bftpd/trunk (5 files)
Levente Polyak
anthraxx at archlinux.org
Thu Mar 22 00:04:07 UTC 2018
Date: Thursday, March 22, 2018 @ 00:04:05
Author: anthraxx
Revision: 319788
upgpkg: bftpd 4.9-1
- cleanup
- ensure flags properly set
- using tmpfiles instead of .install
Added:
bftpd/trunk/bftpd-4.9-Makefile.patch
bftpd/trunk/bftpd.tmpfiles
Modified:
bftpd/trunk/PKGBUILD
bftpd/trunk/bftpd.logrotate
Deleted:
bftpd/trunk/bftpd.install
--------------------------+
PKGBUILD | 86 ++++++++++++++++++++++-----------------------
bftpd-4.9-Makefile.patch | 64 +++++++++++++++++++++++++++++++++
bftpd.install | 11 -----
bftpd.logrotate | 6 +--
bftpd.tmpfiles | 1
5 files changed, 111 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-21 22:45:25 UTC (rev 319787)
+++ PKGBUILD 2018-03-22 00:04:05 UTC (rev 319788)
@@ -1,68 +1,68 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
pkgname=bftpd
-pkgver=4.8
+pkgver=4.9
pkgrel=1
-pkgdesc="Small, easy-to-configure FTP server"
-arch=(x86_64)
-url="https://bftpd.sourceforge.net/"
+pkgdesc='Small, easy-to-configure FTP server'
+url='http://bftpd.sourceforge.net/'
+arch=('x86_64')
license=('GPL')
-depends=('pam')
-install=bftpd.install
+depends=('pam' 'zlib' 'glibc')
backup=(etc/bftpd.conf
etc/logrotate.d/bftpd
etc/pam.d/bftpd
etc/xinetd.d/bftpd)
-source=(https://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
+source=(https://downloads.sourceforge.net/sourceforge/bftpd/bftpd-${pkgver}.tar.gz
bftpd.logrotate
bftpd.pam
bftpd.xinetd
bftpd.service
bftpd.socket
- bftpd_AT.service)
-sha256sums=('0c80399b0cbdd24c882d59c39b4bd5233fe1a153f5d92f23e3a9496ea4549afe'
- '83b6c950026ed7c1ac7802f800dd79d494ac395b48f88d57bee55c2122c7f821'
+ bftpd_AT.service
+ bftpd.tmpfiles
+ bftpd-4.9-Makefile.patch)
+sha256sums=('cdd8cdfbca44309bac47b2d6cc1efd7c63ff3535a1803ace89f73dc9128df28e'
+ '4768016884e2aaaaecc1412353f7dfaf19d2dab0e03789c4df9bbae2d56dfb7a'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'18096a2f6914fecd9f36721247d170ba48b986225dae3564cb2d3b0e6f18c35a'
'6047c33d1694445aa1b0cfad4ba796ff6c1635eb86c8398f39c0f9180d9490be'
'0f930f803cf40dda1336ddb89e925b8f7b703518484b8a1a41153f0828de404c'
- '97dba309c60029c498f353b39778c6594deef8a3b98ca09889857ca920674ccc')
+ '97dba309c60029c498f353b39778c6594deef8a3b98ca09889857ca920674ccc'
+ '0be0b772ca19362173152fa7a8d7578faa535995b1e150bafec7a28e649b399f'
+ '93248ffd3f99336e704aeedaaac207cb2e25f64998fd5c274fd29cb548f14acc')
+prepare() {
+ cd ${pkgname}
+ patch -Np1 < ../bftpd-4.9-Makefile.patch
+ # Fix default in config file
+ sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i bftpd.conf
+ rm -f config.{cache,status}
+ autoreconf -fiv
+}
build() {
- cd "${srcdir}"/$pkgname
- # The bftpd author keeps screwing up the release tarballs
- rm -f config.{cache,status}
- autoreconf
- sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in
- ./configure --prefix=/usr \
- --enable-pam \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
+ cd ${pkgname}
+ ./configure \
+ --prefix=/usr \
+ --enable-pam \
+ --enable-libz \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin
make
}
package() {
- cd "${srcdir}"/$pkgname
- install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8}
- install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd
+ cd ${pkgname}
make DESTDIR="${pkgdir}" install
- # Remove log file and /var/run from the package
- # This guy keeps messing up his Makefile, /usr/var, wtf?
- rm -f "${pkgdir}"/usr/var/log/bftpd.log
- rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,}
- # Install PAM file
- mkdir -p "${pkgdir}"/etc/pam.d
- cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd
- # Install xinetd file
- install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd
- # Did I mention this guy keeps messing up his Makefiles?
- mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/
- rmdir "${pkgdir}"/usr/etc
- # Fix default in config file
- sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf
- # Install systemd files
- install -D -m644 "${srcdir}"/bftpd.service "${pkgdir}"/usr/lib/systemd/system/bftpd.service
- install -D -m644 "${srcdir}"/bftpd_AT.service "${pkgdir}"/usr/lib/systemd/system/bftpd at .service
- install -D -m644 "${srcdir}"/bftpd.socket "${pkgdir}"/usr/lib/systemd/system/bftpd.socket
+ rm -rf "${pkgdir}/usr/var"
+ install -Dm 644 ../bftpd.service "${pkgdir}/usr/lib/systemd/system/bftpd.service"
+ install -Dm 644 ../bftpd_AT.service "${pkgdir}/usr/lib/systemd/system/bftpd at .service"
+ install -Dm 644 ../bftpd.socket "${pkgdir}/usr/lib/systemd/system/bftpd.socket"
+ install -Dm 644 ../bftpd.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/bftpd.conf"
+ install -Dm 644 ../bftpd.logrotate "${pkgdir}/etc/logrotate.d/bftpd"
+ install -Dm 644 ../bftpd.pam "${pkgdir}/etc/pam.d/bftpd"
+ install -Dm 644 ../bftpd.xinetd "${pkgdir}/etc/xinetd.d/bftpd"
}
+
+# vim: ts=2 sw=2 et:
Added: bftpd-4.9-Makefile.patch
===================================================================
--- bftpd-4.9-Makefile.patch (rev 0)
+++ bftpd-4.9-Makefile.patch 2018-03-22 00:04:05 UTC (rev 319788)
@@ -0,0 +1,64 @@
+From 5301e7349ba4d1c3f3808829947dab8ee2ac73b0 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Wed, 21 Mar 2018 02:12:52 +0100
+Subject: [PATCH] make: unfuck paths, flags and modes
+
+---
+ Makefile.in | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6d6ee03..e931934 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2,7 +2,7 @@ VERSION=4.9
+ CC?=@CC@
+ INSTALL=@INSTALL@
+ prefix=@prefix@
+-CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
++CFLAGS=@CFLAGS@ @CPPFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
+ LIBS=@LIBS@
+ mandir=@mandir@
+ sbindir=@sbindir@
+@@ -15,7 +15,7 @@ OBJS=bftpdutmp.o commands.o commands_admin.o cwd.o dirlist.o list.o login.o logg
+ SRCS=bftpdutmp.c commands.c commands_admin.c cwd.c dirlist.c list.c login.c logging.c main.c mystring.c options.c md5.c
+
+ OBJS2LINK=$(OBJS) $(PAX)
+-LDFLAGS=
++LDFLAGS=@LDFLAGS@
+
+ all: bftpd
+
+@@ -26,13 +26,13 @@ bftpd: $(OBJS)
+ $(OBJS): $(HEADERS) Makefile
+
+ install: all
+- mkdir -p $(DESTDIR)/$(prefix)/sbin
+- $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin
++ mkdir -p $(DESTDIR)/$(sbindir)
++ $(INSTALL) -g 0 -m 755 -o 0 bftpd $(DESTDIR)/$(sbindir)
+ mkdir -p $(DESTDIR)/$(mandir)/man8
+ $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
+- mkdir -p $(DESTDIR)/$(prefix)/etc
+- [ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \
+- $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc
++ mkdir -p $(DESTDIR)/etc
++ [ -f $(DESTDIR)/etc/bftpd.conf ] || \
++ $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
+ mkdir -p $(DESTDIR)/$(prefix)/var/log
+ touch $(DESTDIR)/$(prefix)/var/log/bftpd.log
+ chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log
+@@ -49,8 +49,8 @@ newversion: clean
+ ./configure --enable-pax=pax --enable-libz --enable-pam
+
+ uninstall:
+- rm -f $(DESTDIR)/$(prefix)/sbin/bftpd $(DESTDIR)/$(mandir)/man8/bftpd.8 \
+- $(DESTDIR)/$(prefix)/etc/bftpd.conf
++ rm -f $(DESTDIR)/$(sbindir)/bftpd $(DESTDIR)/$(mandir)/man8/bftpd.8 \
++ $(DESTDIR)/etc/bftpd.conf
+
+ distribute: install
+ rm -rf dist
+--
+2.16.2
+
Deleted: bftpd.install
===================================================================
--- bftpd.install 2018-03-21 22:45:25 UTC (rev 319787)
+++ bftpd.install 2018-03-22 00:04:05 UTC (rev 319788)
@@ -1,11 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install () {
- [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
- true
-}
-
-post_upgrade() {
- post_install $1
-}
Modified: bftpd.logrotate
===================================================================
--- bftpd.logrotate 2018-03-21 22:45:25 UTC (rev 319787)
+++ bftpd.logrotate 2018-03-22 00:04:05 UTC (rev 319788)
@@ -1,5 +1,5 @@
/var/log/bftpd.log {
- missingok
- notifempty
- delaycompress
+ copytruncate
+ missingok
+ notifempty
}
Added: bftpd.tmpfiles
===================================================================
--- bftpd.tmpfiles (rev 0)
+++ bftpd.tmpfiles 2018-03-22 00:04:05 UTC (rev 319788)
@@ -0,0 +1 @@
+f /var/log/bftpd.log
More information about the arch-commits
mailing list