source: net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch @ f3987e6

Revision f3987e6, 13.8 KB checked in by Mario Fetka <mario.fetka@…>, 10 months ago (diff)

Bump

  • Property mode set to 100644
  • oftpd-0.3.6-ipv6rel2.patch

    Difference from upstream mentioned patch for version 0.3.6
    ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
    to Mario Fetka (geos_one) (mario dot fetka at gmail dot com) at 
    http://bugs.gentoo.org/attachment.cgi?id=220543&action=view
    
     
    1 diff -urN oftpd-0.3.6-orig/Makefile.in oftpd-0.3.6/Makefile.in 
    2 --- oftpd-0.3.6-orig/Makefile.in        Mon May 28 00:53:40 2001 
    3 +++ oftpd-0.3.6/Makefile.in     Fri Jun  8 19:09:50 2001 
    4 @@ -72,8 +72,8 @@ 
    5  CONFIG_HEADER = ./src/config.h 
    6  CONFIG_CLEAN_FILES =  
    7  DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ 
    8 -Makefile.in NEWS TODO acconfig.h aclocal.m4 configure configure.in \ 
    9 -install-sh missing mkinstalldirs src/config.h.in src/stamp-h.in 
    10 +Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \ 
    11 +missing mkinstalldirs 
    12   
    13   
    14  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) 
    15 @@ -83,9 +83,9 @@ 
    16  all: all-redirect 
    17  .SUFFIXES: 
    18  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)  
    19 -       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile 
    20 +       cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile 
    21   
    22 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status 
    23 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES) 
    24         cd $(top_builddir) \ 
    25           && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
    26   
    27 @@ -97,34 +97,6 @@ 
    28  $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) 
    29         cd $(srcdir) && $(AUTOCONF) 
    30   
    31 -src/config.h: src/stamp-h 
    32 -       @if test ! -f $@; then \ 
    33 -               rm -f src/stamp-h; \ 
    34 -               $(MAKE) src/stamp-h; \ 
    35 -       else :; fi 
    36 -src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status 
    37 -       cd $(top_builddir) \ 
    38 -         && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ 
    39 -            $(SHELL) ./config.status 
    40 -       @echo timestamp > src/stamp-h 2> /dev/null 
    41 -$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in 
    42 -       @if test ! -f $@; then \ 
    43 -               rm -f $(srcdir)/src/stamp-h.in; \ 
    44 -               $(MAKE) $(srcdir)/src/stamp-h.in; \ 
    45 -       else :; fi 
    46 -$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h 
    47 -       cd $(top_srcdir) && $(AUTOHEADER) 
    48 -       @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null 
    49 - 
    50 -mostlyclean-hdr: 
    51 - 
    52 -clean-hdr: 
    53 - 
    54 -distclean-hdr: 
    55 -       -rm -f src/config.h 
    56 - 
    57 -maintainer-clean-hdr: 
    58 - 
    59  # This directory's subdirectories are mostly independent; you can cd 
    60  # into them and run `make' without going through this Makefile. 
    61  # To change the values of `make' variables: instead of editing Makefiles, 
    62 @@ -252,6 +224,11 @@ 
    63         -rm -rf $(distdir) 
    64         mkdir $(distdir) 
    65         -chmod 777 $(distdir) 
    66 +       here=`cd $(top_builddir) && pwd`; \ 
    67 +       top_distdir=`cd $(distdir) && pwd`; \ 
    68 +       distdir=`cd $(distdir) && pwd`; \ 
    69 +       cd $(top_srcdir) \ 
    70 +         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile 
    71         $(mkinstalldirs) $(distdir)/dist $(distdir)/init 
    72         @for file in $(DISTFILES); do \ 
    73           d=$(srcdir); \ 
    74 @@ -309,32 +286,32 @@ 
    75         -rm -f config.cache config.log stamp-h stamp-h[0-9]* 
    76   
    77  maintainer-clean-generic: 
    78 -mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic 
    79 +mostlyclean-am:  mostlyclean-tags mostlyclean-generic 
    80   
    81  mostlyclean: mostlyclean-recursive 
    82   
    83 -clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am 
    84 +clean-am:  clean-tags clean-generic mostlyclean-am 
    85   
    86  clean: clean-recursive 
    87   
    88 -distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am 
    89 +distclean-am:  distclean-tags distclean-generic clean-am 
    90   
    91  distclean: distclean-recursive 
    92         -rm -f config.status 
    93   
    94 -maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \ 
    95 -               maintainer-clean-generic distclean-am 
    96 +maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \ 
    97 +               distclean-am 
    98         @echo "This command is intended for maintainers to use;" 
    99         @echo "it deletes files that may require special tools to rebuild." 
    100   
    101  maintainer-clean: maintainer-clean-recursive 
    102         -rm -f config.status 
    103   
    104 -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ 
    105 -install-data-recursive uninstall-data-recursive install-exec-recursive \ 
    106 -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ 
    107 -all-recursive check-recursive installcheck-recursive info-recursive \ 
    108 -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ 
    109 +.PHONY: install-data-recursive uninstall-data-recursive \ 
    110 +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ 
    111 +uninstalldirs-recursive all-recursive check-recursive \ 
    112 +installcheck-recursive info-recursive dvi-recursive \ 
    113 +mostlyclean-recursive distclean-recursive clean-recursive \ 
    114  maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ 
    115  distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ 
    116  dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ 
    117 diff -urN oftpd-0.3.6-orig/man/Makefile.in oftpd-0.3.6/man/Makefile.in 
    118 --- oftpd-0.3.6-orig/man/Makefile.in    Mon May 28 00:53:44 2001 
    119 +++ oftpd-0.3.6/man/Makefile.in Fri Jun  8 19:09:50 2001 
    120 @@ -84,9 +84,9 @@ 
    121  all: all-redirect 
    122  .SUFFIXES: 
    123  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)  
    124 -       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile 
    125 +       cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile 
    126   
    127 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status 
    128 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES) 
    129         cd $(top_builddir) \ 
    130           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status 
    131   
    132 @@ -138,6 +138,11 @@ 
    133  subdir = man 
    134   
    135  distdir: $(DISTFILES) 
    136 +       here=`cd $(top_builddir) && pwd`; \ 
    137 +       top_distdir=`cd $(top_distdir) && pwd`; \ 
    138 +       distdir=`cd $(distdir) && pwd`; \ 
    139 +       cd $(top_srcdir) \ 
    140 +         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile 
    141         @for file in $(DISTFILES); do \ 
    142           d=$(srcdir); \ 
    143           if test -d $$d/$$file; then \ 
     1Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) 
     2Date: 2010-01-05 
     3Initial Package Version: 0.3.6 
     4Origin: ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz 
     5Upstream Status: unknown 
     6Description: add better ipv6 support to oftpd 
     7  
    1448diff -urN oftpd-0.3.6-orig/src/Makefile.am oftpd-0.3.6/src/Makefile.am 
    1459--- oftpd-0.3.6-orig/src/Makefile.am    Wed Apr 18 01:05:16 2001 
    14610+++ oftpd-0.3.6/src/Makefile.am Fri Jun  8 19:09:45 2001 
     
    14812 bin_PROGRAMS = oftpd 
    14913-oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h 
    15014+oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h 
    151 diff -urN oftpd-0.3.6-orig/src/Makefile.in oftpd-0.3.6/src/Makefile.in 
    152 --- oftpd-0.3.6-orig/src/Makefile.in    Mon May 28 00:53:42 2001 
    153 +++ oftpd-0.3.6/src/Makefile.in Fri Jun  8 19:09:50 2001 
    154 @@ -66,7 +66,7 @@ 
    155  VERSION = @VERSION@ 
    156   
    157  bin_PROGRAMS = oftpd 
    158 -oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h 
    159 +oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h 
    160  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 
    161  CONFIG_HEADER = config.h 
    162  CONFIG_CLEAN_FILES =  
    163 @@ -78,7 +78,8 @@ 
    164  LDFLAGS = @LDFLAGS@ 
    165  LIBS = @LIBS@ 
    166  oftpd_OBJECTS =  file_list.o ftp_command.o ftp_listener.o ftp_session.o \ 
    167 -oftpd.o telnet_session.o watchdog.o error.o daemon_assert.o 
    168 +oftpd.o telnet_session.o watchdog.o error.o af_portability.o \ 
    169 +daemon_assert.o 
    170  oftpd_LDADD = $(LDADD) 
    171  oftpd_DEPENDENCIES =  
    172  oftpd_LDFLAGS =  
    173 @@ -93,6 +94,10 @@ 
    174   
    175  TAR = gtar 
    176  GZIP_ENV = --best 
    177 +DEP_FILES =  .deps/af_portability.P .deps/daemon_assert.P .deps/error.P \ 
    178 +.deps/file_list.P .deps/ftp_command.P .deps/ftp_listener.P \ 
    179 +.deps/ftp_session.P .deps/oftpd.P .deps/telnet_session.P \ 
    180 +.deps/watchdog.P 
    181  SOURCES = $(oftpd_SOURCES) 
    182  OBJECTS = $(oftpd_OBJECTS) 
    183   
    184 @@ -100,9 +105,9 @@ 
    185  .SUFFIXES: 
    186  .SUFFIXES: .S .c .o .s 
    187  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)  
    188 -       cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile 
    189 +       cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile 
    190   
    191 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status 
    192 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES) 
    193         cd $(top_builddir) \ 
    194           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status 
    195   
    196 @@ -160,9 +165,6 @@ 
    197           rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ 
    198         done 
    199   
    200 -.c.o: 
    201 -       $(COMPILE) -c $< 
    202 - 
    203  .s.o: 
    204         $(COMPILE) -c $< 
    205   
    206 @@ -217,6 +219,11 @@ 
    207  subdir = src 
    208   
    209  distdir: $(DISTFILES) 
    210 +       here=`cd $(top_builddir) && pwd`; \ 
    211 +       top_distdir=`cd $(top_distdir) && pwd`; \ 
    212 +       distdir=`cd $(distdir) && pwd`; \ 
    213 +       cd $(top_srcdir) \ 
    214 +         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile 
    215         @for file in $(DISTFILES); do \ 
    216           d=$(srcdir); \ 
    217           if test -d $$d/$$file; then \ 
    218 @@ -228,6 +235,37 @@ 
    219           fi; \ 
    220         done 
    221   
    222 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) 
    223 + 
    224 +-include $(DEP_FILES) 
    225 + 
    226 +mostlyclean-depend: 
    227 + 
    228 +clean-depend: 
    229 + 
    230 +distclean-depend: 
    231 +       -rm -rf .deps 
    232 + 
    233 +maintainer-clean-depend: 
    234 + 
    235 +%.o: %.c 
    236 +       @echo '$(COMPILE) -c $<'; \ 
    237 +       $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< 
    238 +       @-cp .deps/$(*F).pp .deps/$(*F).P; \ 
    239 +       tr ' ' '\012' < .deps/$(*F).pp \ 
    240 +         | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ 
    241 +           >> .deps/$(*F).P; \ 
    242 +       rm .deps/$(*F).pp 
    243 + 
    244 +%.lo: %.c 
    245 +       @echo '$(LTCOMPILE) -c $<'; \ 
    246 +       $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< 
    247 +       @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \ 
    248 +         < .deps/$(*F).pp > .deps/$(*F).P; \ 
    249 +       tr ' ' '\012' < .deps/$(*F).pp \ 
    250 +         | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ 
    251 +           >> .deps/$(*F).P; \ 
    252 +       rm -f .deps/$(*F).pp 
    253  info-am: 
    254  info: info-am 
    255  dvi-am: 
    256 @@ -268,24 +306,26 @@ 
    257   
    258  maintainer-clean-generic: 
    259  mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \ 
    260 -               mostlyclean-compile mostlyclean-tags \ 
    261 +               mostlyclean-compile mostlyclean-tags mostlyclean-depend \ 
    262                 mostlyclean-generic 
    263   
    264  mostlyclean: mostlyclean-am 
    265   
    266  clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \ 
    267 -               clean-generic mostlyclean-am 
    268 +               clean-depend clean-generic mostlyclean-am 
    269   
    270  clean: clean-am 
    271   
    272  distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \ 
    273 -               distclean-tags distclean-generic clean-am 
    274 +               distclean-tags distclean-depend distclean-generic \ 
    275 +               clean-am 
    276   
    277  distclean: distclean-am 
    278   
    279  maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \ 
    280                 maintainer-clean-compile maintainer-clean-tags \ 
    281 -               maintainer-clean-generic distclean-am 
    282 +               maintainer-clean-depend maintainer-clean-generic \ 
    283 +               distclean-am 
    284         @echo "This command is intended for maintainers to use;" 
    285         @echo "it deletes files that may require special tools to rebuild." 
    286   
    287 @@ -296,10 +336,11 @@ 
    288  maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ 
    289  mostlyclean-compile distclean-compile clean-compile \ 
    290  maintainer-clean-compile tags mostlyclean-tags distclean-tags \ 
    291 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ 
    292 -check-am installcheck-am installcheck all-recursive-am install-exec-am \ 
    293 -install-exec install-data-am install-data install-am install \ 
    294 -uninstall-am uninstall all-redirect all-am all installdirs \ 
    295 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ 
    296 +distclean-depend clean-depend maintainer-clean-depend info-am info \ 
    297 +dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ 
    298 +install-exec-am install-exec install-data-am install-data install-am \ 
    299 +install uninstall-am uninstall all-redirect all-am all installdirs \ 
    300  mostlyclean-generic distclean-generic clean-generic \ 
    301  maintainer-clean-generic clean mostlyclean distclean maintainer-clean 
    302   
    30315diff -urN oftpd-0.3.6-orig/src/af_portability.c oftpd-0.3.6/src/af_portability.c 
    30416--- oftpd-0.3.6-orig/src/af_portability.c       Thu Jan  1 01:00:00 1970 
    30517+++ oftpd-0.3.6/src/af_portability.c    Fri Jun  8 19:01:31 2001 
     
    37688diff -urN oftpd-0.3.6-orig/src/config.h.in oftpd-0.3.6/src/config.h.in 
    37789--- oftpd-0.3.6-orig/src/config.h.in    Sun May 27 23:04:05 2001 
    37890+++ oftpd-0.3.6/src/config.h.in Fri Jun  8 19:03:43 2001 
    379 @@ -100,14 +100,14 @@ 
     91@@ -97,15 +97,15 @@ 
    38092 /* Define if you have the <limits.h> header file.  */ 
    38193 #undef HAVE_LIMITS_H 
    38294  
     
    388100  
    389101 /* Define if you have the <sys/types.h> header file.  */ 
    390102 #undef HAVE_SYS_TYPES_H 
    391 - 
     103  
    392104-/* Define if you have the <syslog.h> header file.  */ 
    393105-#undef HAVE_SYSLOG_H 
    394   
     106- 
    395107 /* Define if you have the <unistd.h> header file.  */ 
    396108 #undef HAVE_UNISTD_H 
     109  
    397110diff -urN oftpd-0.3.6-orig/src/error.c oftpd-0.3.6/src/error.c 
    398111--- oftpd-0.3.6-orig/src/error.c        Wed Apr 18 23:41:04 2001 
    399112+++ oftpd-0.3.6/src/error.c     Thu Jun 21 20:57:09 2001 
     
    14361149        } 
    14371150 #else 
    14381151        if (memcmp(&f->client_addr.sin_addr,  
    1439 @@ -1803,20 +1893,69 @@ 
     1152@@ -1811,20 +1901,69 @@ 
    14401153     } 
    14411154 } 
    14421155  
Note: See TracBrowser for help on using the repository browser.