Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/mgetty/files: mgetty-1.1.36-qa-fixes.patch mgetty-1.1.36-nofax.patch
Date: Mon, 31 Aug 2009 13:32:44
Message-Id: E1MiBot-0000uC-5Z@stork.gentoo.org
1 mrness 09/08/31 18:41:35
2
3 Modified: mgetty-1.1.36-qa-fixes.patch
4 mgetty-1.1.36-nofax.patch
5 Log:
6 Fix broken nofax.patch and yet another parallelization bug in the main Makefile (#282674).
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch?r1=1.2&r2=1.3
15
16 Index: mgetty-1.1.36-qa-fixes.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- mgetty-1.1.36-qa-fixes.patch 22 Aug 2009 08:51:39 -0000 1.2
23 +++ mgetty-1.1.36-qa-fixes.patch 31 Aug 2009 18:41:34 -0000 1.3
24 @@ -1,29 +1,6 @@
25 -diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
26 ---- mgetty-1.1.36.orig/Makefile 2009-08-22 10:37:19.000000000 +0200
27 -+++ mgetty-1.1.36/Makefile 2009-08-22 10:43:31.000000000 +0200
28 -@@ -617,15 +617,15 @@
29 - # fax spool directories
30 - #
31 - test -d $(spool) || \
32 -- ( mkdir $(spool) && chmod 755 $(spool) )
33 -+ ( ./mkidirs $(spool) && chmod 755 $(spool) )
34 - test -d $(FAX_SPOOL) || \
35 -- ( mkdir $(FAX_SPOOL) && \
36 -+ ( ./mkidirs $(FAX_SPOOL) && \
37 - chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
38 - chmod 755 $(FAX_SPOOL) )
39 - test -d $(FAX_SPOOL_IN) || \
40 -- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
41 -+ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
42 - test -d $(FAX_SPOOL_OUT) || \
43 -- mkdir $(FAX_SPOOL_OUT)
44 -+ ./mkidirs $(FAX_SPOOL_OUT)
45 - chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
46 - chmod 755 $(FAX_SPOOL_OUT)
47 - #
48 diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
49 ---- mgetty-1.1.36.orig/doc/Makefile 2009-08-22 09:25:53.000000000 +0200
50 -+++ mgetty-1.1.36/doc/Makefile 2009-08-22 09:35:54.000000000 +0200
51 +--- mgetty-1.1.36.orig/doc/Makefile 2006-02-22 18:35:02.000000000 +0100
52 ++++ mgetty-1.1.36/doc/Makefile 2009-08-31 20:31:01.000000000 +0200
53 @@ -63,7 +63,7 @@
54 *.man *.[1-9] mgetty.texi
55
56 @@ -54,27 +31,9 @@
57 ../sedscript <$< >$*.8
58
59 #
60 -diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
61 ---- mgetty-1.1.36.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100
62 -+++ mgetty-1.1.36/frontends/www/Makefile 2009-08-22 09:39:03.000000000 +0200
63 -@@ -125,12 +125,12 @@
64 - #
65 - .SUFFIXES: .in .cgi .html
66 -
67 --.in.cgi:
68 -+.in.cgi: ../../sedscript
69 - rm -f $*.cgi
70 - ../../sedscript <$< >$*.cgi
71 - chmod +x $*.cgi
72 -
73 --.in.html:
74 -+.in.html: ../../sedscript
75 - rm -f $*.html
76 - ../../sedscript <$< | \
77 - sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
78 diff -Nru mgetty-1.1.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
79 ---- mgetty-1.1.36.orig/fax/Makefile 2006-02-22 19:25:30.000000000 +0200
80 -+++ mgetty-1.1.36/fax/Makefile 2007-09-14 23:02:58.000000000 +0300
81 +--- mgetty-1.1.36.orig/fax/Makefile 2006-02-22 18:25:30.000000000 +0100
82 ++++ mgetty-1.1.36/fax/Makefile 2009-08-31 20:31:01.000000000 +0200
83 @@ -36,7 +36,7 @@
84 @cd .. ; $(MAKE) sedscript
85
86 @@ -85,8 +44,8 @@
87 faxq-helper.o: faxq-helper.c ../sedscript
88 $(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \
89 diff -Nru mgetty-1.1.36.orig/fax_lib.h mgetty-1.1.36/fax_lib.h
90 ---- mgetty-1.1.36.orig/fax_lib.h 2007-06-15 09:44:36.000000000 +0300
91 -+++ mgetty-1.1.36/fax_lib.h 2007-09-14 22:29:47.000000000 +0300
92 +--- mgetty-1.1.36.orig/fax_lib.h 2007-06-15 08:44:36.000000000 +0200
93 ++++ mgetty-1.1.36/fax_lib.h 2009-08-31 20:31:01.000000000 +0200
94 @@ -41,6 +41,7 @@
95 int fax_set_fdcc _PROTO(( int fd, int fine, int maxsp, int minsp ));
96 int fax_set_bor _PROTO(( int fd, int bit_order ));
97 @@ -95,9 +54,27 @@
98 int mdm_identify _PROTO(( int fd ));
99 void fax2_incoming_nsf _PROTO(( char * nsf_hex ));
100 void fax1_incoming_nsf _PROTO(( uch * nsf_bin, int len ));
101 +diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
102 +--- mgetty-1.1.36.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100
103 ++++ mgetty-1.1.36/frontends/www/Makefile 2009-08-31 20:31:01.000000000 +0200
104 +@@ -125,12 +125,12 @@
105 + #
106 + .SUFFIXES: .in .cgi .html
107 +
108 +-.in.cgi:
109 ++.in.cgi: ../../sedscript
110 + rm -f $*.cgi
111 + ../../sedscript <$< >$*.cgi
112 + chmod +x $*.cgi
113 +
114 +-.in.html:
115 ++.in.html: ../../sedscript
116 + rm -f $*.html
117 + ../../sedscript <$< | \
118 + sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
119 diff -Nru mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c
120 ---- mgetty-1.1.36.orig/logfile.c 2005-11-26 15:48:16.000000000 +0200
121 -+++ mgetty-1.1.36/logfile.c 2007-09-14 22:25:13.000000000 +0300
122 +--- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100
123 ++++ mgetty-1.1.36/logfile.c 2009-08-31 20:31:01.000000000 +0200
124 @@ -58,10 +58,10 @@
125 /* Most systems have these variables but do not declare them. On many
126 of those systems that _do_ declare them, it won't hurt */
127 @@ -142,9 +119,41 @@
128 #ifdef SYSLOG
129 syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
130 #endif
131 +diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
132 +--- mgetty-1.1.36.orig/Makefile 2009-08-31 20:30:33.000000000 +0200
133 ++++ mgetty-1.1.36/Makefile 2009-08-31 20:32:08.000000000 +0200
134 +@@ -361,7 +361,7 @@
135 +
136 + # subdirectories...
137 +
138 +-subdirs:
139 ++subdirs: sedscript
140 + cd g3 ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
141 + cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
142 + cd fax ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" "FAX_SPOOL_OUT=$(FAX_SPOOL_OUT)" "FAX_OUT_USER=$(FAX_OUT_USER)" "CONFDIR=$(CONFDIR)" all
143 +@@ -617,15 +617,15 @@
144 + # fax spool directories
145 + #
146 + test -d $(spool) || \
147 +- ( mkdir $(spool) && chmod 755 $(spool) )
148 ++ ( ./mkidirs $(spool) && chmod 755 $(spool) )
149 + test -d $(FAX_SPOOL) || \
150 +- ( mkdir $(FAX_SPOOL) && \
151 ++ ( ./mkidirs $(FAX_SPOOL) && \
152 + chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
153 + chmod 755 $(FAX_SPOOL) )
154 + test -d $(FAX_SPOOL_IN) || \
155 +- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
156 ++ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
157 + test -d $(FAX_SPOOL_OUT) || \
158 +- mkdir $(FAX_SPOOL_OUT)
159 ++ ./mkidirs $(FAX_SPOOL_OUT)
160 + chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
161 + chmod 755 $(FAX_SPOOL_OUT)
162 + #
163 diff -Nru mgetty-1.1.36.orig/t/t_g3f_c.c mgetty-1.1.36/t/t_g3f_c.c
164 ---- mgetty-1.1.36.orig/t/t_g3f_c.c 2007-05-05 15:03:03.000000000 +0300
165 -+++ mgetty-1.1.36/t/t_g3f_c.c 2007-09-14 22:26:36.000000000 +0300
166 +--- mgetty-1.1.36.orig/t/t_g3f_c.c 2007-05-05 14:03:03.000000000 +0200
167 ++++ mgetty-1.1.36/t/t_g3f_c.c 2009-08-31 20:31:01.000000000 +0200
168 @@ -19,6 +19,7 @@
169 #include "fax_lib.h"
170
171 @@ -154,8 +163,8 @@
172 #include <errno.h>
173 #include <stdlib.h>
174 diff -Nru mgetty-1.1.36.orig/t/t_ring.c mgetty-1.1.36/t/t_ring.c
175 ---- mgetty-1.1.36.orig/t/t_ring.c 2005-03-23 11:56:21.000000000 +0200
176 -+++ mgetty-1.1.36/t/t_ring.c 2007-09-14 22:25:07.000000000 +0300
177 +--- mgetty-1.1.36.orig/t/t_ring.c 2005-03-23 10:56:21.000000000 +0100
178 ++++ mgetty-1.1.36/t/t_ring.c 2009-08-31 20:31:01.000000000 +0200
179 @@ -24,6 +24,7 @@
180
181 #include "mgetty.h"
182
183
184
185 1.2 net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
186
187 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?rev=1.2&view=markup
188 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?rev=1.2&content-type=text/plain
189 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?r1=1.1&r2=1.2
190
191 Index: mgetty-1.1.36-nofax.patch
192 ===================================================================
193 RCS file: /var/cvsroot/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch,v
194 retrieving revision 1.1
195 retrieving revision 1.2
196 diff -u -r1.1 -r1.2
197 --- mgetty-1.1.36-nofax.patch 25 Nov 2007 08:21:36 -0000 1.1
198 +++ mgetty-1.1.36-nofax.patch 31 Aug 2009 18:41:34 -0000 1.2
199 @@ -31,7 +31,7 @@
200 @@ -362,9 +362,7 @@
201 # subdirectories...
202
203 - subdirs:
204 + subdirs: sedscript
205 - cd g3 ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
206 cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
207 - cd fax ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" "FAX_SPOOL_OUT=$(FAX_SPOOL_OUT)" "FAX_OUT_USER=$(FAX_OUT_USER)" "CONFDIR=$(CONFDIR)" all
208 @@ -66,15 +66,15 @@
209 -# fax spool directories
210 -#
211 - test -d $(spool) || \
212 -- ( mkdir $(spool) && chmod 755 $(spool) )
213 +- ( ./mkidirs $(spool) && chmod 755 $(spool) )
214 - test -d $(FAX_SPOOL) || \
215 -- ( mkdir $(FAX_SPOOL) && \
216 +- ( ./mkidirs $(FAX_SPOOL) && \
217 - chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
218 - chmod 755 $(FAX_SPOOL) )
219 - test -d $(FAX_SPOOL_IN) || \
220 -- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
221 +- ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
222 - test -d $(FAX_SPOOL_OUT) || \
223 -- mkdir $(FAX_SPOOL_OUT)
224 +- ./mkidirs $(FAX_SPOOL_OUT)
225 - chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
226 - chmod 755 $(FAX_SPOOL_OUT)
227 -#
Report Message
Find on MARC Find on Google Groups