summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-07 15:23:11 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-07 15:23:11 (GMT)
commitf3cc98651b738ac7f2dc56ea772afa9f874b9d3b (patch)
tree02fcb02d1a7db02e09355c88e5a4f66f54079d6f
parent5bcfd51dfd2fb526705540ec690e2798a3074e55 (diff)
allow to enable daemons on startup via menuconfig
-rw-r--r--.gitignore1
-rw-r--r--Config.in10
-rw-r--r--adk/tools/pkgmaker.c66
-rw-r--r--mk/package.mk3
-rw-r--r--package/busybox/Makefile6
-rw-r--r--package/busybox/config/miscutils/Config.in6
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/config/networking/udhcp/Config.in2
-rw-r--r--package/busybox/files/busybox.postinst3
-rw-r--r--package/busybox/files/network (renamed from package/busybox/files/network.init)0
-rw-r--r--package/busybox/files/syslog.init33
-rw-r--r--package/busybox/files/udhcpd.init2
-rw-r--r--package/dropbear/Makefile3
-rw-r--r--package/dropbear/files/dropbear.postinst4
-rw-r--r--package/iptables/Makefile20
-rwxr-xr-xpackage/iptables/files/firewall6.init2
-rw-r--r--package/osiris/Makefile39
-rw-r--r--package/osiris/files/osirisd.init28
-rw-r--r--package/osiris/files/osirisd.postinst3
-rw-r--r--package/osiris/patches/patch-configure113
-rw-r--r--package/osiris/patches/patch-src_db-4_2_52_dist_configure12
-rw-r--r--package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh11
-rw-r--r--package/osiris/patches/patch-src_libosiris_Makefile_in41
-rw-r--r--package/osiris/patches/patch-src_libosiris_configuration_c27
-rw-r--r--package/osiris/patches/patch-src_libosiris_configuration_h13
-rw-r--r--package/osiris/patches/patch-src_libosiris_filter_c35
-rw-r--r--package/osiris/patches/patch-src_libosiris_filter_h23
-rw-r--r--package/osiris/patches/patch-src_libosiris_osi_common_h10
-rw-r--r--package/osiris/patches/patch-src_libosiris_ssl_utilities_c30
-rw-r--r--package/osiris/patches/patch-src_libosiris_ssl_utilities_h14
-rw-r--r--package/osiris/patches/patch-src_libosiris_utilities_c13
-rw-r--r--package/osiris/patches/patch-src_osirisd_modules_Makefile_am11
-rw-r--r--package/osiris/patches/patch-src_osirisd_modules_Makefile_in11
-rw-r--r--package/osiris/patches/patch-src_osirisd_scanner_c33
-rw-r--r--package/osiris/patches/patch-src_osirismd_md_control_c16
-rw-r--r--target/config/Config.in2
-rw-r--r--target/config/Config.in.runtime8
-rw-r--r--target/packages/pkg-available/console1
-rw-r--r--target/packages/pkg-available/mpdbox2
-rw-r--r--target/x86/kernel/generic-pc4
40 files changed, 117 insertions, 546 deletions
diff --git a/.gitignore b/.gitignore
index 3ac9569..68214f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
/target/packages/Config.in
/target/config/Config.in.system.default
/target/config/Config.in.system
+/target/config/Config.in.scripts
/target/config/Config.in.native
/target/config/Config.in.arch
/target/config/Config.in.prereq
diff --git a/Config.in b/Config.in
index 9fddb78..01e64ae 100644
--- a/Config.in
+++ b/Config.in
@@ -32,11 +32,6 @@ config ADK_CHOOSE_TARGET_SYSTEM
source "target/config/Config.in"
-menu "Runtime configuration"
-depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
-source "target/config/Config.in.runtime"
-endmenu
-
menu "Package collection"
depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
source "target/packages/Config.in"
@@ -89,6 +84,11 @@ source "package/Config.in.auto.global"
source "package/Config.in.auto"
endmenu
+menu "Runtime configuration"
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
+source "target/config/Config.in.runtime"
+endmenu
+
choice
prompt "Kernel Version"
depends on ADK_TOOLCHAIN_ONLY
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index 51d31aa..6997f3d 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -304,13 +304,18 @@ static char *toupperstr(char *string) {
int main() {
- DIR *pkgdir, *pkglistdir;
+ DIR *pkgdir, *pkglistdir, *scriptdir;
struct dirent *pkgdirp;
- FILE *pkg, *cfg, *menuglobal, *section;
+ struct dirent *scriptdirp;
+ size_t len;
+ FILE *pkg, *cfg, *menuglobal, *section, *initscript, *icfg;
char hvalue[MAXVALUE];
char buf[MAXPATH];
+ char ibuf[MAXPATH];
char tbuf[MAXPATH];
char path[MAXPATH];
+ char script[MAXPATH];
+ char script2[MAXPATH];
char spath[MAXPATH];
char dir[MAXPATH];
char variable[2*MAXVAR];
@@ -320,9 +325,10 @@ int main() {
char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
- char *saveptr, *p_ptr, *s_ptr, *pkg_helper;
+ char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2;
int result;
StrMap *pkgmap, *sectionmap;
+ const char runtime[] = "target/config/Config.in.scripts";
pkg_name = NULL;
pkg_descr = NULL;
@@ -355,6 +361,7 @@ int main() {
s_ptr = NULL;
unlink("package/Config.in.auto");
+ unlink(runtime);
/* open global sectionfile */
menuglobal = fopen("package/Config.in.auto.global", "w");
if (menuglobal == NULL)
@@ -410,6 +417,7 @@ int main() {
fprintf(cfg, "\t C library header files.\n\n");
fclose(cfg);
+
/* read Makefile's for all packages */
pkgdir = opendir("package");
while ((pkgdirp = readdir(pkgdir)) != NULL) {
@@ -421,6 +429,57 @@ int main() {
if (pkg == NULL)
continue;
+ /* runtime configuration */
+ if (snprintf(script, MAXPATH, "package/%s/files", pkgdirp->d_name) < 0)
+ fatal_error("script variable creation failed.");
+ scriptdir = opendir(script);
+ if (scriptdir != NULL) {
+ while ((scriptdirp = readdir(scriptdir)) != NULL) {
+ /* skip dotfiles */
+ if (strncmp(scriptdirp->d_name, ".", 1) > 0) {
+ len = strlen(scriptdirp->d_name);
+ if (strlen(".init") > len)
+ continue;
+ if (strncmp(scriptdirp->d_name + len - strlen(".init"), ".init", strlen(".init")) == 0) {
+ if (snprintf(script, MAXPATH, "package/%s/files/%s", pkgdirp->d_name, scriptdirp->d_name) < 0)
+ fatal_error("script variable creation failed.");
+ initscript = fopen(script, "r");
+ if (initscript == NULL)
+ continue;
+
+ while (fgets(ibuf, MAXPATH, initscript) != NULL) {
+ if (strncmp("#PKG", ibuf, 4) == 0) {
+ sname = strdup(ibuf+5);
+ sname[strlen(sname)-1] = '\0';
+ sname2 = strdup(scriptdirp->d_name);
+ sname2[strlen(sname2)-5] = '\0';
+ icfg = fopen(runtime, "a");
+ if (icfg == NULL)
+ continue;
+ if (strncmp("busybox", sname, 7) == 0)
+ fprintf(icfg, "config ADK_RUNTIME_START_%s_%s\n", toupperstr(sname), toupperstr(sname2));
+ else
+ fprintf(icfg, "config ADK_RUNTIME_START_%s\n", toupperstr(sname));
+ fprintf(icfg, "\tprompt \"Start %s on boot\"\n", sname2);
+ fprintf(icfg, "\tboolean\n");
+ if (strncmp("busybox", sname, 7) == 0)
+ fprintf(icfg, "\tdepends on BUSYBOX_%s\n", toupperstr(sname2));
+ else
+ fprintf(icfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(sname));
+ fprintf(icfg, "\tdepends on ADK_RUNTIME_START_SERVICES\n");
+ fprintf(icfg, "\tdefault n\n\n");
+ fclose(icfg);
+ }
+ continue;
+ free(sname);
+ free(sname2);
+ }
+ }
+ }
+ }
+ closedir(scriptdir);
+ }
+
/* skip manually maintained packages */
if (snprintf(path, MAXPATH, "package/%s/Config.in.manual", pkgdirp->d_name) < 0)
fatal_error("can not create path variable.");
@@ -621,7 +680,6 @@ int main() {
fclose(cfg);
free(pkgs);
-
/* skip packages without binary package output */
if (nobinpkgs == 1)
continue;
diff --git a/mk/package.mk b/mk/package.mk
index eba9c44..c23530e 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -178,6 +178,9 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
done
+ifeq ($(ADK_RUNTIME_START_$(1)),y)
+ $(SED) "s#NO#YES#" $$(IDIR_$(1))/CONTROL/postinst
+endif
ifneq ($(ADK_DEBUG),y)
@echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control
@echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index fce16fa..6b07623 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.21.1
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base
@@ -60,6 +60,10 @@ do-build:
do-install:
$(MAKE) ${BB_MAKE_FLAGS} install $(MAKE_TRACE)
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
+ifeq ($(BUSYBOX_IFUPDOWN),y)
+ $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d
+ $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d
+endif
ifeq ($(ADK_DEBUG),y)
${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
$(IDIR_BUSYBOX)/bin/busybox
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 4c05e5d..f13267e 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -281,7 +281,7 @@ config BUSYBOX_CHRT
config BUSYBOX_CROND
bool "crond"
- default y
+ default n
select BUSYBOX_FEATURE_SYSLOG
help
Crond is a background daemon that parses individual crontab
@@ -301,7 +301,7 @@ config BUSYBOX_FEATURE_CROND_D
config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL
bool "Report command output via email (using sendmail)"
- default y
+ default n
depends on BUSYBOX_CROND
help
Command output will be sent to corresponding user via email.
@@ -747,7 +747,7 @@ config BUSYBOX_WALL
config BUSYBOX_WATCHDOG
bool "watchdog"
- default y
+ default n
depends on !BUSYBOX_DISABLE_WATCHDOG
select BUSYBOX_PLATFORM_LINUX
help
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index e350a1b..fa5a7cd 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -748,7 +748,7 @@ config BUSYBOX_NSLOOKUP
config BUSYBOX_NTPD
bool "ntpd"
depends on !BUSYBOX_DISABLE_NTPD
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
help
The NTP client/server daemon.
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index 6ece730..e0f20fc 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -12,7 +12,7 @@ config BUSYBOX_UDHCPC6
config BUSYBOX_UDHCPD
bool "udhcp server (udhcpd)"
- default y
+ default n
select BUSYBOX_PLATFORM_LINUX
help
udhcpd is a DHCP server geared primarily toward embedded systems,
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index c71a536..d403ff4 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -5,7 +5,8 @@ add_rcconf network network YES
add_rcconf crond crond NO
add_rcconf watchdog watchdog NO
add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
-add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
+add_rcconf syslogd NO
+add_rcconf 'use "-C32" normally' syslogd_flags '-C32'
add_rcconf inetd inetd NO
add_rcconf ntpd ntpd NO
add_rcconf ntpd_flags ntpd_flags '-p time.fu-berlin.de'
diff --git a/package/busybox/files/network.init b/package/busybox/files/network
index 4989fcb..4989fcb 100644
--- a/package/busybox/files/network.init
+++ b/package/busybox/files/network
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
deleted file mode 100644
index 7a85430..0000000
--- a/package/busybox/files/syslog.init
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#PKG busybox
-#INIT 05
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${syslogd_flags:-NO}" = x"NO" && exit 0
- exec sh $0 start
- ;;
-start)
- /sbin/syslogd $syslogd_flags
- if [ -f /proc/sys/kernel/printk ];then
- /sbin/klogd
- fi
- ;;
-stop)
- if [ -f /proc/sys/kernel/printk ];then
- kill $(pgrep -f /sbin/klogd)
- fi
- kill $(pgrep -f /sbin/syslogd)
- ;;
-restart)
- sh $0 stop
- sh $0 start
- ;;
-*)
- echo "Usage: $0 {start | stop | restart}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/package/busybox/files/udhcpd.init b/package/busybox/files/udhcpd.init
index f626fb7..edec3ac 100644
--- a/package/busybox/files/udhcpd.init
+++ b/package/busybox/files/udhcpd.init
@@ -1,5 +1,5 @@
#!/bin/sh
-#PKG udhcpd
+#PKG busybox
#INIT 50
. /etc/rc.conf
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 319c752..58c5537 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -14,7 +14,6 @@ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY && !ADK_PKG_TEST
PKG_SUBPKGS:= DROPBEAR DBCONVERT
PKGSD_DBCONVERT:= Utility for converting SSH private keys
@@ -26,8 +25,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
-TARGET_LDFLAGS+= $(ADK_TARGET_ABI_CFLAGS)
-
ifeq ($(ADK_STATIC),y)
TARGET_LDFLAGS+= -static
endif
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
index 11c7923..c39e169 100644
--- a/package/dropbear/files/dropbear.postinst
+++ b/package/dropbear/files/dropbear.postinst
@@ -1,4 +1,4 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable' dropbear_flags " "
-add_rcconf dropbear dropbear YES
+add_rcconf dropbear_flags dropbear_flags " "
+add_rcconf dropbear dropbear NO
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index d9fa9fd..fe2d940 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= iptables
PKG_VERSION:= 1.4.21
PKG_RELEASE:= 2
PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0
-PKG_DESCR:= The netfilter firewalling software
+PKG_DESCR:= netfilter firewalling software
PKG_SECTION:= firewall
PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack
PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-full-nat
@@ -22,13 +22,19 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_SUBPKGS:= IPTABLES IP6TABLES
+PKGSD_IPTABLES:= iptables for IPv4
+PKGSD_IP6TABLES:= iptables for IPv6
+PKGSS_IP6TABLES:= iptables
+
include ${TOPDIR}/mk/package.mk
# right now default extensions are builtin
# use --disable-static in CONFIGURE_ARGS to change and optimize package
#include ${LINUX_DIR}/.config
-$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_IPTABLES},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_IP6TABLES},${PKGSD_IP6TABLES},${PKG_SECTION},${PKG_OPTS}))
TARGET_LDFLAGS+= -fPIC
CONFIGURE_ARGS+= --enable-devel
@@ -41,9 +47,11 @@ iptables-install:
${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
- ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
- ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IPTABLES}/etc
- ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
- ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib
+
+ip6tables-install:
+ ${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin}
+ ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc
+ ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin
+ ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iptables/files/firewall6.init b/package/iptables/files/firewall6.init
index bedb639..162b98a 100755
--- a/package/iptables/files/firewall6.init
+++ b/package/iptables/files/firewall6.init
@@ -1,5 +1,5 @@
#!/bin/sh
-#PKG iptables
+#PKG ip6tables
#INIT 45
. /etc/rc.conf
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
deleted file mode 100644
index c2921b3..0000000
--- a/package/osiris/Makefile
+++ /dev/null
@@ -1,39 +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:= osiris
-PKG_VERSION:= 4.2.3
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 1951c7dc0fe729af9ffaf58910340d12
-PKG_DESCR:= Host Integrity Monitoring System (scanning agent)
-PKG_SECTION:= admin
-PKG_DEPENDS:= libopenssl libpthread
-PKG_BUILDDEP:= openssl
-PKG_URL:= http://osiris.shmoo.com/
-PKG_SITES:= http://openadk.org/distfiles/
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,OSIRIS,osiris,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_TARGET_DIR}/usr" \
- ac_cv_have_accrights_in_msghdr=no \
- ac_cv_have_control_in_msghdr=yes
-CONFIGURE_ARGS+= --with-osiris-user=root \
- --with-root-dir=/var/lib/osiris \
- --with-readline=no
-XAKE_FLAGS+= ar=${TARGET_CROSS}ar \
- INTERACTIVE=0
-TARGET_CFLAGS+= -DOPENSSL_NO_RIPEMD
-
-post-configure:
- (cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh);
-
-osiris-install:
- ${INSTALL_DIR} ${IDIR_OSIRIS}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/osirisd \
- ${IDIR_OSIRIS}/usr/sbin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init
deleted file mode 100644
index b412e7e..0000000
--- a/package/osiris/files/osirisd.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#PKG osirisd
-#INIT 75
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${osirisd:-NO}" = x"NO" && exit 0
- exec sh $0 start
- ;;
-start)
- [ -d /var/lib/osiris ] || mkdir -p /var/lib/osiris
- /usr/sbin/osirisd
- ;;
-stop)
- kill $(pgrep -f /usr/sbin/osirisd)
- ;;
-restart)
- sh $0 stop
- sh $0 start
- ;;
-*)
- echo "Usage: $0 {start | stop | restart}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/package/osiris/files/osirisd.postinst b/package/osiris/files/osirisd.postinst
deleted file mode 100644
index 04e53ac..0000000
--- a/package/osiris/files/osirisd.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf osirisd osirisd NO
diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure
deleted file mode 100644
index 6dce9a8..0000000
--- a/package/osiris/patches/patch-configure
+++ /dev/null
@@ -1,113 +0,0 @@
---- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/configure 2011-01-21 20:40:11.234913757 +0100
-@@ -3403,7 +3403,7 @@ else
- fi
-
-
--OS_NAME=`uname`
-+OS_NAME=Linux
- AUTOHEADER=echo
-
- if test "x$prefix" = "xNONE" ; then
-@@ -3573,7 +3573,6 @@ else
-
- for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
- CPPFLAGS="$saved_CPPFLAGS"
-- LDFLAGS="$saved_LDFLAGS"
-
- # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS.
-
-@@ -3596,29 +3595,6 @@ else
- if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
- continue;
- fi
-- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-- # Try to use $ssldir/lib if it exists, otherwise
-- # $ssldir
-- if test -d "$ssldir/lib" ; then
-- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
-- if test ! -z "$need_dash_r" ; then
-- LDFLAGS="-R$ssldir/lib $LDFLAGS"
-- fi
-- else
-- LDFLAGS="-L$ssldir $saved_LDFLAGS"
-- if test ! -z "$need_dash_r" ; then
-- LDFLAGS="-R$ssldir $LDFLAGS"
-- fi
-- fi
--
-- # Try to use $ssldir/include if it exists, otherwise
-- # $ssldir
-- if test -d "$ssldir/include" ; then
-- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
-- else
-- CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
-- fi
-- fi
-
- # Basic test to check for compatible version and correct linking
-
-@@ -3694,34 +3670,6 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5
- echo "${ECHO_T}$ac_cv_openssldir" >&6
-
--if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then
--# AC_DEFINE(HAVE_OPENSSL)
-- ssldir=$ac_cv_openssldir
-- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-- # Try to use $ssldir/lib if it exists, otherwise
-- # $ssldir
-- if test -d "$ssldir/lib" ; then
-- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
-- if test ! -z "$need_dash_r" ; then
-- LDFLAGS="-R$ssldir/lib $LDFLAGS"
-- fi
-- else
-- LDFLAGS="-L$ssldir $saved_LDFLAGS"
-- if test ! -z "$need_dash_r" ; then
-- LDFLAGS="-R$ssldir $LDFLAGS"
-- fi
-- fi
-- # Try to use $ssldir/include if it exists, otherwise
-- # $ssldir
-- if test -d "$ssldir/include" ; then
-- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
-- else
-- CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
-- fi
-- fi
--fi
--
--
- case "$OS_NAME" in
- SunOS*)
- LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a"
-@@ -3738,7 +3686,7 @@ CYGWIN*)
- esac
-
-
--DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes"
-+DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes --target=${target_alias} --host=${host_alias} --build=${build_alias}"
-
- case "${OS_NAME}" in
- MINGW32*)
-@@ -4448,11 +4396,6 @@ cat >>confdefs.h <<_ACEOF
- #define SYSTEM_LINUX 1
- _ACEOF
-
--
-- rc=`grep -c krb5 /usr/include/openssl/ssl.h`
-- if test $rc -ne 0; then
-- CPPFLAGS="-I/usr/kerberos/include/ ${CPPFLAGS}"
-- fi
- ;;
- BSD*)
-
-@@ -11394,7 +11337,6 @@ chmod ug+x src/install/install.sh
- echo " Osiris MD Directory: ${with_md_root_dir}"
- echo " Osiris MD user: ${with_osiris_md_user}"
- echo " Osiris MD config dir: ${with_md_conf_dir}"
-- cd ./src/osirisd/modules;./genmods.sh;cd ../../..
- echo " ==> use one of the following targets:"
- echo ""
- echo " all: make everything, agent, CLI and management console."
diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_configure b/package/osiris/patches/patch-src_db-4_2_52_dist_configure
deleted file mode 100644
index 45c04be..0000000
--- a/package/osiris/patches/patch-src_db-4_2_52_dist_configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- osiris-4.2.3.orig/src/db-4.2.52/dist/configure 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/db-4.2.52/dist/configure 2011-01-16 14:41:34.000000000 +0100
-@@ -3498,7 +3498,8 @@ freebsd*)
- LDFLAGS="$LDFLAGS -pthread";;
- gnu*|k*bsd*-gnu|linux*)
- optimize_def="-O2"
-- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
-+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT"
-+ LDFLAGS="$LDFLAGS -pthread";;
- hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";;
- irix*) optimize_def="-O2"
- CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh b/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh
deleted file mode 100644
index 8b90842..0000000
--- a/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- osiris-4.2.3.orig/src/db-4.2.52/dist/ltmain.sh 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/db-4.2.52/dist/ltmain.sh 2011-01-16 14:08:34.000000000 +0100
-@@ -1298,7 +1298,7 @@ EOF
- # but this is not reliable with gcc because gcc may use -mfoo to
- # select a different linker, different libraries, etc, while
- # -Wl,-mfoo simply passes -mfoo to the linker.
-- -m*)
-+ -m*|-fstack-protector*|-flto)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
diff --git a/package/osiris/patches/patch-src_libosiris_Makefile_in b/package/osiris/patches/patch-src_libosiris_Makefile_in
deleted file mode 100644
index 458fc8b..0000000
--- a/package/osiris/patches/patch-src_libosiris_Makefile_in
+++ /dev/null
@@ -1,41 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/Makefile.in 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/Makefile.in 2014-01-03 17:24:45.000000000 +0100
-@@ -105,7 +105,7 @@ libosiris_a_SOURCES = list.c message.c s
- filter_uid.c filter_gid.c filter_user.c \
- filter_group.c filter_header.c filter_file.c \
- filter_suffix.c filter_md5.c filter_sha.c \
-- filter_ripemd.c filter_sid.c filter_permissions.c \
-+ filter_sid.c filter_permissions.c \
- string_list.h ssl_utilities.h utilities.h \
- regex.h regex.c debug.h debug.c strcasestr.c \
- error.h strptime.h
-@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT)
- filter_python.$(OBJEXT) filter_script.$(OBJEXT) \
- filter_gzip.$(OBJEXT) filter_zip.$(OBJEXT) filter_tar.$(OBJEXT) \
- filter_pgp.$(OBJEXT) filter_rpm.$(OBJEXT) filter_uid.$(OBJEXT) \
-- filter_gid.$(OBJEXT) filter_user.$(OBJEXT) \
-+ filter_gid.$(OBJEXT) filter_user.$(OBJEXT) filter_sid.$(OBJEXT) \
- filter_group.$(OBJEXT) filter_header.$(OBJEXT) \
- filter_file.$(OBJEXT) filter_suffix.$(OBJEXT) \
- filter_md5.$(OBJEXT) filter_sha.$(OBJEXT) \
-- filter_ripemd.$(OBJEXT) filter_sid.$(OBJEXT) \
- filter_permissions.$(OBJEXT) regex.$(OBJEXT) debug.$(OBJEXT) \
- strcasestr.$(OBJEXT)
- libosiris_a_OBJECTS = $(am_libosiris_a_OBJECTS)
-@@ -158,7 +157,6 @@ am__depfiles_maybe = depfiles
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_permissions.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_pgp.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_python.Po \
--@AMDEP_TRUE@ ./$(DEPDIR)/filter_ripemd.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_rpm.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_script.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/filter_sgid.Po \
-@@ -224,7 +222,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_permissions.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_pgp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_python.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_ripemd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_rpm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_script.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_sgid.Po@am__quote@
diff --git a/package/osiris/patches/patch-src_libosiris_configuration_c b/package/osiris/patches/patch-src_libosiris_configuration_c
deleted file mode 100644
index f4b164b..0000000
--- a/package/osiris/patches/patch-src_libosiris_configuration_c
+++ /dev/null
@@ -1,27 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/configuration.c 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/configuration.c 2009-05-10 21:06:49.000000000 +0200
-@@ -105,9 +105,11 @@ static struct keywords hash_keywords[] =
- { "sha1", HASH_SHA },
- { "sha-1", HASH_SHA },
-
-+#ifndef OPENSSL_NO_RIPEMD
- { "ripemd", HASH_RIPEMD },
- { "ripemd-160", HASH_RIPEMD },
- { "ripemd160", HASH_RIPEMD },
-+#endif
-
- { NULL, 0 }
- };
-@@ -119,9 +121,11 @@ static char * valid_hash_values[] =
- "sha",
- "sha1",
- "sha-1",
-+#ifndef OPENSSL_NO_RIPEMD
- "ripemd",
- "ripemd160",
- "ripemd-160",
-+#endif
- NULL
- };
-
diff --git a/package/osiris/patches/patch-src_libosiris_configuration_h b/package/osiris/patches/patch-src_libosiris_configuration_h
deleted file mode 100644
index 6cf7c35..0000000
--- a/package/osiris/patches/patch-src_libosiris_configuration_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/configuration.h 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/configuration.h 2009-05-10 21:19:28.000000000 +0200
-@@ -45,7 +45,9 @@
- #define HASH_DEFAULT HASH_MD5
- #define HASH_MD5 1
- #define HASH_SHA 2
-+#ifndef OPENSSL_NO_RIPEMD
- #define HASH_RIPEMD 3
-+#endif
-
- /* config keyword types */
-
diff --git a/package/osiris/patches/patch-src_libosiris_filter_c b/package/osiris/patches/patch-src_libosiris_filter_c
deleted file mode 100644
index d7306ea..0000000
--- a/package/osiris/patches/patch-src_libosiris_filter_c
+++ /dev/null
@@ -1,35 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/filter.c 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/filter.c 2009-05-10 21:02:44.000000000 +0200
-@@ -66,7 +66,9 @@ static struct keywords filter_keywords[]
- { "suffix", FILTER_TYPE_SUFFIX },
- { "md5", FILTER_TYPE_MD5 },
- { "sha", FILTER_TYPE_SHA },
-+#ifndef OPENSSL_NO_RIPEMD
- { "ripemd", FILTER_TYPE_RIPEMD },
-+#endif
- { "permissions", FILTER_TYPE_PERMISSIONS },
- { NULL, 0 }
- };
-@@ -179,9 +181,11 @@ int setup_filter_function( OSI_FILTER *a
- action_filter->perform = filter_sha;
- break;
-
-+#ifndef OPENSSL_NO_RIPEMD
- case FILTER_TYPE_RIPEMD:
- action_filter->perform = filter_ripemd;
- break;
-+#endif
-
- case FILTER_TYPE_PERMISSIONS:
- action_filter->perform = filter_permissions;
-@@ -220,7 +224,9 @@ osi_bool filter_is_dynamic( int filter_t
- case FILTER_TYPE_SUFFIX:
- case FILTER_TYPE_MD5:
- case FILTER_TYPE_SHA:
-+#ifndef OPENSSL_NO_RIPEMD
- case FILTER_TYPE_RIPEMD:
-+#endif
- case FILTER_TYPE_PERMISSIONS:
-
- return TRUE;
diff --git a/package/osiris/patches/patch-src_libosiris_filter_h b/package/osiris/patches/patch-src_libosiris_filter_h
deleted file mode 100644
index c746330..0000000
--- a/package/osiris/patches/patch-src_libosiris_filter_h
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/filter.h 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/filter.h 2009-05-10 21:15:10.000000000 +0200
-@@ -61,7 +61,9 @@
- #define FILTER_TYPE_SUFFIX 19
- #define FILTER_TYPE_MD5 20
- #define FILTER_TYPE_SHA 21
-+#ifndef OPENSSL_NO_RIPEMD
- #define FILTER_TYPE_RIPEMD 22
-+#endif
- #define FILTER_TYPE_PERMISSIONS 23
- #define FILTER_TYPE_SID 24
-
-@@ -143,7 +145,9 @@ osi_bool filter_file( const char *file_p
- osi_bool filter_suffix( const char *file_path, FILTER_CONTEXT *context );
- osi_bool filter_md5( const char *file_path, FILTER_CONTEXT *context );
- osi_bool filter_sha( const char *file_path, FILTER_CONTEXT *context );
-+#ifndef OPENSSL_NO_RIPEMD
- osi_bool filter_ripemd( const char *file_path, FILTER_CONTEXT *context );
-+#endif
- osi_bool filter_permissions( const char *file_path, FILTER_CONTEXT *context );
-
- #endif
diff --git a/package/osiris/patches/patch-src_libosiris_osi_common_h b/package/osiris/patches/patch-src_libosiris_osi_common_h
deleted file mode 100644
index b30462a..0000000
--- a/package/osiris/patches/patch-src_libosiris_osi_common_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- osiris-4.2.3.orig/src/libosiris/osi_common.h 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/osi_common.h 2014-01-03 17:33:53.000000000 +0100
-@@ -31,6 +31,7 @@
- #ifndef OSI_COMMON_H
- #define OSI_COMMON_H
-
-+#include <sys/types.h>
- #include "config.h"
-
- /* for atomic_t */
diff --git a/package/osiris/patches/patch-src_libosiris_ssl_utilities_c b/package/osiris/patches/patch-src_libosiris_ssl_utilities_c
deleted file mode 100644
index 4756359..0000000
--- a/package/osiris/patches/patch-src_libosiris_ssl_utilities_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/ssl_utilities.c 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/ssl_utilities.c 2009-05-10 20:41:31.000000000 +0200
-@@ -51,7 +51,9 @@
- #include <openssl/rand.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-+#ifndef OPENSSL_NO_RIPEMD
- #include <openssl/ripemd.h>
-+#endif
-
- #ifdef WIN32
- #include <winsock.h>
-@@ -337,6 +339,7 @@ int hash_file_sha( const char *file_path
- return -1;
- }
-
-+#ifndef OPENSSL_NO_RIPEMD
- /******************************************************************************
- **
- ** Function: hash_file_ripemd
-@@ -433,7 +436,7 @@ int hash_file_ripemd( const char *file_p
-
- return -1;
- }
--
-+#endif
-
- /******************************************************************************
- **
diff --git a/package/osiris/patches/patch-src_libosiris_ssl_utilities_h b/package/osiris/patches/patch-src_libosiris_ssl_utilities_h
deleted file mode 100644
index 6680969..0000000
--- a/package/osiris/patches/patch-src_libosiris_ssl_utilities_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/ssl_utilities.h 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/ssl_utilities.h 2009-05-10 20:42:04.000000000 +0200
-@@ -59,8 +59,10 @@ int hash_file_md5( const char *file_path
- int hash_file_sha( const char *file_path, FILE *file,
- char *buffer, int buffer_size );
-
-+#ifndef OPENSSL_NO_RIPEMD
- int hash_file_ripemd( const char *file_path, FILE *file,
- char *buffer, int buffer_size );
-+#endif
-
- /* random SSL utilities. */
-
diff --git a/package/osiris/patches/patch-src_libosiris_utilities_c b/package/osiris/patches/patch-src_libosiris_utilities_c
deleted file mode 100644
index ec5a26e..0000000
--- a/package/osiris/patches/patch-src_libosiris_utilities_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/libosiris/utilities.c 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/libosiris/utilities.c 2009-05-10 20:37:18.000000000 +0200
-@@ -60,7 +60,9 @@
-
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-+#ifndef OPENSSL_NO_RIPEMD
- #include <openssl/ripemd.h>
-+#endif
-
- #include "utilities.h"
- #include "error.h"
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
deleted file mode 100644
index 332a866..0000000
--- a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- osiris-4.2.3.orig/src/osirisd/modules/Makefile.am 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/osirisd/modules/Makefile.am 2011-01-21 20:47:14.568658281 +0100
-@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src \
- noinst_SCRIPTS = modules
-
- unused.o:
-- $(CC) -c unused.c
-+ $(CC) $(CFLAGS) -c unused.c
-
- libmodules_a_DEPENDENCIES = unused.o
-
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
deleted file mode 100644
index 459702d..0000000
--- a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- osiris-4.2.3.orig/src/osirisd/modules/Makefile.in 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/osirisd/modules/Makefile.in 2011-01-21 20:47:02.618658788 +0100
-@@ -254,7 +254,7 @@ uninstall-am: uninstall-info-am
-
-
- unused.o:
-- $(CC) -c unused.c
-+ $(CC) $(CFLAGS) -c unused.c
-
- modules:
- ./genmods.sh
diff --git a/package/osiris/patches/patch-src_osirisd_scanner_c b/package/osiris/patches/patch-src_osirisd_scanner_c
deleted file mode 100644
index ee3927b..0000000
--- a/package/osiris/patches/patch-src_osirisd_scanner_c
+++ /dev/null
@@ -1,33 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/osirisd/scanner.c 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/src/osirisd/scanner.c 2009-05-10 20:43:04.000000000 +0200
-@@ -839,12 +839,14 @@ void populate_scan_record( SCANNER *scan
- MAX_CHECKSUM_LENGTH );
- break;
-
-+#ifndef OPENSSL_NO_RIPEMD
- case HASH_RIPEMD:
-
- rc = hash_file_ripemd( scan_record->path, file_handle,
- scan_record->checksum,
- MAX_CHECKSUM_LENGTH );
- break;
-+#endif
-
- default:
-
-@@ -987,12 +989,14 @@ void populate_scan_record( SCANNER *scan
- MAX_CHECKSUM_LENGTH );
- break;
-
-+#ifndef OPENSSL_NO_RIPEMD
- case HASH_RIPEMD:
-
- rc = hash_file_ripemd( scan_record->path, file_handle,
- scan_record->checksum,
- MAX_CHECKSUM_LENGTH );
- break;
-+#endif
-
- default:
-
diff --git a/package/osiris/patches/patch-src_osirismd_md_control_c b/package/osiris/patches/patch-src_osirismd_md_control_c
deleted file mode 100644
index 0c33533..0000000
--- a/package/osiris/patches/patch-src_osirismd_md_control_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- osiris-4.2.3.orig/src/osirismd/md_control.c 2006-12-05 13:02:48.000000000 +0100
-+++ osiris-4.2.3/src/osirismd/md_control.c 2009-05-10 21:28:06.000000000 +0200
-@@ -3259,9 +3259,9 @@ osi_bool generate_session_key_hash( unsi
- int index;
- char checksum[41];
-
-- SHA_Init( &context );
-- SHA_Update( &context, key, (unsigned long)keysize );
-- SHA_Final( &( digest[0] ), &context );
-+ SHA1_Init( &context );
-+ SHA1_Update( &context, key, (unsigned long)keysize );
-+ SHA1_Final( &( digest[0] ), &context );
-
- for ( index = 0; index < SHA_DIGEST_LENGTH; index++ )
- {
diff --git a/target/config/Config.in b/target/config/Config.in
index 25e34c9..e2e9f87 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -266,7 +266,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK
boolean "enabled"
select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
- select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
+ select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_I486
select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 776a1a6..ea023d0 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -7,6 +7,14 @@ config ADK_RUNTIME_HOSTNAME
help
Set your target hostname.
+config ADK_RUNTIME_START_SERVICES
+ prompt "start some services by default"
+ boolean
+ default n
+ help
+
+source "target/config/Config.in.scripts"
+
config ADK_RUNTIME_SSH_PUBKEY
string "SSH public key (root user only)"
default ""
diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
index ef688a3..68ff1f0 100644
--- a/target/packages/pkg-available/console
+++ b/target/packages/pkg-available/console
@@ -3,6 +3,7 @@ config ADK_PKG_CONSOLE
default n
select ADK_PACKAGE_ALSA_UTILS
select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
+ select ADK_PACKAGE_DROPBEAR
select ADK_PACKAGE_SCREEN
select ADK_PACKAGE_SUDO
select ADK_PACKAGE_LINKS
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index b67197c..768de9c 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -2,6 +2,8 @@ config ADK_PKG_MPDBOX
bool "Choose packages for MPDBox system"
default n
select ADK_PACKAGE_MPDBOX
+ select ADK_PACKAGE_DROPBEAR
+ select BUSYBOX_NTPD
select ADK_PACKAGE_CIFS_UTILS
select ADK_PACKAGE_NFS_UTILS
select ADK_PACKAGE_NFS_UTILS_CLIENT
diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc
index f665a27..8b26b4d 100644
--- a/target/x86/kernel/generic-pc
+++ b/target/x86/kernel/generic-pc
@@ -17,3 +17,7 @@ CONFIG_E100=y
CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_ATA=y
+CONFIG_ATA_SFF=y
+CONFIG_ATA_BMDMA=y
+CONFIG_ATA_PIIX=y