From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 3 Jun 2014 06:38:48 +0000 (+0000)
Subject: - cleanup
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=0f932318cb02b5a8d44187a3df16f2d6f93243d9;p=packages%2Fproftpd.git

- cleanup
---

diff --git a/proftpd-pool.patch b/proftpd-pool.patch
deleted file mode 100644
index 6ecaeba..0000000
--- a/proftpd-pool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proftpd-1.3.0/src/pool.c.orig	2005-03-08 18:06:39.000000000 +0100
-+++ proftpd-1.3.0/src/pool.c	2006-10-24 12:53:07.000000000 +0200
-@@ -47,7 +47,7 @@
-   union align a;
- 
-   /* Padding */
--#if defined(_LP64) || defined(__LP64__)
-+#if defined(_LP64) || defined(__LP64__) || defined(__alpha__)
-   char pad[32];
- #endif
- 
diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
deleted file mode 100644
index 9aa7aef..0000000
--- a/proftpd-wtmp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -burNp proftpd-1.3.2.orig/src/log.c proftpd-1.3.2-dud/src/log.c
---- proftpd-1.3.2.orig/src/wtmp.c	2008-12-17 00:43:55.000000000 +0100
-+++ proftpd-1.3.2-dud/src/wtmp.c	2009-02-09 14:24:34.271689801 +0100
-@@ -129,9 +129,31 @@ int log_wtmp(char *line, const char *nam
-   struct utmp ut;
-   static int fd = -1;
- 
-+#if defined(HAVE_UTMPX_H)
-+#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
-+# define WTMPX_FILE _PATH_WTMPX
-+#endif
-+  static char *wtmp_file = NULL;
-+  if (wtmp_file == NULL) {
-+    if (access(WTMPX_FILE"x", F_OK) == 0)
-+      wtmp_file = WTMPX_FILE"x";
-+    else if (access(WTMPX_FILE, F_OK) == 0)
-+      wtmp_file = WTMPX_FILE;
-+    else if (access(WTMP_FILE"x", F_OK) == 0)
-+      wtmp_file = WTMP_FILE"x";
-+    else if (access(WTMP_FILE, F_OK) == 0)
-+      wtmp_file = WTMP_FILE;
-+    else {
-+      pr_log_pri(PR_LOG_WARNING, "cannot find "WTMPX_FILE);
-+      return -1;
-+    }
-+  }
-+#else
-+  static char *wtmp_file = WTMP_FILE;
-+#endif
-   if (fd < 0 &&
--      (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
--    pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
-+      (fd = open(wtmp_file, O_WRONLY|O_APPEND, 0)) < 0) {
-+    pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", wtmp_file, strerror(errno));
-     return -1;
-   }
- 
diff --git a/proftpd.spec b/proftpd.spec
index 80813c9..f586a01 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -47,8 +47,6 @@ Source12:	%{name}-mod_clamav.conf
 Source13:	%{name}.tmpfiles
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-noautopriv.patch
-Patch2:		%{name}-wtmp.patch
-Patch3:		%{name}-pool.patch
 URL:		http://www.proftpd.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf