rpms/crypto-utils/devel certwatch.c, 1.9, 1.10 crypto-utils.spec, 1.29, 1.30 genkey.pl, 1.5, 1.6

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24388

Modified Files:
	certwatch.c crypto-utils.spec genkey.pl 
Log Message:
* Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 2.3-4
- fix certwatch -p too
- clarify License; package license texts



Index: certwatch.c
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/certwatch.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- certwatch.c	22 Aug 2007 08:13:29 -0000	1.9
+++ certwatch.c	23 Aug 2007 10:09:40 -0000	1.10
@@ -199,7 +199,7 @@
      * mktime() back to UTC: */
     tzset();
     
-    while ((optc = getopt_long(argc, argv, "qpa:", options, NULL)) != -1) {
+    while ((optc = getopt_long(argc, argv, "qp:a:", options, NULL)) != -1) {
         switch (optc) {
         case 'q':
             quiet = 1;
@@ -212,6 +212,7 @@
             break;
         default:
             exit(2);
+            break;
         }
     }
 


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- crypto-utils.spec	22 Aug 2007 08:13:29 -0000	1.29
+++ crypto-utils.spec	23 Aug 2007 10:09:40 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.3
-Release: 3
+Release: 4
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -12,10 +12,12 @@
 Source4: certwatch.xml
 Source5: genkey.xml
 Source6: keyrand.c
+Source7: COPYING
 Group: Applications/System
-License: Various
+License: MIT and GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: openssl-devel, perl-devel, pkgconfig, newt-devel, xmlto, perl(Newt)
+BuildRequires: openssl-devel, pkgconfig, newt-devel, xmlto
+BuildRequires: perl-devel, perl(Newt), perl(Extutils::MakeMaker)
 Requires: perl(Newt), openssl >= 0.9.7f-4
 Requires: %(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
 Obsoletes: crypto-rand
@@ -50,6 +52,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+sed -n '1,/^ \*\/$/p' librand/qshs.c > LICENSE.librand
+cp -p $RPM_SOURCE_DIR/COPYING .
+
 pushd Makerand
 make install
 popd
@@ -96,10 +101,15 @@
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/certwatch
 %{_mandir}/man*/*
+%doc LICENSE* COPYING
 %{perl_vendorarch}/Crypt
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Aug 23 2007 Joe Orton <jorton at redhat.com> 2.3-4
+- fix certwatch -p too
+- clarify License; package license texts
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 2.3-3
 - fix certwatch -a (Tuomo Soini, #253819)
 


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- genkey.pl	27 Apr 2005 12:39:28 -0000	1.5
+++ genkey.pl	23 Aug 2007 10:09:40 -0000	1.6
@@ -1,13 +1,19 @@
 #!%INSTDIR%/bin/perl
 #
-# Copyright (c) 2001-2005 Red Hat, Inc. All rights reserved.
-#
-# This software may be freely redistributed under the terms of the
-# GNU General Public License.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, US
 #
 # Generate a keypair.  Get a keysize from the user, generate
 # some useful random data, generate a key, produce a CSR if