summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--package/Config.in1
-rw-r--r--package/Depends.mk11
-rw-r--r--package/Makefile1
-rw-r--r--package/git/Config.in9
-rw-r--r--package/git/Makefile37
-rw-r--r--package/git/patches/patch-Makefile32
-rw-r--r--package/openswan/Config.in20
-rw-r--r--package/openswan/Makefile70
-rw-r--r--package/openswan/patches/patch-Makefile_inc19
-rw-r--r--package/openswan/patches/patch-programs_Makefile_program6
-rw-r--r--package/openswan/patches/patch-programs_ikeping_ikeping_c6
-rw-r--r--target/Config.in8
-rw-r--r--target/linux/config/Config.in.ipsec52
-rw-r--r--target/linux/config/Config.in.network1
15 files changed, 215 insertions, 59 deletions
diff --git a/.gitignore b/.gitignore
index a42417b2b..e05128c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ toolchain_build_*/
.prereq_done
.config*
.cfg/
+.cfg.*/
cross_*/
root_*/
bin_*/
diff --git a/package/Config.in b/package/Config.in
index 1716c763f..b88026c44 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -245,6 +245,7 @@ menu "Misc"
source "package/cups/Config.in"
source "package/fakeidentd/Config.in"
source "package/gkrellmd/Config.in"
+source "package/git/Config.in"
source "package/net-snmp/Config.in"
source "package/nut/Config.in"
source "package/openldap/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 9a45f5823..ef792d9df 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -47,6 +47,7 @@ gatling-compile: libowfat-compile libiconv-compile
gcc-compile: gmp-compile mpfr-compile
gdb-compile: ncurses-compile readline-compile
gettext-compile: libiconv-compile libpthread-compile
+git-compile: openssl-compile curl-compile expat-compile
gkrellmd-compile: glib-compile
glib-compile: gettext-compile libiconv-compile
gmediaserver-compile: id3lib-compile libupnp-compile
@@ -245,22 +246,12 @@ apr-compile: libpthread-compile
endif
asterisk-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile
-ifneq ($(ADK_PACKAGE_ASTERISK_CHAN_BLUETOOTH),)
-asterisk-compile: bluez-compile
-endif
ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
asterisk-compile: speex-compile
endif
ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
asterisk-compile: postgresql-compile
endif
-ifneq ($(ADK_PACKAGE_ASTERISK_MYSQL),)
-asterisk-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_ASTERISK_SQLITE),)
-asterisk-compile: sqlite-compile
-endif
-
freeradius-client-compile: openssl-compile
freeradius-server-compile: libtool-compile openssl-compile
diff --git a/package/Makefile b/package/Makefile
index 68d6cc5f5..a51c4b42f 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -102,6 +102,7 @@ package-$(ADK_PACKAGE_GCC) += gcc
package-$(ADK_PACKAGE_GDB) += gdb
package-$(ADK_PACKAGE_GDBSERVER) += gdbserver
package-$(ADK_PACKAGE_GETTEXT) += gettext
+package-$(ADK_PACKAGE_GIT) += git
package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd
package-$(ADK_PACKAGE_GLIB) += glib
ifeq (${ADK_TARGET_LIB_GLIBC},y)
diff --git a/package/git/Config.in b/package/git/Config.in
new file mode 100644
index 000000000..0ee3e3ea3
--- /dev/null
+++ b/package/git/Config.in
@@ -0,0 +1,9 @@
+config ADK_PACKAGE_GIT
+ prompt "git............................... fast version control system"
+ tristate
+ select ADK_PACKAGE_LIBOPENSSL
+ select ADK_PACKAGE_LIBCURL
+ select ADK_PACKAGE_LIBEXPAT
+ default n
+ help
+ Fast version control system.
diff --git a/package/git/Makefile b/package/git/Makefile
new file mode 100644
index 000000000..9df88b92b
--- /dev/null
+++ b/package/git/Makefile
@@ -0,0 +1,37 @@
+# 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:= git
+PKG_VERSION:= 1.6.3.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a634d76881f3bd6b92cb1892ea5f88fe
+PKG_DESCR:= fast version control system
+PKG_SECTION:= misc
+PKG_DEPENDS:= openssl curl
+PKG_URL:= http://git-scm.com
+PKG_SITES:= http://kernel.org/pub/software/scm/git/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+TCFLAGS+= -DNO_NSEC -DNO_TCLTK -DNO_PERL
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ENV+= ac_cv_c_c99_format=yes \
+ ac_cv_fread_reads_directories=no \
+ ac_cv_snprintf_returns_bogus=no
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core
+ $(CP) $(WRKINST)/usr/bin/git $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-shell $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-receive-pack $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-upload-pack $(IDIR_GIT)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin
+ ${CP} $(WRKINST)/usr/sbin/git-core/* $(IDIR_GIT)/usr/sbin/git-core
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
new file mode 100644
index 000000000..46b1488e5
--- /dev/null
+++ b/package/git/patches/patch-Makefile
@@ -0,0 +1,32 @@
+use symlinks instead of hardlinks
+--- git-1.6.3.3.orig/Makefile 2009-06-22 08:24:25.000000000 +0200
++++ git-1.6.3.3/Makefile 2009-07-24 20:59:26.186421458 +0200
+@@ -215,7 +215,7 @@ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-gitexecdir = libexec/git-core
++gitexecdir = bin
+ sharedir = $(prefix)/share
+ template_dir = share/git-core/templates
+ htmldir = share/doc/git-doc
+@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm
+
+ $(BUILT_INS): git$X
+ $(QUIET_BUILT_IN)$(RM) $@ && \
+- ln git$X $@ 2>/dev/null || \
+ ln -s git$X $@ 2>/dev/null || \
+ cp git$X $@
+
+@@ -1554,11 +1553,9 @@ endif
+ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+ { $(RM) "$$execdir/git-add$X" && \
+ test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+- ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
+ cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
+ { for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+ $(RM) "$$execdir/$$p" && \
+- ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+ done; } && \
diff --git a/package/openswan/Config.in b/package/openswan/Config.in
index 9bb43fa5c..172d02679 100644
--- a/package/openswan/Config.in
+++ b/package/openswan/Config.in
@@ -8,3 +8,23 @@ config ADK_PACKAGE_OPENSWAN
Openswan is an implementation of IPsec for Linux.
http://www.openswan.org/
+
+choice
+prompt "IPSec stack to use"
+depends ADK_PACKAGE_OPENSWAN
+config ADK_COMPILE_OPENSWAN_WITH_NETKEY
+ prompt "NETKEY - use Linux integrated IPSec Stack"
+ select ADK_KPACKAGE_KMOD_NET_KEY
+ select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
+ select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
+ select ADK_KPACKAGE_KMOD_INET_ESP
+ select ADK_KPACKAGE_KMOD_INET_AH
+ bool
+ help
+
+config ADK_COMPILE_OPENSWAN_WITH_KLIPS
+ prompt "KLIPS - use OpenS/WAN IPSec Stack"
+ bool
+ help
+
+endchoice
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 2fdb07849..3c417135d 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openswan
-PKG_VERSION:= 2.6.21
+PKG_VERSION:= 2.6.22
PKG_RELEASE:= 1
-PKG_MD5SUM:= ba9da6c90e0f5fe856767d7510ce371f
+PKG_MD5SUM:= 9a30009bade8a1b09fba27680c87cf72
PKG_DESCR:= IPSec software
PKG_SECTION:= net
PKG_DEPENDS:= ip libgmp
@@ -18,42 +18,36 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-FLAGS:= ${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}
-
-do-build:
- ${MAKE} -C ${WRKBUILD} \
- ${TARGET_CONFIGURE_OPTS} \
- KERNELSRC="${LINUX_DIR}" \
- ARCH="${ARCH}" \
- USERCOMPILE="${FLAGS}" \
- EXTRA_INCLUDE="${TCPPFLAGS}" \
- EXTRA_LIBS="${TLDFLAGS}" \
- IPSECDIR="/usr/lib/ipsec" \
- INC_USRLOCAL="/usr" \
- MODPROBE="insmod" \
- OSDEP="linux" \
- BUILDENV="linux" \
- programs
-
-do-install:
- ${MAKE} -C ${WRKBUILD} \
- ${TARGET_CONFIGURE_OPTS} \
- DESTDIR="${IDIR_OPENSWAN}" \
- KERNELSRC="${LINUX_DIR}" \
- ARCH="${ARCH}" \
- USERCOMPILE="${FLAGS}" \
- IPSECDIR="/usr/lib/ipsec" \
- INC_USRLOCAL="/usr" \
- MODPROBE="insmod" \
- OSDEP="linux" \
- BUILDENV="linux" \
- install
- rm -rf ${IDIR_OPENSWAN}/usr/share
- rm -rf ${IDIR_OPENSWAN}/usr/man
- rm -rf ${IDIR_OPENSWAN}/var
- mv ${IDIR_OPENSWAN}/etc/rc.d/init.d/ipsec \
+#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_NETKEY),y)
+#XAKE_FLAGS+= USE_KLIPS=false USE_NETKEY=true
+#endif
+
+#ifeq ($(ADK_COMPILE_OPENSWAN_WITH_KLIPS),y)
+#XAKE_FLAGS+= USE_KLIPS=true USE_NETKEY=false
+#endif
+
+XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \
+ IPSECDIR="/usr/lib/ipsec" \
+ INC_USRLOCAL="/usr" \
+ MODPROBE="insmod" \
+ OSDEP="linux" \
+ BUILDENV="linux"
+
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+ALL_TARGET:= programs
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/lib/ipsec
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d
+ ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/sbin
+ ${CP} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
+ ${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d
+ ${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec
+ ${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ipsec ${IDIR_OPENSWAN}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/etc/rc.d/init.d/ipsec \
${IDIR_OPENSWAN}/usr/libexec/ipsec/setup
- rm -rf ${IDIR_OPENSWAN}/etc/rc*.d
- find ${IDIR_OPENSWAN} -name \*.old -print0 | xargs -0 rm -rf
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc
index 653528eb9..872f21335 100644
--- a/package/openswan/patches/patch-Makefile_inc
+++ b/package/openswan/patches/patch-Makefile_inc
@@ -1,5 +1,5 @@
---- openswan-2.6.21.orig/Makefile.inc 2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/Makefile.inc 2009-06-13 14:48:55.000000000 +0200
+--- openswan-2.6.22.orig/Makefile.inc 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/Makefile.inc 2009-07-23 20:09:34.556071786 +0200
@@ -163,7 +163,7 @@ INSTALL=install
# how backup names are composed.
# Note that the install procedures will never overwrite an existing config
@@ -9,3 +9,18 @@
INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
INSTMANFLAGS=
INSTCONFFLAGS=
+@@ -262,12 +262,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+ # Note you need a locally running bind9 nameserver with lwres{} enabled
+ # to use this, or have the "lwres" package installed and running.
+ # This only affects conns that use DNS for keys in lookups.
+-USE_LWRES?=false
++USE_LWRES?=true
+
+ # Do a new lookup every time a connection is (re)started. This works better
+ # on hosts with some dyndns service, since DPD will cause a new dns lookup,
+ # but it could be a potential security issue if receiving spoofed dns.
+-USE_DYNAMICDNS?=true
++USE_DYNAMICDNS?=false
+
+ # Do we want all the configuration files like ipsec.conf and ipsec.secrets
+ # and any certificates to be in a single directory defined by
diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program
index 74f5c8751..154fd06c2 100644
--- a/package/openswan/patches/patch-programs_Makefile_program
+++ b/package/openswan/patches/patch-programs_Makefile_program
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 15:11:28.000000000 +0200
-+++ openswan-2.6.21/programs/Makefile.program 2009-06-13 14:42:38.000000000 +0200
+--- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/programs/Makefile.program 2009-07-23 19:46:18.635264333 +0200
@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL
CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
@@ -14,7 +14,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
CFLAGS+= ${WERROR}
-@@ -108,67 +108,67 @@ endif
+@@ -104,67 +104,67 @@ endif
ifneq ($(NOINSTALL),true)
doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
diff --git a/package/openswan/patches/patch-programs_ikeping_ikeping_c b/package/openswan/patches/patch-programs_ikeping_ikeping_c
index 5e8bde61b..4be18fcdb 100644
--- a/package/openswan/patches/patch-programs_ikeping_ikeping_c
+++ b/package/openswan/patches/patch-programs_ikeping_ikeping_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.18.orig/programs/ikeping/ikeping.c 2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/programs/ikeping/ikeping.c 2008-10-14 13:09:06.000000000 +0200
-@@ -316,7 +316,7 @@ main(int argc, char **argv)
+--- openswan-2.6.22.orig/programs/ikeping/ikeping.c 2009-06-23 04:53:08.000000000 +0200
++++ openswan-2.6.22/programs/ikeping/ikeping.c 2009-07-23 19:46:18.643265912 +0200
+@@ -319,7 +319,7 @@ main(int argc, char **argv)
natt=0;
listen_only=0;
noDNS=0;
diff --git a/target/Config.in b/target/Config.in
index da40e1b36..32424365c 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -346,6 +346,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
ADK_LINUX_MIPS64EL_QEMU || \
ADK_LINUX_RESCUE || \
ADK_LINUX_MIPS64_LEMOTE
+ select ADK_KERNEL_BLK_DEV_INITRD
help
create an read-only initramfs system.
@@ -393,12 +394,13 @@ config ADK_TARGET_ROOTFS_EXT2_CF
inside your hardware and want to boot from it.
config ADK_TARGET_ROOTFS_EXT2
- bool "read-write filesystem for qemu emulator"
+ bool "Ext2 read-write filesystem"
depends on ADK_LINUX_QEMU || \
- ADK_LINUX_XSCALE_ZAURUS
+ ADK_LINUX_XSCALE_ZAURUS || \
+ ADK_LINUX_MIPS64_LEMOTE
select ADK_KERNEL_EXT2_FS
help
- Use this option if you compile for qemu.
+ Use this option if your rootfs is ext2.
endchoice
config ADK_SSP
diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec
new file mode 100644
index 000000000..998e3a383
--- /dev/null
+++ b/target/linux/config/Config.in.ipsec
@@ -0,0 +1,52 @@
+menu "IPSec support"
+
+config ADK_KPACKAGE_KMOD_NET_KEY
+ prompt "kmod-net-ipsec-netkey............. PF_KEYv2 socket family"
+ tristate
+ default n
+ help
+ PF_KEYv2 socket family, compatible to KAME ones.
+
+config ADK_KPACKAGE_KMOD_INET_AH
+ prompt "kmod-net-ipsec-ah................. IPsec AH support"
+ tristate
+ default n
+ help
+ Support for IPsec AH.
+
+config ADK_KPACKAGE_KMOD_INET_ESP
+ prompt "kmod-net-ipsec-esp................ IPsec ESP support"
+ tristate
+ default n
+ help
+ Support for IPsec ESP.
+
+config ADK_KPACKAGE_KMOD_INET_IPCOMP
+ prompt "kmod-net-ipsec-comp................ IP Payload Compression"
+ tristate
+ default n
+ help
+ Support for IP Payload Compression Protocol (IPComp) (RFC3173),
+ typically needed for IPsec.
+
+config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
+ prompt "kmod-net-ipsec-transport........... IPsec transport mode"
+ tristate
+ default n
+ help
+ Support for IPsec transport mode.
+
+config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
+ prompt "kmod-net-ipsec-tunnel.............. IPsec tunnel mode"
+ tristate
+ default n
+ help
+ Support for IPsec tunnel mode.
+
+config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET
+ prompt "kmod-net-ipsec-beet................ IPsec BEET mode"
+ tristate
+ default n
+ help
+ Support for IPsec BEET mode.
+endmenu
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 05bd03137..4fa5d37a5 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -234,6 +234,7 @@ config ADK_KPACKAGE_KMOD_BONDING
information.
source target/linux/config/Config.in.sched
+source target/linux/config/Config.in.ipsec
endmenu
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 14:01:37 +0000