rpms/mgetty/devel mgetty-1.1.33-time_range.patch, NONE, 1.1 mgetty-1.1.36-handle_spaces.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 logrotate.mgetty, 1.3, 1.4 logrotate.vgetty, 1.4, 1.5 mgetty-1.1.30-unioninit.patch, 1.1, 1.2 mgetty.spec, 1.48, 1.49 sources, 1.9, 1.10 mgetty-1.1.21-giftopnm.patch, 1.2, NONE mgetty-1.1.25-faxprint.patch, 1.1, NONE mgetty-1.1.30-path.patch, 1.1, NONE mgetty-1.1.31-W-format.patch, 1.1, NONE mgetty-1.1.33-sprintf_chk.patch, 1.1, NONE
Martin Nagy (mnagy)
fedora-extras-commits at redhat.com
Thu Apr 10 13:48:57 UTC 2008
- Previous message (by thread): rpms/freenx-server/F-8 freenx-0.7.1-sharing_and_multimedia_fixes.patch, NONE, 1.1 freenx-server.spec, NONE, 1.1 freenx.logrotate, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/rhpxl/devel .cvsignore, 1.57, 1.58 rhpxl.spec, 1.76, 1.77 sources, 1.64, 1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mnagy
Update of /cvs/extras/rpms/mgetty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14428
Modified Files:
.cvsignore logrotate.mgetty logrotate.vgetty
mgetty-1.1.30-unioninit.patch mgetty.spec sources
Added Files:
mgetty-1.1.33-time_range.patch
mgetty-1.1.36-handle_spaces.patch
Removed Files:
mgetty-1.1.21-giftopnm.patch mgetty-1.1.25-faxprint.patch
mgetty-1.1.30-path.patch mgetty-1.1.31-W-format.patch
mgetty-1.1.33-sprintf_chk.patch
Log Message:
* Thu Apr 10 2008 Martin Nagy <mnagy at redhat.com> - 1.1.36-1
- update to new upstream release
- use our own faxq-helper man page now that we updated
- fix -t flag of faxspool so it now accepts time ranges as it should (#171280)
- fix mgetty and vgetty logrotate configuration files (#436727)
- faxspool will handle spaces in file names better (#46697)
mgetty-1.1.33-time_range.patch:
--- NEW FILE mgetty-1.1.33-time_range.patch ---
diff -up mgetty-1.1.33/fax/faxspool.in.time_range mgetty-1.1.33/fax/faxspool.in
--- mgetty-1.1.33/fax/faxspool.in.time_range 2008-04-04 19:13:06.000000000 +0200
+++ mgetty-1.1.33/fax/faxspool.in 2008-04-04 19:15:16.000000000 +0200
@@ -539,8 +539,22 @@ do
$echo "Invalid time specified: $h:$m" >&2; exit 2
fi
TIME="$h$m"
+ elif expr "$2" : "[0-2][0-9]:[0-9][0-9]-[0-2][0-9]:[0-9][0-9]$" >/dev/null
+ then
+ h=`expr "$2" : "\(..\)"`
+ m=`expr "$2" : "..:\(..\)"`
+ h2=`expr "$2" : "..:..-\(..\)"`
+ m2=`expr "$2" : "..:..-..:\(..\)"`
+ if [ "$h" -gt 23 -o "$m" -gt 60 ]
+ then
+ $echo "Invalid time specified: $h:$m" >&2; exit 2
+ elif [ "$h2" -gt 23 -o "$m2" -gt 60 ]
+ then
+ $echo "Invalid time specified: $h2:$m2" >&2; exit 2
+ fi
+ TIME="$h$m-$h2$m2"
else
- $echo "Time must be in <hh:mm> format." >&2; exit 2
+ $echo "Time must be in <hh:mm> or <hh:mm-hh:mm> format." >&2; exit 2
fi
shift ; shift
;;
diff -up mgetty-1.1.33/fax/faxrunq.in.time_range mgetty-1.1.33/fax/faxrunq.in
--- mgetty-1.1.33/fax/faxrunq.in.time_range 2008-04-04 19:13:14.000000000 +0200
+++ mgetty-1.1.33/fax/faxrunq.in 2008-04-04 19:16:24.000000000 +0200
@@ -168,17 +168,18 @@ do
# read job using 'tr', remove all quote characters, dollar, and backslash
#
eval `tr -d '\042\047\140\134\044\073' <JOB | \
- $AWK 'BEGIN { user=""; mail=""; verbto=""; time=""; re=""; ah=""; }
+ $AWK 'BEGIN { user=""; mail=""; verbto=""; time=""; time_to=""; re=""; ah=""; }
$1=="user" { user=$2 }
$1=="mail" { mail=substr( $0, 6) }
$1=="phone" { printf "PHONE=%s;", $2 }
- $1=="time" { time=$2 }
+ $1=="time" { time=substr($2,1,4); time_to=substr($2,6,4); }
$1=="verbose_to" { verbto=substr($0,12) }
$1=="subject" { re=substr($0,9) }
$1=="acct_handle" { ah=substr($0,13) }
END { if ( mail != "" ) printf "MAIL_TO=\"%s\";", mail
else printf "MAIL_TO=\"%s\";", user
printf "TIME=\"%s\";", time
+ printf "TIME_TO=\"%s\";", time_to
printf "VERBOSE_TO=\"%s\";", verbto
printf "RE=\"%s\"; AH=\"%s\"", re, ah }' - `
@@ -187,11 +188,25 @@ do
#
if [ ! -z "$TIME" ]
then
- if [ `date "+%H""%M"` -lt $TIME ]
+ if [ -z $TIME_TO ]
then
- $echo "...send time not reached, postponing job"
- rm JOB.locked
- continue
+ TIME_TO="0000"
+ fi
+ if [ $TIME -lt $TIME_TO ]
+ then
+ if [ `date "+%H""%M"` -lt $TIME -o `date "+%H""%M"` -gt $TIME_TO ]
+ then
+ $echo "...send time not reached, postponing job"
+ rm JOB.locked
+ continue
+ fi
+ else
+ if [ `date "+%H""%M"` -lt $TIME -o `date "+%H""%M"` -lt $TIME_TO ]
+ then
+ $echo "...send time not reached, postponing job"
+ rm JOB.locked
+ continue
+ fi
fi
fi
mgetty-1.1.36-handle_spaces.patch:
--- NEW FILE mgetty-1.1.36-handle_spaces.patch ---
diff -up mgetty-1.1.36/fax/faxspool.in.handle_spaces mgetty-1.1.36/fax/faxspool.in
--- mgetty-1.1.36/fax/faxspool.in.handle_spaces 2008-04-10 14:41:26.000000000 +0200
+++ mgetty-1.1.36/fax/faxspool.in 2008-04-10 15:14:49.000000000 +0200
@@ -170,11 +170,11 @@ PATH=@BINDIR@:$PATH
# change coverpage/header defaults to per-user files, if $HOME exists
if [ -d "$HOME" ]; then
- if [ -r $HOME/.make.coverpg ]; then
+ if [ -r "$HOME/.make.coverpg" ]; then
MAKE_COVER_PG=$HOME/.make.coverpg
fi
- if [ -r $HOME/.faxheader ]; then
- FAX_HEADER=$HOME/.faxheader
+ if [ -r "$HOME/.faxheader" ]; then
+ FAX_HEADER="$HOME/.faxheader"
fi
fi
@@ -192,7 +192,7 @@ fi
#
fs_cvt_pbm()
{
- pbm2g3 $1 >$2.001
+ pbm2g3 "$1" >"$2.001"
}
#
@@ -200,7 +200,7 @@ fs_cvt_pbm()
#
fs_cvt_pgm()
{
- pgmtopbm $1 | pbm2g3 >$2.001
+ pgmtopbm "$1" | pbm2g3 >"$2.001"
}
#
@@ -208,7 +208,7 @@ fs_cvt_pgm()
#
fs_cvt_ppm()
{
- ppmtopgm $1 | pgmtopbm | pbm2g3 >$2.001
+ ppmtopgm "$1" | pgmtopbm | pbm2g3 >"$2.001"
}
#
@@ -218,7 +218,7 @@ fs_cvt_ppm()
#
fs_cvt_g3()
{
- g3cat $1 >$2.001
+ g3cat "$1" >"$2.001"
}
#
@@ -230,14 +230,14 @@ fs_cvt_g3()
fs_cvt_xwd()
{
REDUCE="cat"
- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
+ test "$3" = "-n" && REDUCE="pnmscale -yscale 0.5"
- xwdtopnm $1 |\
+ xwdtopnm "$1" |\
pnmscale -xysize 1728 2000 |\
$REDUCE |\
ppmtopgm |\
pgmtopbm |\
- pbm2g3 >$2.001
+ pbm2g3 >"$2.001"
}
#
@@ -248,14 +248,14 @@ fs_cvt_xwd()
fs_cvt_gif()
{
REDUCE="cat"
- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
+ test "$3" = "-n" && REDUCE="pnmscale -yscale 0.5"
- giftopnm $1 |\
+ giftopnm "$1" |\
pnmscale -xysize 1728 2000 |\
$REDUCE |\
ppmtopgm |\
pgmtopbm |\
- pbm2g3 >$2.001
+ pbm2g3 >"$2.001"
}
#
@@ -266,14 +266,14 @@ fs_cvt_gif()
fs_cvt_tif()
{
REDUCE="cat"
- test X$3 = X-n && REDUCE="pnmscale -yscale 0.5"
+ test "$3" = "-n" && REDUCE="pnmscale -yscale 0.5"
- tifftopnm $1 |\
+ tifftopnm "$1" |\
pnmscale -xysize 1728 2000 |\
$REDUCE |\
ppmtopgm |\
pgmtopbm |\
- pbm2g3 >$2.001
+ pbm2g3 >"$2.001"
}
#
@@ -282,11 +282,11 @@ fs_cvt_tif()
#
fs_cvt_lj()
{
- if [ X$3 = X-n ]
+ if [ "$3" = "-n" ]
then
- hp2log3 -r$2 <$1
+ hp2log3 "-r$2" <"$1"
else
- hp2hig3 -r$2 <$1
+ hp2hig3 "-r$2" <"$1"
fi
}
@@ -298,9 +298,9 @@ fs_cvt_lj()
fs_cvt_ps()
{
driver="$GS_DRIVER_HI"
- test X$3 = X-n && driver="$GS_DRIVER_LO"
+ test "$3" = "-n" && driver="$GS_DRIVER_LO"
- cat $1 |
+ cat "$1" |
gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER -
}
@@ -315,10 +315,10 @@ fs_cvt_ascii()
# via Ghostscript:
driver="$GS_DRIVER_HI"
- test X$3 = X-n && driver="$GS_DRIVER_LO"
+ test "$3" = "-n" && driver="$GS_DRIVER_LO"
gs $driver -sOutputFile=$2%03d -dNOPAUSE \
- -- gslp.ps -fCourier-Bold10 -B $1
+ -- gslp.ps -fCourier-Bold10 -B "$1"
#####
# via hp2pbm:
@@ -353,7 +353,7 @@ fs_cvt_ascii()
#
fs_cvt_dvi()
{
- if [ X$3 = X-n ]
+ if [ "$3" = "-n" ]
then
driver="$GS_DRIVER_LO" ; dvipscfg="-P dfaxlo"
else
@@ -363,7 +363,7 @@ fs_cvt_dvi()
# if you do not have the dfaxlo(w)/dfaxhigh dvips modes configured,
# remove "$dvipscfg" from the dvips command line below [or configure them!]
- dvips $dvipscfg $1 -o \
+ dvips $dvipscfg "$1" -o \
!"gs $driver -sOutputFile=$2%03d -dNOPAUSE -dSAFER -q -"
# for those that only have the old "dvialw":
@@ -388,10 +388,10 @@ fs_cvt_dvi()
fs_cvt_pdf()
{
driver="$GS_DRIVER_HI"
- test X$3 = X-n && driver="$GS_DRIVER_LO"
+ test "$3" = "-n" && driver="$GS_DRIVER_LO"
r=0;
if /usr/bin/which acroread >/dev/null 2>&1; then
- cat $1 |
+ cat "$1" |
acroread -toPostScript |
gs $driver -sOutputFile=$2%03d -dNOPAUSE -q -dSAFER -
r=$?;
@@ -616,7 +616,7 @@ else
then
eval `$AWK "$awkpgm" $PRIVATE_PHONE_DIR`
fi
- if [ -z "$phone" -a -r $GLOBAL_PHONE_DIR ]
+ if [ -z "$phone" -a -r "$GLOBAL_PHONE_DIR" ]
then
eval `$AWK "$awkpgm" $GLOBAL_PHONE_DIR`
fi
@@ -643,11 +643,11 @@ do
then
$echo "$0: invalid characters in file name '$file'!" >&2 ; exit 5
fi
- if [ ! -r $file -a x$file != x- ]
+ if [ ! -r "$file" -a "$file" != "-" ]
then
$echo "$0: cannot open '$file'!" >&2 ; exit 5
fi
- if [ ! -s $file -a x$file != x- ]
+ if [ ! -s "$file" -a "$file" != "-" ]
then
$echo "$0: input file '$file' is empty (0 bytes)!" >&2 ; exit 5
fi
@@ -682,7 +682,7 @@ fi
#
spooldir=${TMP:-/tmp}/$new_seq.$$.`date +%S`
-if ( umask 077 ; mkdir $spooldir ) ; then
+if ( umask 077 ; mkdir "$spooldir" ) ; then
$echo "spooling to $spooldir (->$new_seq)..."
else
$echo "ERROR: can't create work dir '$spooldir', giving up" >&2 ; exit 6
@@ -699,16 +699,16 @@ do
#
# if filename is "-", use stdin
#
- if [ x$file = x- ]
+ if [ "$file" = "-" ]
then
file=`mktemp /tmp/faxspool.XXXXXX`
- if test -z $file
+ if test -z "$file"
then
$echo "ERROR: can't create work file, giving up" >&2 ; exit 6
fi
trap "rm $file" 0
$echo "spooling $file (stdin)..."
- cat - >$file
+ cat - >"$file"
else
$echo "spooling $file..."
fi
@@ -718,7 +718,7 @@ do
#
# try to determine file type by extention (won't work for print spooler!)
#
- case $file in
+ case "$file" in
*.g3) format="g3" ;;
*.ps) format="ps" ;;
*.pdf) format="pdf" ;;
@@ -824,7 +824,7 @@ do
$echo "$file is format: $format"
- target=$spooldir/i-$F_NO-
+ target="$spooldir/i-$F_NO-"
# get & use external filter command (if set)
filter=`$AWK '$1 == "FILTER" && $2 == "'"$format$normal_res"'" \
@@ -839,7 +839,7 @@ do
case $format in
ps | ascii | pbm | pgm | ppm |\
g3 | dvi | lj | xwd | gif | tif | pdf)
- fs_cvt_$format $file $target $normal_res
+ fs_cvt_$format "$file" "$target" "$normal_res"
;;
*) $echo "$0: no internal filter for format '$format!' found" >&2
exit 8 ;;
@@ -863,7 +863,7 @@ if [ ! -z "$copy_source" ] ; then
for file in $input_data
do
b=`basename $file`
- $FAXQ_HELPER input $new_seq .source-files/$b <$file
+ $FAXQ_HELPER input $new_seq .source-files/$b <"$file"
done
fi
@@ -873,7 +873,7 @@ fi
# Now let's create the work file
#
-job=$spooldir/JOB
+job="$spooldir/JOB"
#
# conversion complete. Post-process G3 files
@@ -883,7 +883,7 @@ pages=`ls $spooldir | sed '/^\./d'`
#
# get list / number of pages
#
-cd $spooldir
+cd "$spooldir"
nr=0
maxnr=`echo $pages | wc -w | tr -d " "`
@@ -940,13 +940,13 @@ do
-e "s;@S@;$new_seq;g" \
-e "s;@DATE@;`date`;g" \
| pbmtext -font $hdrfont | pbm2g3 \
- | g3cat - $f | \
+ | g3cat - "$f" | \
$FAXQ_HELPER input $new_seq f$nr.g3 \
- && rm $f
+ && rm "$f"
else
- g3cat $f | \
+ g3cat "$f" | \
$FAXQ_HELPER input $new_seq f$nr.g3 \
- && rm $f
+ && rm "$f"
fi
finalpg="$finalpg f$nr.g3"
done
@@ -954,8 +954,8 @@ done
if [ -z "$finalpg" -a -z "$poll_req" ]
then
$echo "\nnothing to do (no cover page, no data)." >&2
- cd $FAX_SPOOL_OUT
- rmdir $spooldir
+ cd "$FAX_SPOOL_OUT"
+ rmdir "$spooldir"
exit 52
fi
@@ -994,9 +994,9 @@ $echo "pages " $finalpg >>$job.q
$FAXQ_HELPER activate $new_seq < $job.q || exit 99
# clean up
-rm $job.q
+rm "$job.q"
cd ..
-rmdir $spooldir
+rmdir "$spooldir"
if [ -z "`find $LAST_RUN -ctime -1 -print 2>/dev/null`" ]
then
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 5 Mar 2008 17:28:42 -0000 1.10
+++ .cvsignore 10 Apr 2008 13:48:18 -0000 1.11
@@ -1,3 +1,2 @@
-faxq-helper.8
-mgetty1.1.33-Apr10.tar.gz
-mgetty1.1.33-Apr10.tar.gz.asc
+mgetty1.1.36-Jun15.tar.gz
+mgetty1.1.36-Jun15.tar.gz.asc
Index: logrotate.mgetty
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/logrotate.mgetty,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logrotate.mgetty 9 Sep 2004 08:29:46 -0000 1.3
+++ logrotate.mgetty 10 Apr 2008 13:48:18 -0000 1.4
@@ -1,7 +1,9 @@
#
# Rotate mgetty log files.
#
-/var/log/mgetty.log.tty[^.] /var/log/mgetty.log.tty[^.][^.] /var/log/mgetty.log.tty[^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.][^.] /var/log/mgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.][^.][^.] /var/log/mgetty.log.unknown /var/log/mgetty.callback {
+
+tabooext + mgetty.log.tty*[-.]*
+/var/log/mgetty.log.tty /var/log/mgetty.log.unknown /var/log/mgetty.callback {
nocompress
missingok
}
Index: logrotate.vgetty
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/logrotate.vgetty,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- logrotate.vgetty 9 Sep 2004 08:31:22 -0000 1.4
+++ logrotate.vgetty 10 Apr 2008 13:48:18 -0000 1.5
@@ -1,7 +1,9 @@
#
# Entry for rotating vgetty log files.
#
-/var/log/vgetty.log.tty[^.] /var/log/vgetty.log.tty[^.][^.] /var/log/vgetty.log.tty[^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.][^.] /var/log/vgetty.log.tty[^.][^.][^.][^.][^.][^.][^.][^.][^.][^.] /var/log/vgetty.log.unknown /var/log/vgetty.callback {
+
+tabooext + vgetty.log.tty*[-.]*
+/var/log/vgetty.log.tty /var/log/vgetty.log.unknown /var/log/vgetty.callback {
nocompress
missingok
}
mgetty-1.1.30-unioninit.patch:
Index: mgetty-1.1.30-unioninit.patch
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty-1.1.30-unioninit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mgetty-1.1.30-unioninit.patch 9 Sep 2004 08:32:21 -0000 1.1
+++ mgetty-1.1.30-unioninit.patch 10 Apr 2008 13:48:18 -0000 1.2
@@ -86,7 +86,7 @@
{ "login-time", {MAX_LOGIN_TIME}, CT_INT, C_PRESET },
#else
@@ -108,39 +108,39 @@
- { "fido-send-emsi", {TRUE}, CT_BOOL, C_PRESET },
+ { "login-env-ttyprompt-hack", {FALSE}, CT_BOOL, C_PRESET },
#ifdef LOGIN_CFG_FILE
- { "login-conf-file", {(p_int) LOGIN_CFG_FILE}, CT_STRING, C_PRESET },
@@ -105,7 +105,7 @@
- { "notify", {(p_int)MAIL_TO}, CT_STRING, C_PRESET },
+ { "notify", {p:MAIL_TO}, CT_STRING, C_PRESET },
#else
- { "notify", {0, CT_STRING}, C_EMPTY },
+ { "notify", {0}, CT_STRING, C_EMPTY },
#endif
- { "fax-owner", {(p_int)FAX_IN_OWNER}, CT_STRING, C_PRESET },
+ { "fax-owner", {p:FAX_IN_OWNER}, CT_STRING, C_PRESET },
Index: mgetty.spec
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mgetty.spec 3 Apr 2008 12:29:02 -0000 1.48
+++ mgetty.spec 10 Apr 2008 13:48:18 -0000 1.49
@@ -1,36 +1,34 @@
+%define date Jun15
+
Summary: A getty replacement for use with data and fax modems
Name: mgetty
-Version: 1.1.33
-Release: 17%{?dist}
-Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
-Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
+Version: 1.1.36
+Release: 1%{?dist}
+Source: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz
+Source1: ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-%{date}.tar.gz.asc
Source2: logrotate.mgetty
Source3: logrotate.sendfax
Source4: logrotate.vgetty
Source5: logrotate.vm
-Source6: faxq-helper.8
Patch0: mgetty-1.1.29-config.patch
Patch1: mgetty-1.1.26-policy.patch
-#Patch2: mgetty-1.1.25-faxprint.patch
-Patch3: mgetty-1.1.21-giftopnm.patch
Patch4: mgetty-1.1.25-voiceconfig.patch
Patch5: mgetty-1.1.26-issue.patch
Patch6: mgetty-1.1.31-issue-doc.patch
Patch7: mgetty-1.1.29-helper.patch
Patch8: mgetty-1.1.30-mktemp.patch
Patch9: mgetty-1.1.30-unioninit.patch
-#Patch10: mgetty-1.1.30-path.patch
Patch11: mgetty-1.1.31-helper2.patch
Patch12: mgetty-1.1.31-no-acroread.patch
-Patch13: mgetty-1.1.31-W-format.patch
Patch14: mgetty-1.1.31-sendmail_path.patch
Patch15: mgetty-1.1.31-lfs.patch
Patch16: mgetty-1.1.31-162174_tcflush.patch
-Patch17: mgetty-1.1.33-sprintf_chk.patch
Patch18: mgetty-1.1.33-bug_63843.patch
Patch19: mgetty-1.1.33-167830_tty_access.patch
Patch20: mgetty-1.1.33-167830.patch
Patch21: mgetty-1.1.33-turn.patch
+Patch22: mgetty-1.1.33-time_range.patch
+Patch23: mgetty-1.1.36-handle_spaces.patch
License: GPLv2+
Group: Applications/Communications
@@ -102,8 +100,6 @@
mv policy.h-dist policy.h
%patch0 -p1 -b .config
%patch1 -p1 -b .policy
-#%patch2 -p1 -b .faxprint
-%patch3 -p1 -b .giftopnm
%patch4 -p1 -b .voiceconfig
%patch5 -p1 -b .issue
%patch6 -p1 -b .issue-doc
@@ -112,15 +108,15 @@
%patch9 -p1 -b .unioninit
%patch11 -p1 -b .helper2
%patch12 -p1 -b .no-acroread
-%patch13 -p1 -b .-W-format
%patch14 -p1 -b .sendmail_path
%patch15 -p1 -b .lfs
%patch16 -p1 -b .162174_tcflush
-%patch17 -p1 -b .sprintf_chk
%patch18 -p1 -b .bug_63843
%patch19 -p1 -b .167830_tty_access
%patch20 -p1 -b .167830
%patch21 -p1 -b .turn
+%patch22 -p1 -b .time_range
+%patch23 -p1 -b .handle_spaces
%build
%define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP -D_FILE_OFFSET_BITS=64" prefix=%{_prefix} spool=%{_var}/spool BINDIR=%{_bindir} SBINDIR=%{_sbindir} LIBDIR=%{_libdir}/mgetty+sendfax HELPDIR=%{_libdir}/mgetty+sendfax CONFDIR=%{_sysconfdir}/mgetty+sendfax MANDIR=%{_mandir} MAN1DIR=%{_mandir}/man1 MAN4DIR=%{_mandir}/man4 MAN5DIR=%{_mandir}/man5 MAN8DIR=%{_mandir}/man8 INFODIR=%{_infodir} ECHO='"echo -e"' INSTALL=%{__install}
@@ -170,9 +166,6 @@
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty
install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm
-# add missing man page
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man8/faxq-helper.8
-
# remove file droppings from $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
@@ -326,6 +319,13 @@
%{_mandir}/man1/viewfax.1*
%changelog
+* Thu Apr 10 2008 Martin Nagy <mnagy at redhat.com> - 1.1.36-1
+- update to new upstream release
+- use our own faxq-helper man page now that we updated
+- fix -t flag of faxspool so it now accepts time ranges as it should (#171280)
+- fix mgetty and vgetty logrotate configuration files (#436727)
+- faxspool will handle spaces in file names better (#46697)
+
* Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 1.1.33-17
- make sure we compile everything with FORTIFY_SOURCE
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mgetty/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 5 Mar 2008 17:28:42 -0000 1.9
+++ sources 10 Apr 2008 13:48:18 -0000 1.10
@@ -1,3 +1,2 @@
-3765cb20a2a17d388096b232c1e29046 faxq-helper.8
-d61a2bd343111be35250496710393bd5 mgetty1.1.33-Apr10.tar.gz
-06d71de7d8c95a521f8e7e5fa872998c mgetty1.1.33-Apr10.tar.gz.asc
+0320e98c6b86bcca48fc5f355b94ead4 mgetty1.1.36-Jun15.tar.gz
+c81cb55741e867cc02f00da4135aad64 mgetty1.1.36-Jun15.tar.gz.asc
--- mgetty-1.1.21-giftopnm.patch DELETED ---
--- mgetty-1.1.25-faxprint.patch DELETED ---
--- mgetty-1.1.30-path.patch DELETED ---
--- mgetty-1.1.31-W-format.patch DELETED ---
--- mgetty-1.1.33-sprintf_chk.patch DELETED ---
- Previous message (by thread): rpms/freenx-server/F-8 freenx-0.7.1-sharing_and_multimedia_fixes.patch, NONE, 1.1 freenx-server.spec, NONE, 1.1 freenx.logrotate, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/rhpxl/devel .cvsignore, 1.57, 1.58 rhpxl.spec, 1.76, 1.77 sources, 1.64, 1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list