[111145] trunk/dports/devel/libcipher

[ryandesign at macports.org]

Revision: 111145
          https://trac.macports.org/changeset/111145
Author:   ryandesign at macports.org
Date:     2013-09-15 18:03:39 -0700 (Sun, 15 Sep 2013)
Log Message:
-----------
libcipher: fix build with latest clang (#40489)

Modified Paths:
--------------
    trunk/dports/devel/libcipher/Portfile

Added Paths:
-----------
    trunk/dports/devel/libcipher/files/patch-Makefile.diff
    trunk/dports/devel/libcipher/files/patch-crypt.c.diff

Removed Paths:
-------------
    trunk/dports/devel/libcipher/files/patch-Makefile

Modified: trunk/dports/devel/libcipher/Portfile
===================================================================
--- trunk/dports/devel/libcipher/Portfile	2013-09-16 01:00:14 UTC (rev 111144)
+++ trunk/dports/devel/libcipher/Portfile	2013-09-16 01:03:39 UTC (rev 111145)
@@ -20,7 +20,8 @@
                 sha1 16d5f31be00361b61f0f1b50a63cad1b31619462 \
                 rmd160 5a619279536eb7258533cf477e10ce5eae1d1d7c
 
-patchfiles      patch-Makefile
+patchfiles      patch-Makefile.diff \
+                patch-crypt.c.diff
 
 worksrcdir      ${name}
 

Deleted: trunk/dports/devel/libcipher/files/patch-Makefile
===================================================================
--- trunk/dports/devel/libcipher/files/patch-Makefile	2013-09-16 01:00:14 UTC (rev 111144)
+++ trunk/dports/devel/libcipher/files/patch-Makefile	2013-09-16 01:03:39 UTC (rev 111145)
@@ -1,10 +0,0 @@
---- Makefile.orig	Wed Mar 26 14:18:54 2003
-+++ Makefile	Wed Mar 26 14:19:28 2003
-@@ -6,6 +6,7 @@
- SRCS=		crypt.c
- PRECIOUSLIB=	yes
- #NOPROFILE=	yes
-+SHLIB_MAJOR=	1
- 
- MAN=	cipher.3
- MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3

Copied: trunk/dports/devel/libcipher/files/patch-Makefile.diff (from rev 111069, trunk/dports/devel/libcipher/files/patch-Makefile)
===================================================================
--- trunk/dports/devel/libcipher/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/libcipher/files/patch-Makefile.diff	2013-09-16 01:03:39 UTC (rev 111145)
@@ -0,0 +1,10 @@
+--- Makefile.orig	Wed Mar 26 14:18:54 2003
++++ Makefile	Wed Mar 26 14:19:28 2003
+@@ -6,6 +6,7 @@
+ SRCS=		crypt.c
+ PRECIOUSLIB=	yes
+ #NOPROFILE=	yes
++SHLIB_MAJOR=	1
+ 
+ MAN=	cipher.3
+ MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3

Added: trunk/dports/devel/libcipher/files/patch-crypt.c.diff
===================================================================
--- trunk/dports/devel/libcipher/files/patch-crypt.c.diff	                        (rev 0)
+++ trunk/dports/devel/libcipher/files/patch-crypt.c.diff	2013-09-16 01:03:39 UTC (rev 111145)
@@ -0,0 +1,37 @@
+--- crypt.c.orig	1999-08-27 18:30:21.000000000 -0700
++++ crypt.c	2013-09-15 12:51:10.000000000 -0700
+@@ -566,12 +566,14 @@
+ 
+ 	setup_salt(salt);
+ 
+-	rawl = ntohl(*((u_long *) in)++);
++	rawl = ntohl(*((u_long *) in));
++	(u_long *)in++;
+ 	rawr = ntohl(*((u_long *) in));
+ 
+ 	retval = do_des(rawl, rawr, &l_out, &r_out, count);
+ 
+-	*((u_long *) out)++ = htonl(l_out);
++	*((u_long *) out) = htonl(l_out);
++	(u_long *)out++;
+ 	*((u_long *) out) = htonl(r_out);
+ 	return(retval);
+ }
+@@ -592,7 +594,7 @@
+ 			if (*key++ & 1)
+ 				p[i] |= bits8[j];
+ 	}
+-	return(des_setkey(p));
++	return(des_setkey((char*)p));
+ }
+ 
+ 
+@@ -607,7 +609,7 @@
+ 		des_init();
+ 
+ 	setup_salt(0L);
+-	p = block;
++	p = (u_char*)block;
+ 	for (i = 0; i < 2; i++) {
+ 		io[i] = 0L;
+ 		for (j = 0; j < 32; j++)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130915/53be27dc/attachment.html>