summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in1
-rw-r--r--package/Config.in1
-rw-r--r--package/busybox/config/findutils/Config.in3
-rw-r--r--package/cryptsetup/Makefile4
-rw-r--r--package/cryptsetup/patches/patch-Makefile_in58
-rw-r--r--package/cryptsetup/patches/patch-configure175
-rw-r--r--package/cryptsetup/patches/patch-configure_in47
-rw-r--r--package/cryptsetup/patches/patch-lib_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-luks_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-man_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-src_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-tests_Makefile_in8
-rw-r--r--package/grep/Makefile32
13 files changed, 323 insertions, 38 deletions
diff --git a/Config.in b/Config.in
index 8b7d40cd6..e22136582 100644
--- a/Config.in
+++ b/Config.in
@@ -36,7 +36,6 @@ config ADK_DEVELSYSTEM
select ADK_PACKAGE_GAWK
select ADK_PACKAGE_GCC
select ADK_PACKAGE_GIT
- select ADK_PACKAGE_GREP
select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
diff --git a/package/Config.in b/package/Config.in
index 1d5743055..68c81aad1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -551,7 +551,6 @@ source "package/cpufrequtils/Config.in"
source "package/fbset/Config.in"
source "package/file/Config.in"
source "package/findutils/Config.in"
-source "package/grep/Config.in"
source "package/hdparm/Config.in"
source "package/usbutils/Config.in"
source "package/patch/Config.in"
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 1a1e0f4d5..ba2e5f557 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -182,8 +182,7 @@ config BUSYBOX_FEATURE_FIND_CONTEXT
config BUSYBOX_GREP
bool "grep"
- default y if !ADK_PACKAGE_GREP
- depends on !ADK_PACKAGE_GREP
+ default y
help
grep is used to search files for a specified pattern.
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f4efcccf5..4d8973482 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
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 \
diff --git a/package/cryptsetup/patches/patch-Makefile_in b/package/cryptsetup/patches/patch-Makefile_in
new file mode 100644
index 000000000..828b25c11
--- /dev/null
+++ b/package/cryptsetup/patches/patch-Makefile_in
@@ -0,0 +1,58 @@
+--- cryptsetup-1.1.0.orig/Makefile.in 2010-01-17 11:29:23.000000000 +0100
++++ cryptsetup-1.1.0/Makefile.in 2010-02-16 20:32:36.876861682 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -323,7 +323,7 @@ distclean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -348,7 +348,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -512,7 +512,8 @@ distdir: $(DISTFILES)
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -556,17 +557,17 @@ dist dist-all: distdir
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
diff --git a/package/cryptsetup/patches/patch-configure b/package/cryptsetup/patches/patch-configure
new file mode 100644
index 000000000..be8bf3375
--- /dev/null
+++ b/package/cryptsetup/patches/patch-configure
@@ -0,0 +1,175 @@
+--- cryptsetup-1.1.0.orig/configure 2010-01-17 11:29:24.000000000 +0100
++++ cryptsetup-1.1.0/configure 2010-02-16 20:32:36.868858986 +0100
+@@ -894,7 +894,6 @@ enable_nls
+ enable_rpath
+ with_libiconv_prefix
+ with_libintl_prefix
+-enable_shared_library
+ enable_selinux
+ with_plain_hash
+ with_plain_cipher
+@@ -1543,7 +1542,7 @@ Optional Features:
+ --disable-largefile omit support for large files
+ --disable-nls do not use Native Language Support
+ --disable-rpath do not hardcode runtime library paths
+- --disable-shared-library
++ --disable-shared
+ disable building of shared cryptsetup library
+ --disable-selinux disable selinux support [default=auto]
+
+@@ -5966,13 +5965,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:5969: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5968: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5972: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5971: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5975: output\"" >&5)
++ (eval echo "\"\$as_me:5974: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7177,7 +7176,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7180 "configure"' > conftest.$ac_ext
++ echo '#line 7179 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8409,11 +8408,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8411: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8416: \$? = $ac_status" >&5
++ echo "$as_me:8415: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8748,11 +8747,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8755: \$? = $ac_status" >&5
++ echo "$as_me:8754: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8853,11 +8852,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8860: \$? = $ac_status" >&5
++ echo "$as_me:8859: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -8908,11 +8907,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8911: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8910: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8915: \$? = $ac_status" >&5
++ echo "$as_me:8914: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11292,7 +11291,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11295 "configure"
++#line 11294 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11388,7 +11387,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11391 "configure"
++#line 11390 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14409,14 +14408,14 @@ POPT_LIBS=$LIBS
+ LIBS=$saved_LIBS
+
+
+-# Check whether --enable-shared-library was given.
+-if test "${enable_shared_library+set}" = set; then :
+- enableval=$enable_shared_library;
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++ enableval=$enable_shared;
+ else
+- enable_shared_library=yes
++ enable_shared=yes
+ fi
+
+- if test x$enable_shared_library = xno; then
++ if test x$enable_shared = xno; then
+ STATIC_LIBRARY_TRUE=
+ STATIC_LIBRARY_FALSE='#'
+ else
+@@ -14619,7 +14618,7 @@ _ACEOF
+
+ fi
+
+- 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
+@@ -14684,7 +14683,7 @@ fi
+ 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
+@@ -14916,7 +14915,7 @@ fi
+
+
+
+- if test x$enable_static = xyes; then
++ if test x$enable_static_cryptsetup = xyes; then
+ STATIC_CRYPTSETUP_TRUE=
+ STATIC_CRYPTSETUP_FALSE='#'
+ else
+@@ -14924,7 +14923,7 @@ else
+ STATIC_CRYPTSETUP_FALSE=
+ fi
+
+- if test x$enable_static = xno; then
++ if test x$enable_static_cryptsetup = xno; then
+ DYNAMIC_CRYPTSETUP_TRUE=
+ DYNAMIC_CRYPTSETUP_FALSE='#'
+ else
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in
new file mode 100644
index 000000000..6d88412f5
--- /dev/null
+++ b/package/cryptsetup/patches/patch-configure_in
@@ -0,0 +1,47 @@
+--- cryptsetup-1.1.0.orig/configure.in 2010-01-17 11:26:31.000000000 +0100
++++ cryptsetup-1.1.0/configure.in 2010-02-16 20:32:36.868858986 +0100
+@@ -62,11 +62,11 @@ LIBS=$saved_LIBS
+
+ dnl ==========================================================================
+
+-AC_ARG_ENABLE(shared-library,
+-[ --disable-shared-library
++AC_ARG_ENABLE(shared,
++[ --disable-shared
+ disable building of shared cryptsetup library],,
+-enable_shared_library=yes)
+-AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared_library = xno)
++enable_shared=yes)
++AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared = xno)
+
+ AC_ARG_ENABLE(selinux,
+ [ --disable-selinux disable selinux support [[default=auto]]],[], [])
+@@ -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_Makefile_in b/package/cryptsetup/patches/patch-lib_Makefile_in
new file mode 100644
index 000000000..812950459
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_Makefile_in
@@ -0,0 +1,8 @@
+--- cryptsetup-1.1.0.orig/lib/Makefile.in 2010-01-17 11:29:22.000000000 +0100
++++ cryptsetup-1.1.0/lib/Makefile.in 2010-02-16 20:32:36.872861451 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-luks_Makefile_in b/package/cryptsetup/patches/patch-luks_Makefile_in
new file mode 100644
index 000000000..208b1f396
--- /dev/null
+++ b/package/cryptsetup/patches/patch-luks_Makefile_in
@@ -0,0 +1,8 @@
+--- cryptsetup-1.1.0.orig/luks/Makefile.in 2010-01-17 11:29:22.000000000 +0100
++++ cryptsetup-1.1.0/luks/Makefile.in 2010-02-16 20:32:36.876861682 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-man_Makefile_in b/package/cryptsetup/patches/patch-man_Makefile_in
new file mode 100644
index 000000000..66fdcb7cf
--- /dev/null
+++ b/package/cryptsetup/patches/patch-man_Makefile_in
@@ -0,0 +1,8 @@
+--- cryptsetup-1.1.0.orig/man/Makefile.in 2010-01-17 11:29:23.000000000 +0100
++++ cryptsetup-1.1.0/man/Makefile.in 2010-02-16 20:32:36.880860794 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-src_Makefile_in b/package/cryptsetup/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..6c0b0096f
--- /dev/null
+++ b/package/cryptsetup/patches/patch-src_Makefile_in
@@ -0,0 +1,8 @@
+--- cryptsetup-1.1.0.orig/src/Makefile.in 2010-01-17 11:29:23.000000000 +0100
++++ cryptsetup-1.1.0/src/Makefile.in 2010-02-16 20:32:36.880860794 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-tests_Makefile_in b/package/cryptsetup/patches/patch-tests_Makefile_in
new file mode 100644
index 000000000..30e05580d
--- /dev/null
+++ b/package/cryptsetup/patches/patch-tests_Makefile_in
@@ -0,0 +1,8 @@
+--- cryptsetup-1.1.0.orig/tests/Makefile.in 2010-01-17 11:29:23.000000000 +0100
++++ cryptsetup-1.1.0/tests/Makefile.in 2010-02-16 20:32:36.888860137 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/grep/Makefile b/package/grep/Makefile
deleted file mode 100644
index 9508508c3..000000000
--- a/package/grep/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= grep
-PKG_VERSION:= 2.5.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672
-PKG_DESCR:= global search for a regular expression and print out matched lines
-PKG_SECTION:= text
-PKG_URL:= http://www.gnu.org/software/grep/
-PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-#CONFIG_STYLE:= manual
-# use following to add ./configure options
-#CONFIGURE_ARGS+= --disable-foo
-# overwrite any configure variables
-#CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
-#BUILD_STYLE:= manual
-#INSTALL_STYLE:= manual
-
-post-install:
- $(INSTALL_DIR) $(IDIR_GREP)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/grep \
- $(IDIR_GREP)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 09:08:58 +0000