Accepting request 130776 from home:computersalat:devel:network

udpate to 1.3.4b OBS-URL: https://build.opensuse.org/request/show/130776 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=13
2012-08-14 11:47:07 +00:00 · 2012-08-14 11:47:07 +00:00 · 60f9c64d76
commit 60f9c64d76
parent 80fdfc4575
6 changed files with 161 additions and 25 deletions
--- a/proftpd-1.3.4a.tar.bz2
+++ b/proftpd-1.3.4a.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad92eec86deccc385ac144e3925f9b9cbe085e60f10b33d1de6da91d32f39f3e
-size 6805631
--- a/proftpd-1.3.4b.tar.gz
+++ b/proftpd-1.3.4b.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb
+size 7647825
--- a/proftpd-1.3.4b.tar.gz.asc
+++ b/proftpd-1.3.4b.tar.gz.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAlAYE/wACgkQt46JP6URl2pIgQCgwqPzMUsUx++mlK/MFTzSRL1g
+e1cAoNuD1fHAQ7eQppw0hSUp7vam416k
+=Za9N
+-----END PGP SIGNATURE-----
--- a/proftpd-no_BuildDate.patch
+++ b/proftpd-no_BuildDate.patch
@ -0,0 +1,80 @@
+Index: src/main.c
+===================================================================
+--- src/main.c.orig
+++ src/main.c
+@@ -2703,8 +2703,8 @@ static void standalone_main(void) {
+ 
+   init_bindings();
+ 
+-  pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s (built %s) standalone mode STARTUP",
+-    PROFTPD_VERSION_TEXT " " PR_STATUS, BUILD_STAMP);
+  pr_log_pri(PR_LOG_NOTICE, "ProFTPD %s standalone mode STARTUP",
+    PROFTPD_VERSION_TEXT " " PR_STATUS);
+ 
+   pr_pidfile_write();
+   daemon_loop();
+@@ -2759,7 +2759,6 @@ static void show_settings(void) {
+   printf("%s", "  Platform: " PR_PLATFORM " [unknown]\n");
+ #endif /* !HAVE_UNAME */
+ 
+-  printf("%s", "  Built: " BUILD_STAMP "\n");
+   printf("%s", "  Built With:\n    configure " PR_BUILD_OPTS "\n\n");
+ 
+   printf("%s", "  CFLAGS: " PR_BUILD_CFLAGS "\n");
+@@ -3271,7 +3270,6 @@ int main(int argc, char *argv[], char **
+ 
+     printf("ProFTPD Version: %s", PROFTPD_VERSION_TEXT " " PR_STATUS "\n");
+     printf("  Scoreboard Version: %08x\n", PR_SCOREBOARD_VERSION); 
+-    printf("  Built: %s\n\n", BUILD_STAMP);
+ 
+     modules_list(PR_MODULES_LIST_FL_SHOW_VERSION);
+     exit(0);
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
+++ Makefile.in
+@@ -24,28 +24,26 @@ BUILD_BIN=proftpd$(EXEEXT) ftpcount$(EXE
+ 
+ all: $(BUILD_BIN)
+ 
+-include/buildstamp.h:
+-	echo \#define BUILD_STAMP \"`date +"%a %b %e %Y %H:%M:%S %Z"`\" > include/buildstamp.h
+ 
+ dummy:
+ 
+-lib: include/buildstamp.h dummy
+lib: dummy
+ 	cd lib/ && $(MAKE) lib
+ 
+-src: include/buildstamp.h dummy
+src: dummy
+ 	cd src/ && $(MAKE) src
+ 
+-modules: include/buildstamp.h dummy
+modules: dummy
+ 	cd modules/ && $(MAKE) static
+ 	test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" || (cd modules/ && $(MAKE) shared)
+ 
+-utils: include/buildstamp.h dummy
+utils: dummy
+ 	cd utils/ && $(MAKE) utils
+ 
+-locale: include/buildstamp.h dummy
+locale: dummy
+ 	test -z "$(ENABLE_NLS)" || (cd locale/ && $(MAKE) locale)
+ 
+-dirs: include/buildstamp.h dummy
+dirs: dummy
+ 	@dirs="$(DIRS)"; \
+ 	for dir in $$dirs; do \
+ 		if [ -d "$$dir" ]; then cd $$dir/ && $(MAKE); fi; \
+Index: include/version.h
+===================================================================
+--- include/version.h.orig
+++ include/version.h
+@@ -1,5 +1,3 @@
+-#include "buildstamp.h"
+-
+ /* Application version (in various forms) */
+ #define PROFTPD_VERSION_NUMBER		0x0001030406
+ #define PROFTPD_VERSION_TEXT		"1.3.4b"
--- a/proftpd.changes
+++ b/proftpd.changes
@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Aug 14 11:11:28 UTC 2012 - chris@computersalat.de
+
+- update to 1.3.4b
+  + Fixed mod_ldap segfault on login when LDAPUsers with no filters used.
+  + Fixed sporadic SFTP upload issues for large files.
+  + Fixed SSH2 handling for some clients (e.g. OpenVMS).
+  + New FactsOptions directive; see doc/modules/mod_facts.html#FactsOptions
+  + Fixed build errors on Tru64, AIX, Cygwin.
+- add Source Signatuire (.asc) file
+- add noBuildDate patch
+- add lang pkg
+  * --enable-nls
+- add configure option
+  * --enable-openssl, --with-lastlog
+
 -------------------------------------------------------------------
 Mon Dec 12 15:00:18 UTC 2011 - chris@computersalat.de

--- a/proftpd.spec
+++ b/proftpd.spec
@ -1,7 +1,7 @@
 #
 # spec file for package proftpd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -15,18 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

+
 Name:           proftpd
 Summary:        Highly configurable GPL-licensed FTP server software
 License:        GPL-2.0+
 Group:          Productivity/Networking/Ftp/Servers
 # Please save your time and do not update to "rc" versions.
 # We only accept updates for "STABLE" Versions
-Version:        1.3.4a
+Version:        1.3.4b
 Release:        0
 Url:            http://www.proftpd.org/
-Source:         ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-Source1:        %{name}.init
-Source2:        %{name}.passwd
+Source0:        ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
+Source1:        ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz.asc
+Source11:       %{name}.init
+Source12:       %{name}.passwd
 #PATCH-FIX-openSUSE: pam, logrotate, xinet
 Patch100:       %{name}-1.3.4a-dist.patch
 #PATCH-FIX-openSUSE: provide a useful default config
@ -35,10 +37,13 @@ Patch101:       %{name}-1.3.4a-basic.conf.patch
 Patch102:       %{name}-1.3.4a-ftpasswd.patch
 #PATCH-FIX: fix strip
 Patch103:       %{name}-1.3.4a-strip.patch
+#PATCH-FIX-openSUSE: file-contains-date-and-time
+Patch104:       %{name}-no_BuildDate.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  krb5-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
+#BuildRequires:  libmemcached-devel
 BuildRequires:  mysql-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openldap2-devel
@ -51,11 +56,25 @@ BuildRequires:  tcpd-devel
 BuildRequires:  unixODBC-devel
 Requires:       logrotate

+%if 0%{?lang_package:1} > 0
+Recommends:     %{name}-lang
+%endif
+
 %description
 ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
 operating systems.  See the README.ports file for more details about
 the platforms on which ProFTPD in known or thought to build and run.

+%{?lang_package}
+
+%package devel
+Summary:        Development files for ProFTPD
+Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+
+%description devel
+This package contains Development files for ProFTPD
+
 %package ldap
 Summary:        LDAP Module for ProFTPD
 Group:          Productivity/Networking/Ftp/Servers
@ -96,14 +115,6 @@ Requires:       %{name} = %{version}
 %description sqlite
 This is the SQLite Module for ProFTPD

-%package devel
-Summary:        Development files for ProFTPD
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
-
-%description devel
-This package contains Development files for ProFTPD
-
 %package doc
 Summary:        Documentation for ProFTPD
 Group:          Documentation/HTML
@ -119,6 +130,7 @@ Here are Documentation for ProFTPD
 %patch101
 %patch102
 %patch103
+%patch104

 %build
 PROFTPD_SHARED_MODS="$(for spec_mod in $(find contrib -name mod_\*.c); do echo "$(basename ${spec_mod%%.c})"; done | tr '\n' ':' | sed -e 's|:$||')"
@ -130,13 +142,17 @@ export CXXFLAGS="$CFLAGS"
    --sysconfdir=%{_sysconfdir}/%{name} \
    --localstatedir=%{_localstatedir}/run/%{name} \
    --enable-sendfile \
-    --enable-ipv6 \
    --enable-ctrls \
-    --enable-facl \
    --enable-dso \
+    --enable-facl \
+    --enable-ipv6 \
+    --enable-nls \
+    --enable-openssl \
+    --with-lastlog \
    --with-includes="%{_includedir}/mysql:%{_includedir}/pgsql" \
    --with-shared="${PROFTPD_SHARED_MODS}"

+#    --enable-memcache \
 %{__make} %{?_smp_mflags}

 %install
@ -144,7 +160,7 @@ export CXXFLAGS="$CFLAGS"
 %{__install} -D -m 0644 contrib/dist/rpm/ftp.pamd   $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
 %{__install} -D -m 0644 contrib/dist/rpm/xinetd   $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 %{__install} -D -m 0644 contrib/dist/rpm/%{name}.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -D -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+%{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 %{__ln_s} -f %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
 #
 %{__rm} -fv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
@ -154,9 +170,11 @@ export CXXFLAGS="$CFLAGS"

 # some needed dirs
 %{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{conf.d,auth}
-%{__install} -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/auth/passwd
+%{__install} -m 0644 %{S:12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/auth/passwd
 %{__install} -d -m 0750 $RPM_BUILD_ROOT/var/log/%{name}

+%find_lang %{name}
+
 %pre
 # on `rpm -ivh` PARAM is 1
 # on `rpm -Uvh` PARAM is 2
@ -185,7 +203,22 @@ fi
 %clean
 %{__rm} -rf %{buildroot}

+%if 0%{?lang_package:1} > 0
+%files lang -f %{name}.lang
+%if 0%{?sles_version} == 11
+%defattr(-,root,root,-)
+%dir %{_datadir}/locale/bg_BG
+%dir %{_datadir}/locale/bg_BG/LC_MESSAGES
+%dir %{_datadir}/locale/ja_JP
+%dir %{_datadir}/locale/ja_JP/LC_MESSAGES
+%dir %{_datadir}/locale/ko_KR
+%dir %{_datadir}/locale/ko_KR/LC_MESSAGES
+%endif
+
 %files
+%else
+%files -f %{name}.lang
+%endif
 %defattr(-,root,root,-)
 %doc COPYING CREDITS ChangeLog INSTALL NEWS README* RELEASE_NOTES
 %doc contrib/README.*
@ -215,6 +248,11 @@ fi
 %exclude %{_libdir}/%{name}/mod_radius.so
 %exclude %{_libdir}/%{name}/mod_sql_sqlite.so

+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
+
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/mod_ldap.so
@ -235,11 +273,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/mod_sql_sqlite.so

-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}
-%{_libdir}/pkgconfig/%{name}.pc
-
 %files doc
 %defattr(-,root,root,-)
 %doc doc/*.html doc/contrib doc/howto doc/modules