[Gsrc-commit] /srv/bzr/gsrc/trunk r1223: clean up shishi and fix build

[Brandon Invergo]

------------------------------------------------------------
revno: 1223
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-20 23:45:00 +0100
message:
  clean up shishi and fix build
added:
  gnu/shishi/config.mk
  gnu/shishi/files/
  gnu/shishi/files/shishi-1.0.1-fix-build.diff
modified:
  gnu/shishi/Makefile
  gnu/shishi/sha256sums

=== modified file 'gnu/shishi/Makefile'
--- a/gnu/shishi/Makefile       2012-08-25 22:15:17 +0000
+++ b/gnu/shishi/Makefile       2012-11-20 22:45:00 +0000
@@ -1,16 +1,29 @@
 GARNAME = shishi
 GARVERSION = 1.0.1
+HOME_URL = http://www.gnu.org/software/shishi/
+DESCRIPTION = A free implementation of the Kerberos 5 network security \
+system
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = shishi/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-fix-build.diff
 
 BUILDDEPS = libtasn1 libgcrypt gnutls
-# LIBDEPS = 
+LIBDEPS = 
 
-HOME_URL = http://www.gnu.org/software/shishi/
-DESCRIPTION = GNU Shishi, free implementation of the Kerberos 5 network 
security system
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-system-asn1 \
+                 --with-libtasn1-prefix=$(prefix) \
+                 --with-libgnutls-prefix=$(prefix) \
+                 --with-libgcrypt-prefix=$(prefix)
+
+
+

=== added file 'gnu/shishi/config.mk'
--- a/gnu/shishi/config.mk      1970-01-01 00:00:00 +0000
+++ b/gnu/shishi/config.mk      2012-11-20 22:45:00 +0000
@@ -0,0 +1,4 @@
+## Configuration options for shishi ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/shishi/files'
=== added file 'gnu/shishi/files/shishi-1.0.1-fix-build.diff'
--- a/gnu/shishi/files/shishi-1.0.1-fix-build.diff      1970-01-01 00:00:00 
+0000
+++ b/gnu/shishi/files/shishi-1.0.1-fix-build.diff      2012-11-20 22:45:00 
+0000
@@ -0,0 +1,41 @@
+diff -x config.log -x config.status -ru work/shishi-1.0.1/gl/stdio.in.h 
work/shishi-1.0.1/gl/stdio.in.h
+--- work/shishi-1.0.1/gl/stdio.in.h    2012-02-08 13:04:22.000000000 +0100
++++ work/shishi-1.0.1/gl/stdio.in.h    2012-11-20 23:36:03.063244297 +0100
+@@ -715,7 +715,6 @@
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+ 
+diff -x config.log -x config.status -ru work/shishi-1.0.1/lib/asn1.c 
work/shishi-1.0.1/lib/asn1.c
+--- work/shishi-1.0.1/lib/asn1.c       2012-02-08 13:17:44.000000000 +0100
++++ work/shishi-1.0.1/lib/asn1.c       2012-11-20 23:41:23.363293034 +0100
+@@ -39,7 +39,7 @@
+ int
+ _shishi_asn1_init (Shishi * handle)
+ {
+-  char errorDescription[MAX_ERROR_DESCRIPTION_SIZE] = "";
++  char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+   int asn1_result;
+ 
+   if (!asn1_check_version (ASN1_VERSION))
+@@ -764,7 +764,7 @@
+ shishi_asn1_to_der_field (Shishi * handle, Shishi_asn1 node,
+                         const char *field, char **der, size_t * len)
+ {
+-  char errorDescription[MAX_ERROR_DESCRIPTION_SIZE] = "";
++  char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+   int mylen = 0;
+   int rc;
+ 
+@@ -847,7 +847,7 @@
+         const char *fieldname,
+         const char *nodename, const char *der, size_t derlen)
+ {
+-  char errorDescription[MAX_ERROR_DESCRIPTION_SIZE] = "";
++  char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+   Shishi_asn1 structure = NULL;
+   int asn1_result = ASN1_SUCCESS;
+ 

=== modified file 'gnu/shishi/sha256sums'
--- a/gnu/shishi/sha256sums     2012-04-23 22:35:10 +0000
+++ b/gnu/shishi/sha256sums     2012-11-20 22:45:00 +0000
@@ -1,2 +1,3 @@
 9d7e4738df21116422585b347ad1c985d2bafd32c8665b4c5563617573e2868d  
download/shishi-1.0.1.tar.gz
+687de4461d8c5272b35b1e66861cc6c0ceb86bf4d6b2ae468225647a8a41e310  
download/shishi-1.0.1-fix-build.diff
 39876c31527877f3a45bf35830e573ef633934a7987f177262714e8f4eb9cec6  
download/shishi-1.0.1.tar.gz.sig