Hello community,

here is the log from the commit of package shellinabox for openSUSE:Factory 
checked in at 2012-12-07 14:51:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shellinabox (Old)
 and      /work/SRC/openSUSE:Factory/.shellinabox.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "shellinabox", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/shellinabox/shellinabox.changes  2012-10-24 
07:14:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.shellinabox.new/shellinabox.changes     
2012-12-07 14:51:35.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 28 15:04:41 UTC 2012 - [email protected]
+
+- use check-create-certificate for creating SSL certificate
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ shellinabox.spec ++++++
--- /var/tmp/diff_new_pack.4qM6p5/_old  2012-12-07 14:51:39.000000000 +0100
+++ /var/tmp/diff_new_pack.4qM6p5/_new  2012-12-07 14:51:39.000000000 +0100
@@ -26,6 +26,7 @@
 Group:          Productivity/Networking/Web/Utilities
 %define         shellinabox_user shellinabox
 %define         pkg_home /var/lib/%{shellinabox_user}
+Requires:      check-create-certificate
 
 
 Source0: %{name}-%{version}.tar.bz2

++++++ rcshellinabox ++++++
--- /var/tmp/diff_new_pack.4qM6p5/_old  2012-12-07 14:51:39.000000000 +0100
+++ /var/tmp/diff_new_pack.4qM6p5/_new  2012-12-07 14:51:39.000000000 +0100
@@ -167,27 +167,21 @@
     start)
        if [ ! -e  $CERTIFICATEFILE ]
        then
-           HOSTNAME=`hostname --fqdn`
-           echo "No certificate found, creating one now for host: $HOSTNAME"
-           `cd $CERTIFICATEPATH ; openssl req -passout pass:linux -subj 
"/C=DE/ST=BY/L=Nuremberg/O=SUSE Linux GmbH/OU=SUSE Linux GmbH/CN=$HOSTNAME" 
-new > $CERTIFICATEPATH/server.csr`
-           `openssl rsa -passin pass:linux -in $CERTIFICATEPATH/privkey.pem 
-out $CERTIFICATEPATH/server.key`
-           `cp $CERTIFICATEPATH/server.key $CERTIFICATEPATH/server.key.org`
-           `openssl rsa -in $CERTIFICATEPATH/server.key.org -out 
$CERTIFICATEPATH/server.key`
-           `openssl x509 -req -days 365 -in $CERTIFICATEPATH/server.csr 
-signkey $CERTIFICATEPATH/server.key -out $CERTIFICATEPATH/server.crt`
-           `cat $CERTIFICATEPATH/server.crt $CERTIFICATEPATH/server.key > 
$CERTIFICATEFILE`
-           echo -n "Created certificate: "
-           openssl x509 -in $CERTIFICATEFILE -fingerprint -noout
-            `rm $CERTIFICATEPATH/server.*`
-            `rm $CERTIFICATEPATH/privkey.pem`
-           if [ ! -e  $CERTIFICATEFILE ]
+           echo -e "\nNo shellinabox certificate found, creating one now..."
+           if ! /usr/sbin/check-create-certificate -c -C $CERTIFICATEFILE.crt 
-K $CERTIFICATEFILE.key -B $CERTIFICATEFILE -D shellinabox -O Shellinabox -U 
Shellinabox
            then
                echo -n "Can not create certificate."
                rc_failed
                rc_status -v
                rc_exit
            fi
+
+           # only combined key is needed
+           rm $CERTIFICATEFILE.crt $CERTIFICATEFILE.key
             chown shellinabox:shellinabox $CERTIFICATEFILE
-            chmod 600 $CERTIFICATEFILE
+
+           echo -n "Created certificate: "
+           openssl x509 -in $CERTIFICATEFILE -fingerprint -noout
        fi
 
        echo -n "Starting shellinabox "

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to