Compare commits
51 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6712c15acc | ||
|
|
5104a55ce6 | ||
|
|
3c73e2bc6f |
||
|
|
e8cfc944a0 | ||
|
|
6bf60785e9 | ||
|
|
ce04bd4e30 | ||
|
|
c7a2892b46 | ||
|
|
c205926cb9 | ||
|
|
bc7a24037e | ||
|
|
7f021a5526 | ||
|
|
f430a125ef | ||
|
|
c0f1b9f846 | ||
|
|
0afeb1b790 | ||
|
|
9f2939929d | ||
|
|
e7c6a52ff4 | ||
|
|
5ac4cfdf6a | ||
|
|
ef5dfb6505 | ||
|
|
bda0bb3968 | ||
|
|
413183aa91 | ||
|
|
3177359572 | ||
|
|
9b9a61bcc6 | ||
|
|
a8e2468958 | ||
|
|
07656be37e | ||
|
|
9073da9177 | ||
|
|
b80572389b | ||
|
|
8e6120de59 | ||
|
|
4050194997 | ||
|
|
9911e254ec | ||
|
|
926e446efe | ||
|
|
f5c72017e3 | ||
|
|
5100010544 |
||
|
|
a887e6bdeb | ||
|
|
1a87daeffa | ||
|
|
67313c1a47 | ||
|
|
0e9f570322 | ||
|
|
ac1fd363ae | ||
|
|
19810353e4 | ||
|
|
b1400ae94b | ||
|
|
c4e0ccede6 | ||
|
|
5be41d7de1 | ||
|
|
92a7148671 |
||
|
|
7b8008a043 | ||
|
|
0a05cb720c | ||
|
|
749308ee9d | ||
|
|
9683b36f71 | ||
|
|
a5f4b2edab | ||
|
|
2e80e45a04 | ||
|
|
17e7e91e6a | ||
|
|
718bbc9a66 | ||
|
|
9c1956be70 | ||
|
|
2884f6b658 |
12 changed files with 386 additions and 220 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
|
@ -7,3 +7,9 @@ pure-ftpd-1.0.29.tar.bz2
|
|||
/pure-ftpd-1.0.39.tar.bz2
|
||||
/pure-ftpd-1.0.40.tar.bz2
|
||||
/pure-ftpd-1.0.42.tar.bz2
|
||||
/pure-ftpd-1.0.46.tar.bz2
|
||||
/pure-ftpd-1.0.47.tar.bz2
|
||||
/pure-ftpd-1.0.48.tar.bz2
|
||||
/pure-ftpd-1.0.49.tar.bz2
|
||||
/pure-ftpd-1.0.51.tar.bz2
|
||||
/pure-ftpd-1.0.52.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,7 +1,17 @@
|
|||
diff -Naur pure-ftpd-1.0.40.orig/pam/pure-ftpd pure-ftpd-1.0.40/pam/pure-ftpd
|
||||
--- pure-ftpd-1.0.40.orig/pam/pure-ftpd 2015-06-13 12:26:37.000000000 +0200
|
||||
+++ pure-ftpd-1.0.40/pam/pure-ftpd 2015-06-01 16:36:31.000000000 +0200
|
||||
@@ -4,12 +4,14 @@
|
||||
From 0cabf3b8b952c6117d575360f793ba63fb53c7ba Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 12 Jul 2017 12:09:38 +0200
|
||||
Subject: [PATCH 1/2] modify pam
|
||||
|
||||
---
|
||||
pam/pure-ftpd | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pam/pure-ftpd b/pam/pure-ftpd
|
||||
index 6611b87..ece8733 100644
|
||||
--- a/pam/pure-ftpd
|
||||
+++ b/pam/pure-ftpd
|
||||
@@ -4,12 +4,13 @@
|
||||
# Install it in /etc/pam.d/pure-ftpd or add to /etc/pam.conf
|
||||
|
||||
auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
|
||||
|
|
@ -13,9 +23,12 @@ diff -Naur pure-ftpd-1.0.40.orig/pam/pure-ftpd pure-ftpd-1.0.40/pam/pure-ftpd
|
|||
+account include password-auth
|
||||
|
||||
-password required pam_stack.so service=system-auth
|
||||
-
|
||||
-session required pam_stack.so service=system-auth
|
||||
+password include password-auth
|
||||
|
||||
-session required pam_stack.so service=system-auth
|
||||
+session required pam_loginuid.so
|
||||
+session include password-auth
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
131
0002-fedora-specific-config-file.patch
Normal file
131
0002-fedora-specific-config-file.patch
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
From 5dbbb2948bee45ec0115146efb4a090df00f5530 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 14 Sep 2017 16:41:12 +0200
|
||||
Subject: [PATCH] fedora specific config file
|
||||
|
||||
---
|
||||
pure-ftpd.conf.in | 31 +++++++++++++++----------------
|
||||
1 file changed, 15 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/pure-ftpd.conf.in b/pure-ftpd.conf.in
|
||||
index aeb093a..e93053a 100644
|
||||
--- a/pure-ftpd.conf.in
|
||||
+++ b/pure-ftpd.conf.in
|
||||
@@ -9,7 +9,7 @@
|
||||
# instead of command-line options, please run the
|
||||
# following command :
|
||||
#
|
||||
-# @sbindir@/sbin/pure-ftpd @sysconfdir@/pure-ftpd.conf
|
||||
+# @sbindir@/pure-ftpd @sysconfdir@/pure-ftpd.conf
|
||||
#
|
||||
# Online documentation:
|
||||
# https://www.pureftpd.org/project/pure-ftpd/doc
|
||||
@@ -42,7 +42,7 @@ MaxClientsNumber 50
|
||||
|
||||
|
||||
# Run as a background process
|
||||
-
|
||||
+# Important: this must be set to 'yes' for the systemd service to work.
|
||||
Daemonize yes
|
||||
|
||||
|
||||
@@ -106,34 +106,34 @@ MaxIdleTime 15
|
||||
|
||||
# LDAP configuration file (see README.LDAP)
|
||||
|
||||
-# LDAPConfigFile /etc/pureftpd-ldap.conf
|
||||
+# LDAPConfigFile @sysconfigdir@/pureftpd-ldap.conf
|
||||
|
||||
|
||||
|
||||
# MySQL configuration file (see README.MySQL)
|
||||
|
||||
-# MySQLConfigFile /etc/pureftpd-mysql.conf
|
||||
+# MySQLConfigFile @sysconfigdir@/pureftpd-mysql.conf
|
||||
|
||||
|
||||
# PostgreSQL configuration file (see README.PGSQL)
|
||||
|
||||
-# PGSQLConfigFile /etc/pureftpd-pgsql.conf
|
||||
+# PGSQLConfigFile @sysconfigdir@/pureftpd-pgsql.conf
|
||||
|
||||
|
||||
# PureDB user database (see README.Virtual-Users)
|
||||
|
||||
-# PureDB /etc/pureftpd.pdb
|
||||
+# PureDB @sysconfigdir@/pureftpd.pdb
|
||||
|
||||
|
||||
# Path to pure-authd socket (see README.Authentication-Modules)
|
||||
|
||||
-# ExtAuth /var/run/ftpd.sock
|
||||
+# ExtAuth @localstatedir@/run/ftpd.sock
|
||||
|
||||
|
||||
|
||||
# If you want to enable PAM authentication, uncomment the following line
|
||||
|
||||
-# PAMAuthentication yes
|
||||
+PAMAuthentication yes
|
||||
|
||||
|
||||
|
||||
@@ -238,8 +238,7 @@ Umask 133:022
|
||||
# For example, a value of 100 prevents all users whose user id is below
|
||||
# 100 from logging in. If you want "root" to be able to log in, use 0.
|
||||
|
||||
-MinUID 100
|
||||
-
|
||||
+MinUID 1000
|
||||
|
||||
|
||||
# Allow FXP transfers for authenticated users.
|
||||
@@ -277,7 +276,7 @@ AutoRename no
|
||||
|
||||
# Prevent anonymous users from uploading new files (no = upload is allowed)
|
||||
|
||||
-AnonymousCantUpload no
|
||||
+AnonymousCantUpload yes
|
||||
|
||||
|
||||
|
||||
@@ -301,21 +300,21 @@ AnonymousCantUpload no
|
||||
# fw.c9x.org - jedi [13/Apr/2017:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
|
||||
# This log file can then be processed by common HTTP traffic analyzers.
|
||||
|
||||
-# AltLog clf:/var/log/pureftpd.log
|
||||
+AltLog clf:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
# Create an additional log file with transfers logged in a format optimized
|
||||
# for statistic reports.
|
||||
|
||||
-# AltLog stats:/var/log/pureftpd.log
|
||||
+# AltLog stats:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
# Create an additional log file with transfers logged in the standard W3C
|
||||
# format (compatible with many HTTP log analyzers)
|
||||
|
||||
-# AltLog w3c:/var/log/pureftpd.log
|
||||
+# AltLog w3c:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
@@ -346,9 +345,9 @@ AnonymousCantUpload no
|
||||
|
||||
|
||||
# If your pure-ftpd has been compiled with standalone support, you can change
|
||||
-# the location of the pid file. The default is /var/run/pure-ftpd.pid
|
||||
+# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid
|
||||
|
||||
-# PIDFile /var/run/pure-ftpd.pid
|
||||
+#PIDFile @localstatedir@/run/pure-ftpd.pid
|
||||
|
||||
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
diff -up ./configuration-file/pure-ftpd.conf.in.config ./configuration-file/pure-ftpd.conf.in
|
||||
--- ./configuration-file/pure-ftpd.conf.in.config 2009-11-20 14:15:01.000000000 +0100
|
||||
+++ ./configuration-file/pure-ftpd.conf.in 2009-12-04 22:09:21.461504212 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
# instead of command-line options, please run the
|
||||
# following command :
|
||||
#
|
||||
-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf
|
||||
+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf
|
||||
#
|
||||
# Please don't forget to have a look at documentation at
|
||||
# http://www.pureftpd.org/documentation.shtml for a complete list of
|
||||
@@ -107,34 +107,34 @@ MaxIdleTime 15
|
||||
|
||||
# LDAP configuration file (see README.LDAP)
|
||||
|
||||
-# LDAPConfigFile /etc/pureftpd-ldap.conf
|
||||
+# LDAPConfigFile @sysconfdir@/pureftpd-ldap.conf
|
||||
|
||||
|
||||
|
||||
# MySQL configuration file (see README.MySQL)
|
||||
|
||||
-# MySQLConfigFile /etc/pureftpd-mysql.conf
|
||||
+# MySQLConfigFile @sysconfdir@/pureftpd-mysql.conf
|
||||
|
||||
|
||||
# Postgres configuration file (see README.PGSQL)
|
||||
|
||||
-# PGSQLConfigFile /etc/pureftpd-pgsql.conf
|
||||
+# PGSQLConfigFile @sysconfdir@/pureftpd-pgsql.conf
|
||||
|
||||
|
||||
# PureDB user database (see README.Virtual-Users)
|
||||
|
||||
-# PureDB /etc/pureftpd.pdb
|
||||
+# PureDB @sysconfdir@/pureftpd.pdb
|
||||
|
||||
|
||||
# Path to pure-authd socket (see README.Authentication-Modules)
|
||||
|
||||
-# ExtAuth /var/run/ftpd.sock
|
||||
+# ExtAuth @localstatedir@/run/ftpd.sock
|
||||
|
||||
|
||||
|
||||
# If you want to enable PAM authentication, uncomment the following line
|
||||
|
||||
-# PAMAuthentication yes
|
||||
+PAMAuthentication yes
|
||||
|
||||
|
||||
|
||||
@@ -237,7 +237,14 @@ Umask 133:022
|
||||
|
||||
# Minimum UID for an authenticated user to log in.
|
||||
|
||||
-MinUID 100
|
||||
+MinUID 1000
|
||||
+
|
||||
+
|
||||
+
|
||||
+# Do not use the /etc/ftpusers file to disable accounts. We're already
|
||||
+# using MinUID to block users with uid < 1000
|
||||
+
|
||||
+UseFtpUsers no
|
||||
|
||||
|
||||
|
||||
@@ -276,7 +283,7 @@ AutoRename no
|
||||
|
||||
# Disallow anonymous users to upload new files (no = upload is allowed)
|
||||
|
||||
-AnonymousCantUpload no
|
||||
+AnonymousCantUpload yes
|
||||
|
||||
|
||||
|
||||
@@ -301,21 +308,21 @@ AnonymousCantUpload no
|
||||
# fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338
|
||||
# This log file can then be processed by www traffic analyzers.
|
||||
|
||||
-# AltLog clf:/var/log/pureftpd.log
|
||||
+AltLog clf:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
# Create an additional log file with transfers logged in a format optimized
|
||||
# for statistic reports.
|
||||
|
||||
-# AltLog stats:/var/log/pureftpd.log
|
||||
+# AltLog stats:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
# Create an additional log file with transfers logged in the standard W3C
|
||||
# format (compatible with most commercial log analyzers)
|
||||
|
||||
-# AltLog w3c:/var/log/pureftpd.log
|
||||
+# AltLog w3c:@localstatedir@/log/pureftpd.log
|
||||
|
||||
|
||||
|
||||
@@ -346,9 +353,9 @@ AnonymousCantUpload no
|
||||
|
||||
|
||||
# If your pure-ftpd has been compiled with standalone support, you can change
|
||||
-# the location of the pid file. The default is /var/run/pure-ftpd.pid
|
||||
+# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid
|
||||
|
||||
-#PIDFile /var/run/pure-ftpd.pid
|
||||
+#PIDFile @localstatedir@/run/pure-ftpd.pid
|
||||
|
||||
|
||||
|
||||
10
pure-ftpd-with-tls-init.service
Normal file
10
pure-ftpd-with-tls-init.service
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
[Unit]
|
||||
Description=One-time configuration for pure-ftpd
|
||||
|
||||
ConditionPathExists=|!/etc/pki/pure-ftpd/pure-ftpd.pem
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=no
|
||||
|
||||
ExecStart=/usr/bin/sscg --ca-file /etc/pki/pure-ftpd/ca.crt --cert-file /etc/pki/pure-ftpd/pure-ftpd.pem --cert-key-file /etc/pki/pure-ftpd/pure-ftpd.pem
|
||||
12
pure-ftpd-with-tls.service
Normal file
12
pure-ftpd-with-tls.service
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
[Unit]
|
||||
Description=Pure-FTPd FTP server
|
||||
After=syslog.target network.target pure-ftpd-init.service
|
||||
Requires=pure-ftpd-init.service
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/pure-ftpd.pid
|
||||
ExecStart=/usr/sbin/pure-ftpd /etc/pure-ftpd/pure-ftpd.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
USER=root
|
||||
PROGRAM=/usr/sbin/pure-ftpwho
|
||||
GUI=no
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth required pam_localuser.so
|
||||
account required pam_permit.so
|
||||
|
|
@ -5,7 +5,7 @@ After=syslog.target network.target
|
|||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/pure-ftpd.pid
|
||||
ExecStart=/usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize
|
||||
ExecStart=/usr/sbin/pure-ftpd /etc/pure-ftpd/pure-ftpd.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
|
|||
279
pure-ftpd.spec
279
pure-ftpd.spec
|
|
@ -1,35 +1,38 @@
|
|||
Name: pure-ftpd
|
||||
Version: 1.0.42
|
||||
Release: 3%{?dist}
|
||||
Version: 1.0.52
|
||||
Release: 2%{?dist}
|
||||
Summary: Lightweight, fast and secure FTP server
|
||||
|
||||
Group: System Environment/Daemons
|
||||
License: BSD
|
||||
# Automatically converted from old format: BSD - review is highly recommended.
|
||||
License: LicenseRef-Callaway-BSD
|
||||
URL: http://www.pureftpd.org
|
||||
|
||||
Source0: http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2
|
||||
Source1: pure-ftpd.service
|
||||
Source2: pure-ftpd.logrotate
|
||||
Source3: pure-ftpd.xinetd
|
||||
Source4: pure-ftpd.pure-ftpwho.pam
|
||||
Source5: pure-ftpd.pure-ftpwho.consoleapp
|
||||
Source6: pure-ftpd.README.SELinux
|
||||
Source7: pure-ftpd.pureftpd.te
|
||||
Patch0: pure-ftpd-1.0.35-config.patch
|
||||
Patch1: pure-ftpd-1.0.40-paminclude.patch
|
||||
Source8: pure-ftpd-with-tls-init.service
|
||||
Source9: pure-ftpd-with-tls.service
|
||||
Patch0: 0001-modify-pam.patch
|
||||
Patch1: 0002-fedora-specific-config-file.patch
|
||||
|
||||
Provides: ftpserver
|
||||
BuildRequires: pam-devel, perl, python, libcap-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: pam-devel, libcap-devel
|
||||
BuildRequires: libxcrypt-devel
|
||||
%{!?_without_ldap:BuildRequires: openldap-devel}
|
||||
%{!?_without_mysql:BuildRequires: mysql-devel}
|
||||
%{!?_without_pgsql:BuildRequires: postgresql-devel}
|
||||
%{!?_without_mysql:BuildRequires: mariadb-connector-c-devel}
|
||||
%{!?_without_pgsql:BuildRequires: libpq-devel}
|
||||
%{!?_without_tls:BuildRequires: openssl-devel}
|
||||
BuildRequires: checkpolicy, selinux-policy-devel
|
||||
BuildRequires: systemd-units
|
||||
Requires(post): systemd-sysv
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
Requires: logrotate, usermode
|
||||
BuildRequires: systemd
|
||||
BuildRequires: git
|
||||
BuildRequires: gcc
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires: logrotate
|
||||
%{!?_without_tls:Requires: sscg}
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -51,10 +54,9 @@ Rebuild switches:
|
|||
|
||||
%package selinux
|
||||
Summary: SELinux support for Pure-FTPD
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): policycoreutils, initscripts, %{name}
|
||||
Requires(preun): policycoreutils, initscripts, %{name}
|
||||
Requires(post): policycoreutils, %{name}
|
||||
Requires(preun): policycoreutils, %{name}
|
||||
Requires(postun): policycoreutils
|
||||
|
||||
%description selinux
|
||||
|
|
@ -65,9 +67,7 @@ Pure-FTPd to be protected in the same way other FTP servers are in Fedora
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0 -b .config
|
||||
%patch1 -p1 -b .paminclude
|
||||
%autosetup -S git
|
||||
install -pm 644 %{SOURCE6} README.SELinux
|
||||
mkdir selinux
|
||||
cp -p %{SOURCE7} selinux/pureftpd.te
|
||||
|
|
@ -78,7 +78,6 @@ cp -p %{SOURCE7} selinux/pureftpd.te
|
|||
--sysconfdir=%{_sysconfdir}/%{name} \
|
||||
--with-capabilities \
|
||||
--with-sendfile \
|
||||
--with-cork \
|
||||
--with-paranoidmsg \
|
||||
--with-altlog \
|
||||
--with-puredb \
|
||||
|
|
@ -103,11 +102,10 @@ cp -p %{SOURCE7} selinux/pureftpd.te
|
|||
--with-rfc2640 \
|
||||
--without-bonjour \
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
|
||||
|
|
@ -117,9 +115,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_localstatedir}/ftp
|
|||
%{!?_without_tls:install -d -m 700 $RPM_BUILD_ROOT%{_sysconfdir}/pki/%{name}}
|
||||
|
||||
# Conf
|
||||
install -p -m 755 configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}
|
||||
install -p -m 644 configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -p -m 755 configuration-file/pure-config.py $RPM_BUILD_ROOT%{_sbindir}
|
||||
install -p -m 644 pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -p -m 644 pureftpd-ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -p -m 644 pureftpd-mysql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
install -p -m 644 pureftpd-pgsql.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
|
||||
|
|
@ -135,8 +131,13 @@ install -p -m 644 man/pure-statsdecode.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
|||
install -p -m 644 man/pure-quotacheck.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
install -p -m 644 man/pure-authd.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
|
||||
# Init script
|
||||
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
|
||||
# Systemd services
|
||||
%if 0%{!?_without_tls:1}
|
||||
install -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_unitdir}/pure-ftpd-init.service
|
||||
install -p -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_unitdir}/pure-ftpd.service
|
||||
%else
|
||||
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/pure-ftpd.service
|
||||
%endif
|
||||
|
||||
# Pam
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
|
||||
|
|
@ -146,36 +147,21 @@ install -p -m 644 pam/pure-ftpd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
|
|||
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
|
||||
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
|
||||
|
||||
# xinetd support
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
|
||||
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
|
||||
|
||||
# pure-ftpwho and non-root users
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
|
||||
install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/pure-ftpwho
|
||||
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/pure-ftpwho
|
||||
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/pure-ftpwho
|
||||
|
||||
# SELinux support
|
||||
cd selinux
|
||||
pushd selinux
|
||||
echo "%{_sbindir}/pure-ftpd system_u:object_r:ftpd_exec_t:s0" > pureftpd.fc
|
||||
echo '%{_localstatedir}/log/pureftpd.log system_u:object_r:xferlog_t:s0' >> pureftpd.fc
|
||||
touch pureftpd.if
|
||||
make -f %{_datadir}/selinux/devel/Makefile
|
||||
install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp
|
||||
popd
|
||||
|
||||
# Remove unnecessary docs
|
||||
rm $RPM_BUILD_ROOT%{_docdir}/%{name}/README.MacOS-X
|
||||
|
||||
%post
|
||||
%systemd_post pure-ftpd.service
|
||||
|
||||
%if 0%{!?_without_tls:1}
|
||||
# TLS Certificate
|
||||
if [ ! -f %{_sysconfdir}/pki/%{name}/%{name}.pem ]; then
|
||||
%{_sysconfdir}/pki/tls/certs/make-dummy-cert \
|
||||
%{_sysconfdir}/pki/%{name}/%{name}.pem
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%systemd_preun pure-ftpd.service
|
||||
|
||||
|
|
@ -187,14 +173,14 @@ fi
|
|||
if [ "$1" -le "1" ]; then # Fist install
|
||||
semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || :
|
||||
fixfiles -R pure-ftpd restore || :
|
||||
/sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
|
||||
/bin/systemctl condrestart pure-ftpd > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun selinux
|
||||
if [ "$1" -lt "1" ]; then # Final removal
|
||||
semodule -r pureftpd 2>/dev/null || :
|
||||
fixfiles -R pure-ftpd restore || :
|
||||
/sbin/service pure-ftpd condrestart > /dev/null 2>&1 || :
|
||||
/bin/systemctl condrestart pure-ftpd > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun selinux
|
||||
|
|
@ -205,32 +191,24 @@ if [ "$1" -ge "1" ]; then # Upgrade
|
|||
fi
|
||||
|
||||
|
||||
%triggerun -- pure-ftpd < 1.0.32-2
|
||||
# Save the current service runlevel info
|
||||
# User must manually run systemd-sysv-convert --apply pure-ftpd
|
||||
# to migrate them to systemd targets
|
||||
/usr/bin/systemd-sysv-convert --save pure-ftpd >/dev/null 2>&1 ||:
|
||||
|
||||
# Run these because the SysV package being removed won't do them
|
||||
/sbin/chkconfig --del pure-ftpd >/dev/null 2>&1 || :
|
||||
/bin/systemctl try-restart pure-ftpd.service >/dev/null 2>&1 || :
|
||||
|
||||
|
||||
%files
|
||||
%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS
|
||||
%doc FAQ THANKS AUTHORS HISTORY NEWS
|
||||
%doc README README.Authentication-Modules README.Configuration-File
|
||||
%doc README.Contrib README.Donations README.LDAP README.MySQL
|
||||
%doc README.Donations README.LDAP README.MySQL README.SELinux
|
||||
%doc README.PGSQL README.TLS README.Virtual-Users
|
||||
%doc contrib/pure-vpopauth.pl pureftpd.schema contrib/pure-stat.pl
|
||||
%doc pureftpd.schema
|
||||
%doc %{_docdir}/%{name}/*.conf
|
||||
%{_bindir}/pure-*
|
||||
%{_sbindir}/pure-*
|
||||
%{_unitdir}/%{name}.service
|
||||
%if 0%{!?_without_tls:1}
|
||||
%{_unitdir}/pure-ftpd-init.service
|
||||
%{_unitdir}/pure-ftpd.service
|
||||
%else
|
||||
%{_unitdir}/pure-ftpd.service
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/pure-ftpwho
|
||||
%config(noreplace) %{_sysconfdir}/security/console.apps/pure-ftpwho
|
||||
%{!?_without_tls:%{_sysconfdir}/pki/%{name}}
|
||||
%{_mandir}/man8/*
|
||||
%dir /var/ftp/
|
||||
|
|
@ -242,6 +220,161 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.52-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue May 20 2025 Jonathan Wright <jonathan@almalinux.org> - 1.0.52-1
|
||||
- update to 1.0.52 rhbz#2313435
|
||||
- Fixes CVE-2024-48208 rhbz#2343476
|
||||
|
||||
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.0.51-9
|
||||
- Add explicit BR: libxcrypt-devel
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.51-7
|
||||
- convert license to SPDX
|
||||
|
||||
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.51-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Jonathan Wright <jonathan@almalinux.org> - 1.0.51-1
|
||||
- New version
|
||||
- Resolves: rhbz#2026153
|
||||
- Remove usermode dependency and non-root "ftpwho"
|
||||
- Resolves: rhbz#502754
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.0.49-11
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.49-9
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 1.0.49-8
|
||||
- rebuild for libpq ABI fix rhbz#1908268
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed May 06 2020 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.49-5
|
||||
- Fix CVE-2020-9365 and CVE-2020-9274
|
||||
- Resolves: rhbz#1828688
|
||||
- Resolves: rhbz#1831059
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 27 2020 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.49-3
|
||||
- Fix potential stack exhaustion in function listdir (CVE-2019-20176)
|
||||
- Resolves: rhbz#1795152
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.49-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Apr 03 2019 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.49-1
|
||||
- New version
|
||||
- Resolves: rhbz#1695561
|
||||
|
||||
* Fri Mar 29 2019 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.48-1
|
||||
- New version
|
||||
- Resolves: rhbz#1692539
|
||||
- Resolves: rhbz#1672494
|
||||
- Resolves: rhbz#1654838
|
||||
|
||||
* Tue Feb 12 2019 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.47-10
|
||||
- Temporarily disable TLSv1.3 support until it's fully fixed
|
||||
|
||||
* Tue Feb 05 2019 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.47-9
|
||||
- Fixed TLSv1.3 support
|
||||
- Resolves: rhbz#1654838
|
||||
- Fixed postgresql authentication
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.47-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.0.47-7
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
||||
* Mon Nov 19 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.47-6
|
||||
- Fix for oversight in previous change
|
||||
|
||||
* Sun Nov 18 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.47-5
|
||||
- Drop sysv legacy bits
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.47-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Mar 15 2018 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.47-3
|
||||
- Apply upstream patch to increase the size limit of the process's data segment
|
||||
- https://github.com/jedisct1/pure-ftpd/issues/82
|
||||
- Resolves: rhbz#1490354
|
||||
|
||||
* Mon Feb 19 2018 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.47-2
|
||||
- Add gcc to BuildRequires
|
||||
|
||||
* Tue Feb 13 2018 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.47-1
|
||||
- New version
|
||||
- Dropped patch 0003-Allow-having-both-options-and-config-file-on-command.patch
|
||||
as it was rejected by upstream
|
||||
- Complain when invalid or excessive arguments are given on the command line
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.46-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.46-5
|
||||
- Rebuilt for switch to libxcrypt
|
||||
|
||||
* Wed Oct 25 2017 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.46-4
|
||||
- Depend on mariadb-connector-c-devel instead of mysql-devel
|
||||
- Resolves: rhbz#1493658
|
||||
|
||||
* Wed Oct 25 2017 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.46-3
|
||||
- Generate the TLS certificate using sscg in an initialization systemd service
|
||||
- This is required by
|
||||
- https://fedoraproject.org/wiki/Packaging:Initial_Service_Setup
|
||||
|
||||
* Thu Sep 14 2017 Ondřej Lysoněk <olysonek@redhat.com> - 1.0.46-2
|
||||
- Fix loading the configuration file
|
||||
- Drop unsupported UseFtpUsers option from configuration file
|
||||
|
||||
* Mon Aug 14 2017 Martin Sehnoutka <msehnout@redhat.com> - 1.0.46-1
|
||||
- Rebase to 1.0.46
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.42-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.42-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.42-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.42-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Dec 23 2015 Robert Scheck <robert@fedoraproject.org> - 1.0.42-3
|
||||
- Remove executable permission bits from pure-ftpd systemd unit
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
# default: off
|
||||
# description: pure-ftpd server, xinetd version. \
|
||||
# Don't run the standalone version if you run \
|
||||
# this and remember do set "Daemonize" to "no" \
|
||||
# in /etc/pure-ftpd/pure-ftpd.conf
|
||||
service ftp
|
||||
{
|
||||
disable = yes
|
||||
socket_type = stream
|
||||
wait = no
|
||||
user = root
|
||||
server = /usr/sbin/pure-config.pl
|
||||
server_args = /etc/pure-ftpd/pure-ftpd.conf
|
||||
log_on_success += DURATION USERID
|
||||
log_on_failure += USERID
|
||||
nice = 10
|
||||
}
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
4022f38939f6a112b18c1a43dee552c1 pure-ftpd-1.0.42.tar.bz2
|
||||
SHA512 (pure-ftpd-1.0.52.tar.bz2) = c7b6f76c1429d2cbf9d740c3408464564e023716ebf8361231ba5021f81804575049910c9874970c83c98f927cd496899e5c30625e4dee6538497f9179632c23
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue