Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-ftp/oftpd/files: oftpd-0.3.7-family-1.patch oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
Date: Wed, 01 Sep 2010 10:00:43
Message-Id: 20100901100039.68E1420054@flycatcher.gentoo.org
1 xmw 10/09/01 10:00:39
2
3 Added: oftpd-0.3.7-family-1.patch
4 oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
5 Log:
6 Revbump to re-add ipv6 support, fixes bug 157005
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-family-1.patch?rev=1.1&content-type=text/plain
14
15 Index: oftpd-0.3.7-family-1.patch
16 ===================================================================
17 Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
18 Date: 2010-01-05
19 Initial Package Version: 0.3.7
20 Origin: http://gentoo.mirror.solnet.ch/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
21 Upstream Status: unkonwn
22 Description: dont crash on wrong protocol family
23
24 diff -Naur oftpd-0.3.7.orig/src/ftp_session.c oftpd-0.3.7/src/ftp_session.c
25 --- oftpd-0.3.7.orig/src/ftp_session.c 2010-01-05 21:56:48.540303543 +0000
26 +++ oftpd-0.3.7/src/ftp_session.c 2010-01-05 21:57:29.995553119 +0000
27 @@ -708,10 +708,12 @@
28 if ((((struct sockaddr *)host_port)->sa_family != AF_INET) &&
29 (((struct sockaddr *)host_port)->sa_family != AF_INET6)) {
30 reply(f, 521, "Only IPv4 and IPv6 supported, address families (4,6)");
31 + return;
32 }
33 #else
34 if (((struct sockaddr *)host_port)->sa_family != AF_INET) {
35 reply(f, 521, "Only IPv4 supported, address family (4)");
36 + return;
37 }
38 #endif
39
40
41
42
43 1.1 net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/oftpd/files/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch?rev=1.1&content-type=text/plain
47
48 Index: oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
49 ===================================================================
50 Difference from upstream mentioned patch for version 0.3.6
51 ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
52 to Mario Fetka (geos_one) (mario dot fetka at gmail dot com) at
53 http://bugs.gentoo.org/attachment.cgi?id=220543&action=view
54
55 --- oftpd-0.3.6-ipv6rel2.patch 2010-09-01 11:17:37.137000090 +0200
56 +++ oftpd-0.3.6-ipv6rel2.patch 2010-09-01 11:15:21.900000084 +0200
57 @@ -1,146 +1,10 @@
58 -diff -urN oftpd-0.3.6-orig/Makefile.in oftpd-0.3.6/Makefile.in
59 ---- oftpd-0.3.6-orig/Makefile.in Mon May 28 00:53:40 2001
60 -+++ oftpd-0.3.6/Makefile.in Fri Jun 8 19:09:50 2001
61 -@@ -72,8 +72,8 @@
62 - CONFIG_HEADER = ./src/config.h
63 - CONFIG_CLEAN_FILES =
64 - DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
65 --Makefile.in NEWS TODO acconfig.h aclocal.m4 configure configure.in \
66 --install-sh missing mkinstalldirs src/config.h.in src/stamp-h.in
67 -+Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \
68 -+missing mkinstalldirs
69 -
70 -
71 - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
72 -@@ -83,9 +83,9 @@
73 - all: all-redirect
74 - .SUFFIXES:
75 - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
76 -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
77 -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
78 -
79 --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
80 -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
81 - cd $(top_builddir) \
82 - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
83 -
84 -@@ -97,34 +97,6 @@
85 - $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
86 - cd $(srcdir) && $(AUTOCONF)
87 -
88 --src/config.h: src/stamp-h
89 -- @if test ! -f $@; then \
90 -- rm -f src/stamp-h; \
91 -- $(MAKE) src/stamp-h; \
92 -- else :; fi
93 --src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
94 -- cd $(top_builddir) \
95 -- && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
96 -- $(SHELL) ./config.status
97 -- @echo timestamp > src/stamp-h 2> /dev/null
98 --$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
99 -- @if test ! -f $@; then \
100 -- rm -f $(srcdir)/src/stamp-h.in; \
101 -- $(MAKE) $(srcdir)/src/stamp-h.in; \
102 -- else :; fi
103 --$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
104 -- cd $(top_srcdir) && $(AUTOHEADER)
105 -- @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
106 --
107 --mostlyclean-hdr:
108 --
109 --clean-hdr:
110 --
111 --distclean-hdr:
112 -- -rm -f src/config.h
113 --
114 --maintainer-clean-hdr:
115 --
116 - # This directory's subdirectories are mostly independent; you can cd
117 - # into them and run `make' without going through this Makefile.
118 - # To change the values of `make' variables: instead of editing Makefiles,
119 -@@ -252,6 +224,11 @@
120 - -rm -rf $(distdir)
121 - mkdir $(distdir)
122 - -chmod 777 $(distdir)
123 -+ here=`cd $(top_builddir) && pwd`; \
124 -+ top_distdir=`cd $(distdir) && pwd`; \
125 -+ distdir=`cd $(distdir) && pwd`; \
126 -+ cd $(top_srcdir) \
127 -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
128 - $(mkinstalldirs) $(distdir)/dist $(distdir)/init
129 - @for file in $(DISTFILES); do \
130 - d=$(srcdir); \
131 -@@ -309,32 +286,32 @@
132 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
133 -
134 - maintainer-clean-generic:
135 --mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
136 -+mostlyclean-am: mostlyclean-tags mostlyclean-generic
137 -
138 - mostlyclean: mostlyclean-recursive
139 -
140 --clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
141 -+clean-am: clean-tags clean-generic mostlyclean-am
142 -
143 - clean: clean-recursive
144 -
145 --distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
146 -+distclean-am: distclean-tags distclean-generic clean-am
147 -
148 - distclean: distclean-recursive
149 - -rm -f config.status
150 -
151 --maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
152 -- maintainer-clean-generic distclean-am
153 -+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
154 -+ distclean-am
155 - @echo "This command is intended for maintainers to use;"
156 - @echo "it deletes files that may require special tools to rebuild."
157 -
158 - maintainer-clean: maintainer-clean-recursive
159 - -rm -f config.status
160 -
161 --.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
162 --install-data-recursive uninstall-data-recursive install-exec-recursive \
163 --uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
164 --all-recursive check-recursive installcheck-recursive info-recursive \
165 --dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
166 -+.PHONY: install-data-recursive uninstall-data-recursive \
167 -+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
168 -+uninstalldirs-recursive all-recursive check-recursive \
169 -+installcheck-recursive info-recursive dvi-recursive \
170 -+mostlyclean-recursive distclean-recursive clean-recursive \
171 - maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
172 - distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
173 - dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
174 -diff -urN oftpd-0.3.6-orig/man/Makefile.in oftpd-0.3.6/man/Makefile.in
175 ---- oftpd-0.3.6-orig/man/Makefile.in Mon May 28 00:53:44 2001
176 -+++ oftpd-0.3.6/man/Makefile.in Fri Jun 8 19:09:50 2001
177 -@@ -84,9 +84,9 @@
178 - all: all-redirect
179 - .SUFFIXES:
180 - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
181 -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
182 -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
183 -
184 --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
185 -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
186 - cd $(top_builddir) \
187 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
188 -
189 -@@ -138,6 +138,11 @@
190 - subdir = man
191 -
192 - distdir: $(DISTFILES)
193 -+ here=`cd $(top_builddir) && pwd`; \
194 -+ top_distdir=`cd $(top_distdir) && pwd`; \
195 -+ distdir=`cd $(distdir) && pwd`; \
196 -+ cd $(top_srcdir) \
197 -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
198 - @for file in $(DISTFILES); do \
199 - d=$(srcdir); \
200 - if test -d $$d/$$file; then \
201 +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
202 +Date: 2010-01-05
203 +Initial Package Version: 0.3.6
204 +Origin: ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
205 +Upstream Status: unknown
206 +Description: add better ipv6 support to oftpd
207 +
208 diff -urN oftpd-0.3.6-orig/src/Makefile.am oftpd-0.3.6/src/Makefile.am
209 --- oftpd-0.3.6-orig/src/Makefile.am Wed Apr 18 01:05:16 2001
210 +++ oftpd-0.3.6/src/Makefile.am Fri Jun 8 19:09:45 2001
211 @@ -148,158 +12,6 @@
212 bin_PROGRAMS = oftpd
213 -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
214 +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
215 -diff -urN oftpd-0.3.6-orig/src/Makefile.in oftpd-0.3.6/src/Makefile.in
216 ---- oftpd-0.3.6-orig/src/Makefile.in Mon May 28 00:53:42 2001
217 -+++ oftpd-0.3.6/src/Makefile.in Fri Jun 8 19:09:50 2001
218 -@@ -66,7 +66,7 @@
219 - VERSION = @VERSION@
220 -
221 - bin_PROGRAMS = oftpd
222 --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
223 -+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
224 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
225 - CONFIG_HEADER = config.h
226 - CONFIG_CLEAN_FILES =
227 -@@ -78,7 +78,8 @@
228 - LDFLAGS = @LDFLAGS@
229 - LIBS = @LIBS@
230 - oftpd_OBJECTS = file_list.o ftp_command.o ftp_listener.o ftp_session.o \
231 --oftpd.o telnet_session.o watchdog.o error.o daemon_assert.o
232 -+oftpd.o telnet_session.o watchdog.o error.o af_portability.o \
233 -+daemon_assert.o
234 - oftpd_LDADD = $(LDADD)
235 - oftpd_DEPENDENCIES =
236 - oftpd_LDFLAGS =
237 -@@ -93,6 +94,10 @@
238 -
239 - TAR = gtar
240 - GZIP_ENV = --best
241 -+DEP_FILES = .deps/af_portability.P .deps/daemon_assert.P .deps/error.P \
242 -+.deps/file_list.P .deps/ftp_command.P .deps/ftp_listener.P \
243 -+.deps/ftp_session.P .deps/oftpd.P .deps/telnet_session.P \
244 -+.deps/watchdog.P
245 - SOURCES = $(oftpd_SOURCES)
246 - OBJECTS = $(oftpd_OBJECTS)
247 -
248 -@@ -100,9 +105,9 @@
249 - .SUFFIXES:
250 - .SUFFIXES: .S .c .o .s
251 - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
252 -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
253 -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
254 -
255 --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
256 -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
257 - cd $(top_builddir) \
258 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
259 -
260 -@@ -160,9 +165,6 @@
261 - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
262 - done
263 -
264 --.c.o:
265 -- $(COMPILE) -c $<
266 --
267 - .s.o:
268 - $(COMPILE) -c $<
269 -
270 -@@ -217,6 +219,11 @@
271 - subdir = src
272 -
273 - distdir: $(DISTFILES)
274 -+ here=`cd $(top_builddir) && pwd`; \
275 -+ top_distdir=`cd $(top_distdir) && pwd`; \
276 -+ distdir=`cd $(distdir) && pwd`; \
277 -+ cd $(top_srcdir) \
278 -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
279 - @for file in $(DISTFILES); do \
280 - d=$(srcdir); \
281 - if test -d $$d/$$file; then \
282 -@@ -228,6 +235,37 @@
283 - fi; \
284 - done
285 -
286 -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
287 -+
288 -+-include $(DEP_FILES)
289 -+
290 -+mostlyclean-depend:
291 -+
292 -+clean-depend:
293 -+
294 -+distclean-depend:
295 -+ -rm -rf .deps
296 -+
297 -+maintainer-clean-depend:
298 -+
299 -+%.o: %.c
300 -+ @echo '$(COMPILE) -c $<'; \
301 -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
302 -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
303 -+ tr ' ' '\012' < .deps/$(*F).pp \
304 -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
305 -+ >> .deps/$(*F).P; \
306 -+ rm .deps/$(*F).pp
307 -+
308 -+%.lo: %.c
309 -+ @echo '$(LTCOMPILE) -c $<'; \
310 -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
311 -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
312 -+ < .deps/$(*F).pp > .deps/$(*F).P; \
313 -+ tr ' ' '\012' < .deps/$(*F).pp \
314 -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
315 -+ >> .deps/$(*F).P; \
316 -+ rm -f .deps/$(*F).pp
317 - info-am:
318 - info: info-am
319 - dvi-am:
320 -@@ -268,24 +306,26 @@
321 -
322 - maintainer-clean-generic:
323 - mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
324 -- mostlyclean-compile mostlyclean-tags \
325 -+ mostlyclean-compile mostlyclean-tags mostlyclean-depend \
326 - mostlyclean-generic
327 -
328 - mostlyclean: mostlyclean-am
329 -
330 - clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
331 -- clean-generic mostlyclean-am
332 -+ clean-depend clean-generic mostlyclean-am
333 -
334 - clean: clean-am
335 -
336 - distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
337 -- distclean-tags distclean-generic clean-am
338 -+ distclean-tags distclean-depend distclean-generic \
339 -+ clean-am
340 -
341 - distclean: distclean-am
342 -
343 - maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
344 - maintainer-clean-compile maintainer-clean-tags \
345 -- maintainer-clean-generic distclean-am
346 -+ maintainer-clean-depend maintainer-clean-generic \
347 -+ distclean-am
348 - @echo "This command is intended for maintainers to use;"
349 - @echo "it deletes files that may require special tools to rebuild."
350 -
351 -@@ -296,10 +336,11 @@
352 - maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
353 - mostlyclean-compile distclean-compile clean-compile \
354 - maintainer-clean-compile tags mostlyclean-tags distclean-tags \
355 --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
356 --check-am installcheck-am installcheck all-recursive-am install-exec-am \
357 --install-exec install-data-am install-data install-am install \
358 --uninstall-am uninstall all-redirect all-am all installdirs \
359 -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
360 -+distclean-depend clean-depend maintainer-clean-depend info-am info \
361 -+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
362 -+install-exec-am install-exec install-data-am install-data install-am \
363 -+install uninstall-am uninstall all-redirect all-am all installdirs \
364 - mostlyclean-generic distclean-generic clean-generic \
365 - maintainer-clean-generic clean mostlyclean distclean maintainer-clean
366 -
367 diff -urN oftpd-0.3.6-orig/src/af_portability.c oftpd-0.3.6/src/af_portability.c
368 --- oftpd-0.3.6-orig/src/af_portability.c Thu Jan 1 01:00:00 1970
369 +++ oftpd-0.3.6/src/af_portability.c Fri Jun 8 19:01:31 2001
370 @@ -376,7 +88,7 @@
371 diff -urN oftpd-0.3.6-orig/src/config.h.in oftpd-0.3.6/src/config.h.in
372 --- oftpd-0.3.6-orig/src/config.h.in Sun May 27 23:04:05 2001
373 +++ oftpd-0.3.6/src/config.h.in Fri Jun 8 19:03:43 2001
374 -@@ -100,14 +100,14 @@
375 +@@ -97,15 +97,15 @@
376 /* Define if you have the <limits.h> header file. */
377 #undef HAVE_LIMITS_H
378
379 @@ -388,12 +100,13 @@
380
381 /* Define if you have the <sys/types.h> header file. */
382 #undef HAVE_SYS_TYPES_H
383 --
384 +
385 -/* Define if you have the <syslog.h> header file. */
386 -#undef HAVE_SYSLOG_H
387 -
388 +-
389 /* Define if you have the <unistd.h> header file. */
390 #undef HAVE_UNISTD_H
391 +
392 diff -urN oftpd-0.3.6-orig/src/error.c oftpd-0.3.6/src/error.c
393 --- oftpd-0.3.6-orig/src/error.c Wed Apr 18 23:41:04 2001
394 +++ oftpd-0.3.6/src/error.c Thu Jun 21 20:57:09 2001
395 @@ -1436,7 +1149,7 @@
396 }
397 #else
398 if (memcmp(&f->client_addr.sin_addr,
399 -@@ -1803,20 +1893,69 @@
400 +@@ -1811,20 +1901,69 @@
401 }
402 }