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

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

10 files changed, 22 insertions, 37 deletions

diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index c0099db85..45ea785f4 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -9,24 +9,35 @@ PKG_NAME:=		openssh
 PKG_VERSION:=		5.2p1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ada79c7328a8551bdf55c95e631e7dad
-MASTER_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
+PKG_DESCR:=		OpenSSH server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		zlib libopenssl
+PKG_URL:=		http://www.openssh.com
+PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 			ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \
 			ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
 			ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
 
+PKG_DESCR_1:=		OpenSSH client
+PKG_DESCR_2:=		OpenSSH client utilities
+PKG_DESCR_3:=		OpenSSH sftp client
+PKG_DESCR_4:=		OpenSSH sftp server
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq ($(ADK_COMPILE_OPENSSH_WITH_KERBEROS),y)
+PKG_DEPENDS+=		heimdal-libs
+endif
+
+$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
 
-PKG_DEPENDS:=		zlib, libopenssl,
 
 ifeq ($(ADK_COMPILE_OPENSSH_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_DIR}/usr"
-PKG_DEPENDS+=		heimdal-libs
 else
 CONFIGURE_ARGS+=	--without-kerberos5
 endif
@@ -52,11 +63,8 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
-	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/init.d
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin
-	${INSTALL_SCRIPT} files/sshd.init \
-	    ${IDIR_OPENSSH_SERVER}/etc/init.d/sshd
 	${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \
 		${IDIR_OPENSSH_SERVER}/usr/bin
@@ -78,6 +86,5 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/sftp-server \
 		${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
 	chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh
-	echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_OPENSSH_SERVER}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssh/ipkg/openssh-client.conffiles b/package/openssh/files/openssh-client.conffiles
index 489e8267f..489e8267f 100644
--- a/package/openssh/ipkg/openssh-client.conffiles
+++ b/package/openssh/files/openssh-client.conffiles
diff --git a/package/openssh/ipkg/openssh-server.conffiles b/package/openssh/files/openssh-server.conffiles
index 6f0cfbcbe..6f0cfbcbe 100644
--- a/package/openssh/ipkg/openssh-server.conffiles
+++ b/package/openssh/files/openssh-server.conffiles
diff --git a/package/openssh/ipkg/openssh-server.postinst b/package/openssh/files/openssh-server.postinst
index e14a2b0b9..e14a2b0b9 100644
--- a/package/openssh/ipkg/openssh-server.postinst
+++ b/package/openssh/files/openssh-server.postinst
diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init
index 19774b891..81f073b88 100644
--- a/package/openssh/files/sshd.init
+++ b/package/openssh/files/sshd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 50
+#PKG openssh-server
+#INIT 50
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/openssh/ipkg/openssh-client-utils.control b/package/openssh/ipkg/openssh-client-utils.control
deleted file mode 100644
index d34db0ddf..000000000
--- a/package/openssh/ipkg/openssh-client-utils.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openssh-client-utils
-Priority: optional
-Section: net
-Depends: zlib, libopenssl
-Description: OpenSSH client utilities
diff --git a/package/openssh/ipkg/openssh-client.control b/package/openssh/ipkg/openssh-client.control
deleted file mode 100644
index 183b7f152..000000000
--- a/package/openssh/ipkg/openssh-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openssh-client
-Priority: optional
-Section: net
-Depends: zlib, libopenssl
-Description: OpenSSH client
diff --git a/package/openssh/ipkg/openssh-server.control b/package/openssh/ipkg/openssh-server.control
deleted file mode 100644
index 5fde84ecd..000000000
--- a/package/openssh/ipkg/openssh-server.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: openssh-server
-Priority: optional
-Section: net
-Description: OpenSSH server
diff --git a/package/openssh/ipkg/openssh-sftp-client.control b/package/openssh/ipkg/openssh-sftp-client.control
deleted file mode 100644
index 705a3854a..000000000
--- a/package/openssh/ipkg/openssh-sftp-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openssh-sftp-client
-Priority: optional
-Section: net
-Depends: zlib, libopenssl
-Description: OpenSSH SFTP client
diff --git a/package/openssh/ipkg/openssh-sftp-server.control b/package/openssh/ipkg/openssh-sftp-server.control
deleted file mode 100644
index 8c17fcc5b..000000000
--- a/package/openssh/ipkg/openssh-sftp-server.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openssh-sftp-server
-Priority: optional
-Section: net
-Depends: zlib, libopenssl
-Description: OpenSSH SFTP server