Merge branch 'master' of ssh://openadk.org/git/openadk

BSDmakefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

BUGS

@@ -1,7 +1,5 @@
-- lvm package and device-mapper combine and shared
 - use kmod-template for external kernel modules
 - optimize iptables package (libdirs depending on choosen kernel features)
 - checksum for toolchain packages
 - network scripts for wireless client / ap
-- x11 support completion
 - disable platforms zaurus / qemu etrax

Config.in

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

GNUmakefile

@@ -1,5 +1,3 @@
-# $Id: GNUmakefile 255 2008-12-11 16:20:28Z wbx $
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

Makefile

@@ -1,5 +1,3 @@
-# $Id: Makefile 420 2009-05-08 19:31:15Z wbx $
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

TODO

@@ -1,16 +1,15 @@
-- rename radiusclient-ng -> freeradius-client
+- rescue initramfs image (more archs, generic kernel config )
+  - usb boot via stick
+- combine lvm2 + devicemapper package
 - squid package update
+- bind isc 9.6.1
+- eglibc support
 - check mips -mno-abicalls
 - check ac_cv_func_setpgrp_void=no
-- remove glib1
-- rename glib2, gdbm, lib?
-- update mt-daapd / rename
-- remove $Id$ lines
-- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e.
-- eglibc support
-- rescue initramfs image (more archs, generic kernel config )
-  - replace ibm x40
-  - usb boot via stick
 - kernel 2.6.30
-- bind isc 9.6.1
+- freebsd build
-- asterisk 1.6
+- win cygwin build
+- netbsd build
+- macos x build
+- openbsd build
+- publish via trac+git

config/Makefile

@@ -1,5 +1,3 @@
-# $Id: Makefile 185 2008-10-28 12:24:05Z wbx $
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/build.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/buildhlp.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/cpu.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 # 

mk/fetch.mk

@@ -1,8 +1,5 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
-#-
 
 ifneq ($(strip ${DIST_SUBDIR}),)
 FULLDISTDIR?=		${DISTDIR}/${DIST_SUBDIR}

mk/image.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/kernel-build.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/kernel.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/linux.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/mirrors.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/modules.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/package.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/pkg-bottom.mk

@@ -1,8 +1,5 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
-#-
 # Comments:
 # * pre/do/post-foo are always defined here, but empty. This is so
 #   that we can call it (BSD make has .if target(foo) but GNU not)
@@ -14,7 +11,6 @@
 # * we want to use styles (configure:gnu, build/install:auto), for
 #   making the Makefiles of the packages more clear
 
-#--- configure
 pre-configure:
 do-configure:
 post-configure:
@@ -74,7 +70,6 @@ endif
 	@${MAKE} post-configure $(MAKE_TRACE)
 	touch $@
 
-#--- build
 pre-build:
 do-build:
 post-build:
@@ -95,7 +90,6 @@ endif
 	@env ${MAKE_ENV} ${MAKE} post-build $(MAKE_TRACE)
 	touch $@
 
-#--- fake
 pre-install:
 do-install:
 post-install:
@@ -152,7 +146,6 @@ endif
 	done
 	touch $@
 
-#--- package
 ${_IPKGS_COOKIE}:
 	@clean=0; \
 	for f in ${ALL_IPKGS}; do \
@@ -199,7 +192,6 @@ package: ${ALL_IPKGS}
 	done
 	touch ${_IPKGS_COOKIE}
 
-#--- clean
 clean-targets: clean-dev-generic
 
 clean-dev-generic:

mk/rootfs.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

mk/split-cfg.mk

@@ -1,8 +1,5 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
-#-
 # must work with both BSD and GNU make
 
 ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \

mk/vars.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/6tunnel/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/Config.in

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
@@ -47,7 +45,6 @@ source "package/vim/Config.in"
 endmenu
 
 menu "Filesystem utilities"
-source "package/device-mapper/Config.in"
 source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/fuse/Config.in"
@@ -205,8 +202,6 @@ menu "IPv6"
 depends ADK_IPV6
 source "package/6tunnel/Config.in"
 source "package/aiccu/Config.in"
-# timeb.h / dn_comp issues
-#source "package/dhcpv6/Config.in"
 source "package/miredo/Config.in"
 source "package/mrd6/Config.in"
 source "package/ndisc/Config.in"
@@ -291,7 +286,8 @@ source "package/rtorrent/Config.in"
 endmenu
 
 menu "PPP / PPTP / RADIUS"
-source "package/freeradius/Config.in"
+source "package/freeradius-client/Config.in"
+source "package/freeradius-server/Config.in"
 source "package/ppp/Config.in"
 source "package/pptp/Config.in"
 source "package/pptpd/Config.in"
@@ -425,7 +421,6 @@ source "package/popt/Config.in"  # libpopt
 source "package/postgresql/Config.in"  # libpq
 source "package/libpthread/Config.in"
 source "package/libthread_db/Config.in"
-source "package/radiusclient-ng/Config.in" #libradiusclient-ng
 source "package/readline/Config.in"  # libreadline
 source "package/cyrus-sasl/Config.in"  # libsasl2
 source "package/speex/Config.in" # libspeex
@@ -452,7 +447,7 @@ source "package/zlib/Config.in"
 endmenu
 
 menu "X"
-depends ADK_XORG
+depends ADK_X11
 source "package/xorg-server/Config.in"
 source "package/xf86-video-geode/Config.in"
 
@@ -460,6 +455,7 @@ menu "X Libraries"
 source "package/libICE/Config.in"
 source "package/libSM/Config.in"
 source "package/libX11/Config.in"
+source "package/libXv/Config.in"
 source "package/libXdmcp/Config.in"
 source "package/libXext/Config.in"
 source "package/libXfont/Config.in"
@@ -471,8 +467,11 @@ source "package/libXaw/Config.in"
 source "package/libXmu/Config.in"
 source "package/libXpm/Config.in"
 source "package/libXt/Config.in"
+source "package/libXxf86dga/Config.in"
 source "package/pixman/Config.in"
 source "package/xf86dga/Config.in"
+source "package/xkbcomp/Config.in"
+source "package/xkeyboard-config/Config.in"
 endmenu
 endmenu
 

package/Depends.mk

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
@@ -18,7 +16,7 @@ cbtt-compile: uclibc++-compile
 endif
 cbtt-compile: mysql-compile zlib-compile
 collectd-compile: libpthread-compile
-cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile device-mapper-compile
+cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile
 ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y)
 ctorrent-compile: uclibc++-compile
 endif
@@ -37,7 +35,7 @@ davfs2-compile: libiconv-compile neon-compile
 dbus-compile: expat-compile
 deco-compile: ncurses-compile
 dhcpv6-compile: libnl-compile ncurses-compile
-digitemp-compile: libusb-compile
+digitemp-compile: libusb-compile libusb-compat-compile
 dsniff-compile: libnids-compile openssl-compile gdbm-compile
 elinks-compile: openssl-compile
 esound-compile: libaudiofile-compile
@@ -96,13 +94,14 @@ libnids-compile: libnet-compile libpcap-compile
 libp11-compile: openssl-compile libtool-compile
 libpng-compile: zlib-compile
 libshout-compile: libvorbis-compile
-libusb-compile: libusb-compat-compile
+libusb-compat-compile: libusb-compile
 libtorrent-compile: openssl-compile libsigc++-compile
 libvorbis-compile: libogg-compile
 libfontenc-compile: xproto-compile zlib-compile
 libICE-compile: xtrans-compile
 libSM-compile: libICE-compile
 libXt-compile: libSM-compile
+libXv-compile: libX11-compile videoproto-compile
 libXmu-compile: libXt-compile
 libXext-compile: libX11-compile
 libXaw-compile: libXext-compile libXmu-compile libXpm-compile
@@ -229,6 +228,8 @@ endif
 wx200d-compile: postgresql-compile
 xfsprogs-compile: e2fsprogs-compile
 libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile
+xkeyboard-config-compile: xkbcomp-compile
+xf86-video-geode-compile: xorg-server-compile
 xf86dga-compile: libXxf86dga-compile 
 xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \
 	damageproto-compile scrnsaverproto-compile resourceproto-compile \
@@ -258,15 +259,16 @@ asterisk-compile: sqlite-compile
 endif
 
 
-freeradius-compile: libtool-compile openssl-compile
+freeradius-client-compile: openssl-compile
+freeradius-server-compile: libtool-compile openssl-compile
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
-freeradius-compile: openldap-compile
+freeradius-server-compile: openldap-compile
 endif
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
-freeradius-compile: mysql-compile
+freeradius-server-compile: mysql-compile
 endif
 ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
-freeradius-compile: postgresql-compile
+freeradius-server-compile: postgresql-compile
 endif
 
 hostapd-compile: libnl-compile openssl-compile

package/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
@@ -63,10 +61,8 @@ package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto
 package-$(ADK_PACKAGE_DAVFS2) += davfs2
 package-$(ADK_PACKAGE_DBUS) += dbus
 package-$(ADK_PACKAGE_DECO) += deco
-package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper
 package-$(ADK_COMPILE_DHCP) += dhcp
 package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(ADK_COMPILE_DHCPV6) += dhcpv6
 package-$(ADK_PACKAGE_DIGITEMP) += digitemp
 package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq
 package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools
@@ -96,7 +92,8 @@ package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto
 package-$(ADK_PACKAGE_FPING) += fping
 package-$(ADK_PACKAGE_FPROBE) += fprobe
 package-$(ADK_PACKAGE_FPROBE_ULOG) += fprobe-ulog
-package-$(ADK_PACKAGE_FREERADIUS) += freeradius
+package-$(ADK_COMPILE_FREERADIUS_CLIENT) += freeradius-client
+package-$(ADK_PACKAGE_FREERADIUS_SERVER) += freeradius-server
 package-$(ADK_COMPILE_FREETYPE) += freetype
 package-$(ADK_PACKAGE_FRICKIN) += frickin
 package-$(ADK_COMPILE_FUSE) += fuse
@@ -206,10 +203,12 @@ package-$(ADK_PACKAGE_LIBX11) += libX11
 package-$(ADK_PACKAGE_LIBXAU) += libXau
 package-$(ADK_PACKAGE_LIBXAW) += libXaw
 package-$(ADK_PACKAGE_LIBXPM) += libXpm
+package-$(ADK_PACKAGE_LIBXV) += libXv
 package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp
 package-$(ADK_PACKAGE_LIBXEXT) += libXext
 package-$(ADK_PACKAGE_LIBXFONT) += libXfont
 package-$(ADK_PACKAGE_LIBXKBFILE) += libxkbfile
+package-$(ADK_PACKAGE_LIBXXF86DGA) += libXxf86dga
 package-$(ADK_PACKAGE_LIBXML2) += libxml2
 package-$(ADK_PACKAGE_LIBXMU) += libXmu
 package-$(ADK_PACKAGE_LIBXSLT) += libxslt
@@ -298,7 +297,6 @@ package-$(ADK_PACKAGE_PROCMAIL) += procmail
 package-$(ADK_PACKAGE_PROCPS) += procps
 package-$(ADK_PACKAGE_PTUNNEL) += ptunnel
 package-$(ADK_PACKAGE_QUAGGA) += quagga
-package-$(ADK_COMPILE_RADIUSCLIENT_NG) += radiusclient-ng
 package-$(ADK_PACKAGE_RADDUMP) += raddump
 package-$(ADK_PACKAGE_RADVD) += radvd
 package-$(ADK_PACKAGE_RANDRPROTO) += randrproto
@@ -397,6 +395,8 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
 package-$(ADK_PACKAGE_XINETD) += xinetd
 package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
 package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
+package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp
+package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config
 package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
 package-$(ADK_PACKAGE_XF86DGA) += xf86dga
 package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto

package/aiccu/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/aircrack-ng/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/alsa-lib/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/alsa-utils/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/apr-util/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/apr/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/arpd/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/arpwatch/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/asterisk/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/atftp/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/atftp/files/atftp.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh
+grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
+if [ $? -ne 0 ]; then
+       echo "tftp            69/tcp" >>${IPKG_INSTROOT}/etc/services
+       echo "tftp            69/udp" >>${IPKG_INSTROOT}/etc/services
+fi

package/atftp/ipkg/files/postinst

@@ -1,8 +0,0 @@
-#!/usr/bin/env mksh
-grep -q '^tftp[[:space:]]*69/tcp' ${IPKG_INSTROOT}/etc/services 2>/dev/null
-if [ $? -ne 0 ]; then
-	echo "tftp            69/tcp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp            69/udp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp-mcast    1758/tcp" >>${IPKG_INSTROOT}/etc/services
-	echo "tftp-mcast    1758/udp" >>${IPKG_INSTROOT}/etc/services
-fi

package/autossh/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/avahi/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/axtls/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/base-files/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
@@ -26,7 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-install:
-	$(CP) ./files/* $(IDIR_BASE_FILES)
+	$(CP) ./extra/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES)
 	$(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
@@ -52,6 +50,7 @@ endif
 	mkdir -p $(IDIR_BASE_FILES)/usr/lib
 	mkdir -p $(IDIR_BASE_FILES)/usr/bin
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
+	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	ln -sf ../tmp/resolv.conf $(IDIR_BASE_FILES)/etc/resolv.conf
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 	rm -rf $(IDIR_BASE_FILES)/var

package/base-files/extra/etc/banner

@@ -0,0 +1 @@
+     Linux created with OpenADK

package/base-files/extra/etc/ipkg.conf

@@ -0,0 +1,3 @@
+src openadk http://www.openadk.org/packages/@TARGET@
+dest root /
+dest ram /tmp

package/base-files/files/etc/banner

@@ -1,3 +0,0 @@
-
-     Linux created with OpenADK
-   --- build from revision $R ---

package/base-files/files/etc/ipkg.conf

@@ -1,3 +0,0 @@
-src openadk http://waldemar-brodkorb.de/openadk/downloads/@TARGET@/packages
-dest root /
-dest ram /tmp

package/bash/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bc/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bigreqsproto/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bind/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
@@ -80,11 +78,11 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/
 	# bind lib
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/binutils/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bitlbee/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bluez-firmware/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bluez/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bogofilter/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bridge-utils/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/busybox/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/bwm/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/cbtt/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/cbtt/patches/patch-base64_cpp

@@ -0,0 +1,20 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- cbtt80-20060211-src.orig/base64.cpp	2006-02-07 18:44:58.000000000 +0100
++++ cbtt80-20060211-src/base64.cpp	2009-06-01 19:00:07.000000000 +0200
+@@ -112,7 +112,7 @@ uchar   pBase64[]   =   {               
+ /* Returns:     bool    - True (!0) if the operation was successful.         */
+ /*                        False (0) if the operation was unsuccessful.       */
+ /*---------------------------------------------------------------------------*/
+-char *b64decode(const char *s)
++char *b64decode(char *s)
+ {
+     int     l = strlen(s);                  // Get length of Base64 string.
+     char   *b;                              // Decoding buffer pointers.
+@@ -121,7 +121,6 @@ char *b64decode(const char *s)
+     int     y = 0;
+ 
+     static                                  // Collating sequence...
+-    const                                   // ...independant "===".
+     char    pPad[]  =   {0x3d, 0x3d, 0x3d, 0x00};
+ 
+     if  (l % 4)                             // If it's not modulo 4, then it...

package/cfgfs/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/cfgfs/src/BSDmakefile

@@ -1,14 +1,8 @@
-# $MirOS: contrib/hosted/fwcf/BSDmakefile,v 1.8 2007/03/13 18:14:30 tg Exp $
+SUBDIR+= lib
-#-
+SUBDIR+= mkfwcf
-# This file is part of the FreeWRT project. FreeWRT is copyrighted
+SUBDIR+= unfwcf
-# material, please see the LICENCE file in the top-level directory
+SUBDIR+= tool
-# or at http://www.freewrt.org/licence for details.
+SUBDIR+= fwcf.helper
-
-  SUBDIR+= lib
-  SUBDIR+= mkfwcf
-  SUBDIR+= unfwcf
-  SUBDIR+= tool
-  SUBDIR+= fwcf.helper
 
 test: _SUBDIRUSE
 

package/cfgfs/src/LICENCE

@@ -30,6 +30,3 @@ c_lzo1x plug-in is covered by the GNU General Public License, Ver-
 sion 1 or higher. The files in the bundled/ subdirectory are not a
 part of FWCF and covered by their own licenced. The version 1.0 of
 FWCF bundles MiniLZO from lzo-2.02 under the GPL 2 or higher only.
-
-⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼⎼
-$MirOS: contrib/hosted/fwcf/LICENCE,v 1.5 2007/03/13 18:31:07 tg Exp $

package/cfgfs/src/Makefile

@@ -1,9 +1,3 @@
-# $MirOS: contrib/hosted/fwcf/GNUmakefile,v 1.8 2007/03/09 23:09:34 tg Exp $
-#-
-# This file is part of the FreeWRT project. FreeWRT is copyrighted
-# material, please see the LICENCE file in the top-level directory
-# or at http://www.freewrt.org/licence for details.
-
 SRCS+=		tool.c
 SRCS+=		sys_linux.c
 SRCS+=		replace.c

package/cfgfs/src/Makefile.inc

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/Makefile.inc,v 1.10 2007/05/08 21:52:53 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cfgfs/src/fwcf.helper/Makefile

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/fwcf.helper/Makefile,v 1.9 2007/03/13 18:14:31 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cfgfs/src/fwcf.sh

@@ -1,9 +1,8 @@
 #!/bin/sh
-#-
 # Copyright (c) 2006, 2007
 #	Thorsten Glaser <tg@mirbsd.de>
 # Copyright (c) 2009
-#	Waldemar Brodkorb <openadk@waldemar-brodkorb.de>
+#	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
 # are retained or reproduced in an accompanying document, permission
@@ -19,7 +18,6 @@
 # of dealing in the work, even if advised of the possibility of such
 # damage or existence of a defect, except proven that it results out
 # of said person's immediate fault when using the work as intended.
-#-
 # Possible return values:
 # 0 - everything ok
 # 1 - syntax error
@@ -44,7 +42,13 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 wd=$(pwd)
 cd /
-what='Configuration Filesystem (cfgfs), Version 1.06'
+what='Configuration Filesystem Utility (cfgfs), Version 1.06'
+
+who=$(id -u)
+if [ $who -ne 0 ]; then
+	echo 'Exit. Configuration Filesystem Utility must be run as root.'
+	exit 1
+fi
 
 usage() {
 	cat >&2 <<EOF
@@ -109,10 +113,10 @@ EOF
 	exit 1 ;;
 esac
 
-uname=$(uname -m)          
+# find backend device, first try to find partition with ID 88
-if [[ "$uname" = "i586" ]];then                      
+part=$(fdisk -l|awk '$5 == 88 { print $1 }')
-        part=/dev/sda2                               
+if [ -z $part ]; then
-else
+	# otherwise search for MTD device with name cfgfs
 	part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro
 fi
 

package/cfgfs/src/lib/Makefile

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/lib/Makefile,v 1.5 2007/03/13 18:14:31 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cfgfs/src/mkfwcf/Makefile

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/mkfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cfgfs/src/tool/Makefile

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/tool/Makefile,v 1.5 2007/02/28 22:59:38 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cfgfs/src/unfwcf/Makefile

@@ -1,5 +1,4 @@
 # $MirOS: contrib/hosted/fwcf/unfwcf/Makefile,v 1.14 2006/09/26 10:25:06 tg Exp $
-#-
 # This file is part of the FreeWRT project. FreeWRT is copyrighted
 # material, please see the LICENCE file in the top-level directory
 # or at http://www.freewrt.org/licence for details.

package/cgilib/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/chillispot/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/collectd/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/comgt/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/compositeproto/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/cryptsetup/Config.in

@@ -4,7 +4,7 @@ config ADK_PACKAGE_CRYPTSETUP
 	select ADK_PACKAGE_LIBPOPT
 	select ADK_PACKAGE_LIBUUID
 	select ADK_PACKAGE_LIBGCRYPT
-	select ADK_PACKAGE_DEVICE_MAPPER
+	select ADK_PACKAGE_LVM
 	select ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	select ADK_KPACKAGE_KMOD_DM_CRYPT
 	select ADK_KPACKAGE_KMOD_CRYPTO_SHA256

package/cryptsetup/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 

package/ctorrent/Makefile

@@ -1,5 +1,3 @@
-# $Id$
-#-
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.