change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.

3 files changed, 39 insertions, 38 deletions

diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 7e41abe3b..d3bd57e6f 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,12 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:=		8177f1833f4d6aaacc5812046d2010b6
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
-PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-blk-dev-dm
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt \
+			kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \
+			kmod-crypto-sha256 kmod-blk-dev-dm
 PKG_BUILDDEP+=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
@@ -22,27 +24,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	--disable-static
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
-# hackish way to although build the static libraries for cryptinit
-pre-configure:
-	(cd ${WRKBUILD}; \
-		env ${CONFIGURE_ENV} \
-		./configure --enable-static --disable-nls \
-			--build=${GNU_HOST_NAME} \
-			--host=${GNU_TARGET_NAME} \
-			--target=${GNU_TARGET_NAME} \
-	);
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)"
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" DESTDIR='${WRKINST}' install
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" clean
+AUTOTOOL_STYLE:=	autotool
+CONFIGURE_ARGS+=	--disable-selinux
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \
+	${CP} ${WRKINST}/usr/lib/libcryptsetup.so* \
 		${IDIR_CRYPTSETUP}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \
 		${IDIR_CRYPTSETUP}/usr/sbin
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in
new file mode 100644
index 000000000..2b4c32ad9
--- /dev/null
+++ b/package/cryptsetup/patches/patch-configure_in
@@ -0,0 +1,31 @@
+--- cryptsetup-1.1.0.orig/configure.in	2010-01-17 11:26:31.000000000 +0100
++++ cryptsetup-1.1.0/configure.in	2010-02-05 17:05:34.911823330 +0100
+@@ -80,7 +80,7 @@ LIBS=$saved_LIBS
+ if test "x$enable_selinux" != xno; then
+ 	AC_CHECK_LIB(sepol, sepol_bool_set)
+ 	AC_CHECK_LIB(selinux, is_selinux_enabled)
+-	if test x$enable_static = xyes; then
++	if test x$enable_static_cryptsetup = xyes; then
+ 		SELINUX_STATIC_LIBS=$LIBS
+ 		# Check if we need -pthread with --enable-static and selinux
+ 		saved_LIBS2=$LIBS
+@@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then
+ 	fi
+ fi
+ 
+-if test x$enable_static = xyes; then
++if test x$enable_static_cryptsetup = xyes; then
+ 	saved_LIBS2=$LIBS
+ 	LIBS="$LIBS -static"
+ 	# Check if it there is still not some missing dependency like static selinux libs
+@@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length 
+ 
+ dnl ==========================================================================
+ 
+-AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
+-AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
++AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
++AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
+ 
+ dnl ==========================================================================
+ 
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
deleted file mode 100644
index 97b356f68..000000000
--- a/package/cryptsetup/patches/patch-lib_setup_c
+++ /dev/null
@@ -1,17 +0,0 @@
-already added in svn upstream
---- cryptsetup-1.0.7.orig/lib/setup.c	2009-07-22 13:12:44.000000000 +0200
-+++ cryptsetup-1.0.7/lib/setup.c	2009-08-22 15:10:32.000000000 +0200
-@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
- start:
- 	mk=NULL;
- 
--	if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
-+	if(options->passphrase) {
-+		passwordLen = strlen(options->passphrase);
-+		password = safe_alloc(passwordLen + 1);
-+		strncpy(password, options->passphrase, passwordLen + 1);
-+		tries = 0;
-+	} else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
- 		tries--;
- 	else
- 		tries = 0;