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

8 files changed, 288 insertions, 135 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 66f49089b..1fa253b11 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -188,7 +188,7 @@ kernelconfig:
 newpackage:
 	@echo "Creating new package $(PKG)"
 	$(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG)
-	pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \
+	pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'|sed -e "s/-/_/g"); \
 		$(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile
 	$(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile
 	$(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile
diff --git a/package/Config.in b/package/Config.in
index c42a75728..736875423 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -166,28 +166,6 @@ source "package/swconfig/Config.in"
 source "package/watchdog/Config.in"
 endmenu
 
-menu "Programming / Languages"
-source "package/autoconf/Config.in"
-source "package/automake/Config.in"
-source "package/binutils/Config.in"
-source "package/bison/Config.in"
-source "package/diffutils/Config.in"
-source "package/flex/Config.in"
-source "package/gawk/Config.in"
-source "package/gcc/Config.in"
-source "package/gperf/Config.in"
-source "package/haserl/Config.in"
-source "package/jamvm/Config.in"
-source "package/lua/Config.in"
-source "package/m4/Config.in"
-source "package/make/Config.in"
-source "package/microperl/Config.in"
-source "package/perl/Config.in"
-source "package/php/Config.in"
-source "package/python/Config.in"
-source "package/ruby/Config.in"
-source "package/tcl/Config.in"
-endmenu
 
 menu "Network - Analyze / Debugging / Monitoring"
 source "package/bwm/Config.in"
@@ -276,113 +254,6 @@ source "package/wondershaper/Config.in"
 source "package/vrrpd/Config.in"
 endmenu
 
-menu "Networking 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"
-# intentionally inserted here, as it depends on the above
-source "package/iptables-snmp/Config.in"
-source "package/nut/Config.in"
-source "package/openldap/Config.in"
-source "package/p910nd/Config.in"
-source "package/pipacs/Config.in"
-#source "package/pmacct/Config.in"
-source "package/portmap/Config.in"
-source "package/rarpd/Config.in"
-source "package/rrs/Config.in"
-source "package/rsync/Config.in"
-source "package/shat/Config.in"
-source "package/socat/Config.in"
-source "package/subversion/Config.in"
-source "package/udp-broadcast-relay/Config.in"
-source "package/vgp/Config.in"
-source "package/vnstat/Config.in"
-source "package/vtun/Config.in"
-source "package/wccpd/Config.in"
-source "package/xinetd/Config.in"
-endmenu
-
-menu "Network Filesystems"
-source "package/davfs2/Config.in"
-source "package/davfs2/Config.in.kernel"
-source "package/nfs-utils/Config.in"
-source "package/samba/Config.in"
-endmenu
-
-menu "NTP"
-source "package/htpdate/Config.in"
-source "package/ntpclient/Config.in"
-source "package/openntpd/Config.in"
-source "package/rdate/Config.in"
-endmenu
-
-menu "P2P"
-source "package/cbtt/Config.in"
-source "package/ctorrent/Config.in"
-source "package/rtorrent/Config.in"
-endmenu
-
-menu "PPP / PPTP / RADIUS"
-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"
-source "package/rp-pppoe/Config.in"
-source "package/raddump/Config.in"
-endmenu
-
-menu "Proxy"
-source "package/dansguardian/Config.in"
-source "package/frickin/Config.in"
-source "package/igmpproxy/Config.in"
-source "package/parprouted/Config.in"
-source "package/privoxy/Config.in"
-source "package/siproxd/Config.in"
-source "package/squid/Config.in"
-source "package/srelay/Config.in"
-source "package/tinyproxy/Config.in"
-source "package/tor/Config.in"
-source "package/vnc-reflector/Config.in"
-endmenu
-
-menu "Networking Security"
-source "package/arpwatch/Config.in"
-source "package/autossh/Config.in"
-source "package/axtls/Config.in"
-source "package/ca-certificates/Config.in"
-source "package/dropbear/Config.in"
-source "package/httptunnel/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/l2tpns/Config.in"
-source "package/openssh/Config.in"
-source "package/openssh/Config.in.kerberos"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/portsentry/Config.in"
-source "package/ptunnel/Config.in"
-source "package/scanlogd/Config.in"
-source "package/snort/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/tinc/Config.in"
-source "package/vpnc/Config.in"
-endmenu
-
-menu "Wireless"
-source "package/aircrack-ng/Config.in"
-source "package/chillispot/Config.in"
-source "package/hostapd/Config.in"
-source "package/iw/Config.in"
-#source "package/kismet/Config.in"
-source "package/olsrd/Config.in"
-source "package/wifidog/Config.in"
-source "package/wireless-firmware/Config.in"
-source "package/wpa_supplicant/Config.in"
-endmenu
-
-
 menu "Libraries"
 source "package/alsa-lib/Config.in"
 source "package/apr/Config.in"
@@ -556,13 +427,151 @@ source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
-menu "X"
+
+menu "Networking 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"
+# intentionally inserted here, as it depends on the above
+source "package/iptables-snmp/Config.in"
+source "package/nut/Config.in"
+source "package/openldap/Config.in"
+source "package/p910nd/Config.in"
+source "package/pipacs/Config.in"
+#source "package/pmacct/Config.in"
+source "package/portmap/Config.in"
+source "package/rarpd/Config.in"
+source "package/rrs/Config.in"
+source "package/rsync/Config.in"
+source "package/shat/Config.in"
+source "package/socat/Config.in"
+source "package/subversion/Config.in"
+source "package/udp-broadcast-relay/Config.in"
+source "package/vgp/Config.in"
+source "package/vnstat/Config.in"
+source "package/vtun/Config.in"
+source "package/wccpd/Config.in"
+source "package/xinetd/Config.in"
+endmenu
+
+menu "Network Filesystems"
+source "package/davfs2/Config.in"
+source "package/davfs2/Config.in.kernel"
+source "package/nfs-utils/Config.in"
+source "package/samba/Config.in"
+endmenu
+
+menu "NTP"
+source "package/htpdate/Config.in"
+source "package/ntpclient/Config.in"
+source "package/openntpd/Config.in"
+source "package/rdate/Config.in"
+endmenu
+
+menu "P2P"
+source "package/cbtt/Config.in"
+source "package/ctorrent/Config.in"
+source "package/rtorrent/Config.in"
+endmenu
+
+menu "PPP / PPTP / RADIUS"
+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"
+source "package/rp-pppoe/Config.in"
+source "package/raddump/Config.in"
+endmenu
+
+menu "Proxy"
+source "package/dansguardian/Config.in"
+source "package/frickin/Config.in"
+source "package/igmpproxy/Config.in"
+source "package/parprouted/Config.in"
+source "package/privoxy/Config.in"
+source "package/siproxd/Config.in"
+source "package/squid/Config.in"
+source "package/srelay/Config.in"
+source "package/tinyproxy/Config.in"
+source "package/tor/Config.in"
+source "package/vnc-reflector/Config.in"
+endmenu
+
+menu "Programming / Languages"
+source "package/autoconf/Config.in"
+source "package/automake/Config.in"
+source "package/binutils/Config.in"
+source "package/bison/Config.in"
+source "package/diffutils/Config.in"
+source "package/flex/Config.in"
+source "package/gawk/Config.in"
+source "package/gcc/Config.in"
+source "package/gperf/Config.in"
+source "package/haserl/Config.in"
+source "package/jamvm/Config.in"
+source "package/lua/Config.in"
+source "package/m4/Config.in"
+source "package/make/Config.in"
+source "package/microperl/Config.in"
+source "package/perl/Config.in"
+source "package/php/Config.in"
+source "package/python/Config.in"
+source "package/ruby/Config.in"
+source "package/tcl/Config.in"
+endmenu
+
+menu "Networking Security"
+source "package/arpwatch/Config.in"
+source "package/autossh/Config.in"
+source "package/axtls/Config.in"
+source "package/ca-certificates/Config.in"
+source "package/dropbear/Config.in"
+source "package/httptunnel/Config.in"
+source "package/ipsec-tools/Config.in"
+source "package/l2tpns/Config.in"
+source "package/openssh/Config.in"
+source "package/openssh/Config.in.kerberos"
+source "package/openswan/Config.in"
+source "package/openvpn/Config.in"
+source "package/portsentry/Config.in"
+source "package/ptunnel/Config.in"
+source "package/scanlogd/Config.in"
+source "package/snort/Config.in"
+source "package/ssltunnel/Config.in"
+source "package/tinc/Config.in"
+source "package/vpnc/Config.in"
+endmenu
+
+menu "Wireless"
+source "package/aircrack-ng/Config.in"
+source "package/chillispot/Config.in"
+source "package/hostapd/Config.in"
+source "package/iw/Config.in"
+#source "package/kismet/Config.in"
+source "package/olsrd/Config.in"
+source "package/wifidog/Config.in"
+source "package/wireless-firmware/Config.in"
+source "package/wpa_supplicant/Config.in"
+endmenu
+
+
+menu "Xorg server and drivers"
 source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
 source "package/xf86-input-mouse/Config.in"
 source "package/xf86-input-keyboard/Config.in"
 source "package/xf86-input-evtouch/Config.in"
+endmenu
+
+menu "X Applications"
+source "package/evilwm/Config.in"
+source "package/rxvt-unicode/Config.in"
+source "package/xauth/Config.in"
+endmenu
 
 menu "X Libraries"
 source "package/libICE/Config.in"
@@ -604,9 +613,6 @@ source "package/pixman/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu
-
-endmenu
-
 endmenu
 
 menu "Kernel configuration"
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h
index c25f10856..b0903f45d 100644
--- a/package/dropbear/patches/patch-options_h
+++ b/package/dropbear/patches/patch-options_h
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- dropbear-0.52.orig/options.h	2008-11-11 15:13:50.000000000 +0100
-+++ dropbear-0.52/options.h	2009-03-19 19:24:46.000000000 +0100
++++ dropbear-0.52/options.h	2010-01-22 17:55:09.000000000 +0100
 @@ -10,6 +10,11 @@
   * parts are to allow for commandline -DDROPBEAR_XXX options etc.
   ******************************************************************/
@@ -13,6 +13,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #ifndef DROPBEAR_DEFPORT
  #define DROPBEAR_DEFPORT "22"
  #endif
+@@ -115,7 +120,7 @@ etc) slower (perhaps by 50%). Recommende
+  * Removing either of these won't save very much space.
+  * SSH2 RFC Draft requires dss, recommends rsa */
+ #define DROPBEAR_RSA
+-#define DROPBEAR_DSS
++/* #define DROPBEAR_DSS */
+ 
+ /* RSA can be vulnerable to timing attacks which use the time required for
+  * signing to guess the private key. Blinding avoids this attack, though makes
 @@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende
  /* #define DSS_PROTOK */
  
@@ -22,3 +31,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /* Whether to print the message of the day (MOTD). This doesn't add much code
   * size */
+@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende
+ /* The command to invoke for xauth when using X11 forwarding.
+  * "-q" for quiet */
+ #ifndef XAUTH_COMMAND
+-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
++#define XAUTH_COMMAND "/usr/bin/xauth -q"
+ #endif
+ 
+ /* if you want to enable running an sftp server (such as the one included with
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
new file mode 100644
index 000000000..1dabdf9d5
--- /dev/null
+++ b/package/evilwm/Makefile
@@ -0,0 +1,29 @@
+# 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:=		evilwm
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8fd9256c635cce2289b648a01d54202c
+PKG_DESCR:=		A minimalist window manager for the X Window System
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libx11 libxext
+PKG_BUILDDEP+=		libX11 libXext
+PKG_URL:=		http://www.6809.org.uk/evilwm/
+PKG_SITES:=		http://www.6809.org.uk/evilwm/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+MAKE_FLAGS+=		XROOT="$(STAGING_DIR)/usr"
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/evilwm $(IDIR_EVILWM)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile
new file mode 100644
index 000000000..a945a534f
--- /dev/null
+++ b/package/evilwm/patches/patch-Makefile
@@ -0,0 +1,36 @@
+--- evilwm-1.0.1.orig/Makefile	2009-03-30 12:37:06.000000000 +0200
++++ evilwm-1.0.1/Makefile	2010-01-22 17:14:53.000000000 +0100
+@@ -1,11 +1,11 @@
+ # If you don't use CC 
+-CC       = gcc
++CC       ?= gcc
+ 
+ # Edit this line if you don't want evilwm to install under /usr.
+ # Note that $(DESTDIR) is used by the Debian build process.
+ prefix = $(DESTDIR)/usr
+ 
+-XROOT    = /usr/X11R6
++XROOT    ?= /usr/X11R6
+ INCLUDES = -I$(XROOT)/include
+ LDPATH   = -L$(XROOT)/lib
+ LIBS     = -lX11
+@@ -35,8 +35,8 @@ LIBS    += -lXext
+ # Be sure that libXrandr is in your library search directory (e.g., under
+ # Solaris, it is in /usr/X11R6/lib, so can be built against with the default
+ # XPATH above, but won't necessarily be in the library search path).
+-DEFINES += -DRANDR
+-LIBS    += -lXrandr
++#DEFINES += -DRANDR
++#LIBS    += -lXrandr
+ 
+ # Uncomment for mouse support.  You probably want this.
+ DEFINES += -DMOUSE
+@@ -71,7 +71,7 @@ distname = evilwm-$(version)
+ #DEFINES += -DXDEBUG  # show some X calls
+ 
+ DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
+-CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
++CFLAGS  += $(INCLUDES) $(DEFINES) -Wall
+ #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
+ CFLAGS  += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
+ LDFLAGS += $(LDPATH) $(LIBS)
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index ae021e974..208bf5256 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -23,5 +23,6 @@ INSTALL_STYLE:=		auto
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXmu.so* ${IDIR_LIBXMU}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libXmuu.so* ${IDIR_LIBXMU}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
new file mode 100644
index 000000000..e6ac62eb3
--- /dev/null
+++ b/package/rxvt-unicode/Makefile
@@ -0,0 +1,34 @@
+# 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:=		rxvt-unicode
+PKG_VERSION:=		9.07
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		49bb52c99e002bf85eb41d8385d903b5
+PKG_DESCR:=		x-term with unicode support
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libx11
+PKG_BUILDDEP+=		libX11
+PKG_URL:=		http://software.schmorp.de/pkg/rxvt-unicode.html
+PKG_SITES:=		http://dist.schmorp.de/rxvt-unicode/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RXVT_UNICODE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--disable-perl \
+			--disable-utmp
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_RXVT_UNICODE)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/urxvt \
+		$(IDIR_RXVT_UNICODE)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
new file mode 100644
index 000000000..c18f936d0
--- /dev/null
+++ b/package/xauth/Makefile
@@ -0,0 +1,29 @@
+# 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:=		xauth
+PKG_VERSION:=		1.0.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2eb3cc3e4421e1b747c4ac16aac20cda
+PKG_DESCR:=		X authority file utility
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		libx11 libxext libxmu
+PKG_BUILDDEP+=		libX11 libXext libXmu
+PKG_URL:=		http://www.x.org
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XAUTH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_XAUTH)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xauth $(IDIR_XAUTH)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk