head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.11.21.08.26;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	bAOpHH41u6ewgjQr;

1.1.2.1
date	2006.10.11.21.08.26;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.52.26;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@fix building
@
text
@Index: src/nettle/Makefile.in
--- src/nettle/Makefile.in.orig	2006-05-09 19:53:14 +0200
+++ src/nettle/Makefile.in	2006-06-09 22:38:12 +0200
@@@@ -13,7 +13,7 @@@@
 INSTALL_SCRIPT = @@INSTALL_SCRIPT@@
 INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
 
-SUBDIRS = tools testsuite examples
+SUBDIRS = 
 
 include config.make
 
@@@@ -227,7 +227,7 @@@@
 	./config.status $@@
 
 # Installation
-install-here: install-info install-headers libnettle.a $(SHLIBINSTALL)
+install-here: install-headers libnettle.a $(SHLIBINSTALL)
 	[ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) libnettle.a $(DESTDIR)$(libdir)
 
Index: src/nettle/examples/nettle-openssl.c
--- src/nettle/examples/nettle-openssl.c.orig	2006-05-09 19:53:15 +0200
+++ src/nettle/examples/nettle-openssl.c	2006-06-09 22:34:27 +0200
@@@@ -36,6 +36,7 @@@@
 #define OPENSSL_DISABLE_OLD_DES_SUPPORT
 
 #include <assert.h>
+#include <sys/types.h>
 
 #include <openssl/aes.h>
 #include <openssl/blowfish.h>
@


1.1.2.1
log
@file lsh.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:26 +0000
@
text
@d1 32
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 32
Index: src/nettle/Makefile.in
--- src/nettle/Makefile.in.orig	2006-05-09 19:53:14 +0200
+++ src/nettle/Makefile.in	2006-06-09 22:38:12 +0200
@@@@ -13,7 +13,7 @@@@
 INSTALL_SCRIPT = @@INSTALL_SCRIPT@@
 INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
 
-SUBDIRS = tools testsuite examples
+SUBDIRS = 
 
 include config.make
 
@@@@ -227,7 +227,7 @@@@
 	./config.status $@@
 
 # Installation
-install-here: install-info install-headers libnettle.a $(SHLIBINSTALL)
+install-here: install-headers libnettle.a $(SHLIBINSTALL)
 	[ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) libnettle.a $(DESTDIR)$(libdir)
 
Index: src/nettle/examples/nettle-openssl.c
--- src/nettle/examples/nettle-openssl.c.orig	2006-05-09 19:53:15 +0200
+++ src/nettle/examples/nettle-openssl.c	2006-06-09 22:34:27 +0200
@@@@ -36,6 +36,7 @@@@
 #define OPENSSL_DISABLE_OLD_DES_SUPPORT
 
 #include <assert.h>
+#include <sys/types.h>
 
 #include <openssl/aes.h>
 #include <openssl/blowfish.h>
@