forked from Lainports/freebsd-ports
3f08af39e0
which officially fixes the setuid security exploit by the vendors.
Additionally, from the PR:
* adds in distribution patches to allow it to interoperate
with libtiff-3.5.5 (the current version in the ports tree),
and replace an original FreeBSD patch.
* includes security patches (replacements of 'strcpy' and
'sprintf', primarily), mostly based on patches originally
submitted by Alex Langer [1] for 4.0pl2 and not yet commited,
although some new work was done too.
[1] I don't think, that these were my patches but those submitted by
John Holland <john@zoner.org> in PR 19180.
* Fixes some issues with the configure/setup scripts introduced
since the previous version.
* Additionally, original FreeBSD patches from 4.0pl2 were
merged in where they were not addressed by anything else.
(except the I18N patch, sorry).
I removed the FORBIDDEN line since there are at least no obvious security
concerns left.
PR: 19237
Submitted by: Andy Sparrow <andy@geek4food.org>
48 lines
1.3 KiB
Text
48 lines
1.3 KiB
Text
diff -ruN etc/faxsetup.sh.in.orig etc/faxsetup.sh.in
|
|
--- etc/faxsetup.sh.in.orig Thu Aug 5 04:11:42 1999
|
|
+++ etc/faxsetup.sh.in Mon Jun 12 21:52:46 2000
|
|
@@ -1660,7 +1660,7 @@
|
|
#
|
|
if onServer; then
|
|
signalINETD=no
|
|
- if [ -f $SYSVINIT ]; then
|
|
+ if [ -f "$SYSVINIT" ]; then
|
|
# started by init at boot time
|
|
if [ $FAXQ_SERVER -eq 0 ]; then
|
|
cat <<EOF
|
|
@@ -1674,7 +1674,7 @@
|
|
$FAXQ_SERVER=0
|
|
$HFAXD_SERVER=0
|
|
fi
|
|
- if [ -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
|
|
+ if [ -f "$INETDCONF" -a $HFAXD_SERVER -eq 0 ]; then
|
|
E="hylafax stream tcp nowait $FAX $DIR_LIBEXEC/hfaxd hfaxd -I"
|
|
editInetdConf()
|
|
{
|
|
@@ -1753,7 +1753,7 @@
|
|
isOK "$x" && editInetdConf
|
|
fi
|
|
fi
|
|
- elif [ ! -f $INETDCONF -a $HFAXD_SERVER -eq 0 ]; then
|
|
+ elif [ ! -f "$INETDCONF" -a $HFAXD_SERVER -eq 0 ]; then
|
|
cat<<EOF
|
|
|
|
|
|
@@ -1775,7 +1775,7 @@
|
|
#
|
|
if onServer; then
|
|
x=`(ypcat -k aliases) 2>/dev/null | $GREP -i '^faxmaster'` 2>/dev/null
|
|
- if [ -z "$x" -a -f $ALIASES ]; then
|
|
+ if [ -z "$x" -a -f "$ALIASES" ]; then
|
|
x=`$GREP -i '^faxmaster' $ALIASES`
|
|
fi
|
|
if [ -z "$x" ]; then
|
|
@@ -2160,7 +2160,7 @@
|
|
prompt "Should I restart the HylaFAX server processes [yes]?"; read x
|
|
if isOK "$x"; then
|
|
echo ""
|
|
- if [ -x $SYSVINIT ]; then
|
|
+ if [ -x "$SYSVINIT" ]; then
|
|
echo $SYSVINIT start
|
|
$SYSVINIT start
|
|
else
|