* [gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/files/, net-misc/hylafaxplus/
@ 2022-08-27 13:18 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-08-27 13:18 UTC (permalink / raw
To: gentoo-commits
commit: 69298c4e178c987e997c3f033192fb03914ba759
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 13:17:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 13:17:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69298c4e
net-misc/hylafaxplus: tidy up init script a bit further
Bug: https://bugs.gentoo.org/849269
See: a94e38544f0927e94325ad851a55c26763cae33a
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/hylafaxplus/files/hylafaxplus-init-r1 | 100 ++++++++++-----------
...7.0.3-r2.ebuild => hylafaxplus-7.0.3-r3.ebuild} | 0
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init-r1 b/net-misc/hylafaxplus/files/hylafaxplus-init-r1
index 37e459f79c99..fd70fe02d657 100644
--- a/net-misc/hylafaxplus/files/hylafaxplus-init-r1
+++ b/net-misc/hylafaxplus/files/hylafaxplus-init-r1
@@ -1,6 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Author Geaaru
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
extra_commands="zap"
@@ -12,81 +11,81 @@ depend() {
checkconfig() {
ebegin "Check hylafax server configuration..."
- if [ x$spooldir = x ] ; then
+ if [ x${spooldir} = x ] ; then
eerror "No spooldir directory defined"
return 1
else
- SPOOL=$spooldir
- einfo "Use spool directory $SPOOL"
+ SPOOL=${spooldir}
+ einfo "Use spool directory ${SPOOL}"
fi
- if [ x$mode = x ] ; then
+ if [ x${mode} = x ] ; then
eerror "No mode defined"
return 1
fi
- if [ ! -f $SPOOL/etc/setup.cache ] ; then
- eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
+ if [ ! -f ${SPOOL}/etc/setup.cache ] ; then
+ eerror "No ${SPOOL}/etc/setup.cache file found. Use faxsetup command"
return 1
fi
- if [ x$hfaxd = x -o ! -f $hfaxd ] ; then
- eerror "No hfaxd daemon founded"
+ if [ x${hfaxd} = x ] || [ ! -f ${hfaxd} ] ; then
+ eerror "No hfaxd daemon found"
return 1
fi
- if [ x$faxq = x -o ! -f $faxq ] ; then
- eerror "No faxq program founded"
+ if [ x${faxq} = x ] || [ ! -f ${faxq} ] ; then
+ eerror "No faxq program found"
return 1
fi
- if [ x$faxgetty = x -o ! -f $faxgetty ] ; then
- eerror "No faxgetty program founded"
+ if [ x${faxgetty} = x ] || [ ! -f ${faxgetty} ] ; then
+ eerror "No faxgetty program found"
return 1
fi
- if [ x$faxbind = x ] ; then
- eerror "No binding address supply"
+ if [ x${faxbind} = x ] ; then
+ eerror "No binding address supplied"
return 1
fi
- if [ x$piddir = x ] ; then
- PIDDIR=$SPOOL
+ if [ x${PIDDIR} = x ] ; then
+ PIDDIR=${SPOOL}
else
- PIDDIR=$piddir
+ PIDDIR=${PIDDIR}
fi
- hfaxd_args="-l $faxbind -q $SPOOL"
+ hfaxd_args="-l ${faxbind} -q ${SPOOL}"
- case $mode in
+ case ${mode} in
newproto)
- if [ x$faxport = x ] ; then
+ if [ x${faxport} = x ] ; then
eerror "No faxport defined"
return 1
fi
- hfaxd_args="$hfaxd_args -i $faxport"
+ hfaxd_args="${hfaxd_args} -i ${faxport}"
;;
oldproto)
- if [ x$oldprotoport = x ] ; then
+ if [ x${oldprotoport} = x ] ; then
eerror "No oldprotoport defined"
return 1
fi
- hfaxd_args="$hfaxd_args -o $oldprotoport"
+ hfaxd_args="${hfaxd_args} -o ${oldprotoport}"
;;
snpp)
- if [ x$snppport = x ] ; then
+ if [ x${snppport} = x ] ; then
eerror "No snppport defined"
return 1
fi
- hfaxd_args="$hfaxd_args -s $snppport"
+ hfaxd_args="${hfaxd_args} -s ${snppport}"
;;
any)
- if [ x$faxport = x -o x$snppport = x -o x$oldprotoport = x ] ; then
+ if [ x${faxport} = x ] || [ x${snppport} = x ] || [ x${oldprotoport} = x ] ; then
eerror "No port data founded for old services"
return 1
fi
- hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
+ hfaxd_args="${hfaxd_args} -i ${faxport} -s ${snppport} -o ${oldprotoport}"
;;
*)
eerror "Invalid mode"
@@ -95,12 +94,12 @@ checkconfig() {
esac
- faxq_args="-q $SPOOL"
+ faxq_args="-q ${SPOOL}"
# workaround for manage save of pidfile with start-stop-daemon
- hfaxd_args="$hfaxd_args -d"
- faxq_args="$faxq_args -D"
-
+ hfaxd_args="${hfaxd_args} -d"
+ faxq_args="${faxq_args} -D"
+
return 0
}
@@ -114,35 +113,34 @@ start() {
start_faxq
result=$?
- if [ $result -ne 0 ] ; then
- eerror "Error on start $faxq daemon"
+ if [ ${result} -ne 0 ] ; then
+ eerror "Error on start ${faxq} daemon"
return 1
fi
start_hfaxd
result=$?
- eend $result
+ eend ${result}
}
start_hfaxd() {
local arguments="--start \
- --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
-
- einfo "Starting $hfaxd with args $hfaxd_args"
+ --make-pidfile --pidfile ${PIDDIR}/hfaxd.pid"
+ einfo "Starting ${hfaxd} with args ${hfaxd_args}"
- start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
+ start-stop-daemon -b ${arguments} --exec ${hfaxd} -- ${hfaxd_args} > /dev/null 2>&1
return $?;
}
start_faxq() {
local arguments="--start \
- --make-pidfile --pidfile $PIDDIR/faxq.pid"
- einfo "Starting $faxq ... "
+ --make-pidfile --pidfile ${PIDDIR}/faxq.pid"
+ einfo "Starting ${faxq} ... "
+
+ start-stop-daemon -b ${arguments} --exec ${faxq} -- ${faxq_args} > /dev/null 2>&1
- start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
-
return $?
}
@@ -150,9 +148,9 @@ stop() {
checkconfig || return 1
ebegin "Stopping HylaFAX server daemons"
-
- start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
- start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
+
+ start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/hfaxd.pid
+ start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/faxq.pid
eend $?
}
@@ -161,12 +159,12 @@ zap() {
ebegin "Zap HylaFAX server daemon files"
- if [ -f $PIDFILE/hfaxd.pid ] ; then
- rm -f $PIDFILE/hfaxd.pid
+ if [ -f ${PIDFILE}/hfaxd.pid ] ; then
+ rm -f ${PIDFILE}/hfaxd.pid
fi
- if [ -f $PIDFILE/faxq.pid ] ; then
- rm -f $PIDFILE/faxq.pid
+ if [ -f ${PIDFILE}/faxq.pid ] ; then
+ rm -f ${PIDFILE}/faxq.pid
fi
}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r2.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r3.ebuild
similarity index 100%
rename from net-misc/hylafaxplus/hylafaxplus-7.0.3-r2.ebuild
rename to net-misc/hylafaxplus/hylafaxplus-7.0.3-r3.ebuild
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/files/, net-misc/hylafaxplus/
@ 2022-12-24 6:47 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-24 6:47 UTC (permalink / raw
To: gentoo-commits
commit: c512eadcb799fa2181fda4479d96083412ddb00e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 06:46:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 06:47:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c512eadc
net-misc/hylafaxplus: drop 7.0.3-r7, 7.0.3-r8
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/hylafaxplus/Manifest | 1 -
.../files/hylafaxplus-7.0.2-tiff-4.2.patch | 13 --
net-misc/hylafaxplus/files/hylafaxplus-init | 176 ---------------------
net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild | 158 ------------------
net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild | 162 -------------------
net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild | 1 -
6 files changed, 511 deletions(-)
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index c73f52d309e6..bd5b6c79d310 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,2 +1 @@
-DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
deleted file mode 100644
index 8c4dbda35cc5..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/706154
-https://bugs.gentoo.org/810658
---- a/configure
-+++ b/configure
-@@ -2583,7 +2583,7 @@ EOF
- echo '#define TIFFSTRIPBYTECOUNTS uint32'
- echo '#define TIFFVERSION TIFF_VERSION'
- echo '#define TIFFHEADER TIFFHeader';;
-- 4.[01]) tiff_runlen_t="uint32"
-+ 4.[0123456789]) tiff_runlen_t="uint32"
- tiff_offset_t="uint64"
- echo '#define TIFFSTRIPBYTECOUNTS uint64'
- echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
deleted file mode 100644
index c15f26774a86..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-init
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Author Geaaru
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="zap"
-
-depend() {
- use lo
-}
-
-checkconfig() {
- ebegin "Check hylafax server configuration..."
-
- if [ x$spooldir == x ] ; then
- eerror "No spooldir directory defined"
- return 1
- else
- SPOOL=$spooldir
- einfo "Use spool directory $SPOOL"
- fi
-
- if [ x$mode == x ] ; then
- eerror "No mode defined"
- return 1
- fi
-
- if [ ! -f $SPOOL/etc/setup.cache ] ; then
- eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
- return 1
- fi
-
- if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then
- eerror "No hfaxd daemon founded"
- return 1
- fi
-
- if [[ x$faxq == x || ! -f $faxq ]] ; then
- eerror "No faxq program founded"
- return 1
- fi
-
- if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then
- eerror "No faxgetty program founded"
- return 1
- fi
-
- if [ x$faxbind == x ] ; then
- eerror "No binding address supply"
- return 1
- fi
-
- if [ x$piddir == x ] ; then
- PIDDIR=$SPOOL
- else
- PIDDIR=$piddir
- fi
-
-
- hfaxd_args="-l $faxbind -q $SPOOL"
-
- case $mode in
- newproto)
- if [[ x$faxport == x ]] ; then
- eerror "No faxport defined"
- return 1
- fi
- hfaxd_args="$hfaxd_args -i $faxport"
- ;;
- oldproto)
- if [[ x$oldprotoport == x ]] ; then
- eerror "No oldprotoport defined"
- return 1
- fi
- hfaxd_args="$hfaxd_args -o $oldprotoport"
- ;;
- snpp)
- if [[ x$snppport == x ]] ; then
- eerror "No snppport defined"
- return 1
- fi
- hfaxd_args="$hfaxd_args -s $snppport"
- ;;
- any)
- if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then
- eerror "No port data founded for old services"
- return 1
- fi
- hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
- ;;
- *)
- eerror "Invalid mode"
- return 1
- ;;
-
- esac
-
- faxq_args="-q $SPOOL"
-
- # workaround for manage save of pidfile with start-stop-daemon
- hfaxd_args="$hfaxd_args -d"
- faxq_args="$faxq_args -D"
-
- return 0
-}
-
-start() {
- local result
-
- checkconfig || return 1
-
- ebegin "Starting HylaFAX server daemons"
-
- start_faxq
- result=$?
-
- if [ $result -ne 0 ] ; then
- eerror "Error on start $faxq daemon"
- return 1
- fi
-
- start_hfaxd
- result=$?
-
- eend $result
-}
-
-start_hfaxd() {
- local arguments="--start \
- --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
-
- einfo "Starting $hfaxd with args $hfaxd_args"
-
- start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
-
- return $?;
-}
-
-start_faxq() {
- local arguments="--start \
- --make-pidfile --pidfile $PIDDIR/faxq.pid"
- einfo "Starting $faxq ... "
-
- start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
-
- return $?
-}
-
-stop() {
- checkconfig || return 1
-
- ebegin "Stopping HylaFAX server daemons"
-
- start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
- start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
- eend $?
-}
-
-zap() {
- checkconfig || return 1
-
- ebegin "Zap HylaFAX server daemon files"
-
- if [ -f $PIDFILE/hfaxd.pid ] ; then
- rm -f $PIDFILE/hfaxd.pid
- fi
-
- if [ -f $PIDFILE/faxq.pid ] ; then
- rm -f $PIDFILE/faxq.pid
- fi
-}
-
-restart() {
- stop
- start
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
deleted file mode 100644
index 9f1fb4d2a5bd..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edo pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="hylafaxplus"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
- app-text/ghostscript-gpl
- media-libs/tiff:=[jbig?]
- media-libs/libjpeg-turbo:=
- >=sys-libs/zlib-1.1.4
- app-alternatives/awk
- virtual/libcrypt:=
- virtual/mta
- jbig? ( media-libs/jbigkit )
- lcms? ( media-libs/lcms )
- ldap? ( net-nds/openldap:= )
- mgetty? ( net-dialup/mgetty[-fax] )
- pam? ( sys-libs/pam )
-"
-RDEPEND="
- ${DEPEND}
- !net-dialup/mgetty[fax]
- !net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
- "${FILESDIR}"/ldconfig-patch
- "${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
- default
-
- # Force it not to strip binaries
- for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
- hfaxd sendfax sendpage ; do
- sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
- "${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
- done
-
- sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
- # Respect LDFLAGS (at least partially)
- sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
- sed -i -e "s|-fpic|-fPIC|g" \
- configure || die
-}
-
-src_configure() {
- local my_conf=(
- --with-DIR_BIN=/usr/bin
- --with-DIR_SBIN=/usr/sbin
- --with-DIR_LIB=/usr/$(get_libdir)
- --with-DIR_LIBEXEC=/usr/sbin
- --with-DIR_LIBDATA=/usr/$(get_libdir)/fax
- --with-DIR_LOCALE=/usr/share/locale
- --with-DIR_LOCKS=/var/lock
- --with-DIR_MAN=/usr/share/man
- --with-DIR_SPOOL=/var/spool/fax
- --with-DIR_HTML=/usr/share/doc/${PF}/html
- --with-DIR_CGI="${WORKDIR}"
- --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
- --with-PATH_IMPRIP=""
- --with-SYSVINIT=no
- --with-REGEX=yes
- --with-LIBTIFF="-ltiff -ljpeg -lz"
- --with-OPTIMIZER="${CFLAGS}"
- --with-DSO=auto
- --with-HTML=$(usex html)
- )
-
- if use mgetty; then
- my_conf+=(
- --with-PATH_GETTY=/sbin/mgetty
- --with-PATH_EGETTY=/sbin/mgetty
- --with-PATH_VGETTY=/usr/sbin/vgetty
- )
- else
- # GETTY defaults to /sbin/agetty
- my_conf+=(
- --with-PATH_EGETTY=/bin/false
- --with-PATH_VGETTY=/bin/false
- )
- fi
-
- # --enable-pam isn't valid
- use pam || my_conf+=( $(use_enable pam) )
- use lcms || my_conf+=( $(use_enable lcms) )
- use ldap || my_conf+=( $(use_enable ldap) )
- use jbig || my_conf+=( $(use_enable jbig) )
-
- tc-export CC CXX AR RANLIB
-
- edo ./configure --nointeractive "${my_conf[@]}"
-}
-
-src_compile() {
- # Parallel building is borked, bug #????
- emake -j1
-}
-
-src_install() {
- dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
- dodir /var/spool /var/spool/fax
- fowners uucp:uucp /var/spool/fax
- fperms 0600 /var/spool/fax
-
- dodir /usr/share/doc/${PF}/samples
- emake DESTDIR="${D}" \
- BIN="${D}/usr/bin" \
- SBIN="${D}/usr/sbin" \
- LIBDIR="${D}/usr/$(get_libdir)" \
- LIB="${D}/usr/$(get_libdir)" \
- LIBEXEC="${D}/usr/sbin" \
- LIBDATA="${D}/usr/$(get_libdir)/fax" \
- DIR_LOCALE="${D}/usr/share/locale" \
- MAN="${D}/usr/share/man" \
- SPOOL="${D}/var/spool/fax" \
- HTMLDIR="${D}/usr/share/doc/${PF}/html" \
- install
-
- keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
- keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
- einfo "Adding env.d entry for ${PN}"
- newenvd - 99hylafaxplus <<-EOF
- PATH="/var/spool/fax/bin"
- CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
- CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
- EOF
-
- newconfd "${FILESDIR}"/${PN}-conf ${PN}
- newinitd "${FILESDIR}"/${PN}-init-r1 ${PN}
-
- use pam && pamd_mimic_system ${MY_PN} auth account session
-
- einstalldocs
- docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
deleted file mode 100644
index 3f86a507030c..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="amd64 x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
- app-text/ghostscript-gpl
- media-libs/tiff:=[jbig?]
- media-libs/libjpeg-turbo:=
- !net-dialup/mgetty[fax]
- >=sys-libs/zlib-1.1.4
- app-alternatives/awk
- virtual/mta
- jbig? ( media-libs/jbigkit )
- lcms? ( media-libs/lcms )
- ldap? ( net-nds/openldap:= )
- mgetty? ( net-dialup/mgetty[-fax] )
- pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}
- !net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
- "${FILESDIR}/ldconfig-patch"
- "${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
- default
-
- # force it not to strip binaries
- for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
- hfaxd sendfax sendpage ; do
- sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
- "${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
- done
-
- sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
- # Respect LDFLAGS(at least partially)
- sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
- sed -i -e "s|-fpic|-fPIC|g" \
- configure || die
-}
-
-src_configure() {
- do_configure() {
- echo ./configure --nointeractive ${1}
- # eval required for quoting in ${my_conf} to work properly, better way?
- eval ./configure --nointeractive ${1} || die "./configure failed"
- }
-
- local my_conf=(
- --with-DIR_BIN=/usr/bin
- --with-DIR_SBIN=/usr/sbin
- --with-DIR_LIB=/usr/$(get_libdir)
- --with-DIR_LIBEXEC=/usr/sbin
- --with-DIR_LIBDATA=/usr/$(get_libdir)/fax
- --with-DIR_LOCALE=/usr/share/locale
- --with-DIR_LOCKS=/var/lock
- --with-DIR_MAN=/usr/share/man
- --with-DIR_SPOOL=/var/spool/fax
- --with-DIR_HTML=/usr/share/doc/${PF}/html
- --with-DIR_CGI="${WORKDIR}"
- --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
- --with-PATH_IMPRIP=""
- --with-SYSVINIT=no
- --with-REGEX=yes
- --with-LIBTIFF=\"-ltiff -ljpeg -lz\"
- --with-OPTIMIZER=\"${CFLAGS}\"
- --with-DSO=auto
- --with-HTML=$(usex html)
- )
-
- if use mgetty; then
- my_conf+=(
- --with-PATH_GETTY=/sbin/mgetty
- --with-PATH_EGETTY=/sbin/mgetty
- --with-PATH_VGETTY=/usr/sbin/vgetty
- )
- else
- # GETTY defaults to /sbin/agetty
- my_conf+=(
- --with-PATH_EGETTY=/bin/false
- --with-PATH_VGETTY=/bin/false
- )
- fi
-
- #--enable-pam isn't valid
- use pam || my_conf+=( $(use_enable pam) )
- use lcms || my_conf+=( $(use_enable lcms) )
- use ldap || my_conf+=( $(use_enable ldap) )
- use jbig || my_conf+=( $(use_enable jbig) )
-
- tc-export CC CXX AR RANLIB
-
- do_configure "${my_conf[*]}"
-}
-
-src_compile() {
- # Parallel building is borked, bug #????
- emake -j1
-}
-
-src_install() {
- dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
- dodir /var/spool /var/spool/fax
- fowners uucp:uucp /var/spool/fax
- fperms 0600 /var/spool/fax
- dodir "/usr/share/doc/${P}/samples"
-
- emake DESTDIR="${D}" \
- BIN="${D}/usr/bin" \
- SBIN="${D}/usr/sbin" \
- LIBDIR="${D}/usr/$(get_libdir)" \
- LIB="${D}/usr/$(get_libdir)" \
- LIBEXEC="${D}/usr/sbin" \
- LIBDATA="${D}/usr/$(get_libdir)/fax" \
- DIR_LOCALE="${D}/usr/share/locale" \
- MAN="${D}/usr/share/man" \
- SPOOL="${D}/var/spool/fax" \
- HTMLDIR="${D}/usr/share/doc/${PF}/html" \
- install
-
- keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
- keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
- einfo "Adding env.d entry for ${PN}"
- newenvd - 99hylafaxplus <<-EOF
- PATH="/var/spool/fax/bin"
- CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
- CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
- EOF
-
- newconfd "${FILESDIR}/${PN}-conf" ${PN}
- newinitd "${FILESDIR}/${PN}-init" ${PN}
-
- use pam && pamd_mimic_system ${MY_PN} auth account session
-
- einstalldocs
- docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
index b7e589501c96..c2207fd1949d 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
@@ -42,7 +42,6 @@ CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
# See bug #706154, bug #810658 if need to patch for newer libtiff.
-
PATCHES=(
"${FILESDIR}"/ldconfig-patch
)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/files/, net-misc/hylafaxplus/
@ 2021-03-02 3:49 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-02 3:49 UTC (permalink / raw
To: gentoo-commits
commit: 82e3eefd5447f36e5bb00068a54b91d8c891ccf6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 2 03:47:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 2 03:49:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e3eefd
net-misc/hylafaxplus: allow newer media-libs/tiff
Closes: https://bugs.gentoo.org/706154
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/hylafaxplus/Manifest | 1 +
net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch | 12 ++++++++++++
net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild | 3 ++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 22ece946d03..56ee707629f 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1 +1,2 @@
DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e
+DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
new file mode 100644
index 00000000000..97623b85080
--- /dev/null
+++ b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/706154
+--- a/configure
++++ b/configure
+@@ -2583,7 +2583,7 @@ EOF
+ echo '#define TIFFSTRIPBYTECOUNTS uint32'
+ echo '#define TIFFVERSION TIFF_VERSION'
+ echo '#define TIFFHEADER TIFFHeader';;
+- 4.[01]) tiff_runlen_t="uint32"
++ 4.[012]) tiff_runlen_t="uint32"
+ tiff_offset_t="uint64"
+ echo '#define TIFFSTRIPBYTECOUNTS uint64'
+ echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
index 05ecc5abe48..6cbf6123a4c 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,6 +44,7 @@ CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
PATCHES=(
"${FILESDIR}/ldconfig-patch"
"${FILESDIR}/${PN}-CVE-2020-1539x.patch"
+ "${FILESDIR}/${PN}-7.0.2-tiff-4.2.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/files/, net-misc/hylafaxplus/
@ 2020-07-22 18:46 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-07-22 18:46 UTC (permalink / raw
To: gentoo-commits
commit: ef2959f12a4402bf6050d6b5f4c07447d8aba5ac
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Jul 22 17:04:39 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 18:46:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2959f1
net-misc/hylafaxplus: Security cleanup
Bug: https://bugs.gentoo.org/730290
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16781
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/hylafaxplus/Manifest | 2 -
.../hylafaxplus/files/hylafax-cryptglibc.patch | 98 ------------
net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild | 177 ---------------------
net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild | 162 -------------------
4 files changed, 439 deletions(-)
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 51882b7cd3d..22ece946d03 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,3 +1 @@
-DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
-DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e
diff --git a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
deleted file mode 100644
index dbfc8bac539..00000000000
--- a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -urN hylafax-5.5.4/hfaxd/Login.c++ hylafax-5.5.4-libc217/hfaxd/Login.c++
---- hylafax-5.5.4/hfaxd/Login.c++ 2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/Login.c++ 2013-11-13 12:56:02.000000000 +0100
-@@ -30,9 +30,6 @@
- #include <ctype.h>
- #include <fcntl.h>
- #include <pwd.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
-
- void
- HylaFAXServer::loginRefused(const char* why)
-@@ -434,7 +431,7 @@
- /*
- * Check hosts.hfaxd first, then PAM, and last, LDAP
- */
-- if (pass[0] == '\0' || !(strcmp(crypt(pass, passWd), passWd) == 0 ||
-+ if (pass[0] == '\0' || !(strcmp(Sys::crypt(pass, passWd), passWd) == 0 ||
- pamCheck(the_user, pass) ||
- ldapCheck(the_user,pass)))
- {
-@@ -513,7 +510,7 @@
- {
- fxAssert(IS(LOGGEDIN), "ADMIN command permitted when not logged in");
- // NB: null adminWd is permitted
-- if ((strcmp(crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
-+ if ((strcmp(Sys::crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) {
- if (++adminAttempts >= maxAdminAttempts) {
- reply(530, "Password incorrect (closing connection).");
- logNotice("Repeated admin failures from %s [%s]"
-diff -urN hylafax-5.5.4/hfaxd/SNPPServer.c++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++
---- hylafax-5.5.4/hfaxd/SNPPServer.c++ 2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++ 2013-11-13 12:55:42.000000000 +0100
-@@ -36,9 +36,6 @@
- #include "RE.h"
-
- #include <ctype.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
-
- extern "C" {
- #include <netdb.h>
-@@ -1003,7 +1000,7 @@
-
- if (checkUser(loginID)) {
- if (passWd != "") {
-- if (pass[0] == '\0' || !(streq(crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
-+ if (pass[0] == '\0' || !(streq(Sys::crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) {
- if (++loginAttempts >= maxLoginAttempts) {
- reply(421, "Login incorrect (closing connection).");
- logNotice("Repeated SNPP login failures for user %s from %s [%s]"
-diff -urN hylafax-5.5.4/hfaxd/User.c++ hylafax-5.5.4-libc217/hfaxd/User.c++
---- hylafax-5.5.4/hfaxd/User.c++ 2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/hfaxd/User.c++ 2013-11-13 12:55:19.000000000 +0100
-@@ -30,9 +30,6 @@
-
- #include <ctype.h>
- #include <pwd.h>
--#if HAS_CRYPT_H
--#include <crypt.h>
--#endif
- #include <math.h>
-
- #ifndef CHAR_BIT
-@@ -374,7 +371,7 @@
- #else
- to64(&salt[0], random(), 2);
- #endif
-- result = crypt(pass, salt);
-+ result = Sys::crypt(pass, salt);
- return (true);
- }
-
-diff -urN hylafax-5.5.4/util/Sys.h hylafax-5.5.4-libc217/util/Sys.h
---- hylafax-5.5.4/util/Sys.h 2013-08-07 01:23:35.000000000 +0200
-+++ hylafax-5.5.4-libc217/util/Sys.h 2013-11-13 12:56:26.000000000 +0100
-@@ -44,6 +44,10 @@
- #include <osfcn.h>
- #endif
-
-+#if HAS_CRYPT_H
-+#include <crypt.h>
-+#endif
-+
- /*
- * Wrapper functions for C library calls.
- *
-@@ -140,5 +144,8 @@
- { return ::fopen(filename, mode); }
-
- static int getOpenMax();
-+
-+ static const char* crypt(const char* key, const char* salt)
-+ { const char* enc = ::crypt(key, salt); return enc ? enc : ""; }
- };
- #endif /* _Sys_ */
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
deleted file mode 100644
index e1d8b5510a8..00000000000
--- a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils multilib pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="http://hylafax.sourceforge.net"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="amd64 x86"
-
-IUSE="jbig html ldap mgetty pam"
-
-DEPEND="
- >=sys-libs/zlib-1.1.4
- app-text/ghostscript-gpl
- virtual/mta
- media-libs/tiff:0[jbig?]
- virtual/jpeg:0
- jbig? ( media-libs/jbigkit )
- virtual/awk
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
- mgetty? ( net-dialup/mgetty[-fax] )
- !net-dialup/mgetty[fax]
-"
-RDEPEND="${DEPEND}
- net-mail/metamail
- !net-dialup/sendpage
-"
-
-S="${WORKDIR}/${MY_P}"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-
-src_prepare() {
- epatch "${FILESDIR}/ldconfig-patch"
- epatch "${FILESDIR}/hylafax-cryptglibc.patch"
-
- # force it not to strip binaries
- for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
- hfaxd sendfax sendpage ; do
- sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
- "${dir}"/Makefile.in || die "sed failed"
- done
-
- sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
- # Respect LDFLAGS(at least partially)
- sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
- sed -i -e "s|-fpic|-fPIC|g" \
- configure || die
-
- epatch_user
-}
-
-src_configure() {
- do_configure() {
- echo ./configure --nointeractive ${1}
- # eval required for quoting in ${my_conf} to work properly, better way?
- eval ./configure --nointeractive ${1} || die "./configure failed"
- }
- local my_conf="
- --with-DIR_BIN=/usr/bin
- --with-DIR_SBIN=/usr/sbin
- --with-DIR_LIB=/usr/$(get_libdir)
- --with-DIR_LIBEXEC=/usr/sbin
- --with-DIR_LIBDATA=/usr/$(get_libdir)/fax
- --with-DIR_LOCALE=/usr/share/locale
- --with-DIR_LOCKS=/var/lock
- --with-DIR_MAN=/usr/share/man
- --with-DIR_SPOOL=/var/spool/fax
- --with-DIR_HTML=/usr/share/doc/${P}/html
- --with-DIR_CGI="${WORKDIR}"
- --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
- --with-PATH_IMPRIP=\"\"
- --with-SYSVINIT=no
- --with-REGEX=yes
- --with-LIBTIFF=\"-ltiff -ljpeg -lz\"
- --with-OPTIMIZER=\"${CFLAGS}\"
- --with-DSO=auto
- --with-HTML=$(usex html)"
-
- if use mgetty; then
- my_conf="${my_conf} \
- --with-PATH_GETTY=/sbin/mgetty \
- --with-PATH_EGETTY=/sbin/mgetty \
- --with-PATH_VGETTY=/usr/sbin/vgetty"
- else
- # GETTY defaults to /sbin/agetty
- my_conf="${my_conf} \
- --with-PATH_EGETTY=/bin/false \
- --with-PATH_VGETTY=/bin/false"
- fi
-
- #--enable-pam isn't valid
- use pam || my_conf="${my_conf} $(use_enable pam)"
- use ldap || my_conf="${my_conf} $(use_enable ldap)"
- use jbig || my_conf="${my_conf} $(use_enable jbig)"
-
- tc-export CC CXX AR RANLIB
-
- do_configure "${my_conf}"
-}
-
-src_compile() {
- # Parallel building is borked
- emake -j1
-}
-
-src_install() {
- dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
- dodir /var/spool /var/spool/recvq /var/spool/fax
- fowners uucp:uucp /var/spool/fax
- fperms 0600 /var/spool/fax
- dodir "/usr/share/doc/${P}/samples"
-
- emake DESTDIR="${D}" \
- BIN="${D}/usr/bin" \
- SBIN="${D}/usr/sbin" \
- LIBDIR="${D}/usr/$(get_libdir)" \
- LIB="${D}/usr/$(get_libdir)" \
- LIBEXEC="${D}/usr/sbin" \
- LIBDATA="${D}/usr/$(get_libdir)/fax" \
- DIR_LOCALE="${D}/usr/share/locale" \
- MAN="${D}/usr/share/man" \
- SPOOL="${D}/var/spool/fax" \
- HTMLDIR="${D}/usr/share/doc/${PF}/html" \
- install
-
- keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
- keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
- generate_files # in this case, it only generates the env.d entry
-
- einfo "Adding env.d entry for ${PN}"
- doenvd "${T}/99${PN}"
-
- newconfd "${FILESDIR}/${PN}-conf" ${PN}
- newinitd "${FILESDIR}/${PN}-init" ${PN}
-
- use pam && pamd_mimic_system ${MY_PN} auth account session
-
- dodoc CONTRIBUTORS README TODO
- docinto samples
-}
-
-pkg_postinst() {
- elog
- elog "The faxonly USE flag has been removed; since ${PN} does not"
- elog "require mgetty, and certain fax files conflict, you must build"
- elog "mgetty without fax support if you wish to use them both. You"
- elog "may want to add both to package.use so any future updates are"
- elog "correctly built:"
- elog
- elog " net-dialup/mgetty -fax"
- elog " net-misc/hylafax [-mgetty|mgetty]"
- elog
- elog "See the docs and man pages for detailed configuration info."
- elog
- elog "Now run faxsetup and (if necessary) faxaddmodem."
- elog
-}
-
-generate_files() {
- cat <<-EOF > "${T}/99${PN}"
- PATH="/var/spool/fax/bin"
- CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
- EOF
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
deleted file mode 100644
index 6a3be949d08..00000000000
--- a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="http://hylafax.sourceforge.net"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="~amd64 ~x86"
-IUSE="jbig html lcms ldap mgetty pam"
-
-DEPEND="
- >=sys-libs/zlib-1.1.4
- app-text/ghostscript-gpl
- virtual/mta
- media-libs/tiff:0[jbig?]
- virtual/jpeg:0
- jbig? ( media-libs/jbigkit )
- virtual/awk
- lcms? ( media-libs/lcms )
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
- mgetty? ( net-dialup/mgetty[-fax] )
- !net-dialup/mgetty[fax]
-"
-RDEPEND="${DEPEND}
- net-mail/metamail
- !net-dialup/sendpage
-"
-
-S="${WORKDIR}/${MY_P}"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=( "${FILESDIR}/ldconfig-patch" )
-
-src_prepare() {
- default
-
- # force it not to strip binaries
- for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
- hfaxd sendfax sendpage ; do
- sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
- "${dir}"/Makefile.in || die "sed failed"
- done
-
- sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
- # Respect LDFLAGS(at least partially)
- sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
- sed -i -e "s|-fpic|-fPIC|g" \
- configure || die
-}
-
-src_configure() {
- do_configure() {
- echo ./configure --nointeractive ${1}
- # eval required for quoting in ${my_conf} to work properly, better way?
- eval ./configure --nointeractive ${1} || die "./configure failed"
- }
- local my_conf="
- --with-DIR_BIN=/usr/bin
- --with-DIR_SBIN=/usr/sbin
- --with-DIR_LIB=/usr/$(get_libdir)
- --with-DIR_LIBEXEC=/usr/sbin
- --with-DIR_LIBDATA=/usr/$(get_libdir)/fax
- --with-DIR_LOCALE=/usr/share/locale
- --with-DIR_LOCKS=/var/lock
- --with-DIR_MAN=/usr/share/man
- --with-DIR_SPOOL=/var/spool/fax
- --with-DIR_HTML=/usr/share/doc/${P}/html
- --with-DIR_CGI="${WORKDIR}"
- --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
- --with-PATH_IMPRIP=\"\"
- --with-SYSVINIT=no
- --with-REGEX=yes
- --with-LIBTIFF=\"-ltiff -ljpeg -lz\"
- --with-OPTIMIZER=\"${CFLAGS}\"
- --with-DSO=auto
- --with-HTML=$(usex html)"
-
- if use mgetty; then
- my_conf="${my_conf} \
- --with-PATH_GETTY=/sbin/mgetty \
- --with-PATH_EGETTY=/sbin/mgetty \
- --with-PATH_VGETTY=/usr/sbin/vgetty"
- else
- # GETTY defaults to /sbin/agetty
- my_conf="${my_conf} \
- --with-PATH_EGETTY=/bin/false \
- --with-PATH_VGETTY=/bin/false"
- fi
-
- #--enable-pam isn't valid
- use pam || my_conf="${my_conf} $(use_enable pam)"
- use lcms || my_conf="${my_conf} $(use_enable lcms)"
- use ldap || my_conf="${my_conf} $(use_enable ldap)"
- use jbig || my_conf="${my_conf} $(use_enable jbig)"
-
- tc-export CC CXX AR RANLIB
-
- do_configure "${my_conf}"
-}
-
-src_compile() {
- # Parallel building is borked, bug #????
- emake -j1
-}
-
-src_install() {
- dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
- dodir /var/spool /var/spool/fax
- fowners uucp:uucp /var/spool/fax
- fperms 0600 /var/spool/fax
- dodir "/usr/share/doc/${P}/samples"
-
- emake DESTDIR="${D}" \
- BIN="${D}/usr/bin" \
- SBIN="${D}/usr/sbin" \
- LIBDIR="${D}/usr/$(get_libdir)" \
- LIB="${D}/usr/$(get_libdir)" \
- LIBEXEC="${D}/usr/sbin" \
- LIBDATA="${D}/usr/$(get_libdir)/fax" \
- DIR_LOCALE="${D}/usr/share/locale" \
- MAN="${D}/usr/share/man" \
- SPOOL="${D}/var/spool/fax" \
- HTMLDIR="${D}/usr/share/doc/${PF}/html" \
- install
-
- keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
- keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
- generate_files # in this case, it only generates the env.d entry
-
- einfo "Adding env.d entry for ${PN}"
- doenvd "${T}/99${PN}"
-
- newconfd "${FILESDIR}/${PN}-conf" ${PN}
- newinitd "${FILESDIR}/${PN}-init" ${PN}
-
- use pam && pamd_mimic_system ${MY_PN} auth account session
-
- einstalldocs
- docinto samples
-}
-
-generate_files() {
- cat <<-EOF > "${T}/99${PN}"
- PATH="/var/spool/fax/bin"
- CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
- CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
- EOF
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-24 6:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-27 13:18 [gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/files/, net-misc/hylafaxplus/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-24 6:47 Sam James
2021-03-02 3:49 Sam James
2020-07-22 18:46 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox