- rel 2; apparmor hat support for extauth, too

diff --git a/pure-ftpd-apparmor.patch b/pure-ftpd-apparmor.patch
index 42e002ab5498b1f62c0ccb44746b67d6300b6f31..cc68db4ad275f2b148b38980375165e51120aab8 100644 (file)
--- a/pure-ftpd-apparmor.patch
+++ b/pure-ftpd-apparmor.patch
@@ -1,6 +1,6 @@
-diff -ur pure-ftpd-1.0.40.org/config.h.in pure-ftpd-1.0.40/config.h.in
---- pure-ftpd-1.0.40.org/config.h.in   2015-06-13 16:45:49.000000000 +0200
-+++ pure-ftpd-1.0.40/config.h.in       2015-06-16 13:13:38.628079468 +0200
+diff -ur pure-ftpd-1.0.49.org/config.h.in pure-ftpd-1.0.49/config.h.in
+--- pure-ftpd-1.0.49.org/config.h.in   2019-03-25 18:00:47.000000000 +0100
++++ pure-ftpd-1.0.49/config.h.in       2019-06-10 11:13:52.181133752 +0200
 @@ -3,6 +3,9 @@
  /* Define if building universal (internal helper macro) */
  #undef AC_APPLE_UNIVERSAL_BUILD
@@ -11,10 +11,10 @@ diff -ur pure-ftpd-1.0.40.org/config.h.in pure-ftpd-1.0.40/config.h.in
  /* display only boring messages */
  #undef BORING_MODE
  
-diff -ur pure-ftpd-1.0.40.org/configure.ac pure-ftpd-1.0.40/configure.ac
---- pure-ftpd-1.0.40.org/configure.ac  2015-06-13 13:59:00.000000000 +0200
-+++ pure-ftpd-1.0.40/configure.ac      2015-06-16 13:13:38.628079468 +0200
-@@ -792,6 +792,13 @@
+diff -ur pure-ftpd-1.0.49.org/configure.ac pure-ftpd-1.0.49/configure.ac
+--- pure-ftpd-1.0.49.org/configure.ac  2019-04-03 12:41:30.000000000 +0200
++++ pure-ftpd-1.0.49/configure.ac      2019-06-10 11:13:52.181133752 +0200
+@@ -790,6 +790,13 @@
      AC_DEFINE(QUOTAS,,[with quotas])
    fi ])
  
@@ -28,9 +28,10 @@ diff -ur pure-ftpd-1.0.40.org/configure.ac pure-ftpd-1.0.40/configure.ac
  AC_ARG_WITH(ftpwho,
  [AS_HELP_STRING(--with-ftpwho,Support for pure-ftpwho)],
  [ if test "x$withval" = "xyes" ; then
-diff -ur pure-ftpd-1.0.40.org/pureftpd-mysql.conf pure-ftpd-1.0.40/pureftpd-mysql.conf
---- pure-ftpd-1.0.40.org/pureftpd-mysql.conf   2015-05-21 12:18:58.000000000 +0200
-+++ pure-ftpd-1.0.40/pureftpd-mysql.conf       2015-06-16 13:13:38.644746557 +0200
+Only in pure-ftpd-1.0.49: configure.ac.orig
+diff -ur pure-ftpd-1.0.49.org/pureftpd-mysql.conf pure-ftpd-1.0.49/pureftpd-mysql.conf
+--- pure-ftpd-1.0.49.org/pureftpd-mysql.conf   2019-06-10 11:13:16.120061167 +0200
++++ pure-ftpd-1.0.49/pureftpd-mysql.conf       2019-06-10 11:13:52.181133752 +0200
 @@ -112,6 +112,9 @@
  # MySQLGetBandwidthDL SELECT DLBandwidth FROM users WHERE User='\L'
  
@@ -41,9 +42,22 @@ diff -ur pure-ftpd-1.0.40.org/pureftpd-mysql.conf pure-ftpd-1.0.40/pureftpd-mysq
  # Enable ~ expansion. NEVER ENABLE THIS BLINDLY UNLESS :
  # 1) You know what you are doing.
  # 2) Real and virtual users match.
-diff -ur pure-ftpd-1.0.40.org/src/ftpd.c pure-ftpd-1.0.40/src/ftpd.c
---- pure-ftpd-1.0.40.org/src/ftpd.c    2015-06-13 12:26:37.000000000 +0200
-+++ pure-ftpd-1.0.40/src/ftpd.c        2015-06-16 13:13:38.644746557 +0200
+diff -ur pure-ftpd-1.0.49.org/README.Authentication-Modules pure-ftpd-1.0.49/README.Authentication-Modules
+--- pure-ftpd-1.0.49.org/README.Authentication-Modules 2019-03-25 18:10:06.000000000 +0100
++++ pure-ftpd-1.0.49/README.Authentication-Modules     2019-06-10 11:17:27.140847844 +0200
+@@ -118,6 +118,9 @@
+ 
+ The maximal authorized number of concurrent sessions.
+ 
++* apparmor_hat:xxx (optional)
++
++Apparmor HAT name.
+ 
+           ------------------------ EXAMPLE ------------------------
+           
+diff -ur pure-ftpd-1.0.49.org/src/ftpd.c pure-ftpd-1.0.49/src/ftpd.c
+--- pure-ftpd-1.0.49.org/src/ftpd.c    2019-06-10 11:13:16.123394599 +0200
++++ pure-ftpd-1.0.49/src/ftpd.c        2019-06-10 11:13:52.184467185 +0200
 @@ -18,6 +18,9 @@
  #ifdef QUOTAS
  # include "quotas.h"
@@ -54,7 +68,7 @@ diff -ur pure-ftpd-1.0.40.org/src/ftpd.c pure-ftpd-1.0.40/src/ftpd.c
  #ifdef WITH_DIRALIASES
  # include "diraliases.h"
  #endif
-@@ -1544,6 +1547,9 @@
+@@ -1516,6 +1519,9 @@
          result.ratio_download = ratio_download;
          result.ratio_ul_changed = result.ratio_dl_changed = 0;
  #endif
@@ -64,7 +78,7 @@ diff -ur pure-ftpd-1.0.40.org/src/ftpd.c pure-ftpd-1.0.40/src/ftpd.c
  #ifdef PER_USER_LIMITS
          result.per_user_max = per_user_max;
  #endif
-@@ -1982,6 +1988,16 @@
+@@ -1944,6 +1950,16 @@
  # endif
      enablesignals();
  #endif
@@ -81,10 +95,10 @@ diff -ur pure-ftpd-1.0.40.org/src/ftpd.c pure-ftpd-1.0.40/src/ftpd.c
      logfile(LOG_INFO, MSG_IS_NOW_LOGGED_IN, account);
  #ifdef FTPWHO
      if (shm_data_cur != NULL) {
-diff -ur pure-ftpd-1.0.40.org/src/ftpd.h pure-ftpd-1.0.40/src/ftpd.h
---- pure-ftpd-1.0.40.org/src/ftpd.h    2015-05-21 10:08:42.000000000 +0200
-+++ pure-ftpd-1.0.40/src/ftpd.h        2015-06-16 13:13:38.644746557 +0200
-@@ -294,6 +294,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/ftpd.h pure-ftpd-1.0.49/src/ftpd.h
+--- pure-ftpd-1.0.49.org/src/ftpd.h    2019-06-10 11:13:16.123394599 +0200
++++ pure-ftpd-1.0.49/src/ftpd.h        2019-06-10 11:13:52.184467185 +0200
+@@ -291,6 +291,9 @@
  #ifdef PER_USER_LIMITS
      unsigned int per_user_max;
  #endif
@@ -94,23 +108,73 @@ diff -ur pure-ftpd-1.0.40.org/src/ftpd.h pure-ftpd-1.0.40/src/ftpd.h
  } AuthResult;
  
  typedef struct PureFileInfo_ {
-diff -ur pure-ftpd-1.0.40.org/src/log_extauth.c pure-ftpd-1.0.40/src/log_extauth.c
---- pure-ftpd-1.0.40.org/src/log_extauth.c     2015-02-17 19:12:45.000000000 +0100
-+++ pure-ftpd-1.0.40/src/log_extauth.c 2015-06-16 13:15:07.670333578 +0200
-@@ -215,6 +215,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/log_extauth.c pure-ftpd-1.0.49/src/log_extauth.c
+--- pure-ftpd-1.0.49.org/src/log_extauth.c     2019-04-03 12:38:36.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_extauth.c 2019-06-10 11:15:54.581435088 +0200
+@@ -145,6 +145,19 @@
+ #endif
+ }
+ 
++static void callback_reply_apparmor_hat(const char *str, AuthResult * const result)
++{
++#ifdef APPARMOR
++    if (*str) {
++        free((void *) (result->apparmor_hat));
++        result->apparmor_hat = strdup(str);
++    }
++#else
++    (void) str;
++    (void) result;
++#endif
++}
++
+ static void callback_reply_end(const char *str, AuthResult * const result)
+ {
+     (void) str;
+@@ -221,6 +234,9 @@
      result->uid = (uid_t) 0;
      result->gid = (gid_t) 0;
      result->dir = NULL;
-+#ifdef APPARMOR_HAT
++#ifdef APPARMOR
 +    result->apparmor_hat = NULL;
 +#endif
      result->slow_tilde_expansion = 1;
      auth_finalized = 0;
      if ((readnb = safe_read(kindy, line, sizeof line - 1U)) <= (ssize_t) 0) {
-diff -ur pure-ftpd-1.0.40.org/src/log_ldap.c pure-ftpd-1.0.40/src/log_ldap.c
---- pure-ftpd-1.0.40.org/src/log_ldap.c        2015-06-11 00:26:19.000000000 +0200
-+++ pure-ftpd-1.0.40/src/log_ldap.c    2015-06-16 13:13:38.644746557 +0200
-@@ -627,6 +627,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/log_extauth.h pure-ftpd-1.0.49/src/log_extauth.h
+--- pure-ftpd-1.0.49.org/src/log_extauth.h     2019-03-25 18:11:33.000000000 +0100
++++ pure-ftpd-1.0.49/src/log_extauth.h 2019-06-10 11:14:18.448581707 +0200
+@@ -35,6 +35,7 @@
+ #define EXTAUTH_REPLY_RATIO_UPLOAD "ratio_upload" EXTAUTH_KEYWORD_SEP
+ #define EXTAUTH_REPLY_RATIO_DOWNLOAD "ratio_download" EXTAUTH_KEYWORD_SEP
+ #define EXTAUTH_REPLY_PER_USER_MAX "per_user_max" EXTAUTH_KEYWORD_SEP
++#define EXTAUTH_REPLY_APPARMOR_HAT "apparmor_hat" EXTAUTH_KEYWORD_SEP
+ #define EXTAUTH_REPLY_END "end"
+ 
+ #endif
+diff -ur pure-ftpd-1.0.49.org/src/log_extauth_p.h pure-ftpd-1.0.49/src/log_extauth_p.h
+--- pure-ftpd-1.0.49.org/src/log_extauth_p.h   2018-09-19 23:53:06.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_extauth_p.h       2019-06-10 11:15:04.449947766 +0200
+@@ -34,6 +34,7 @@
+ static void callback_reply_ratio_upload(const char *str, AuthResult * const result);
+ static void callback_reply_ratio_download(const char *str, AuthResult * const result);
+ static void callback_reply_per_user_max(const char *str, AuthResult * const result);
++static void callback_reply_apparmor_hat(const char *str, AuthResult * const result);
+ static void callback_reply_end(const char *str, AuthResult * const result);
+ 
+ static ExtauthCallBack extauth_callbacks[] = {
+@@ -49,6 +50,7 @@
+     { EXTAUTH_REPLY_RATIO_UPLOAD, callback_reply_ratio_upload },
+     { EXTAUTH_REPLY_RATIO_DOWNLOAD, callback_reply_ratio_download },
+     { EXTAUTH_REPLY_PER_USER_MAX, callback_reply_per_user_max },
++    { EXTAUTH_REPLY_APPARMOR_HAT, callback_reply_apparmor_hat },
+     { EXTAUTH_REPLY_END, callback_reply_end },
+     { NULL, callback_reply_end }
+ };
+diff -ur pure-ftpd-1.0.49.org/src/log_ldap.c pure-ftpd-1.0.49/src/log_ldap.c
+--- pure-ftpd-1.0.49.org/src/log_ldap.c        2019-04-02 16:00:40.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_ldap.c    2019-06-10 11:13:52.184467185 +0200
+@@ -635,6 +635,9 @@
      if ((result->dir = strdup(pw->pw_dir)) == NULL) {
          return;
      }
@@ -120,10 +184,10 @@ diff -ur pure-ftpd-1.0.40.org/src/log_ldap.c pure-ftpd-1.0.40/src/log_ldap.c
      result->slow_tilde_expansion = 1;
      result->auth_ok = 1;            /* User found, authentication ok */
  }
-diff -ur pure-ftpd-1.0.40.org/src/log_mysql.c pure-ftpd-1.0.40/src/log_mysql.c
---- pure-ftpd-1.0.40.org/src/log_mysql.c       2015-05-21 12:52:57.000000000 +0200
-+++ pure-ftpd-1.0.40/src/log_mysql.c   2015-06-16 13:16:21.692207444 +0200
-@@ -322,6 +322,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/log_mysql.c pure-ftpd-1.0.49/src/log_mysql.c
+--- pure-ftpd-1.0.49.org/src/log_mysql.c       2019-06-10 11:13:16.126728032 +0200
++++ pure-ftpd-1.0.49/src/log_mysql.c   2019-06-10 11:13:52.184467185 +0200
+@@ -332,6 +332,9 @@
      const char *bandwidth_ul = NULL;   /* stored bandwidth UL */
      const char *bandwidth_dl = NULL;   /* stored bandwidth DL */
  #endif
@@ -133,7 +197,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_mysql.c pure-ftpd-1.0.40/src/log_mysql.c
      char *escaped_account = NULL;
      char *escaped_ip = NULL;
      char *escaped_port = NULL;
-@@ -605,6 +608,15 @@
+@@ -620,6 +623,15 @@
          }
      }
  #endif
@@ -149,7 +213,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_mysql.c pure-ftpd-1.0.40/src/log_mysql.c
      result->slow_tilde_expansion = !tildexp;
      result->auth_ok = -result->auth_ok;
      bye:
-@@ -634,6 +646,9 @@
+@@ -649,6 +661,9 @@
      free((void *) bandwidth_ul);
      free((void *) bandwidth_dl);
  #endif
@@ -159,7 +223,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_mysql.c pure-ftpd-1.0.40/src/log_mysql.c
      free((void *) escaped_account);
      free((void *) escaped_ip);
      free((void *) escaped_port);
-@@ -702,6 +717,9 @@
+@@ -717,6 +732,9 @@
      ZFREE(sqlreq_getbandwidth_ul);
      ZFREE(sqlreq_getbandwidth_dl);
  #endif
@@ -169,9 +233,9 @@ diff -ur pure-ftpd-1.0.40.org/src/log_mysql.c pure-ftpd-1.0.40/src/log_mysql.c
  }
  #else
  extern signed char v6ready;
-diff -ur pure-ftpd-1.0.40.org/src/log_mysql_p.h pure-ftpd-1.0.40/src/log_mysql_p.h
---- pure-ftpd-1.0.40.org/src/log_mysql_p.h     2015-02-17 19:12:45.000000000 +0100
-+++ pure-ftpd-1.0.40/src/log_mysql_p.h 2015-06-16 13:13:38.648079974 +0200
+diff -ur pure-ftpd-1.0.49.org/src/log_mysql_p.h pure-ftpd-1.0.49/src/log_mysql_p.h
+--- pure-ftpd-1.0.49.org/src/log_mysql_p.h     2018-09-19 23:53:06.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_mysql_p.h 2019-06-10 11:13:52.184467185 +0200
 @@ -38,6 +38,9 @@
  static char *sqlreq_getbandwidth_ul;
  static char *sqlreq_getbandwidth_dl;
@@ -192,9 +256,9 @@ diff -ur pure-ftpd-1.0.40.org/src/log_mysql_p.h pure-ftpd-1.0.40/src/log_mysql_p
      { NULL, NULL }
  };
  
-diff -ur pure-ftpd-1.0.40.org/src/log_pam.c pure-ftpd-1.0.40/src/log_pam.c
---- pure-ftpd-1.0.40.org/src/log_pam.c 2015-02-17 19:12:45.000000000 +0100
-+++ pure-ftpd-1.0.40/src/log_pam.c     2015-06-16 13:13:38.654746809 +0200
+diff -ur pure-ftpd-1.0.49.org/src/log_pam.c pure-ftpd-1.0.49/src/log_pam.c
+--- pure-ftpd-1.0.49.org/src/log_pam.c 2019-04-02 16:00:40.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_pam.c     2019-06-10 11:13:52.184467185 +0200
 @@ -202,6 +202,9 @@
      (void) pam_close_session(pamh, PAM_SILENT);   /* It doesn't matter if it fails */
  #endif
@@ -205,9 +269,9 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pam.c pure-ftpd-1.0.40/src/log_pam.c
      dir = NULL;
      result->uid = pw.pw_uid;
      result->gid = pw.pw_gid;
-diff -ur pure-ftpd-1.0.40.org/src/log_pgsql.c pure-ftpd-1.0.40/src/log_pgsql.c
---- pure-ftpd-1.0.40.org/src/log_pgsql.c       2015-05-22 16:29:27.000000000 +0200
-+++ pure-ftpd-1.0.40/src/log_pgsql.c   2015-06-16 13:18:14.645066852 +0200
+diff -ur pure-ftpd-1.0.49.org/src/log_pgsql.c pure-ftpd-1.0.49/src/log_pgsql.c
+--- pure-ftpd-1.0.49.org/src/log_pgsql.c       2019-06-10 11:13:16.120061167 +0200
++++ pure-ftpd-1.0.49/src/log_pgsql.c   2019-06-10 11:13:52.184467185 +0200
 @@ -402,6 +402,9 @@
      const char *bandwidth_ul = NULL;   /* stored bandwidth UL */
      const char *bandwidth_dl = NULL;   /* stored bandwidth DL */
@@ -218,7 +282,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pgsql.c pure-ftpd-1.0.40/src/log_pgsql.c
      char *escaped_account = NULL;
      char *escaped_ip = NULL;
      char *escaped_port = NULL;
-@@ -651,6 +654,15 @@
+@@ -662,6 +665,15 @@
          }
      }
  #endif
@@ -234,7 +298,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pgsql.c pure-ftpd-1.0.40/src/log_pgsql.c
      result->slow_tilde_expansion = 1;
      result->auth_ok = -result->auth_ok;
      bye:
-@@ -681,6 +693,9 @@
+@@ -692,6 +704,9 @@
      free((void *) bandwidth_ul);
      free((void *) bandwidth_dl);
  #endif
@@ -244,7 +308,7 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pgsql.c pure-ftpd-1.0.40/src/log_pgsql.c
      free((void *) escaped_account);
      free((void *) escaped_ip);
      free((void *) escaped_port);
-@@ -735,6 +750,9 @@
+@@ -746,6 +761,9 @@
      ZFREE(sqlreq_getbandwidth_ul);
      ZFREE(sqlreq_getbandwidth_dl);
  #endif
@@ -254,9 +318,9 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pgsql.c pure-ftpd-1.0.40/src/log_pgsql.c
  }
  #else
  extern signed char v6ready;
-diff -ur pure-ftpd-1.0.40.org/src/log_pgsql_p.h pure-ftpd-1.0.40/src/log_pgsql_p.h
---- pure-ftpd-1.0.40.org/src/log_pgsql_p.h     2015-02-17 19:12:45.000000000 +0100
-+++ pure-ftpd-1.0.40/src/log_pgsql_p.h 2015-06-16 13:13:38.658080227 +0200
+diff -ur pure-ftpd-1.0.49.org/src/log_pgsql_p.h pure-ftpd-1.0.49/src/log_pgsql_p.h
+--- pure-ftpd-1.0.49.org/src/log_pgsql_p.h     2018-09-19 23:53:06.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_pgsql_p.h 2019-06-10 11:13:52.184467185 +0200
 @@ -28,6 +28,9 @@
  static char *sqlreq_getbandwidth_ul;
  static char *sqlreq_getbandwidth_dl;
@@ -277,10 +341,10 @@ diff -ur pure-ftpd-1.0.40.org/src/log_pgsql_p.h pure-ftpd-1.0.40/src/log_pgsql_p
      { NULL, NULL }
  };
  
-diff -ur pure-ftpd-1.0.40.org/src/log_puredb.c pure-ftpd-1.0.40/src/log_puredb.c
---- pure-ftpd-1.0.40.org/src/log_puredb.c      2015-05-21 12:51:56.000000000 +0200
-+++ pure-ftpd-1.0.40/src/log_puredb.c  2015-06-16 13:13:38.658080227 +0200
-@@ -333,6 +333,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/log_puredb.c pure-ftpd-1.0.49/src/log_puredb.c
+--- pure-ftpd-1.0.49.org/src/log_puredb.c      2019-04-02 16:00:40.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_puredb.c  2019-06-10 11:13:52.187800617 +0200
+@@ -335,6 +335,9 @@
          result->user_quota_size = strtoull(line, NULL, 10);
      }
  #endif
@@ -290,10 +354,10 @@ diff -ur pure-ftpd-1.0.40.org/src/log_puredb.c pure-ftpd-1.0.40/src/log_puredb.c
      if ((line = my_strtok2(NULL, *PW_LINE_SEP)) == NULL) {   /* allowed local ip */
          return 0;
      }
-diff -ur pure-ftpd-1.0.40.org/src/log_unix.c pure-ftpd-1.0.40/src/log_unix.c
---- pure-ftpd-1.0.40.org/src/log_unix.c        2015-05-21 12:51:38.000000000 +0200
-+++ pure-ftpd-1.0.40/src/log_unix.c    2015-06-16 13:13:38.658080227 +0200
-@@ -81,6 +81,9 @@
+diff -ur pure-ftpd-1.0.49.org/src/log_unix.c pure-ftpd-1.0.49/src/log_unix.c
+--- pure-ftpd-1.0.49.org/src/log_unix.c        2019-04-02 16:00:40.000000000 +0200
++++ pure-ftpd-1.0.49/src/log_unix.c    2019-06-10 11:13:52.187800617 +0200
+@@ -87,6 +87,9 @@
      result->uid = pw.pw_uid;
      result->gid = pw.pw_gid;
      result->dir = dir;
@@ -303,10 +367,10 @@ diff -ur pure-ftpd-1.0.40.org/src/log_unix.c pure-ftpd-1.0.40/src/log_unix.c
      result->slow_tilde_expansion = 0;
      result->auth_ok = -result->auth_ok;
      return;
-diff -ur pure-ftpd-1.0.40.org/src/Makefile.am pure-ftpd-1.0.40/src/Makefile.am
---- pure-ftpd-1.0.40.org/src/Makefile.am       2015-05-21 16:25:39.000000000 +0200
-+++ pure-ftpd-1.0.40/src/Makefile.am   2015-06-16 13:13:38.658080227 +0200
-@@ -136,6 +136,7 @@
+diff -ur pure-ftpd-1.0.49.org/src/Makefile.am pure-ftpd-1.0.49/src/Makefile.am
+--- pure-ftpd-1.0.49.org/src/Makefile.am       2019-03-25 16:48:42.000000000 +0100
++++ pure-ftpd-1.0.49/src/Makefile.am   2019-06-10 11:13:52.187800617 +0200
+@@ -143,6 +143,7 @@
  pure_ftpd_LDADD = \
        libpureftpd.a \
        ../puredb/src/libpuredb_read.a \
@@ -314,9 +378,9 @@ diff -ur pure-ftpd-1.0.40.org/src/Makefile.am pure-ftpd-1.0.40/src/Makefile.am
        @LDAP_SSL_LIBS@ @GETLOADAVG_LIBS@ @BONJOUR_LDADD@
  
  pure_ftpd_SOURCES = \
-diff -ur pure-ftpd-1.0.40.org/src/messages_en.h pure-ftpd-1.0.40/src/messages_en.h
---- pure-ftpd-1.0.40.org/src/messages_en.h     2015-05-20 16:23:20.000000000 +0200
-+++ pure-ftpd-1.0.40/src/messages_en.h 2015-06-16 13:13:38.658080227 +0200
+diff -ur pure-ftpd-1.0.49.org/src/messages_en.h pure-ftpd-1.0.49/src/messages_en.h
+--- pure-ftpd-1.0.49.org/src/messages_en.h     2019-06-10 11:13:16.126728032 +0200
++++ pure-ftpd-1.0.49/src/messages_en.h 2019-06-10 11:13:52.187800617 +0200
 @@ -57,6 +57,7 @@
  #define MSG_CURRENT_DIR_IS "OK. Current directory is %s"
  #define MSG_CURRENT_RESTRICTED_DIR_IS "OK. Current restricted directory is %s"

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 2ea01bd3b5b5370b4fda44ed54e45494b3a4e06c..28a949e5165809e610743572ff4b7fcd9e6ec730 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 
-%define        rel     1
+%define        rel     2
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd