update to 1.1.36

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4114 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mgetty/mgetty-vl.spec

@@ -1,49 +1,62 @@
-%define _sysconfdir /etc
-%define using_netpbm 1
-%define have_mkdtemp 1
-#%%define have_mkdtemp 0
+%define SENDFAX_UID 78
 
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
-Version: 1.1.25
-Release: 5vl4
-Source: ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/mgetty%{version}-Feb01.tar.gz
+Version: 1.1.36
+Release: 1%{?_dist_release}
+Source: ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/mgetty%{version}-Jun15.tar.gz
 Source1: logrotate.mgetty
 Source2: logrotate.sendfax
 Source3: logrotate.vgetty
 Source4: logrotate.vm
-Patch0: http://www-internal.alphanet.ch/~schaefer/vgetty/global_patches/CURRENT/mgetty-1.1.25-to-11032001.bz2
-Patch1: mgetty-1.1.22-config.patch
-Patch2: mgetty-1.1.26-policy.patch
-Patch3: mgetty-1.1.25-faxprint.patch
-Patch4: mgetty-1.1.21-giftopnm.patch
-Patch5: mgetty-1.1.25-voiceconfig.patch
-Patch6: mgetty-1.1.25-elsa.patch
-License: GPL
+Patch0: mgetty-1.1.29-config.patch
+Patch1: mgetty-1.1.26-policy.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
+Patch11: mgetty-1.1.31-helper2.patch
+Patch12: mgetty-1.1.31-no-acroread.patch
+Patch14: mgetty-1.1.31-sendmail_path.patch
+Patch15: mgetty-1.1.31-lfs.patch
+Patch16: mgetty-1.1.31-162174_tcflush.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
+Patch24: mgetty-1.1.36-man.patch
+
+URL: http://mgetty.greenie.net/
+License: GPLv2+
 Group: Applications/Communications
-Prereq: /sbin/install-info
-BuildPrereq: groff, tetex, texinfo
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+BuildRequires: libX11-devel, libXext-devel, texinfo, texlive
 Requires: mktemp
-URL: http://www.leo.org/~doering/mgetty/index.html
+Requires: sendmail
+
 
 %package sendfax
-Summary: Provides support for sending faxes over a modem.
+Summary: Provides support for sending faxes over a modem
 Requires: mgetty = %{version}
 Group: Applications/Communications
-%if %{using_netpbm}
+Requires: mktemp
 Requires: netpbm-progs
-%else
-Requires: libgr-progs
-%endif
+Requires(pre): shadow-utils
 
 %package voice
-Summary: A program for using your modem and mgetty as an answering machine.
+Summary: A program for using your modem and mgetty as an answering machine
 Requires: mgetty = %{version}
 Group: Applications/Communications
 
 %package viewfax
-Summary: An X Window System fax viewer.
+Summary: An X Window System fax viewer
 Group: Applications/Communications
 
 %description
@@ -86,35 +99,36 @@ install mgetty.
 
 %prep
 %setup -q
-%patch0 -p1 -b .vgetty
-%patch1 -p1 -b .config
-%patch2 -p1 -b .policy
-%patch3 -p1 -b .faxprint
-%if %{using_netpbm}
-%patch4 -p1 -b .giftopnm
-%endif
-%patch5 -p1 -b .voiceconfig
-# Should be outdated by the vgetty patch.
-#%patch6 -p1 -b .elsa
-cp policy.h-dist policy.h
+mv policy.h-dist policy.h
+%patch0 -p1 -b .config
+%patch1 -p1 -b .policy
+%patch4 -p1 -b .voiceconfig
+%patch5 -p1 -b .issue
+%patch6 -p1 -b .issue-doc
+%patch7 -p1 -b .helper
+%patch8 -p1 -b .mktemp
+%patch9 -p1 -b .unioninit
+%patch11 -p1 -b .helper2
+%patch12 -p1 -b .no-acroread
+%patch14 -p1 -b .sendmail_path
+%patch15 -p1 -b .lfs
+%patch16 -p1 -b .162174_tcflush
+%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
+%patch24 -p1 -b .man
 
 %build
-%define makeflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP"                                        CONFDIR=%{_sysconfdir}/mgetty+sendfax                                           ECHO="'echo -e'" prefix=%{_prefix}
-
+%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}
 make %{makeflags}
 make -C voice %{makeflags}
 make -C tools %{makeflags}
 
-%if %{have_mkdtemp}
-MKDTEMP_FLAGS=
-%else
-MKDTEMP_FLAGS=-DNEED_MKDTEMP
-%endif
-
-pushd frontends/X11/viewfax-2.5
-xmkmf
-make depend
-make CDEBUGFLAGS="$RPM_OPT_FLAGS $MKDTEMP_FLAGS" CONFDIR=%{_sysconfdir}/mgetty+sendfax
+pushd frontends/X11/viewfax
+make OPT="$RPM_OPT_FLAGS" CONFDIR=%{_sysconfdir}/mgetty+sendfax
 popd
 
 %install
@@ -123,13 +137,14 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_infodir},%{_libdir}/mgetty+sendfax}
 mkdir -p $RPM_BUILD_ROOT{%{_mandir},%{_sbindir},/sbin,/var/spool}
 
-%define instflags                                                                       CFLAGS="$RPM_OPT_FLAGS"                                                         prefix=$RPM_BUILD_ROOT%{_prefix}                                                spool=$RPM_BUILD_ROOT%{_var}/spool                                              BINDIR=$RPM_BUILD_ROOT%{_bindir}                                                SBINDIR=$RPM_BUILD_ROOT%{_sbindir}                                              LIBDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax                                 HELPDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax                                CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax                            MANDIR=$RPM_BUILD_ROOT%{_mandir}                                                MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1                                          MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4                                          MAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5                                          MAN8DIR=$RPM_BUILD_ROOT%{_mandir}/man8                                          INFODIR=$RPM_BUILD_ROOT%{_infodir}                                              ECHO='echo -e' INSTALL=%{__install}
+%define instflags CFLAGS="$RPM_OPT_FLAGS -Wall -DAUTO_PPP" prefix=$RPM_BUILD_ROOT%{_prefix} spool=$RPM_BUILD_ROOT%{_var}/spool BINDIR=$RPM_BUILD_ROOT%{_bindir} SBINDIR=$RPM_BUILD_ROOT%{_sbindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax HELPDIR=$RPM_BUILD_ROOT%{_libdir}/mgetty+sendfax CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax MANDIR=$RPM_BUILD_ROOT%{_mandir} MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4 MAN5DIR=$RPM_BUILD_ROOT%{_mandir}/man5 MAN8DIR=$RPM_BUILD_ROOT%{_mandir}/man8 INFODIR=$RPM_BUILD_ROOT%{_infodir} ECHO='echo -e' INSTALL=%{__install}
+
 make install %instflags
+# the non-standard executable permissions are used due to security
 install -m700 callback/callback $RPM_BUILD_ROOT%{_sbindir}
+# helper tests internally usage of suid - this is an intention
 install -m4711 callback/ct $RPM_BUILD_ROOT%{_bindir}
 
-gzip -9n $RPM_BUILD_ROOT%{_infodir}/*
-
 mv $RPM_BUILD_ROOT%{_sbindir}/mgetty $RPM_BUILD_ROOT/sbin
 
 # this conflicts with efax
@@ -142,87 +157,108 @@ make -C tools install %instflags
 mkdir -p $RPM_BUILD_ROOT%{_var}/spool/voice/{messages,incoming}
 make -C voice install %instflags
 mv $RPM_BUILD_ROOT%{_sbindir}/vgetty $RPM_BUILD_ROOT/sbin
+# the non-standard permissions are used due to security
 install -m 600 -c voice/voice.conf-dist $RPM_BUILD_ROOT%{_sysconfdir}/mgetty+sendfax/voice.conf
 
 # don't ship documentation that is executable...
 find samples -type f -exec chmod 644 {} \;
 
-make -C frontends/X11/viewfax-2.5 install %instflags
-make -C frontends/X11/viewfax-2.5 install.man %instflags MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
+make -C frontends/X11/viewfax install %instflags MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
 
 # install logrotate control files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m 0644 $RPM_SOURCE_DIR/logrotate.mgetty  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mgetty
-install -m 0644 $RPM_SOURCE_DIR/logrotate.sendfax $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sendfax
-install -m 0644 $RPM_SOURCE_DIR/logrotate.vgetty  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty
-install -m 0644 $RPM_SOURCE_DIR/logrotate.vm      $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mgetty
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sendfax
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vgetty
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/vm
+
+# remove file droppings from $RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_bindir}/cutbl
+
+# remove file conflict with netpbm:
+rm -f $RPM_BUILD_ROOT%{_bindir}/g3topbm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty).		Package to handle faxes, voicemail and more."
+if [ -f %{_infodir}/mgetty.inf* ]; then
+	/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty).		Package to handle faxes, voicemail and more." || :
+fi
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). 	Package to handle faxes, voicemail and more."
+if [ -f %{_infodir}/mgetty.inf* ]; then
+	/sbin/install-info --delete %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty).		Package to handle faxes, voicemail and more." || :
 fi
 
+%pre sendfax
+getent group fax >/dev/null || groupadd -g %SENDFAX_UID -r fax
+getent passwd fax >/dev/null || \
+  useradd -r -u %SENDFAX_UID -g fax -d /var/spool/fax -s /sbin/nologin -c "mgetty fax spool user" fax
+exit 0
+
+
 %files
 %defattr(-,root,root)
-%doc BUGS ChangeLog README.1st Recommend THANKS doc/modems.db samples 
+%doc BUGS ChangeLog README.1st Recommend THANKS doc/modems.db samples
 %doc doc/mgetty.ps doc/*.txt
+%{_bindir}/g3cat
+%{_bindir}/g32pbm
 /sbin/mgetty
 %{_sbindir}/callback
+%{_mandir}/man1/g32pbm.1*
+%{_mandir}/man1/g3cat.1*
 %{_mandir}/man4/mgettydefs.4*
 %{_mandir}/man8/mgetty.8*
 %{_mandir}/man8/callback.8*
 %{_infodir}/mgetty.info*
 %dir %{_sysconfdir}/mgetty+sendfax
-%config %{_sysconfdir}/mgetty+sendfax/login.config
-%config %{_sysconfdir}/mgetty+sendfax/mgetty.config
-%config %{_sysconfdir}/mgetty+sendfax/dialin.config
-%config %{_sysconfdir}/logrotate.d/mgetty
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/login.config
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/mgetty.config
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/dialin.config
+%config(noreplace) %{_sysconfdir}/logrotate.d/mgetty
 
 %files sendfax
 %defattr(-,root,root)
 %dir %{_var}/spool/fax
-%dir %{_var}/spool/fax/incoming
-%dir %{_var}/spool/fax/outgoing
-%dir %{_var}/spool/fax/outgoing/locks
+%attr(0755,fax,root) %dir %{_var}/spool/fax/incoming
+%attr(0755,fax,root) %dir %{_var}/spool/fax/outgoing
 %attr(0755,root,root) %{_bindir}/ct
 %{_bindir}/faxq
 %{_bindir}/faxrm
 %{_bindir}/faxrunq
 %{_bindir}/faxspool
-%{_bindir}/g3cat
-%{_bindir}/g32pbm
 %{_bindir}/kvg
 %{_bindir}/newslock
 %{_bindir}/pbm2g3
+%{_bindir}/sff2g3
 %{_sbindir}/faxrunqd
 %{_sbindir}/sendfax
 %dir %{_libdir}/mgetty+sendfax
 %{_libdir}/mgetty+sendfax/cour25.pbm
 %{_libdir}/mgetty+sendfax/cour25n.pbm
-%{_mandir}/man1/g32pbm.1*
+# helper tests internally usage of suid - this is an intention
+%attr(04711,fax,root) %{_libdir}/mgetty+sendfax/faxq-helper
 %{_mandir}/man1/pbm2g3.1*
-%{_mandir}/man1/g3cat.1*
 %{_mandir}/man1/mgetty_fax.1*
 %{_mandir}/man1/faxspool.1*
 %{_mandir}/man1/faxrunq.1*
 %{_mandir}/man1/faxq.1*
 %{_mandir}/man1/faxrm.1*
 %{_mandir}/man1/coverpg.1*
+%{_mandir}/man1/sff2g3.1*
 %{_mandir}/man5/faxqueue.5*
+%{_mandir}/man8/faxq-helper.8*
 %{_mandir}/man8/faxrunqd.8*
 %{_mandir}/man8/sendfax.8*
 %dir %{_sysconfdir}/mgetty+sendfax
-%config %{_sysconfdir}/mgetty+sendfax/sendfax.config
-%config %{_sysconfdir}/mgetty+sendfax/faxrunq.config
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/sendfax.config
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/faxrunq.config
+# sample config file doesn't use noreplace option to be installed always latest ver.
 %config %{_sysconfdir}/mgetty+sendfax/faxspool.rules.sample
-%config %{_sysconfdir}/mgetty+sendfax/faxheader
-%config %{_sysconfdir}/logrotate.d/sendfax
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/faxheader
+# logrotate file name uses only sub-package name
+%config(noreplace) %{_sysconfdir}/logrotate.d/sendfax
 
 %files voice
 %defattr(-,root,root)
@@ -268,6 +304,8 @@ fi
 %{_mandir}/man1/pvfsine.1*
 %{_mandir}/man1/pvfspeed.1*
 %{_mandir}/man1/pvftormd.1*
+%{_mandir}/man1/pvffilter.1*
+%{_mandir}/man1/pvfnoise.1*
 %{_mandir}/man1/rmdtopvf.1*
 %{_mandir}/man1/rmdfile.1*
 %{_mandir}/man1/pvftovoc.1*
@@ -280,20 +318,27 @@ fi
 %{_mandir}/man1/autopvf.1*
 %{_mandir}/man1/pvftowav.1*
 %{_mandir}/man1/wavtopvf.1*
+%{_mandir}/man8/vgetty.8*
 %dir %{_sysconfdir}/mgetty+sendfax
-%config %{_sysconfdir}/mgetty+sendfax/voice.conf
-%config %{_sysconfdir}/logrotate.d/vgetty
-%config %{_sysconfdir}/logrotate.d/vm
+%config(noreplace) %{_sysconfdir}/mgetty+sendfax/voice.conf
+# logrotate file name uses only sub-package name
+%config(noreplace) %{_sysconfdir}/logrotate.d/vgetty
+%config(noreplace) %{_sysconfdir}/logrotate.d/vm
 
 %files viewfax
 %defattr(-,root,root)
-%doc frontends/X11/viewfax-2.5/C* frontends/X11/viewfax-2.5/README
+%doc frontends/X11/viewfax/C* frontends/X11/viewfax/README
 %{_bindir}/viewfax
 %dir %{_libdir}/mgetty+sendfax
 %{_libdir}/mgetty+sendfax/viewfax.tif
-%{_mandir}/man1/viewfax.1x*
+%{_mandir}/man1/viewfax.1*
+
 
 %changelog
+* Sat Jun 11 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.36-1
+- update to 1.1.36
+- merge spec file with fedora package
+
 * Wed Dec 19 2001 Toru Sagami <sagami@vinelinux.org> 1.1.25-5vl4
 - change %%define mkdtemp 1 in oreder to build on glibc22 system