Fix collision with netpbm (#155670). Install mgetty executable in /sbin (#119078...
authorAlin Năstac <mrness@gentoo.org>
Mon, 20 Nov 2006 20:40:24 +0000 (20:40 +0000)
committerAlin Năstac <mrness@gentoo.org>
Mon, 20 Nov 2006 20:40:24 +0000 (20:40 +0000)
Package-Manager: portage-2.1.1-r1

net-dialup/mgetty/ChangeLog
net-dialup/mgetty/Manifest
net-dialup/mgetty/files/digest-mgetty-1.1.35-r2 [new file with mode: 0644]
net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch [new file with mode: 0644]
net-dialup/mgetty/mgetty-1.1.35-r2.ebuild [new file with mode: 0644]

index 3a8298e3414879d1556bc85de439a490e84769e1..57e2dd2efb4d1ed06d451b243044ab3dbc4e6ba2 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.69 2006/11/04 20:16:06 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.70 2006/11/20 20:40:24 mrness Exp $
+
+*mgetty-1.1.35-r2 (20 Nov 2006)
+
+  20 Nov 2006; Alin Nastac <mrness@gentoo.org>
+  +files/mgetty-1.1.35-netpbm-collision.patch, +mgetty-1.1.35-r2.ebuild:
+  Fix collision with netpbm (#155670). Install mgetty executable in /sbin
+  (#119078). Don't install useless ct program (#106337). Stable on amd64.
 
   04 Nov 2006; Alexander H. Færøy <eroyf@gentoo.org>
   mgetty-1.1.35-r1.ebuild:
index 02bb198d51e5717718a5c51cca8207293c181037..d25ea6dc7383b874224319f877a7a38687a70e8e 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Lucent.c.patch 814 RMD160 686381b3ff22415c3d6a158501ffd1001fd87173 SHA1 c8b62a51af629ad0128a886ae3a78915618113ac SHA256 67770841c024a135efe7fffe24028829366b6da74195ccf43c71d7162738b2e2
 MD5 503ed4bbf18bb0b46850cb173873e16a files/Lucent.c.patch 814
 RMD160 686381b3ff22415c3d6a158501ffd1001fd87173 files/Lucent.c.patch 814
@@ -38,6 +41,10 @@ AUX mgetty-1.1.35-gentoo.patch 933 RMD160 fb13171fb61f236d99d53a6245ef900a7fb280
 MD5 b3c49e2689ed9e1f4abd8d9c0a160a4f files/mgetty-1.1.35-gentoo.patch 933
 RMD160 fb13171fb61f236d99d53a6245ef900a7fb28047 files/mgetty-1.1.35-gentoo.patch 933
 SHA256 f108cf075996748b55f42b31e6e1cacc07669fc2140a5a51f4aecbaf88302941 files/mgetty-1.1.35-gentoo.patch 933
+AUX mgetty-1.1.35-netpbm-collision.patch 3192 RMD160 6aa96f41f97f436af2d38ea8a9b18ab67a375a78 SHA1 e945e2ab9a09defd46f491e377058f7081aeb1cf SHA256 6dfa157007628638c229611821223a3a450b34185fa41d18033ff046054d0ec1
+MD5 ac7b9e4194be605731b25fb45d90e8f9 files/mgetty-1.1.35-netpbm-collision.patch 3192
+RMD160 6aa96f41f97f436af2d38ea8a9b18ab67a375a78 files/mgetty-1.1.35-netpbm-collision.patch 3192
+SHA256 6dfa157007628638c229611821223a3a450b34185fa41d18033ff046054d0ec1 files/mgetty-1.1.35-netpbm-collision.patch 3192
 AUX mgetty-1.1.35-strerror.patch 1573 RMD160 b3b973247539545f90adee99efb50cc53ab0828a SHA1 8465b265daa556b4ca98f23dd8e4f6b7c26f2ddd SHA256 fa3d890c6aee0291db1faf4f1622919b099f42d697a8fcd5079b96eb3c057a40
 MD5 27565fcde66bcc4c9741fd88dea30d04 files/mgetty-1.1.35-strerror.patch 1573
 RMD160 b3b973247539545f90adee99efb50cc53ab0828a files/mgetty-1.1.35-strerror.patch 1573
@@ -57,10 +64,14 @@ EBUILD mgetty-1.1.35-r1.ebuild 4407 RMD160 a9b2f00ac5531a95209419e85d481733e3c0e
 MD5 b6111254918840ec174c2ae5d9165308 mgetty-1.1.35-r1.ebuild 4407
 RMD160 a9b2f00ac5531a95209419e85d481733e3c0e4ba mgetty-1.1.35-r1.ebuild 4407
 SHA256 c559699adf92bff17432424498085306191c41508ca6c2360f421553def21262 mgetty-1.1.35-r1.ebuild 4407
-MISC ChangeLog 10326 RMD160 a373b175b753207bfeae64c3e28cb67c1508749e SHA1 94795128119e4ad598359842c7ceb98d78063237 SHA256 53bd83ecedcdcaf38900a176a6a6d07e60b4c80c625e98b6f0b0d414ebeabe47
-MD5 6def9286c35a291fe5b50985834c28ce ChangeLog 10326
-RMD160 a373b175b753207bfeae64c3e28cb67c1508749e ChangeLog 10326
-SHA256 53bd83ecedcdcaf38900a176a6a6d07e60b4c80c625e98b6f0b0d414ebeabe47 ChangeLog 10326
+EBUILD mgetty-1.1.35-r2.ebuild 4933 RMD160 37485765221fb8750d2839254e264b7e305750bf SHA1 62046afcb9018e59b33e7bf6c20554532c8c35d6 SHA256 8dc1e2ec85503d5d0ab0927291a1e3e6cddc667884bbcadb9f3a2bd000b0913e
+MD5 17137fd16002e55de54f4ccae92679f9 mgetty-1.1.35-r2.ebuild 4933
+RMD160 37485765221fb8750d2839254e264b7e305750bf mgetty-1.1.35-r2.ebuild 4933
+SHA256 8dc1e2ec85503d5d0ab0927291a1e3e6cddc667884bbcadb9f3a2bd000b0913e mgetty-1.1.35-r2.ebuild 4933
+MISC ChangeLog 10629 RMD160 a369d416e7bcdb6e776968044ba2ebaae847248b SHA1 cc5e53afe6f8daab859dc7c8b66bdeb3e499ec61 SHA256 500f4b9ddef6f31c98ccd14600f7c88f307b1d6d074f9d3445f5ae7d64897076
+MD5 efeb029b4dd8453f5e02a5232b6b8adc ChangeLog 10629
+RMD160 a369d416e7bcdb6e776968044ba2ebaae847248b ChangeLog 10629
+SHA256 500f4b9ddef6f31c98ccd14600f7c88f307b1d6d074f9d3445f5ae7d64897076 ChangeLog 10629
 MISC metadata.xml 377 RMD160 1f17a6dbb9efe9992b812c253e63d02e93e37223 SHA1 0bde55896c3d1b16d71d1b33fc4b267b35817d5d SHA256 b6756d3fd813f8ff00f96cb472d15c9402e18001d9308dfdef1201369a4f6a6e
 MD5 1bb6061bf8000d07f70ffdd74f5659f4 metadata.xml 377
 RMD160 1f17a6dbb9efe9992b812c253e63d02e93e37223 metadata.xml 377
@@ -74,3 +85,13 @@ SHA256 e5377aea2620dcb6b0eab1373bf2d7db0a0edbaa0f1df9445652d3e174fc5d1a files/di
 MD5 f2918bd35421e6d03f6fbde02874a7bd files/digest-mgetty-1.1.35-r1 259
 RMD160 faffd810fc4a7846ea21a5fcf97c9ee0cd185ff3 files/digest-mgetty-1.1.35-r1 259
 SHA256 9f5c26b6296f9ea4f57a6d08d7bd44d8437108ecdf1032a4e209456db3196f8c files/digest-mgetty-1.1.35-r1 259
+MD5 f2918bd35421e6d03f6fbde02874a7bd files/digest-mgetty-1.1.35-r2 259
+RMD160 faffd810fc4a7846ea21a5fcf97c9ee0cd185ff3 files/digest-mgetty-1.1.35-r2 259
+SHA256 9f5c26b6296f9ea4f57a6d08d7bd44d8437108ecdf1032a4e209456db3196f8c files/digest-mgetty-1.1.35-r2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYhLF3sf9c6kjmR8RAmKRAJ9Wngjxl+yfaa2G7bYYSwAFwP8rtACghwKM
+e+ZK0wXKdlZcjuESNRY9jEI=
+=iXys
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.35-r2 b/net-dialup/mgetty/files/digest-mgetty-1.1.35-r2
new file mode 100644 (file)
index 0000000..f3024fb
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 6805f8e31423bb777be80e3a856001cb mgetty1.1.35-Feb22.tar.gz 1023412
+RMD160 835fc090835e3838e7d4c77a7f06a4c59869b3ab mgetty1.1.35-Feb22.tar.gz 1023412
+SHA256 0846bfdc49f535842be033a3080b2b08499fabeec8de644c34470243d799f928 mgetty1.1.35-Feb22.tar.gz 1023412
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch b/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch
new file mode 100644 (file)
index 0000000..6d72af9
--- /dev/null
@@ -0,0 +1,81 @@
+diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man
+--- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man   1996-02-04 16:35:33.000000000 +0200
++++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man        2006-11-20 21:36:03.318452515 +0200
+@@ -99,7 +99,7 @@
+ and
+-     g3topbm $f | pbmtolps | lpr &
++     g32pbm $f | pbmtolps | lpr &
+ The
+ .I Return
+@@ -177,7 +177,7 @@
+ .B mgetty(1)
+ (it takes less than a second to display an average fax page).
+-.B g3topbm(1)
++.B g32pbm(1)
+ from the
+ .BR pbmplus ,\  netpbm
+ or
+diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl
+--- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl   1997-01-09 22:47:07.000000000 +0200
++++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl        2006-11-20 21:36:13.923115265 +0200
+@@ -42,7 +42,7 @@
+ # variable `$f' will be replaced with the selected file name(s).
+ #
+ set view_command {viewfax $f &}
+-set print_command {g3topbm $f | pbmtolps | lpr &}
++set print_command {g32pbm $f | pbmtolps | lpr &}
+ # Shall `$f' be replaced with multiple file names or with a single
+ # one?
+diff -Nru mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in mgetty-1.1.35/frontends/www/nph-vf-gif.in
+--- mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in     2004-11-24 15:46:17.000000000 +0200
++++ mgetty-1.1.35/frontends/www/nph-vf-gif.in  2006-11-20 21:35:42.225134263 +0200
+@@ -121,7 +121,7 @@
+     errormessage( "\$indexpage : not configured - please look at the configuration-Files and configure the URL for my main-index-page (\$indexpage)");
+ }
+-checkprogram($g3topbm, "g3topbm");
++checkprogram($g3topbm, "g32pbm");
+ checkprogram($ppmquant, "ppmquant");
+ checkprogram($pnmscale, "pnmscale");
+ checkprogram($ppmtogif, "ppmtogif");
+diff -Nru mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in mgetty-1.1.35/frontends/www/wwwgui.cfg.in
+--- mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in     2004-11-24 15:46:17.000000000 +0200
++++ mgetty-1.1.35/frontends/www/wwwgui.cfg.in  2006-11-20 21:37:51.205195012 +0200
+@@ -52,7 +52,7 @@
+ #
+ # convert G3 image to PBM
+-$g3topbm='@BINDIR@/g32pbm';
++$g3topbm='/usr/bin/g32pbm';
+ # convert PBM image to GIF (could be "ppmtogif" or "pnmtogif")
+ $ppmtogif='@BINDIR@/ppmtogif';
+diff -Nru mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man mgetty-1.1.35/frontends/X11/viewfax/viewfax.man
+--- mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man       2004-11-14 14:14:29.000000000 +0200
++++ mgetty-1.1.35/frontends/X11/viewfax/viewfax.man    2006-11-20 21:36:23.399707512 +0200
+@@ -274,7 +274,7 @@
+ .B hylafax
+ (http://www.hylafax.org/) is a full-function fax client/server system.
+-.B g3topbm(1)
++.B g32pbm(1)
+ and
+ .B xv(1)
+ can be used in a pipeline to view faxes.  This will usually be slower
+diff -Nru mgetty-1.1.35.orig/g3/Makefile mgetty-1.1.35/g3/Makefile
+--- mgetty-1.1.35.orig/g3/Makefile     2006-11-20 21:35:21.711852263 +0200
++++ mgetty-1.1.35/g3/Makefile  2006-11-20 21:10:47.325515539 +0200
+@@ -45,8 +45,6 @@
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
+ #
+-      -cd $(BINDIR) ; \
+-      test -x g3topbm || ln -s g32pbm g3topbm
+ # test suite
diff --git a/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild b/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild
new file mode 100644 (file)
index 0000000..f00853c
--- /dev/null
@@ -0,0 +1,159 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.35-r2.ebuild,v 1.1 2006/11/20 20:40:24 mrness Exp $
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Fax and Voice modem programs."
+SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Feb22.tar.gz"
+HOMEPAGE="http://mgetty.greenie.net/"
+
+DEPEND="doc? ( virtual/tetex )
+       >=sys-apps/sed-4
+       sys-apps/gawk
+       sys-apps/groff
+       dev-lang/perl
+       sys-apps/texinfo"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+IUSE="doc fidonet"
+
+pkg_setup() {
+       enewgroup fax
+       enewuser fax -1 -1 /dev/null fax
+}
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-gentoo.patch"
+       epatch "${FILESDIR}/${P}-strerror.patch" # fix deprecate warnings
+       epatch "${FILESDIR}/${P}-callback.patch" # add callback install to Makefile
+       epatch "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
+       epatch "${FILESDIR}/${P}-faxrunq.patch"
+       epatch "${FILESDIR}/${P}-netpbm-collision.patch" #g3topbm is installed by netpbm
+
+       #Avoid "is setXid, dynamically linked and using lazy bindings" QA notices 
+       append-ldflags $(bindnow-flags)
+
+       sed -i 's: \$(CFLAGS) -o faxq-helper faxq-helper.o: $(LDLAGS) '$(bindnow-flags)' -o faxq-helper faxq-helper.o:' "${S}/fax/Makefile"
+
+       sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
+               -e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
+               -e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
+               -e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
+               "${S}/policy.h-dist" > "${S}/policy.h"
+
+       #Set proper owner:group
+       sed -i -e "s:uucp:fax:g" "${S}/mgetty.cfg.in"
+       sed -i -e "s:phone_group phone:phone_group fax:g" \
+               -e "s:phone_owner root:phone_owner fax:g" \
+               -e "s/root.phone/fax:fax/g" "${S}/voice/voice.conf-dist"
+
+       # bug 44231 and remove move warning
+       sed -e 's:ECHO="echo":ECHO="echo -e":' \
+               -e "/mv -f \$(SBINDIR)/d" \
+               -i "${S}/Makefile"
+
+       sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config
+       sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules
+
+       sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
+               -i "${S}/doc/Makefile"
+       if use doc; then
+               sed -e "s:dvips -o mgetty.ps:dvips -M -o mgetty.ps:" \
+                       -e "s/^doc-all:/doc-all: mgetty.ps/" \
+                       -i "${S}/doc/Makefile"
+       fi
+}
+
+src_compile() {
+       use fidonet && append-flags "-DFIDO"
+       append-flags "-DAUTO_PPP"
+
+       # parallel make fix later - 'sedscript' issue
+       make prefix=/usr \
+               CC="$(tc-getCC)" \
+               CONFDIR=/etc/mgetty+sendfax \
+               CFLAGS="${CFLAGS}" \
+               LDFLAGS="${LDFLAGS}" \
+               all vgetty || die "make failed."
+}
+
+src_install () {
+       dodir /var/spool
+       keepdir /var/log/mgetty
+       dodir /usr/share/info
+
+       make prefix="${D}/usr" \
+               INFODIR="${D}/usr/share/info" \
+               CONFDIR="${D}/etc/mgetty+sendfax" \
+               MAN1DIR="${D}/usr/share/man/man1" \
+               MAN4DIR="${D}/usr/share/man/man4" \
+               MAN5DIR="${D}/usr/share/man/man5" \
+               MAN8DIR="${D}/usr/share/man/man8" \
+               SBINDIR="${D}/usr/sbin" \
+               BINDIR="${D}/usr/bin" \
+               VOICE_DIR="${D}/var/spool/voice" \
+               PHONE_GROUP=fax \
+               PHONE_PERMS=755 \
+               spool="${D}/var/spool" \
+               install vgetty-install install-callback || die "make install failed."
+
+       #Install mgetty into /sbin (#119078)
+       dodir /sbin && \
+               mv "${D}"/usr/sbin/mgetty "${D}"/sbin && \
+               dosym /sbin/mgetty /usr/sbin/mgetty || die "failed to install /sbin/mgetty"
+       #Don't install ct (#106337)
+       rm "${D}"/usr/bin/ct || die "failed to remove useless ct program"
+
+       cd "${S}"
+       dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
+               doc/*.txt doc/modems.db || die "dodoc failed."
+       doinfo doc/mgetty.info || die "doinfo failed."
+
+       docinto vgetty
+       dodoc voice/{Readme,Announce,ChangeLog,Credits} || die "vgetty voice failed."
+
+       if use doc; then
+               dodoc doc/mgetty.ps || die "mgetty.ps failed"
+       fi
+
+       docinto vgetty/doc
+       dodoc voice/doc/*
+
+       mv samples/new_fax.all samples_new_fax.all || die "move failed."
+       docinto samples
+       dodoc samples/*
+
+       docinto samples/new_fax
+       dodoc samples_new_fax.all/*
+
+       insinto /usr/share/${PN}
+       doins -r patches frontends
+       insinto /usr/share/${PN}/voice
+       doins -r voice/{contrib,Perl,scripts}
+
+       diropts -m 0750 -o fax -g fax
+       dodir /var/spool/voice
+       keepdir /var/spool/voice/incoming
+       keepdir /var/spool/voice/messages
+       dodir /var/spool/fax
+       dodir /var/spool/fax/outgoing
+       keepdir /var/spool/fax/outgoing/locks
+       keepdir /var/spool/fax/incoming
+}
+
+pkg_postinst() {
+       einfo "Users who wish to use the fax or voicemail capabilities must be members"
+       einfo "of the group fax in order to access files"
+       echo
+       einfo "If you want to grab voice messages from a remote location, you must save"
+       einfo "the password in ${ROOT}var/spool/voice/.code file"
+       echo
+       ewarn "${ROOT}var/spool/voice/.code and ${ROOT}var/spool/voice/messages/Index"
+       ewarn "are not longer created by this automatically!"
+}