Hello community, here is the log from the commit of package suseRegister for openSUSE:Factory checked in at 2013-10-01 08:35:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suseRegister (Old) and /work/SRC/openSUSE:Factory/.suseRegister.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suseRegister" Changes: -------- --- /work/SRC/openSUSE:Factory/suseRegister/suseRegister.changes 2011-09-23 12:47:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.suseRegister.new/suseRegister.changes 2013-10-01 08:35:35.000000000 +0200 @@ -2 +2 @@ -Wed Oct 20 20:02:03 UTC 2010 - [email protected] +Sat Sep 28 11:56:28 CEST 2013 - [email protected] @@ -4 +4,2 @@ -- add perl as explicit buildrequire +- remove Requires: uuid-runtime (bnc#840736) + * uuidgen moved to util-linux @@ -7 +8,88 @@ -Wed Jul 15 16:32:28 CEST 2009 - [email protected] +Tue Aug 20 16:13:21 CEST 2013 - [email protected] + +- fix syntax errors in clientSetup4SMT.sh (bnc#834801) +- specify a timeouts while getting the certificate + +------------------------------------------------------------------- +Thu Jun 6 15:59:06 CEST 2013 - [email protected] + +- Enhance clientSetup4SMT.sh to accept a CA certificate in a + non-interactive way by providing the fingerprint (bnc#821853) + +------------------------------------------------------------------- +Thu Apr 18 15:36:35 CEST 2013 - [email protected] + +- pass correct proxy auth flags to libcurl (bnc#812475) +- unescape proxy user and password (bnc#812475) + +------------------------------------------------------------------- +Fri Nov 9 14:38:32 CET 2012 - [email protected] + +- implement erase registration data (FATE#308838) + +------------------------------------------------------------------- +Mon Jan 2 11:15:03 CET 2012 - [email protected] + +- require openssl-certs (bnc#738904) + +------------------------------------------------------------------- +Mon Oct 24 15:55:15 CEST 2011 - [email protected] + +- use 0600 for logfile permissions (bnc#725769) + +------------------------------------------------------------------- +Fri Jul 15 15:46:01 CEST 2011 - [email protected] + +- do not write the mirror credential passwords in the logfile + +------------------------------------------------------------------- +Wed May 18 11:26:31 CEST 2011 - [email protected] + +- add support for registration-time retrieval of + Mirroring Credentials from NCC (fate#312188) +- add detection of ec2 (fate#312187) +- add clientSetup4SMT.sh (FATE#309916) + +------------------------------------------------------------------- +Thu Mar 10 09:26:32 CET 2011 - [email protected] + +- set proxy values in cronjob (bnc#677407) + +------------------------------------------------------------------- +Fri Dec 17 12:56:11 CET 2010 - [email protected] + +- send ostarget as initial registration value (bnc#660080) + +------------------------------------------------------------------- +Mon Aug 16 14:33:08 CEST 2010 - [email protected] + +- let libcurl evaluate the proxy enviroment variables (bnc#626857) +- clear registration-status at needinfo (bnc#614068 C15 C20) + +------------------------------------------------------------------- +Tue Jul 13 15:15:15 CEST 2010 - [email protected] + +- implement handling of registration status (bnc#593607) +- detect VirtualBox virtualization (bnc#546142) + +------------------------------------------------------------------- +Thu Apr 29 18:36:55 CEST 2010 - [email protected] + +- let libcurl calculate the Content-Length of a post request + (bnc#597264) +- show also curl errors + +------------------------------------------------------------------- +Thu Jan 21 13:52:30 CET 2010 - [email protected] + +- call to-delete also on catalogs which are already gone + (bnc#572634) + +------------------------------------------------------------------- +Fri Nov 20 15:43:31 CET 2009 - [email protected] + +- add context option to request needinfo with translated + descriptions from NCC (bnc#557229) + +------------------------------------------------------------------- +Fri Nov 6 14:38:49 CET 2009 - [email protected] @@ -10,2 +98,13 @@ -- use WWW::Curl::Easy instead of LWP::UserAgent to make - registration work in an IPv6 enviroment (FATE#306441) +- switch to WWW:Curl to get IPv6 support (fate#306441) +- call zypper refresh at the end to finish the repository + setup from services (bnc#536554). + This happens only from the commandline tool. +- log by default to <HOME>/.suse_register.log (bnc#552167) +- add description to args hash(bnc#552420) + +------------------------------------------------------------------- +Mon Oct 12 12:34:43 UTC 2009 - [email protected] + +- enable autorefresh for yum and zypp repositories during + create (bnc#545330) +- detect PowerVM and VMWare virtualization (bnc#546142) @@ -14 +113 @@ -Fri Jun 26 13:00:09 CEST 2009 - [email protected] +Thu Jul 30 14:03:12 CEST 2009 - [email protected] @@ -16 +115,2 @@ -- cronjob needs a user (bnc#514685) +- fix language fixing again (bnc#525962) +- strip out non-printable characters (bnc#502785) @@ -19 +119 @@ -Thu May 14 16:52:55 CEST 2009 - [email protected] +Fri Jul 17 15:26:38 CEST 2009 - [email protected] @@ -21 +121 @@ -- strip non-printable characters (bnc#502785) +- add executing user to cron file (bnc#514685) @@ -24 +124 @@ -Fri May 8 11:04:31 CEST 2009 - [email protected] +Thu Apr 09 18:15:01 CEST 2009 - [email protected] @@ -26,2 +126 @@ -- do not change LANG and LANGUAGE enviroment variables - if they are already en_* (bnc#490811) +- apply patch for proper language switching (bnc#490811) New: ---- clientSetup4SMT.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.1VGRYI/_old 2013-10-01 08:35:36.000000000 +0200 +++ /var/tmp/diff_new_pack.1VGRYI/_new 2013-10-01 08:35:36.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package suseRegister (Version 1.4) +# spec file for package suseRegister # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,34 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: suseRegister Version: 1.4 -Release: 8 +Release: 1.<RELEASE33> Summary: Registration Tool -Group: Productivity/Other License: GPL-2.0+ +Group: Productivity/Other Source: %{name}-%{version}.tar.bz2 Source1: cron_suse_register +Source2: clientSetup4SMT.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Requires: curl +Requires: cron +Requires: curl +Requires: distribution-release +Requires: hwinfo +Requires: openssl-certs Requires: perl = %{perl_version} -Requires: perl-XML-Parser -Requires: perl-XML-Writer Requires: perl-URI Requires: perl-WWW-Curl -Requires: uuid-runtime -Requires: coreutils -Requires: util-linux +Requires: perl-XML-Parser +Requires: perl-XML-Writer Requires: sysconfig -Requires: hwinfo +Requires: util-linux +Requires: wget Requires: zypper >= 0.12.6 -Requires: cron -Requires: distribution-release -BuildRequires: perl -PreReq: coreutils +PreReq: coreutils sed grep BuildArch: noarch %description @@ -64,13 +62,16 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/suseRegister/bin make DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} SYSCONFIGDIR=%{_sysconfdir} install install -m 755 %{S:1} $RPM_BUILD_ROOT/usr/lib/suseRegister/bin +install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/lib/suseRegister/bin/ # touching the ghost mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/ touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/novell.com-suse_register %post -if [ ! -s /etc/cron.d/novell.com-suse_register ]; then +if [ ! -s %{_sysconfdir}/cron.d/novell.com-suse_register ]; then date +"%M %H %d * * root /usr/lib/suseRegister/bin/cron_suse_register" > %{_sysconfdir}/cron.d/novell.com-suse_register +elif ! grep "root /usr/lib/suseRegister/bin/cron_suse_register" %{_sysconfdir}/cron.d/novell.com-suse_register > /dev/null 2>&1 ; then + sed -i 's/ \/usr\/lib\/suseRegister\/bin\/cron_suse_register/ root \/usr\/lib\/suseRegister\/bin\/cron_suse_register/' %{_sysconfdir}/cron.d/novell.com-suse_register fi %clean ++++++ clientSetup4SMT.sh ++++++ #! /bin/sh WGET=/usr/bin/wget OPENSSL=/usr/bin/openssl CREHASH=/usr/bin/c_rehash ZMDINIT=/etc/init.d/novell-zmd SRCONF=/etc/suseRegister.conf CP=/bin/cp CAT=/bin/cat CHMOD=/bin/chmod CUT=/usr/bin/cut GREP=/usr/bin/grep RM=/bin/rm SUSEREGISTER=/usr/bin/suse_register GPG=/usr/bin/gpg SSLDIR=/etc/ssl/certs/ CAFILE=("/etc/pki/tls/cert.pem" "/usr/share/ssl/cert.pem") ZMDSSLDIR=/etc/zmd/trusted-certs/ SUPPORTCONFIG=/etc/supportconfig.conf SUPPORTCONFIGENTRY=VAR_OPTION_UPLOAD_TARGET SED=/usr/bin/sed function usage() { if [ -n "$1" ] ; then echo "$1" >&2 echo "" fi cat << EOT >&2 Usage: $0 <registration URL> [--regcert <url>] [--namespace <namespace>] Usage: $0 --host <hostname of the SMT server> [--regcert <url>] [--namespace <namespace>] Usage: $0 --host <hostname of the SMT server> [--fingerprint <fingerprint of server cert>] [--yes] configures a SLE client to register against a different registration server Example: $0 https://smt.example.com/center/regsvc Example: $0 --host smt.example.com --namespace web Example: $0 --host smt.example.com --regcert http://smt.example.com/certs/smt.crt If --namespace is omitted, no namespace is set and this results in using the default production repositories. EOT exit 1 } AUTOACCEPT="" FINGERPRINT="" REGURL="" VARIABLE="" NAMESPACE="" while true ; do case "$1" in --fingerprint) VARIABLE=FINGERPRINT;; --host) VARIABLE=S_HOSTNAME;; --regcert) VARIABLE=REGCERT;; --namespace) VARIABLE=NAMESPACE;; --yes) AUTOACCEPT="Y";; "") break ;; -h|--help) usage;; https*) REGURL=$1;; *) usage "Unknown option $1";; esac if [ -n "$VARIABLE" ] ; then test -z "$2" && usage "Option $1 needs an argument" eval $VARIABLE=\$2 shift VARIABLE="" fi shift done if [ `id -u` != 0 ]; then echo "You must be root. Abort." exit 1; fi if [ -n "$S_HOSTNAME" ]; then REGURL="https://$S_HOSTNAME/center/regsvc"; fi if [ -z "$REGURL" ]; then echo "Missing registration URL. Abort." usage fi if ! echo $REGURL | grep "^https" > /dev/null ; then echo "The registration URL must be a HTTPS URL. Abort." exit 1 fi if ! echo $NAMESPACE | grep -E "^[a-zA-Z0-9_-]*$" > /dev/null ; then echo "Invalid characters in namespace. Allowed are [a-zA-Z0-9_-]. Abort." exit 1 fi # BNC #516495: Changing supportconfig URL for uploading tarbals if [ "${S_HOSTNAME}" != "" ]; then if [ -e "${SUPPORTCONFIG}" ]; then S_ENTRY="http://${S_HOSTNAME}/upload?appname=supportconfig\&file={tarball}"; ${SED} --in-place "s|${SUPPORTCONFIGENTRY}[ \t]*=.*$|${SUPPORTCONFIGENTRY}='${S_ENTRY}'|" ${SUPPORTCONFIG} fi fi if [ -z "$REGCERT" ]; then CERTURL=`echo "$REGURL" | awk -F/ '{print "https://"; $3 "/smt.crt"}'` else CERTURL="$REGCERT" fi if [ "$AUTOACCEPT" = "Y" ] && [ -z "$FINGERPRINT" ]; then echo "Must specify fingerprint with auto accept and auto registration. Abort." exit 1 fi if [ ! -x $OPENSSL ]; then echo "openssl command not found. Abort."; exit 1; fi if [ ! -x $CP ]; then echo "cp command not found. Abort."; exit 1; fi if [ ! -x $CAT ]; then echo "cat command not found. Abort."; exit 1; fi if [ "$AUTOACCEPT" = "Y" ] && [ ! -x $CUT ]; then echo "cut command not found. Abort."; exit 1; fi if [ ! -x $GREP ]; then if [ -x "/bin/grep" ]; then GREP=/bin/grep else echo "grep command not found. Abort."; exit 1; fi fi if [ ! -x $RM ]; then echo "rm command not found. Abort."; exit 1; fi if [ ! -x $CHMOD ]; then echo "chmod command not found. Abort."; exit 1; fi if [ ! -x $SUSEREGISTER ]; then echo "suse_register command not found. Abort." exit 1 fi if [ ! -x $GPG ]; then echo "gpg command not found. Abort." exit 1 fi TEMPFILE=`mktemp /tmp/smt.crt.XXXXXX` if [ -x $WGET ]; then $WGET --no-verbose -q --no-check-certificate --dns-timeout 10 --connect-timeout 10 --output-document $TEMPFILE $CERTURL if [ $? -ne 0 ]; then echo "Download failed. Abort."; exit 1; fi else echo "Binary to download the certificate not found. Please install wget. Abort." exit 1; fi if [ "$AUTOACCEPT" = "Y" ]; then SFPRINT=`/usr/bin/openssl x509 -in $TEMPFILE -noout -fingerprint | /usr/bin/cut -d= -f2` MATCH=`/usr/bin/awk -vs1="$SFPRINT" -vs2="$FINGERPRINT" 'BEGIN { if ( tolower(s1) == tolower(s2) ){ print 1 } }'` if [ "$MATCH" != "1" ]; then echo "Server fingerprint: $SFPRINT and given fingerprint: $FINGERPRINT do not match, not accepting cert. Abort." exit 1 fi else $OPENSSL x509 -in $TEMPFILE -text -noout read -p "Do you accept this certificate? [y/n] " YN if [ "$YN" != "Y" -a "$YN" != "y" ]; then echo "Abort."; exit 1; fi fi ISRES=0 if [ -d $SSLDIR ]; then $CP $TEMPFILE $SSLDIR/registration-server.pem $CHMOD 0644 $SSLDIR/registration-server.pem if [ ! -x $CREHASH ]; then echo "c_rehash command not found."; else $CREHASH $SSLDIR > /dev/null fi else for f in "${CAFILE[@]}"; do if [ -e $f ]; then $CAT $TEMPFILE >> $f; ISRES=1 break; fi done fi if [ -d $ZMDSSLDIR ]; then $CP $TEMPFILE $ZMDSSLDIR/registration-server.cer $CHMOD 0644 $ZMDSSLDIR/registration-server.cer if [ -x $ZMDINIT ]; then $ZMDINIT restart > /dev/null fi fi SRCTMP=`mktemp /tmp/suseRegister.conf.XXXXXX` $CAT $SRCONF | $GREP -v "^url" | grep -v "^register" > $SRCTMP $CP $SRCONF ${SRCONF}-`date '+%F'` echo "url=$REGURL" > $SRCONF if [ -n "$NAMESPACE" ]; then echo "register = command=register&namespace=$NAMESPACE" >> $SRCONF else echo "register = command=register" >> $SRCONF fi $CAT $SRCTMP >> $SRCONF $RM $SRCTMP # # check for keys on the smt server to import # TMPDIR=`mktemp -d /tmp/smtsetup-XXXXXXXX`; KEYSURL=`echo "$REGURL" | awk -F/ '{print "https://"; $3 "/repo/keys/"}'` if [ -z $TMPDIR ]; then echo "Cannot create tmpdir. Abort." exit 1 fi $WGET --quiet --mirror --no-parent --no-host-directories --directory-prefix $TMPDIR --cut-dirs 2 $KEYSURL for key in `ls $TMPDIR/*.key 2>/dev/null`; do if [ -z $key ]; then continue fi if [ "$key" == "$TMPDIR/res-signingkeys.key" -a $ISRES -eq 0 ]; then # this is no RES system, so we do not need this key continue fi mkdir $TMPDIR/.gnupg $GPG --no-default-keyring --quiet --no-greeting --no-permission-warning --homedir $TMPDIR/.gnupg --import $key $GPG --no-default-keyring --no-greeting --no-permission-warning --homedir $TMPDIR/.gnupg --list-public-keys --with-fingerprint if [ "$AUTOACCEPT" = "Y" ]; then echo "Accepting key" rm -rf $TMPDIR/.gnupg/ else read -p "Trust and import this key? [y/n] " YN rm -rf $TMPDIR/.gnupg/ if [ "$YN" != "Y" -a "$YN" != "y" ]; then continue ; fi fi rpm --import $key done rm -rf $TMPDIR/ echo "Client setup finished." if [ -z "$AUTOACCEPT" ]; then read -p "Start the registration now? [y/n] " YN if [ "$YN" != "Y" -a "$YN" != "y" ]; then exit 0; fi fi echo "$SUSEREGISTER -i -L /root/.suse_register.log" $SUSEREGISTER -i -L /root/.suse_register.log ++++++ suseRegister-1.4.tar.bz2 ++++++ ++++ 3503 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
