|
|
@@ -18,7 +18,7 @@ Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
|
|
|
Name: proftpd
|
|
|
Epoch: 1
|
|
|
Version: %{origversion}
|
|
|
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: servers,internet
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -33,6 +33,9 @@ Source5: welcome.msg
|
|
|
|
|
|
# upstream bug fixes & security fixes
|
|
|
|
|
|
+# fedora patches
|
|
|
+Patch1: proftpd-1.3.7b-shellbang.patch
|
|
|
+
|
|
|
# auth
|
|
|
Patch201: proftpd-1.3.1-use-system-auth-instead-of-pam_pwdb.patch
|
|
|
|
|
|
@@ -88,17 +91,33 @@ ProFTPD server:
|
|
|
%setup -q -n %{name}-%{tarballversion}
|
|
|
find . -type d -name CVS | xargs -r rm -frv
|
|
|
|
|
|
+# Avoid documentation name conflicts
|
|
|
+mv contrib/README contrib/README.contrib
|
|
|
+
|
|
|
+# Change shellbangs /usr/bin/env perl ⇒ /usr/bin/perl
|
|
|
+%patch1
|
|
|
+
|
|
|
# upstream fixes
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
+# Tweak logrotate script for systemd compatibility (#802178)
|
|
|
+sed -i -e '/killall/s/test.*/systemctl reload proftpd.service/' \
|
|
|
+ contrib/dist/rpm/proftpd.logrotate
|
|
|
+%endif
|
|
|
+
|
|
|
+# Avoid docfile dependencies
|
|
|
+chmod -c -x contrib/xferstats.holger-preiss
|
|
|
+
|
|
|
+# Remove bogus exec permissions from source files
|
|
|
+chmod -c -x include/hanson-tpl.h lib/hanson-tpl.c
|
|
|
+
|
|
|
+# Remove any patch backup files from documentation
|
|
|
+find doc/ contrib/ -name '*.orig' -delete
|
|
|
+
|
|
|
## patches from mdk
|
|
|
# use system-auth instead of pam_pwdb
|
|
|
%patch201 -p1
|
|
|
|
|
|
-# fix build on recent kernel headers
|
|
|
-# %patch400 -p0
|
|
|
-
|
|
|
-# security fixes
|
|
|
-
|
|
|
|
|
|
%build
|
|
|
# Disable stripping in order to get useful debuginfo packages
|
|
|
@@ -223,10 +242,10 @@ systemctl preset proftpd.service &>/dev/null || :
|
|
|
%files -f proftpd.lang
|
|
|
%defattr(-,root,root)
|
|
|
%license COPYING
|
|
|
-%doc CREDITS INSTALL NEWS
|
|
|
+%doc CREDITS ChangeLog NEWS README.md
|
|
|
%doc README.{md,LDAP,modules}
|
|
|
%doc doc/*
|
|
|
-%doc contrib/README contrib/xferstats.holger-preiss
|
|
|
+%doc contrib/README.contrib contrib/README.ratio
|
|
|
%doc sample-configurations/
|
|
|
%{_sbindir}/*
|
|
|
%{_bindir}/ftpdctl
|
|
|
@@ -272,6 +291,10 @@ systemctl preset proftpd.service &>/dev/null || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Oct 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7c-2
|
|
|
+- rebuilt with openssl-3.0.0.
|
|
|
+- imported Patch1 from rawhide.
|
|
|
+
|
|
|
* Sat Sep 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7c-1
|
|
|
- new upstream release.
|
|
|
|
