* [gentoo-commits] gentoo-x86 commit in net-dialup/mgetty/files: mgetty-1.1.36-qa-fixes.patch mgetty-1.1.36-nofax.patch
@ 2009-08-31 18:41 Alin Nastac (mrness)
0 siblings, 0 replies; only message in thread
From: Alin Nastac (mrness) @ 2009-08-31 18:41 UTC (permalink / raw
To: gentoo-commits
mrness 09/08/31 18:41:35
Modified: mgetty-1.1.36-qa-fixes.patch
mgetty-1.1.36-nofax.patch
Log:
Fix broken nofax.patch and yet another parallelization bug in the main Makefile (#282674).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.3 net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
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
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
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
Index: mgetty-1.1.36-qa-fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mgetty-1.1.36-qa-fixes.patch 22 Aug 2009 08:51:39 -0000 1.2
+++ mgetty-1.1.36-qa-fixes.patch 31 Aug 2009 18:41:34 -0000 1.3
@@ -1,29 +1,6 @@
-diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
---- mgetty-1.1.36.orig/Makefile 2009-08-22 10:37:19.000000000 +0200
-+++ mgetty-1.1.36/Makefile 2009-08-22 10:43:31.000000000 +0200
-@@ -617,15 +617,15 @@
- # fax spool directories
- #
- test -d $(spool) || \
-- ( mkdir $(spool) && chmod 755 $(spool) )
-+ ( ./mkidirs $(spool) && chmod 755 $(spool) )
- test -d $(FAX_SPOOL) || \
-- ( mkdir $(FAX_SPOOL) && \
-+ ( ./mkidirs $(FAX_SPOOL) && \
- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
- chmod 755 $(FAX_SPOOL) )
- test -d $(FAX_SPOOL_IN) || \
-- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
-+ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
- test -d $(FAX_SPOOL_OUT) || \
-- mkdir $(FAX_SPOOL_OUT)
-+ ./mkidirs $(FAX_SPOOL_OUT)
- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
- chmod 755 $(FAX_SPOOL_OUT)
- #
diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
---- mgetty-1.1.36.orig/doc/Makefile 2009-08-22 09:25:53.000000000 +0200
-+++ mgetty-1.1.36/doc/Makefile 2009-08-22 09:35:54.000000000 +0200
+--- mgetty-1.1.36.orig/doc/Makefile 2006-02-22 18:35:02.000000000 +0100
++++ mgetty-1.1.36/doc/Makefile 2009-08-31 20:31:01.000000000 +0200
@@ -63,7 +63,7 @@
*.man *.[1-9] mgetty.texi
@@ -54,27 +31,9 @@
../sedscript <$< >$*.8
#
-diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
---- mgetty-1.1.36.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100
-+++ mgetty-1.1.36/frontends/www/Makefile 2009-08-22 09:39:03.000000000 +0200
-@@ -125,12 +125,12 @@
- #
- .SUFFIXES: .in .cgi .html
-
--.in.cgi:
-+.in.cgi: ../../sedscript
- rm -f $*.cgi
- ../../sedscript <$< >$*.cgi
- chmod +x $*.cgi
-
--.in.html:
-+.in.html: ../../sedscript
- rm -f $*.html
- ../../sedscript <$< | \
- sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
diff -Nru mgetty-1.1.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
---- mgetty-1.1.36.orig/fax/Makefile 2006-02-22 19:25:30.000000000 +0200
-+++ mgetty-1.1.36/fax/Makefile 2007-09-14 23:02:58.000000000 +0300
+--- mgetty-1.1.36.orig/fax/Makefile 2006-02-22 18:25:30.000000000 +0100
++++ mgetty-1.1.36/fax/Makefile 2009-08-31 20:31:01.000000000 +0200
@@ -36,7 +36,7 @@
@cd .. ; $(MAKE) sedscript
@@ -85,8 +44,8 @@
faxq-helper.o: faxq-helper.c ../sedscript
$(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \
diff -Nru mgetty-1.1.36.orig/fax_lib.h mgetty-1.1.36/fax_lib.h
---- mgetty-1.1.36.orig/fax_lib.h 2007-06-15 09:44:36.000000000 +0300
-+++ mgetty-1.1.36/fax_lib.h 2007-09-14 22:29:47.000000000 +0300
+--- mgetty-1.1.36.orig/fax_lib.h 2007-06-15 08:44:36.000000000 +0200
++++ mgetty-1.1.36/fax_lib.h 2009-08-31 20:31:01.000000000 +0200
@@ -41,6 +41,7 @@
int fax_set_fdcc _PROTO(( int fd, int fine, int maxsp, int minsp ));
int fax_set_bor _PROTO(( int fd, int bit_order ));
@@ -95,9 +54,27 @@
int mdm_identify _PROTO(( int fd ));
void fax2_incoming_nsf _PROTO(( char * nsf_hex ));
void fax1_incoming_nsf _PROTO(( uch * nsf_bin, int len ));
+diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
+--- mgetty-1.1.36.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100
++++ mgetty-1.1.36/frontends/www/Makefile 2009-08-31 20:31:01.000000000 +0200
+@@ -125,12 +125,12 @@
+ #
+ .SUFFIXES: .in .cgi .html
+
+-.in.cgi:
++.in.cgi: ../../sedscript
+ rm -f $*.cgi
+ ../../sedscript <$< >$*.cgi
+ chmod +x $*.cgi
+
+-.in.html:
++.in.html: ../../sedscript
+ rm -f $*.html
+ ../../sedscript <$< | \
+ sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
diff -Nru mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c
---- mgetty-1.1.36.orig/logfile.c 2005-11-26 15:48:16.000000000 +0200
-+++ mgetty-1.1.36/logfile.c 2007-09-14 22:25:13.000000000 +0300
+--- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100
++++ mgetty-1.1.36/logfile.c 2009-08-31 20:31:01.000000000 +0200
@@ -58,10 +58,10 @@
/* Most systems have these variables but do not declare them. On many
of those systems that _do_ declare them, it won't hurt */
@@ -142,9 +119,41 @@
#ifdef SYSLOG
syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
#endif
+diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
+--- mgetty-1.1.36.orig/Makefile 2009-08-31 20:30:33.000000000 +0200
++++ mgetty-1.1.36/Makefile 2009-08-31 20:32:08.000000000 +0200
+@@ -361,7 +361,7 @@
+
+ # subdirectories...
+
+-subdirs:
++subdirs: sedscript
+ cd g3 ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
+ cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
+ 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
+@@ -617,15 +617,15 @@
+ # fax spool directories
+ #
+ test -d $(spool) || \
+- ( mkdir $(spool) && chmod 755 $(spool) )
++ ( ./mkidirs $(spool) && chmod 755 $(spool) )
+ test -d $(FAX_SPOOL) || \
+- ( mkdir $(FAX_SPOOL) && \
++ ( ./mkidirs $(FAX_SPOOL) && \
+ chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
+ chmod 755 $(FAX_SPOOL) )
+ test -d $(FAX_SPOOL_IN) || \
+- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
++ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+ test -d $(FAX_SPOOL_OUT) || \
+- mkdir $(FAX_SPOOL_OUT)
++ ./mkidirs $(FAX_SPOOL_OUT)
+ chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
+ chmod 755 $(FAX_SPOOL_OUT)
+ #
diff -Nru mgetty-1.1.36.orig/t/t_g3f_c.c mgetty-1.1.36/t/t_g3f_c.c
---- mgetty-1.1.36.orig/t/t_g3f_c.c 2007-05-05 15:03:03.000000000 +0300
-+++ mgetty-1.1.36/t/t_g3f_c.c 2007-09-14 22:26:36.000000000 +0300
+--- mgetty-1.1.36.orig/t/t_g3f_c.c 2007-05-05 14:03:03.000000000 +0200
++++ mgetty-1.1.36/t/t_g3f_c.c 2009-08-31 20:31:01.000000000 +0200
@@ -19,6 +19,7 @@
#include "fax_lib.h"
@@ -154,8 +163,8 @@
#include <errno.h>
#include <stdlib.h>
diff -Nru mgetty-1.1.36.orig/t/t_ring.c mgetty-1.1.36/t/t_ring.c
---- mgetty-1.1.36.orig/t/t_ring.c 2005-03-23 11:56:21.000000000 +0200
-+++ mgetty-1.1.36/t/t_ring.c 2007-09-14 22:25:07.000000000 +0300
+--- mgetty-1.1.36.orig/t/t_ring.c 2005-03-23 10:56:21.000000000 +0100
++++ mgetty-1.1.36/t/t_ring.c 2009-08-31 20:31:01.000000000 +0200
@@ -24,6 +24,7 @@
#include "mgetty.h"
1.2 net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?rev=1.2&view=markup
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
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
Index: mgetty-1.1.36-nofax.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.36-nofax.patch 25 Nov 2007 08:21:36 -0000 1.1
+++ mgetty-1.1.36-nofax.patch 31 Aug 2009 18:41:34 -0000 1.2
@@ -31,7 +31,7 @@
@@ -362,9 +362,7 @@
# subdirectories...
- subdirs:
+ subdirs: sedscript
- cd g3 ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
- 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
@@ -66,15 +66,15 @@
-# fax spool directories
-#
- test -d $(spool) || \
-- ( mkdir $(spool) && chmod 755 $(spool) )
+- ( ./mkidirs $(spool) && chmod 755 $(spool) )
- test -d $(FAX_SPOOL) || \
-- ( mkdir $(FAX_SPOOL) && \
+- ( ./mkidirs $(FAX_SPOOL) && \
- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
- chmod 755 $(FAX_SPOOL) )
- test -d $(FAX_SPOOL_IN) || \
-- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+- ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
- test -d $(FAX_SPOOL_OUT) || \
-- mkdir $(FAX_SPOOL_OUT)
+- ./mkidirs $(FAX_SPOOL_OUT)
- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
- chmod 755 $(FAX_SPOOL_OUT)
-#
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-31 13:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-31 18:41 [gentoo-commits] gentoo-x86 commit in net-dialup/mgetty/files: mgetty-1.1.36-qa-fixes.patch mgetty-1.1.36-nofax.patch Alin Nastac (mrness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox