Hello community,
here is the log from the commit of package hylafax+ for openSUSE:Factory
checked in at 2018-02-27 17:00:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hylafax+ (Old)
and /work/SRC/openSUSE:Factory/.hylafax+.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hylafax+"
Tue Feb 27 17:00:30 2018 rev:17 rq:580621 version:5.5.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/hylafax+/hylafax+.changes 2017-11-12
18:10:34.442838819 +0100
+++ /work/SRC/openSUSE:Factory/.hylafax+.new/hylafax+.changes 2018-02-27
17:00:57.037554026 +0100
@@ -1,0 +2,7 @@
+Wed Feb 21 20:49:11 UTC 2018 - axel.br...@gmx.de
+
+- create user/group uucp
+ adapt services to use uucp
+ boo#1081899
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hylafax+.spec ++++++
--- /var/tmp/diff_new_pack.f9kSdb/_old 2018-02-27 17:00:59.149477718 +0100
+++ /var/tmp/diff_new_pack.f9kSdb/_new 2018-02-27 17:00:59.149477718 +0100
@@ -56,6 +56,10 @@
Requires: mailx
Requires: sharutils
Requires: tiff
+%if 0%{?suse_version} >= 1500
+Requires(pre): group(uucp)
+Requires(pre): user(uucp)
+%endif
Conflicts: hylafax < 30.0.0
Conflicts: mgetty-sendfax
Provides: hylafax = 30.0.0
@@ -179,6 +183,13 @@
rm -f %{buildroot}%{faxspool}/COPYRIGHT
%pre
+%if 0%{?suse_version} < 1500
+getent group uucp > /dev/null || %{_sbindir}/groupadd -r uucp
+getent passwd uucp > /dev/null || %{_sbindir}/useradd -r -g uucp \
+ -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
+ -c 'Hylafax dialout' uucp
+%endif
+
%service_add_pre hylafax-faxq.service
%service_add_pre hylafax-faxgetty-ttyS0.service
%service_add_pre hylafax-hfaxd.service
++++++ hylafax-faxgetty-ttyS0.service ++++++
--- /var/tmp/diff_new_pack.f9kSdb/_old 2018-02-27 17:00:59.217475262 +0100
+++ /var/tmp/diff_new_pack.f9kSdb/_new 2018-02-27 17:00:59.217475262 +0100
@@ -3,8 +3,8 @@
After=hylafax-hfaxd.service
[Service]
-User=root
-Group=root
+User=uucp
+Group=uucp
Restart=always
RestartSec=30
ExecStart=/usr/sbin/faxgetty ttyS0
++++++ hylafax-faxq.service ++++++
--- /var/tmp/diff_new_pack.f9kSdb/_old 2018-02-27 17:00:59.233474683 +0100
+++ /var/tmp/diff_new_pack.f9kSdb/_new 2018-02-27 17:00:59.237474539 +0100
@@ -4,8 +4,8 @@
After=hylafax-hfaxd.service
[Service]
-User=root
-Group=root
+User=uucp
+Group=uucp
Restart=always
RestartSec=30
ExecStart=/usr/sbin/faxq -D
++++++ hylafax-hfaxd.service ++++++
--- /var/tmp/diff_new_pack.f9kSdb/_old 2018-02-27 17:00:59.253473961 +0100
+++ /var/tmp/diff_new_pack.f9kSdb/_new 2018-02-27 17:00:59.253473961 +0100
@@ -3,8 +3,8 @@
ConditionPathExists=/var/spool/hylafax/etc/setup.cache
[Service]
-User=root
-Group=root
+User=uucp
+Group=uucp
Restart=always
ExecStart=/usr/sbin/hfaxd -d -i hylafax
++++++ notification.diff ++++++
--- /var/tmp/diff_new_pack.f9kSdb/_old 2018-02-27 17:00:59.265473528 +0100
+++ /var/tmp/diff_new_pack.f9kSdb/_new 2018-02-27 17:00:59.265473528 +0100
@@ -1,6 +1,12 @@
diff -rauiEZbB a/util/common-functions.sh.in b/util/common-functions.sh.in
--- a/util/common-functions.sh.in 2017-02-18 02:03:07.000000000 +0100
-+++ b/util/common-functions.sh.in 2017-11-04 16:32:28.727251543 +0100
++++ b/util/common-functions.sh.in 2017-12-23 19:42:34.733559532 +0100
+@@ -1,4 +1,4 @@
+-#! @SCRIPT_SH@
++#! /bin/bash
+ # $Id: common-functions.sh.in 1159 2013-05-11 21:05:30Z faxguy $
+
+ #
@@ -11,20 +11,25 @@
#
encode()
@@ -408,7 +414,7 @@
HYLAFAX_TMPDIR="$TMPDIR/hylafaxtmp-$RANDOM-$RANDOM-$RANDOM-$$"
mkdir -m 0700 "$HYLAFAX_TMPDIR"
}
-@@ -581,3 +640,166 @@
+@@ -581,3 +640,187 @@
cleanupExit
exit $1
}
@@ -477,13 +483,22 @@
+
+rfc2047-encode()
+{
++ # RFC2047-encode a part of a header field value.
++ #
+ # required parameters:
-+ # number of already used columns in the current line,
-+ # charset name,
-+ # header field value to be encoded,
++ #
++ # * number of already used columns in the current line,
++ #
++ # * charset name,
++ #
++ # * header field value to be encoded,
++ #
+ # optional parameters:
-+ # name of a variable to store the number of already used columns in
-+ # the last line.
++ #
++ # * name of a variable to store the number of already used columns in
++ # the last line.
++ #
++ # The encoded text is sent to standard output.
+
+ eval "$( rfc2047-encode-2 "$@" )"
+} 3>&1
@@ -492,44 +507,57 @@
+{
+ # Caller environment:
+ #
-+ # File descriptor #3 be standard output.
-+ # File descriptor #1 be output for to be "eval"ed.
-+
++ # File descriptor #3: receives the encoded text.
++ #
++ # File descriptor #1: receives shell commands for the caller
++ # environment to be "eval"ed.
++ #
+ # required parameters:
-+ # number of already used columns in the current line,
-+ # charset_name,
-+ # header field value to be encoded,
++ #
++ # * number of already used columns in the current line,
++ #
++ # * charset_name,
++ #
++ # * header field value to be encoded,
++ #
+ # optional parameters:
-+ # name of a variable to store the number of already used columns in the
-+ # last line.
++ #
++ # * name of a variable to store the number of already used columns in
++ # the last line.
+
+ set -u &&
-+ columns_used="${1:?missing number of already used columns}" &&
++ columns_in_use="${1:?missing number of already used columns}" &&
+ charset="${2:?missing non-empty charset name}" &&
+ value="${3?missing header field value}" &&
+ column_variable="${4-}" &&
+ prefix=' =?'"$charset"'?Q?' &&
+ suffix='?=' &&
-+ : $(( columns_used += ${#prefix} + ${#suffix} )) &&
++ : $(( columns_in_use += ${#prefix} + ${#suffix} )) &&
+ printf '%s' "${prefix}" >&3 &&
+ while
-+ character="${value%"${value#?}"}" &&
-+ ${character:+:} false &&
-+ value="${value#"$character"}"
++ character="${value%"${value#?}"}" &&
++ # "$character" is the first (maybe multi-byte) character of
++ # "$value".
++ ${character:+:} false &&
++ value="${value#"$character"}"
+ do
+ (
++ # In order to process the individual octets of a single
++ # (maybe multi-byte) character, change the locale to
++ # the POSIX locale:
+ export LC_ALL && LC_ALL=C &&
+ encoded_character= && length_of_encoded_character=0 &&
+ while
-+ octet="${character%"${character#?}"}" &&
-+ ${octet:+:} false &&
-+ character="${character#"$octet"}"
++ octet="${character%"${character#?}"}" &&
++ ${octet:+:} false &&
++ character="${character#"$octet"}"
+ do
+ case "$octet" in
+ [[:alnum:]])
+ ;;
+ *)
-+ octet="$( printf '=%.2X'
"'$octet" )"
++ octet="$( printf '=%.2X' \
++ \'"$octet" )"
+ ;;
+ esac
+ encoded_character="${encoded_character}${octet}"
@@ -542,8 +570,7 @@
+ while read -r encoded_character
+ do
+
length_of_encoded_character="${#encoded_character}" &&
-+ if test \
-+ $(( columns_used += \
++ if test $(( columns_in_use += \
+ length_of_encoded_character )) -gt 75
+ then
+ # Appending the encoded character would
@@ -555,7 +582,7 @@
+ # continuation line a new encoded
+ # word beginning with the encoded
+ # character.
-+ columns_used=$(( ${#prefix} + \
++ columns_in_use=$(( ${#prefix} + \
+ length_of_encoded_character + \
+ ${#suffix} ))
+ printf '%s\n%s' "$suffix" "$prefix"
@@ -569,7 +596,7 @@
+ if ${column_variable:+:} false
+ then
+ printf '%s=%s\n' "$column_variable" \
-+ "$columns_used"
++ "$columns_in_use"
+ fi
+ printf 'set_exit_code %s\n' "$ec"
+ } 3>&-
@@ -577,15 +604,16 @@
+}
diff -rauiEZbB a/util/dictionary.sh.in b/util/dictionary.sh.in
--- a/util/dictionary.sh.in 2017-02-18 02:03:08.000000000 +0100
-+++ b/util/dictionary.sh.in 2017-11-04 16:33:24.196173858 +0100
++++ b/util/dictionary.sh.in 2017-12-23 19:42:34.733559532 +0100
@@ -1,9 +1,7 @@
- #! @SCRIPT_SH@
+-#! @SCRIPT_SH@
++#! /bin/bash
# $Id: dictionary.sh.in 1073 2011-12-13 23:37:07Z faxguy $
-LANG=`echo $LANG | sed 's/^cn_/zh_/'` # fix wrong Chinese locale
-
-case "$LANG" in
-+case "${LC_ALL:-${LC_MESSAGES:-${LANG:-POSIX}}}" in
++case "${NOTIFICATIONLANGUAGE:-${LC_ALL:-${LC_MESSAGES:-${LANG:-}}}}" in
nl_BE*)
. bin/dict/nl_BE
;;
@@ -729,7 +757,7 @@
+ # Recode it from the character set "$CHARSET" to the
+ # character set according to the current locale settings:
+ assign_cmd_subst "$variable" \
-+ 'LC_ALL=C printf %s "${'"$variable"'}" | "$@" ' \
++ 'LC_ALL=C printf %s "${'"$variable"'}" | "$@"' \
+ iconv -c -f "$CHARSET"
+ fi
+done
@@ -741,8 +769,26 @@
+fi
diff -rauiEZbB a/util/notify.sh.in b/util/notify.sh.in
--- a/util/notify.sh.in 2017-02-18 02:03:08.000000000 +0100
-+++ b/util/notify.sh.in 2017-11-04 16:34:31.197287955 +0100
-@@ -53,7 +53,8 @@
++++ b/util/notify.sh.in 2017-12-23 19:42:34.733559532 +0100
+@@ -1,4 +1,4 @@
+-#! @SCRIPT_SH@
++#! /bin/bash
+ # $Id: notify.sh.in 984 2010-02-12 04:45:15Z faxguy $
+ #
+ # ============================================
+@@ -46,6 +46,11 @@
+ # The notify shell now behaves in a manner like faxrcvd.
+ # It is now written in shell with a little embedded awk as needed.
+
++
++#set -x
++#exec > /tmp/hylafax-notify.$$ 2>&1
++
++
+ . bin/common-functions
+
+ #
+@@ -53,7 +58,8 @@
#
# Return mail to the submitter of a job when notification is needed.
#
@@ -752,7 +798,7 @@
echo "Usage: $0 qfile why jobtime [nextTry]"
hfExit 1
fi
-@@ -67,14 +68,20 @@
+@@ -67,14 +73,20 @@
{
MAILSUBJECT="$1"
MAILTO="$2"
@@ -777,7 +823,7 @@
echo ""
echo "This is a multi-part message in MIME format."
echo ""
-@@ -84,12 +91,14 @@
+@@ -84,12 +96,14 @@
echo "Content-Transfer-Encoding: quoted-printable"
echo ""
(
@@ -794,7 +840,7 @@
echo "$DICTCOMPLETEDSUCCESSFULLY"
echo ""
else
-@@ -126,11 +135,14 @@
+@@ -126,11 +140,14 @@
echo "$DICTNOFORMATTER2";;
poll_*)
printf "$DICTPOLLINGFAILED"
@@ -812,7 +858,7 @@
echo "$DICTUNSPECIFIEDPROBLEM"
fi;;
*)
-@@ -151,17 +163,23 @@
+@@ -151,17 +168,23 @@
echo "$DICTDESTINATION| $number" | printFormatted $ITEMSIZE
echo "$DICTSENDER| $sender" | printFormatted $ITEMSIZE
echo "$DICTMAILADDR| $mailaddr" | printFormatted $ITEMSIZE
@@ -842,7 +888,7 @@
case "$resolution" in
196) echo "$DICTQUALITY| $DICTFINE" | printFormatted $ITEMSIZE;;
98) echo "$DICTQUALITY| $DICTNORMAL" | printFormatted
$ITEMSIZE;;
-@@ -171,40 +189,54 @@
+@@ -171,40 +194,54 @@
echo "$DICTPAGELENGTH| $pagelength (mm)" | printFormatted
$ITEMSIZE
echo "$DICTSIGNALRATE| $signalrate" | printFormatted $ITEMSIZE
echo "$DICTDATAFORMAT| $dataformat" | printFormatted $ITEMSIZE
@@ -913,7 +959,7 @@
echo ""
echo " ---- $DICTDOCSSUBMITTED ----"
echo ""
-@@ -214,10 +246,12 @@
+@@ -214,10 +251,12 @@
eval echo "$DICTDOCSTEXT4"
echo ""
printf "%-20s %8s %s\n" "$DICTFILENAME" "$DICTSIZE" "$DICTTYPE"
@@ -928,7 +974,7 @@
set - `wc -c "$filename"`
FILESIZE=$1
type="filetype_$i"
-@@ -227,8 +261,10 @@
+@@ -227,8 +266,10 @@
# and because HylaFAX has historically handled PDF named
as
# "postscript" we have to double-check the PostScript
filetype.
#
@@ -941,7 +987,7 @@
filetype=PDF
fi
fi
-@@ -236,26 +272,31 @@
+@@ -236,26 +277,31 @@
fi
done
fi
@@ -979,7 +1025,7 @@
(
# use -e in echo to interpret escape characters in faxstatus
echo ""
-@@ -266,9 +307,10 @@
+@@ -266,9 +312,10 @@
echo ""
echo " ---- $DICTLOGFOLLOWS2 ----"
echo ""
@@ -992,7 +1038,7 @@
echo ""
echo "--$MIMEBOUNDARY"
echo "Content-Type: text/plain; charset=US-ASCII; name=c$commid"
-@@ -277,24 +319,29 @@
+@@ -277,24 +324,29 @@
echo "Content-Disposition: inline"
echo ""
# dump the comfile to output except for '-- data' lines
@@ -1030,7 +1076,7 @@
ftype="filetype_$i"
eval FROMFMT=`echo "$"$ftype`
#
-@@ -302,13 +349,16 @@
+@@ -302,13 +354,16 @@
# and because HylaFAX has historically handled PDF named as
# "postscript" we have to double-check the PostScript
filetype.
#
@@ -1050,7 +1096,7 @@
case "$FROMFMT" in
"TIFF") FILEEXTEN=tif;;
"PostScript") FILEEXTEN=ps;;
-@@ -343,15 +393,15 @@
+@@ -343,15 +398,15 @@
echo "--$MIMEBOUNDARY--"
) 2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi -t
}
@@ -1069,7 +1115,7 @@
command. Read the documentation on setting up HylaFAX before you
startup a server system.
-@@ -377,8 +427,10 @@
+@@ -377,8 +432,10 @@
. etc/setup.cache
@@ -1082,7 +1128,7 @@
return
fi
COUNT=$1
-@@ -416,7 +468,8 @@
+@@ -416,7 +473,8 @@
# dev-nulling them or allowing them to creep into
# the mail.
#
@@ -1092,7 +1138,7 @@
ERRORSTO=`$TTYCMD`
else
ERRORSTO=/dev/null
-@@ -424,19 +477,19 @@
+@@ -424,19 +482,19 @@
adjustNotifyFaxMaster()
{
@@ -1125,7 +1171,7 @@
case $NOTIFY_FAXMASTER in
never|no) NOTIFY_FAXMASTER=no;;
always|yes) NOTIFY_FAXMASTER=yes;;
-@@ -447,7 +500,10 @@
+@@ -447,7 +505,10 @@
"done"|blocked|removed|killed)
NOTIFY_FAXMASTER=no;;
*)
@@ -1137,7 +1183,7 @@
NOTIFY_FAXMASTER=no
else
NOTIFY_FAXMASTER=yes
-@@ -463,7 +519,8 @@
+@@ -463,7 +524,8 @@
# Apply customizations. All customizable variables should
# be set to their non-customized defaults prior to this.
#
@@ -1147,7 +1193,7 @@
# source notify preferences
. etc/FaxNotify
fi
-@@ -472,16 +529,19 @@
+@@ -472,16 +534,19 @@
# Language settings...
#
. bin/dictionary
@@ -1170,7 +1216,7 @@
ERRMSG="$faxstatus"
fi
else
-@@ -496,13 +556,17 @@
+@@ -496,13 +561,17 @@
# with the '-i' option (mime type output)
{
FILENAME=$1
@@ -1192,7 +1238,7 @@
echo "PDF"
else
echo "$DICTUNKNOWNDOCTYPE"
-@@ -518,13 +582,16 @@
+@@ -518,13 +587,16 @@
{
SOURCEFILE=$1
CONVERTFROM=$2
@@ -1213,7 +1259,7 @@
CONVERTCMD="$PS2PDF $SOURCEFILE $OUTFILE"
else
return # unknow convert from format
-@@ -540,14 +607,17 @@
+@@ -540,14 +612,17 @@
{
SOURCEFILE=$1
CONVERTFROM=$2
@@ -1235,7 +1281,7 @@
CONVERTCMD="$PDF2PS $SOURCEFILE $OUTFILE"
else
return # unknow convert from format
-@@ -563,13 +633,16 @@
+@@ -563,13 +638,16 @@
{
SOURCEFILE=$1
CONVERTFROM=$2
@@ -1256,7 +1302,7 @@
CONVERTCMD="$PS2FAX -r $resolution -o $OUTFILE $SOURCEFILE"
else
return # unknow convert from format
-@@ -580,13 +653,15 @@
+@@ -580,13 +658,15 @@
}
match()
@@ -1275,7 +1321,7 @@
return 0
else
return 1
-@@ -619,27 +694,33 @@
+@@ -619,27 +699,33 @@
adjustNotifyFaxMaster
THISJOBTYPE=""
@@ -1315,7 +1361,7 @@
FAXSTATUSMSG="<$DICTNOREASON>"
else
# we need to change the '\n' in the strings to real newlines
-@@ -657,7 +738,8 @@
+@@ -657,7 +743,8 @@
requeued)
notify_mail "$jobtag $DICTTO $DESTINATION $DICTREQUEUED" "$mailaddr";;
removed|killed)
@@ -1325,7 +1371,7 @@
timedout)
notify_mail "$jobtag $DICTTO $DESTINATION $DICTFAILED" "$mailaddr";;
format_failed)
-@@ -669,16 +751,18 @@
+@@ -669,16 +756,18 @@
*)
notify_mail "$DICTNOTICEABOUT $jobtag" "$mailaddr";;
esac
@@ -1348,3 +1394,4 @@
jobtag="$jobtype job $jobid"
fi
notify_mail "$jobtag to $number $WHY" "$TOADDR"
+Nur in a/util: rfc2047-encode.awk.in.
