| 1 |
pinkbyte 13/02/24 22:14:10 |
| 2 |
|
| 3 |
Added: mgetty-1.1.37-nofax.patch |
| 4 |
mgetty-1.1.37-gentoo.patch |
| 5 |
mgetty-1.1.37-qa-fixes.patch |
| 6 |
Log: |
| 7 |
Version bump |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-nofax.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: mgetty-1.1.37-nofax.patch |
| 18 |
=================================================================== |
| 19 |
diff -Nru mgetty-1.1.37.orig/doc/Makefile mgetty-1.1.37/doc/Makefile |
| 20 |
--- mgetty-1.1.37.orig/doc/Makefile 2007-11-25 09:31:56.000000000 +0200 |
| 21 |
+++ mgetty-1.1.37/doc/Makefile 2007-11-25 09:28:02.000000000 +0200 |
| 22 |
@@ -6,11 +6,10 @@ |
| 23 |
NROFF=nroff |
| 24 |
# |
| 25 |
# |
| 26 |
-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 fax.1 \ |
| 27 |
- faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1 |
| 28 |
+MAN1PAGES= |
| 29 |
MAN4PAGES=mgettydefs.4 |
| 30 |
-MAN5PAGES=faxqueue.5 |
| 31 |
-MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8 |
| 32 |
+MAN5PAGES= |
| 33 |
+MAN8PAGES=mgetty.8 callback.8 |
| 34 |
MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES) |
| 35 |
MAN1DIR=/usr/local/man/man1 |
| 36 |
MAN4DIR=/usr/local/man/man4 |
| 37 |
diff -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile |
| 38 |
--- mgetty-1.1.37.orig/Makefile 2007-11-25 09:31:58.000000000 +0200 |
| 39 |
+++ mgetty-1.1.37/Makefile 2007-11-25 09:34:45.000000000 +0200 |
| 40 |
@@ -324,7 +324,7 @@ |
| 41 |
|
| 42 |
all: bin-all doc-man-only |
| 43 |
|
| 44 |
-bin-all: mgetty sendfax newslock sedscript subdirs call-back |
| 45 |
+bin-all: mgetty newslock sedscript subdirs call-back |
| 46 |
|
| 47 |
# a few C files need extra compiler arguments |
| 48 |
|
| 49 |
@@ -369,9 +369,7 @@ |
| 50 |
# subdirectories... |
| 51 |
|
| 52 |
subdirs: sedscript |
| 53 |
- cd g3 && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 54 |
cd tools && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 55 |
- 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 |
| 56 |
|
| 57 |
call-back: |
| 58 |
@$(MAKE) mgetty |
| 59 |
@@ -597,7 +595,6 @@ |
| 60 |
|
| 61 |
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) |
| 62 |
$(INSTALL) -m 700 mgetty $(SBINDIR) |
| 63 |
- $(INSTALL) -m 755 sendfax $(SBINDIR) |
| 64 |
# |
| 65 |
# data files + directories |
| 66 |
# |
| 67 |
@@ -609,12 +606,8 @@ |
| 68 |
$(INSTALL) -o root -m 600 login.config $(CONFDIR)/ |
| 69 |
test -f $(CONFDIR)/mgetty.config || \ |
| 70 |
$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/ |
| 71 |
- test -f $(CONFDIR)/sendfax.config || \ |
| 72 |
- $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/ |
| 73 |
test -f $(CONFDIR)/dialin.config || \ |
| 74 |
$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/ |
| 75 |
- test -f $(CONFDIR)/faxrunq.config || \ |
| 76 |
- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/ |
| 77 |
# |
| 78 |
# test for outdated stuff |
| 79 |
# |
| 80 |
@@ -626,34 +626,6 @@ |
| 81 |
echo "" ;\ |
| 82 |
fi |
| 83 |
# |
| 84 |
-# fax spool directories |
| 85 |
-# |
| 86 |
- test -d $(spool) || \ |
| 87 |
- ( ./mkidirs $(spool) && chmod 755 $(spool) ) |
| 88 |
- test -d $(FAX_SPOOL) || \ |
| 89 |
- ( ./mkidirs $(FAX_SPOOL) && \ |
| 90 |
- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ |
| 91 |
- chmod 755 $(FAX_SPOOL) ) |
| 92 |
- test -d $(FAX_SPOOL_IN) || \ |
| 93 |
- ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) |
| 94 |
- test -d $(FAX_SPOOL_OUT) || \ |
| 95 |
- ./mkidirs $(FAX_SPOOL_OUT) |
| 96 |
- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) |
| 97 |
- chmod 755 $(FAX_SPOOL_OUT) |
| 98 |
-# |
| 99 |
-# g3 tool programs |
| 100 |
-# |
| 101 |
- cd g3 && $(MAKE) install INSTALL="$(INSTALL)" \ |
| 102 |
- BINDIR=$(BINDIR) \ |
| 103 |
- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) |
| 104 |
-# |
| 105 |
-# fax programs / scripts / font file |
| 106 |
-# |
| 107 |
- cd fax && $(MAKE) install INSTALL="$(INSTALL)" \ |
| 108 |
- FAX_OUT_USER=$(FAX_OUT_USER) \ |
| 109 |
- BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ |
| 110 |
- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) |
| 111 |
-# |
| 112 |
# compatibility |
| 113 |
# |
| 114 |
if [ ! -z "$(INSTALL_MECHO)" ] ; then \ |
| 115 |
diff -Nru mgetty-1.1.37.orig/t/Makefile mgetty-1.1.37/t/Makefile |
| 116 |
--- mgetty-1.1.37.orig/t/Makefile 2006-09-26 01:32:10.000000000 +0300 |
| 117 |
+++ mgetty-1.1.37/t/Makefile 2007-11-25 09:32:28.000000000 +0200 |
| 118 |
@@ -8,8 +8,8 @@ |
| 119 |
CFLAGS=-O2 -I.. -g #-DT_LOG_VERBOSE |
| 120 |
|
| 121 |
TEST_PROGRAMS=t_config t_ring |
| 122 |
-TEST_HELP_PGM=t_g3f_c |
| 123 |
-TEST_SCRIPTS=t_echo t_trap t_g3file |
| 124 |
+TEST_HELP_PGM= |
| 125 |
+TEST_SCRIPTS=t_echo t_trap |
| 126 |
|
| 127 |
test: $(TEST_PROGRAMS) $(TEST_HELP_PGM) |
| 128 |
@for f in $(TEST_PROGRAMS) ; \ |
| 129 |
|
| 130 |
|
| 131 |
|
| 132 |
1.1 net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch |
| 133 |
|
| 134 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch?rev=1.1&view=markup |
| 135 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-gentoo.patch?rev=1.1&content-type=text/plain |
| 136 |
|
| 137 |
Index: mgetty-1.1.37-gentoo.patch |
| 138 |
=================================================================== |
| 139 |
diff -Nru mgetty-1.1.37.orig/callback/Makefile mgetty-1.1.37/callback/Makefile |
| 140 |
--- mgetty-1.1.37.orig/callback/Makefile 2007-09-14 23:03:32.000000000 +0300 |
| 141 |
+++ mgetty-1.1.37/callback/Makefile 2007-09-14 23:02:58.000000000 +0300 |
| 142 |
@@ -37,7 +37,7 @@ |
| 143 |
# install programs |
| 144 |
# |
| 145 |
install: all |
| 146 |
- $(INSTALL) -s -m 700 -o root callback $(SBINDIR) |
| 147 |
- $(INSTALL) -s -m 4711 -o root ct $(BINDIR) |
| 148 |
+ $(INSTALL) -m 700 -o root callback $(SBINDIR) |
| 149 |
+ $(INSTALL) -m 4711 -o root ct $(BINDIR) |
| 150 |
|
| 151 |
# source modules |
| 152 |
diff -Nru mgetty-1.1.37.orig/doc/mgetty.texi-in mgetty-1.1.37/doc/mgetty.texi-in |
| 153 |
--- mgetty-1.1.37.orig/doc/mgetty.texi-in 2007-09-14 23:03:32.000000000 +0300 |
| 154 |
+++ mgetty-1.1.37/doc/mgetty.texi-in 2007-09-14 23:02:58.000000000 +0300 |
| 155 |
@@ -19,6 +19,11 @@ |
| 156 |
Copyright @copyright{} 1993-2005 Gert Doering |
| 157 |
@end ifinfo |
| 158 |
|
| 159 |
+@dircategory User |
| 160 |
+@direntry |
| 161 |
+* MGETTY: (mgetty). Modem+Voice+Fax utilities |
| 162 |
+@end direntry |
| 163 |
+ |
| 164 |
@titlepage |
| 165 |
@sp 6 |
| 166 |
@center @titlefont{mgetty+sendfax} |
| 167 |
diff -Nru mgetty-1.1.37.orig/fax/faxspool.in mgetty-1.1.37/fax/faxspool.in |
| 168 |
--- mgetty-1.1.37.orig/fax/faxspool.in 2007-09-14 23:03:32.000000000 +0300 |
| 169 |
+++ mgetty-1.1.37/fax/faxspool.in 2007-09-14 23:02:58.000000000 +0300 |
| 170 |
@@ -390,7 +390,7 @@ |
| 171 |
|
| 172 |
# |
| 173 |
# convert pdf data |
| 174 |
-# needs GNU GhostScript and Adobe acroread installed. |
| 175 |
+# needs GNU GhostScript installed. |
| 176 |
# For driver selection, see definition of GS_DRIVER_{HI,LO} above. |
| 177 |
# |
| 178 |
# contributed by mfvm@×××.de (Michael Fischer v. Mollard) |
| 179 |
@@ -401,7 +401,7 @@ |
| 180 |
test X$3 = X-n && driver="$GS_DRIVER_LO" |
| 181 |
|
| 182 |
cat $1 | |
| 183 |
- acroread -toPostScript | |
| 184 |
+ pdf2ps -sOutputFile=- - | |
| 185 |
gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER - |
| 186 |
} |
| 187 |
|
| 188 |
diff -Nru mgetty-1.1.37.orig/frontends/X11/viewfax/Makefile mgetty-1.1.37/frontends/X11/viewfax/Makefile |
| 189 |
--- mgetty-1.1.37.orig/frontends/X11/viewfax/Makefile 2007-09-14 23:03:32.000000000 +0300 |
| 190 |
+++ mgetty-1.1.37/frontends/X11/viewfax/Makefile 2007-09-14 23:02:58.000000000 +0300 |
| 191 |
@@ -61,7 +61,7 @@ |
| 192 |
g3hack: g3hack.c |
| 193 |
|
| 194 |
install: viewfax |
| 195 |
- $(INSTALL) -s -m 755 viewfax $(BINDIR) |
| 196 |
+ $(INSTALL) -m 755 viewfax $(BINDIR) |
| 197 |
$(INSTALL) -m 644 viewfax.man $(MANDIR)/viewfax.1 |
| 198 |
$(INSTALL) -m 644 viewfax.tif $(LIBDIR) |
| 199 |
|
| 200 |
diff -Nru mgetty-1.1.37.orig/g3/Makefile mgetty-1.1.37/g3/Makefile |
| 201 |
--- mgetty-1.1.37.orig/g3/Makefile 2007-09-14 23:03:32.000000000 +0300 |
| 202 |
+++ mgetty-1.1.37/g3/Makefile 2007-09-14 23:02:58.000000000 +0300 |
| 203 |
@@ -37,13 +37,13 @@ |
| 204 |
# install programs |
| 205 |
# |
| 206 |
for f in $(G3_PROGRAMS) ; do \ |
| 207 |
- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ |
| 208 |
+ $(INSTALL) -m 755 $$f $(BINDIR) ; \ |
| 209 |
done |
| 210 |
# |
| 211 |
# make symlink for "g3topbm" (so third-party fax viewers won't fail) |
| 212 |
-# |
| 213 |
- -cd $(BINDIR) ; \ |
| 214 |
- test -x g3topbm || ln -s g32pbm g3topbm |
| 215 |
+# Note for Gentoo: following lines will create collision with netpbm if netpbm is installed after |
| 216 |
+# -cd $(BINDIR) ; \ |
| 217 |
+# test -x g3topbm || ln -s g32pbm g3topbm |
| 218 |
|
| 219 |
|
| 220 |
# test suite |
| 221 |
diff -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile |
| 222 |
--- mgetty-1.1.37.orig/Makefile 2007-09-14 23:03:32.000000000 +0300 |
| 223 |
+++ mgetty-1.1.37/Makefile 2007-09-14 23:02:58.000000000 +0300 |
| 224 |
@@ -282,7 +282,7 @@ |
| 225 |
# please use the "mg.echo" program provided in the compat/ subdirectory. |
| 226 |
# Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo |
| 227 |
# |
| 228 |
-ECHO="echo" |
| 229 |
+ECHO="echo -e" |
| 230 |
# |
| 231 |
# INSTALL_MECHO=mg.echo |
| 232 |
|
| 233 |
@@ -596,12 +596,8 @@ |
| 234 |
$(INSTALL) -m 755 newslock $(BINDIR) |
| 235 |
|
| 236 |
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) |
| 237 |
- if [ -f $(SBINDIR)/mgetty ] ; then \ |
| 238 |
- mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ; fi |
| 239 |
- if [ -f $(SBINDIR)/sendfax ] ; then \ |
| 240 |
- mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ; fi |
| 241 |
- $(INSTALL) -s -m 700 mgetty $(SBINDIR) |
| 242 |
- $(INSTALL) -s -m 755 sendfax $(SBINDIR) |
| 243 |
+ $(INSTALL) -m 700 mgetty $(SBINDIR) |
| 244 |
+ $(INSTALL) -m 755 sendfax $(SBINDIR) |
| 245 |
# |
| 246 |
# data files + directories |
| 247 |
# |
| 248 |
@@ -663,7 +661,7 @@ |
| 249 |
if [ ! -z "$(INSTALL_MECHO)" ] ; then \ |
| 250 |
cd compat ; \ |
| 251 |
$(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ |
| 252 |
- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ |
| 253 |
+ $(INSTALL) -m 755 mg.echo $(BINDIR) ; \ |
| 254 |
fi |
| 255 |
|
| 256 |
# |
| 257 |
diff -Nru mgetty-1.1.37.orig/mgetty.cfg.in mgetty-1.1.37/mgetty.cfg.in |
| 258 |
--- mgetty-1.1.37.orig/mgetty.cfg.in 2003-11-17 21:09:41.000000000 +0200 |
| 259 |
+++ mgetty-1.1.37/mgetty.cfg.in 2007-09-14 23:02:58.000000000 +0300 |
| 260 |
@@ -20,16 +20,16 @@ |
| 261 |
# access the modem(s) with @SPEED@ bps |
| 262 |
speed @SPEED@ |
| 263 |
|
| 264 |
-# use these options to make the /dev/tty-device owned by "uucp.uucp" |
| 265 |
+# use these options to make the /dev/tty-device owned by "fax.fax" |
| 266 |
# and mode "rw-rw-r--" (0664). *LEADING ZERO NEEDED!* |
| 267 |
-#port-owner uucp |
| 268 |
-#port-group uucp |
| 269 |
+#port-owner fax |
| 270 |
+#port-group fax |
| 271 |
#port-mode 0664 |
| 272 |
|
| 273 |
-# use these options to make incoming faxes owned by "root.uucp" |
| 274 |
+# use these options to make incoming faxes owned by "root.fax" |
| 275 |
# and mode "rw-r-----" (0640). *LEADING ZERO NEEDED!* |
| 276 |
#fax-owner root |
| 277 |
-#fax-group uucp |
| 278 |
+#fax-group fax |
| 279 |
#fax-mode 0640 |
| 280 |
|
| 281 |
|
| 282 |
diff -Nru mgetty-1.1.37.orig/voice/Makefile mgetty-1.1.37/voice/Makefile |
| 283 |
--- mgetty-1.1.37.orig/voice/Makefile 2007-09-14 23:03:32.000000000 +0300 |
| 284 |
+++ mgetty-1.1.37/voice/Makefile 2007-09-14 23:02:58.000000000 +0300 |
| 285 |
@@ -85,6 +85,7 @@ |
| 286 |
@echo "" |
| 287 |
$(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) |
| 288 |
$(INSTALL) -m 755 vm/vm $(BINDIR) |
| 289 |
+ $(INSTALL) -m 644 voice.conf-dist $(CONFDIR)/voice.conf |
| 290 |
for i in $(PVFTOOLS); \ |
| 291 |
do \ |
| 292 |
$(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ |
| 293 |
diff -Nru mgetty-1.1.37.orig/voice/voice.conf-dist mgetty-1.1.37/voice/voice.conf-dist |
| 294 |
--- mgetty-1.1.37.orig/voice/voice.conf-dist 2005-03-19 18:10:20.000000000 +0200 |
| 295 |
+++ mgetty-1.1.37/voice/voice.conf-dist 2007-09-14 23:02:58.000000000 +0300 |
| 296 |
@@ -47,11 +47,11 @@ |
| 297 |
voice_dir /var/spool/voice |
| 298 |
|
| 299 |
# |
| 300 |
-# incoming messages are owned by "root.phone" and mode "rw-rw----" (0660) |
| 301 |
+# incoming messages are owned by "fax:fax" and mode "rw-rw----" (0660) |
| 302 |
# |
| 303 |
|
| 304 |
-phone_owner root |
| 305 |
-phone_group phone |
| 306 |
+phone_owner fax |
| 307 |
+phone_group fax |
| 308 |
phone_mode 0660 |
| 309 |
|
| 310 |
# |
| 311 |
|
| 312 |
|
| 313 |
|
| 314 |
1.1 net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch |
| 315 |
|
| 316 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch?rev=1.1&view=markup |
| 317 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.37-qa-fixes.patch?rev=1.1&content-type=text/plain |
| 318 |
|
| 319 |
Index: mgetty-1.1.37-qa-fixes.patch |
| 320 |
=================================================================== |
| 321 |
diff -Nru mgetty-1.1.37.orig/doc/Makefile mgetty-1.1.37/doc/Makefile |
| 322 |
--- mgetty-1.1.37.orig/doc/Makefile 2006-02-22 18:35:02.000000000 +0100 |
| 323 |
+++ mgetty-1.1.37/doc/Makefile 2009-08-31 20:31:01.000000000 +0200 |
| 324 |
@@ -64,7 +64,7 @@ |
| 325 |
|
| 326 |
install: $(MANSRC) mgetty.info |
| 327 |
for D in `dirname $(MAN1DIR)` $(MAN1DIR) $(MAN4DIR) $(MAN5DIR) $(MAN8DIR) ; do \ |
| 328 |
- if [ ! -d $$D ] ; then mkdir $$D || exit 1 ; fi ; \ |
| 329 |
+ if [ ! -d $$D ] ; then mkdir -p $$D || exit 1 ; fi ; \ |
| 330 |
done |
| 331 |
for i in $(MAN1PAGES) ; do \ |
| 332 |
$(INSTALL) -m 644 $$i $(MAN1DIR) ; \ |
| 333 |
@@ -122,16 +122,16 @@ |
| 334 |
# |
| 335 |
.SUFFIXES: .1in .4in .5in .8in .1 .4 .5 .8 |
| 336 |
|
| 337 |
-.1in.1: |
| 338 |
+.1in.1: ../sedscript |
| 339 |
../sedscript <$< >$*.1 |
| 340 |
|
| 341 |
-.4in.4: |
| 342 |
+.4in.4: ../sedscript |
| 343 |
../sedscript <$< >$*.4 |
| 344 |
|
| 345 |
-.5in.5: |
| 346 |
+.5in.5: ../sedscript |
| 347 |
../sedscript <$< >$*.5 |
| 348 |
|
| 349 |
-.8in.8: |
| 350 |
+.8in.8: ../sedscript |
| 351 |
../sedscript <$< >$*.8 |
| 352 |
|
| 353 |
# |
| 354 |
diff -Nru mgetty-1.1.37.orig/fax/Makefile mgetty-1.1.37/fax/Makefile |
| 355 |
--- mgetty-1.1.37.orig/fax/Makefile 2006-02-22 18:25:30.000000000 +0100 |
| 356 |
+++ mgetty-1.1.37/fax/Makefile 2009-08-31 20:31:01.000000000 +0200 |
| 357 |
@@ -36,7 +36,7 @@ |
| 358 |
@cd .. ; $(MAKE) sedscript |
| 359 |
|
| 360 |
faxq-helper: faxq-helper.o |
| 361 |
- $(CC) $(CFLAGS) -o faxq-helper faxq-helper.o |
| 362 |
+ $(CC) $(LDLAGS) -o faxq-helper faxq-helper.o |
| 363 |
|
| 364 |
faxq-helper.o: faxq-helper.c ../sedscript |
| 365 |
$(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \ |
| 366 |
diff -Nru mgetty-1.1.37.orig/fax_lib.h mgetty-1.1.37/fax_lib.h |
| 367 |
--- mgetty-1.1.37.orig/fax_lib.h 2007-06-15 08:44:36.000000000 +0200 |
| 368 |
+++ mgetty-1.1.37/fax_lib.h 2009-08-31 20:31:01.000000000 +0200 |
| 369 |
@@ -41,6 +41,7 @@ |
| 370 |
int fax_set_fdcc _PROTO(( int fd, int fine, int maxsp, int minsp )); |
| 371 |
int fax_set_bor _PROTO(( int fd, int bit_order )); |
| 372 |
int fax_set_flowcontrol _PROTO(( int fd, int hw_flow )); |
| 373 |
+void fax_init_swaptable _PROTO(( int direct, unsigned char byte_tab[] )); |
| 374 |
int mdm_identify _PROTO(( int fd )); |
| 375 |
void fax2_incoming_nsf _PROTO(( char * nsf_hex )); |
| 376 |
void fax1_incoming_nsf _PROTO(( uch * nsf_bin, int len )); |
| 377 |
diff -Nru mgetty-1.1.37.orig/frontends/www/Makefile mgetty-1.1.37/frontends/www/Makefile |
| 378 |
--- mgetty-1.1.37.orig/frontends/www/Makefile 2006-02-22 18:25:32.000000000 +0100 |
| 379 |
+++ mgetty-1.1.37/frontends/www/Makefile 2009-08-31 20:31:01.000000000 +0200 |
| 380 |
@@ -125,12 +125,12 @@ |
| 381 |
# |
| 382 |
.SUFFIXES: .in .cgi .html |
| 383 |
|
| 384 |
-.in.cgi: |
| 385 |
+.in.cgi: ../../sedscript |
| 386 |
rm -f $*.cgi |
| 387 |
../../sedscript <$< >$*.cgi |
| 388 |
chmod +x $*.cgi |
| 389 |
|
| 390 |
-.in.html: |
| 391 |
+.in.html: ../../sedscript |
| 392 |
rm -f $*.html |
| 393 |
../../sedscript <$< | \ |
| 394 |
sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html |
| 395 |
diff -Nru mgetty-1.1.37.orig/logfile.c mgetty-1.1.37/logfile.c |
| 396 |
--- mgetty-1.1.37.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100 |
| 397 |
+++ mgetty-1.1.37/logfile.c 2009-08-31 20:31:01.000000000 +0200 |
| 398 |
@@ -58,10 +58,10 @@ |
| 399 |
/* Most systems have these variables but do not declare them. On many |
| 400 |
of those systems that _do_ declare them, it won't hurt */ |
| 401 |
|
| 402 |
-#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) |
| 403 |
+/*#if !defined(__NetBSD__) && !defined( __FreeBSD__ ) && !defined(__OpenBSD__) && !defined(__GLIBC__) && !defined(__MACH__) |
| 404 |
extern int sys_nerr; |
| 405 |
extern char *sys_errlist[]; |
| 406 |
-#endif |
| 407 |
+#endif*/ |
| 408 |
|
| 409 |
/* Interactive Unix is a little bit braindead - does not have atexit(), |
| 410 |
*/ |
| 411 |
@@ -211,6 +211,7 @@ |
| 412 |
va_list pvar; |
| 413 |
int errnr; |
| 414 |
char * p; |
| 415 |
+char *error_string; |
| 416 |
static int first_open = TRUE; |
| 417 |
|
| 418 |
if ( level > log_level ) /* log level high enough? */ |
| 419 |
@@ -327,12 +328,20 @@ |
| 420 |
} |
| 421 |
else /* ERROR or FATAL */ |
| 422 |
{ |
| 423 |
+ error_string = strerror (errnr); |
| 424 |
+ if ( error_string == NULL ) |
| 425 |
+ { |
| 426 |
+ if ( errno == EINVAL ) |
| 427 |
+ error_string = "<error not in list>"; |
| 428 |
+ else |
| 429 |
+ error_string = "<error calling strerror()>"; |
| 430 |
+ } |
| 431 |
+ |
| 432 |
fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s", |
| 433 |
tm->tm_mon+1, tm->tm_mday, |
| 434 |
tm->tm_hour, tm->tm_min, tm->tm_sec, |
| 435 |
log_infix, ws, |
| 436 |
- ( errnr <= sys_nerr ) ? sys_errlist[errnr]: |
| 437 |
- "<error not in list>" ); |
| 438 |
+ strerror (errnr)); |
| 439 |
#ifdef SYSLOG |
| 440 |
syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws ); |
| 441 |
#endif |
| 442 |
diff -Nru mgetty-1.1.37.orig/Makefile mgetty-1.1.37/Makefile |
| 443 |
--- mgetty-1.1.37.orig/Makefile 2009-08-31 20:30:33.000000000 +0200 |
| 444 |
+++ mgetty-1.1.37/Makefile 2009-08-31 20:32:08.000000000 +0200 |
| 445 |
@@ -368,7 +368,7 @@ |
| 446 |
|
| 447 |
# subdirectories... |
| 448 |
|
| 449 |
-subdirs: |
| 450 |
+subdirs: sedscript |
| 451 |
cd g3 && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 452 |
cd tools && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 453 |
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 |
| 454 |
@@ -633,15 +633,15 @@ |
| 455 |
# fax spool directories |
| 456 |
# |
| 457 |
test -d $(spool) || \ |
| 458 |
- ( mkdir $(spool) && chmod 755 $(spool) ) |
| 459 |
+ ( ./mkidirs $(spool) && chmod 755 $(spool) ) |
| 460 |
test -d $(FAX_SPOOL) || \ |
| 461 |
- ( mkdir $(FAX_SPOOL) && \ |
| 462 |
+ ( ./mkidirs $(FAX_SPOOL) && \ |
| 463 |
chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ |
| 464 |
chmod 755 $(FAX_SPOOL) ) |
| 465 |
test -d $(FAX_SPOOL_IN) || \ |
| 466 |
- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) |
| 467 |
+ ( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) |
| 468 |
test -d $(FAX_SPOOL_OUT) || \ |
| 469 |
- mkdir $(FAX_SPOOL_OUT) |
| 470 |
+ ./mkidirs $(FAX_SPOOL_OUT) |
| 471 |
chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) |
| 472 |
chmod 755 $(FAX_SPOOL_OUT) |
| 473 |
# |
| 474 |
diff -Nru mgetty-1.1.37.orig/t/t_g3f_c.c mgetty-1.1.37/t/t_g3f_c.c |
| 475 |
--- mgetty-1.1.37.orig/t/t_g3f_c.c 2007-05-05 14:03:03.000000000 +0200 |
| 476 |
+++ mgetty-1.1.37/t/t_g3f_c.c 2009-08-31 20:31:01.000000000 +0200 |
| 477 |
@@ -19,6 +19,7 @@ |
| 478 |
#include "fax_lib.h" |
| 479 |
|
| 480 |
#include <stdio.h> |
| 481 |
+#include <unistd.h> |
| 482 |
#include <signal.h> |
| 483 |
#include <errno.h> |
| 484 |
#include <stdlib.h> |
| 485 |
diff -Nru mgetty-1.1.37.orig/t/t_ring.c mgetty-1.1.37/t/t_ring.c |
| 486 |
--- mgetty-1.1.37.orig/t/t_ring.c 2005-03-23 10:56:21.000000000 +0100 |
| 487 |
+++ mgetty-1.1.37/t/t_ring.c 2009-08-31 20:31:01.000000000 +0200 |
| 488 |
@@ -24,6 +24,7 @@ |
| 489 |
|
| 490 |
#include "mgetty.h" |
| 491 |
#include <stdio.h> |
| 492 |
+#include <string.h> |
| 493 |
#include <signal.h> |
| 494 |
#include <errno.h> |
| 495 |
#ifdef T_LOG_VERBOSE |
Archives