[gentoo-commits] dev/ulm:patchsets commit in: skey/1.1.5/

[gentoo-commits] dev/ulm:patchsets commit in: skey/1.1.5/

[Ulrich Müller]

commit:     1af659d9eee755ce3baa801f5d99d649e828207f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 21:00:13 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 21:00:13 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ulm.git/commit/?id=1af659d9

Replace broken perl script by sed, bug 553148.

 skey/1.1.5/12_all_fixpathscmd.patch | 73 +++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/skey/1.1.5/12_all_fixpathscmd.patch b/skey/1.1.5/12_all_fixpathscmd.patch
new file mode 100644
index 0000000..d4bd421
--- /dev/null
+++ b/skey/1.1.5/12_all_fixpathscmd.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/553148
+Replace broken perl script by sed.
+
+--- skey-1.1.5-orig/Makefile.in
++++ skey-1.1.5/Makefile.in
+@@ -40,13 +40,11 @@
+ CATMAN		= skey.0 skeyinit.0 skeyinfo.0 skeyaudit.0 skeyprune.0
+ MANPAGES	= @MANTYPE@
+ 
+-PATHSUBS	= -D/etc/skeykeys=${sysconfdir}/skeykeys -D/usr/bin/perl=${PERL}
+-
+-FIXPATHSCMD     = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
++FIXPATHSCMD	= sed -i -e 's:/etc/skey/skeykeys:${sysconfdir}/skeykeys:g;s:/usr/bin/perl:${PERL}:g'
+ 
+ HDRS=	skey.h sha1.h
+ 
+-all: ${TARGETS} ${MANPAGES}
++all: ${TARGETS} ${SCRIPTS} ${MANPAGES}
+ 
+ ${LIBOBJS}: config.h
+ 
+--- skey-1.1.5-orig/fixpaths	2001-05-10 16:10:49.000000000 +0000
++++ skey-1.1.5/fixpaths	1970-01-01 00:00:00.000000000 +0000
+@@ -1,49 +0,0 @@
+-#!/usr/bin/perl -w
+-#
+-# fixpaths  - substitute makefile variables into text files
+-
+-
+-$usage = "Usage: $0 [-x<file dot-suffix>] [-Dstring=replacement] [[infile] ...]\n";
+-
+-$ext="out";
+-
+-if (!defined(@ARGV)) { die ("$usage"); }
+-
+-# read in the command line and get some definitions
+-while ($_=$ARGV[0], /^-/) {
+-  if (/^-[Dx]/) {
+-    # definition
+-    shift(@ARGV);
+-    if ( /-D(.*)=(.*)/ ) {
+-      $def{"$1"}=$2;
+-    } elsif ( /-x\s*(\w+)/ ) {
+-	$ext=$1;
+-    } else {
+-      die ("$usage$0: error in command line arguments.\n");
+-    }
+-  } else {
+-    die ("$usage$0: unknown option '-".$ARGV[0][1]."'\n");
+-  }
+-} # while parsing arguments
+-
+-if (!defined(%def)) {
+-  die ("$0: nothing to do - no substitutions listed!\n");
+-}
+-
+-for $f (@ARGV) {
+-
+-  $f =~ /(.*\/)*(.*)$/;
+-  $of = $2.".$ext"; 
+-
+-  open(IN, "<$f")          || die ("$0: input file $f missing!\n");
+-  if (open(OUT, ">$of")) {
+-    while (<IN>) {
+-      for $s (keys(%def)) {
+-	s#$s#$def{$s}#;
+-      } # for $s
+-      print OUT;
+-    } # while <IN>
+-  } # if (outfile open)
+-} # for $f
+-
+-exit 0;

[gentoo-commits] dev/ulm:patchsets commit in: skey/1.1.5/

[Ulrich Müller]

commit:     e30a41fd9bee90a1efa6504c2aa469203790a6c0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 21:05:17 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 21:05:17 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ulm.git/commit/?id=e30a41fd

timelocal.pl has been superseded by Time::Local.

 skey/1.1.5/13_all_perl-timelocal.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/skey/1.1.5/13_all_perl-timelocal.patch b/skey/1.1.5/13_all_perl-timelocal.patch
new file mode 100644
index 0000000..c93984e
--- /dev/null
+++ b/skey/1.1.5/13_all_perl-timelocal.patch
@@ -0,0 +1,11 @@
+--- skey-1.1.5-orig/skeyprune.pl
++++ skey-1.1.5/skeyprune.pl
+@@ -7,7 +7,7 @@
+ # $OpenBSD: skeyprune.pl,v 1.1 1996/09/28 00:00:41 millert Exp $
+ 
+ # We need to be able convert to time_t
+-require 'timelocal.pl';
++require Time::Local;
+ 
+ # Keep out the stupid
+ die "Only root may run $0.\n" if $>;