cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libc md5 code rather than included broken md5 code.

Browse Source 
Makes unshield work properly on amd64 and probably other 64bit archs.
This commit is contained in:
jsg 2006-10-18 13:47:36 +00:00
parent c1e377c812
commit bc59701678
8 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archivers/unshield/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.3 2006/01/10 10:58:15 espie Exp $
# $OpenBSD: Makefile,v 1.4 2006/10/18 13:47:36 jsg Exp $
COMMENT= "extract files from InstallShield CAB archives"
DISTNAME= unshield-0.5
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synce/}
SHARED_LIBS= unshield 0.0
SHARED_LIBS= unshield 1.0
HOMEPAGE= http://synce.sourceforge.net/synce/unshield.php
@ -19,7 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c z
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
USE_LIBTOOL= Yes

27
archivers/unshield/patches/patch-lib_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/Makefile.in.orig Sat Jul 23 16:02:27 2005
+++ lib/Makefile.in Sat Jul 23 16:02:29 2005
$OpenBSD: patch-lib_Makefile_in,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/Makefile.in.orig Sat Jul 9 00:55:34 2005
+++ lib/Makefile.in Wed Oct 18 23:26:57 2006
@@ -138,7 +138,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
@ -10,3 +10,24 @@ $OpenBSD: patch-lib_Makefile_in,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
lib_LTLIBRARIES = libunshield.la
@@ -155,11 +155,10 @@ libunshield_la_SOURCES = \
libunshield_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libunshield_la_LIBADD = md5/libmd5.la
include_HEADERS = libunshield.h
-SUBDIRS = md5 .
+SUBDIRS = .
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -167,7 +166,6 @@ CONFIG_HEADER = unshield_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-libunshield_la_DEPENDENCIES = md5/libmd5.la
am_libunshield_la_OBJECTS = bswap.lo component.lo directory.lo file.lo \
file_group.lo helper.lo libunshield.lo log.lo
libunshield_la_OBJECTS = $(am_libunshield_la_OBJECTS)

8
archivers/unshield/patches/patch-lib_component_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_component_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/component.c.orig Sat Jul 9 18:37:55 2005
+++ lib/component.c Sat Jul 9 18:38:26 2005
$OpenBSD: patch-lib_component_c,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/component.c.orig Wed Jun 29 04:49:36 2005
+++ lib/component.c Wed Oct 18 23:08:15 2006
@@ -1,8 +1,9 @@
/* $Id: patch-lib_component_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ */
/* $Id: patch-lib_component_c,v 1.2 2006/10/18 13:47:36 jsg Exp $ */
-#include "internal.h"
-#include "log.h"
#include <stdlib.h>

13
archivers/unshield/patches/patch-lib_file_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_file_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/file.c.orig Sat Jul 9 18:39:00 2005
+++ lib/file.c Sat Jul 9 18:39:23 2005
@@ -1,14 +1,15 @@
/* $Id: patch-lib_file_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ */
$OpenBSD: patch-lib_file_c,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/file.c.orig Wed Jun 29 04:49:36 2005
+++ lib/file.c Wed Oct 18 23:10:28 2006
@@ -1,14 +1,14 @@
/* $Id: patch-lib_file_c,v 1.2 2006/10/18 13:47:36 jsg Exp $ */
-#include "internal.h"
-#include "md5/global.h"
-#include "md5/md5.h"
@ -13,10 +13,9 @@ $OpenBSD: patch-lib_file_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
#include <string.h>
#include <sys/param.h> /* for MIN(a,b) */
#include <zlib.h>
+#include <crypto/md5.h>
+
+#include "internal.h"
+#include "md5/global.h"
+#include "md5/md5.h"
+#include "cabfile.h"
+#include "log.h"

8
archivers/unshield/patches/patch-lib_file_group_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_file_group_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/file_group.c.orig Sat Jul 9 18:39:37 2005
+++ lib/file_group.c Sat Jul 9 18:39:55 2005
$OpenBSD: patch-lib_file_group_c,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/file_group.c.orig Wed Jun 29 04:49:36 2005
+++ lib/file_group.c Wed Oct 18 23:08:15 2006
@@ -1,8 +1,9 @@
/* $Id: patch-lib_file_group_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ */
/* $Id: patch-lib_file_group_c,v 1.2 2006/10/18 13:47:36 jsg Exp $ */
-#include "internal.h"
-#include "log.h"
#include <stdlib.h>

8
archivers/unshield/patches/patch-lib_helper_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_helper_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/helper.c.orig Sat Jul 9 18:40:07 2005
+++ lib/helper.c Sat Jul 9 18:40:20 2005
$OpenBSD: patch-lib_helper_c,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/helper.c.orig Fri Jul 30 04:19:21 2004
+++ lib/helper.c Wed Oct 18 23:08:15 2006
@@ -1,11 +1,12 @@
/* $Id: patch-lib_helper_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ */
/* $Id: patch-lib_helper_c,v 1.2 2006/10/18 13:47:36 jsg Exp $ */
#define _BSD_SOURCE 1
-#include "internal.h"
-#include "log.h"

8
archivers/unshield/patches/patch-lib_libunshield_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_libunshield_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/libunshield.c.orig Sat Jul 9 18:40:36 2005
+++ lib/libunshield.c Sat Jul 9 18:40:48 2005
$OpenBSD: patch-lib_libunshield_c,v 1.2 2006/10/18 13:47:36 jsg Exp $
--- lib/libunshield.c.orig Tue Aug 24 16:10:27 2004
+++ lib/libunshield.c Wed Oct 18 23:08:15 2006
@@ -1,11 +1,12 @@
/* $Id: patch-lib_libunshield_c,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ */
/* $Id: patch-lib_libunshield_c,v 1.2 2006/10/18 13:47:36 jsg Exp $ */
#define _BSD_SOURCE 1
-#include "internal.h"
-#include "log.h"

12
archivers/unshield/patches/patch-lib_md5_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_md5_Makefile_in,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $
--- lib/md5/Makefile.in.orig Sat Jul 23 15:55:40 2005
+++ lib/md5/Makefile.in Sat Jul 23 15:55:47 2005
@@ -138,7 +138,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-AM_CFLAGS = -g -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ @APPLE_CFLAGS@ -I..
+AM_CFLAGS = -Wall -Wsign-compare -Wno-long-long -Werror -ansi @CFLAGS@ @APPLE_CFLAGS@ -I..
noinst_LTLIBRARIES = libmd5.la