Преглед изворни кода

upgrading package: proftpd 1.2.4 -> 1.2.5

Ralf S. Engelschall пре 24 година
родитељ
комит
7addfc6de0
2 измењених фајлова са 3 додато и 35 уклоњено
  1. 0 30
      proftpd/proftpd.patch
  2. 3 5
      proftpd/proftpd.spec

+ 0 - 30
proftpd/proftpd.patch

@@ -1,30 +0,0 @@
-Index: modules/mod_ls.c
-===================================================================
-RCS file: /var/proftpd/proftpd-1.2/modules/mod_ls.c,v
-retrieving revision 1.45
-diff -u -r1.45 mod_ls.c
---- modules/mod_ls.c	2001/09/26 15:32:47	1.45
-+++ modules/mod_ls.c	2001/12/05 18:59:50
-@@ -1018,7 +1018,10 @@
-     glob_t g;
-     int    a;
-     char   pbuffer[MAXPATHLEN + 1] = "";
--      
-+     
-+    /* make sure the glob_t is initialized */
-+    memset(&g, '\0', sizeof(glob_t));
-+ 
-     if(*arg == '~') {
-       struct passwd *pw;
-       int i;
-@@ -1491,6 +1494,10 @@
- 	if(strpbrk(target,"{[*?") != NULL) {
- 		glob_t g;
- 		char **path,*p;
-+
-+                /* make sure the glob_t is initialized */
-+                memset(&g, '\0', sizeof(glob_t));
-+
- 		
- 		if(fs_glob(target,GLOB_PERIOD,NULL,&g) != 0) {
- 			add_response_err(R_550,"No files found.");

+ 3 - 5
proftpd/proftpd.spec

@@ -37,8 +37,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        FTP
 License:      GPL
-Version:      1.2.4
-Release:      20020529
+Version:      1.2.5
+Release:      20020610
 
 #   list of sources
 Source0:      ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -46,7 +46,6 @@ Source1:      proftpd.conf
 Source2:      proftpd.msg.goaway
 Source3:      proftpd.msg.login
 Source4:      rc.proftpd
-Patch0:       proftpd.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -80,7 +79,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
 
 %build
     #   make non-standard "rundir" the same as standard "sysconfdir"
@@ -131,7 +129,7 @@ AutoReqProv:  no
 
     #   install more stuff manually
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/share/proftpd
-    %{l_shtool} install -c -m 644 doc/FAQ-config.html \
+    %{l_shtool} install -c -m 644 doc/faq.html \
         $RPM_BUILD_ROOT%{l_prefix}/share/proftpd/faq.html
     %{l_shtool} install -c -m 644 doc/Configuration.html \
         $RPM_BUILD_ROOT%{l_prefix}/share/proftpd/cfg.html