summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.conf10
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
-rw-r--r--package/dnsmasq/files/dnsmasq.postinst2
-rw-r--r--package/nfs-utils/Makefile2
-rw-r--r--package/nfs-utils/files/nfsd.init6
-rw-r--r--package/openssh/Makefile62
-rw-r--r--package/openssh/patches/patch-openbsd-compat_port-tun_c6
-rw-r--r--package/ppp/Makefile10
9 files changed, 56 insertions, 46 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 6bce7db1e..3cca7cc35 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
PKG_VERSION:= 2.55
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a
PKG_DESCR:= A lightweight DNS and DHCP server
PKG_SECTION:= dns
diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 086a0b7f7..9da4b0c85 100644
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -12,21 +12,19 @@ expand-hosts
# add more dhcp-range options for every subnet
dhcp-range=192.168.1.129,192.168.1.254,255.255.255.0,72h
interface=lo
-interface=eth0.0
-#interface=eth1
-interface=br0
+interface=eth0
# Enable dnsmasq's built-in TFTP server
-#enable-tftp
+enable-tftp
# Set the root directory for files available via TFTP.
-#tftp-root=/tftpboot
+tftp-root=/tftpboot
dhcp-authoritative
dhcp-leasefile=/tmp/dhcp.leases
# use /etc/ethers for static hosts
# <hwaddr> <ipaddr>
-#read-ethers
+read-ethers
# other useful options (0.0.0.0 means server itself)
# default route(s):
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 7f4f75325..07c76f862 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -6,7 +6,7 @@
case $1 in
autostop) ;;
autostart)
- [[ $dns_dhcp = NO ]] && exit 0
+ [[ $dnsmasq = NO ]] && exit 0
exec sh $0 start
;;
start)
diff --git a/package/dnsmasq/files/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst
index f2ff69e58..86cf960e6 100644
--- a/package/dnsmasq/files/dnsmasq.postinst
+++ b/package/dnsmasq/files/dnsmasq.postinst
@@ -4,4 +4,4 @@
gid=$(get_next_gid)
add_user dnsmasq $(get_next_uid) $gid /tmp
add_group dnsmasq $gid
-add_rcconf dnsmasq dns_dhcp NO
+add_rcconf dnsmasq dnsmasq NO
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index a62547095..1d6e9aa23 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= nfs-utils
PKG_VERSION:= 1.2.3
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d
PKG_DESCR:= Utilities for NFS kernel server implementation
PKG_SECTION:= net/fs
diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init
index 55dbd1c04..26be81aa8 100644
--- a/package/nfs-utils/files/nfsd.init
+++ b/package/nfs-utils/files/nfsd.init
@@ -7,7 +7,7 @@
case $1 in
autostop) ;;
autostart)
- test x"${portmap:-NO}" = x"NO" && exit 0
+ test x"${portmap:-NO}" = x"NO" || test x"${rpcbind:-NO}" = x"NO" && exit 0
test x"${nfs_server:-NO}" = x"NO" && exit 0
exec sh $0 start
;;
@@ -18,9 +18,8 @@ start)
/bin/touch /var/lib/nfs/xtab
/bin/touch /var/lib/nfs/sm
chown nfs:nfs /var/lib/nfs/sm
- /usr/sbin/exportfs -r
- /usr/sbin/mountd
/usr/sbin/nfsd
+ /usr/sbin/mountd
if [ ${nfs_server_version} -eq 4 ];then
mkdir -p /var/lib/nfs/rpc_pipefs
mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
@@ -29,7 +28,6 @@ start)
fi
;;
stop)
- kill $(pgrep -f /usr/sbin/nfsd)
kill $(pgrep -f /usr/sbin/mountd)
if [ ${nfs_server_version} -eq 4 ];then
kill $(pgrep -f /usr/sbin/idmapd)
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index fb876c330..2023a4bbb 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -7,36 +7,40 @@ PKG_NAME:= openssh
PKG_VERSION:= 5.6p1
PKG_RELEASE:= 1
PKG_MD5SUM:= e6ee52e47c768bf0ec42a232b5d18fb0
-PKG_DESCR:= OpenSSH server
+PKG_DESCR:= OpenSSH
PKG_SECTION:= net/security
PKG_DEPENDS:= zlib libopenssl libpthread
PKG_BUILDDEP:= zlib openssl
PKG_URL:= http://www.openssh.com/
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
+PKG_MULTI:= 1
-PKG_SUBPKGS:= OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
+PKG_SUBPKGS:= OPENSSH OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
PKG_SUBPKGS+= OPENSSH_SFTP_CLIENT OPENSSH_SFTP_SERVER
+
+PKGSD_OPENSSH_SERVER:= OpenSSH server
PKGSD_OPENSSH_CLIENT:= OpenSSH client
PKGSD_OPENSSH_CLIENT_UTILS:= OpenSSH client utilities
PKGSD_OPENSSH_SFTP_CLIENT:= OpenSSH sftp client
PKGSD_OPENSSH_SFTP_SERVER:= OpenSSH sftp server
-PKG_CHOICES_OPENSSH_SERVER:= NOKRB WITH_KRB5 WITH_HEIMDAL
-PKGCD_NOKRB:= no Kerberos support
-PKGCD_WITH_KRB5:= with MIT Kerberos
-PKGCS_WITH_KRB5:= libkrb5 libcom-err
-PKGCB_WITH_KRB5:= krb5
-PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos
-PKGCS_WITH_HEIMDAL:= libheimdal libcom-err
-PKGCB_WITH_HEIMDAL:= heimdal
+PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5 WITH_HEIMDAL
+PKGCD_NOKRB:= no Kerberos support
+PKGCD_WITH_KRB5:= with MIT Kerberos
+PKGCS_WITH_KRB5:= libkrb5 libcom-err
+PKGCB_WITH_KRB5:= krb5
+PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos
+PKGCS_WITH_HEIMDAL:= libheimdal libcom-err
+PKGCB_WITH_HEIMDAL:= heimdal
include ${TOPDIR}/mk/package.mk
-$(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},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH,openssh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SERVER},${PKGSD_OPENSSH_SERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_CLIENT},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_CLIENT_UTILS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_CLIENT},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_SERVER},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr"
@@ -65,7 +69,11 @@ CONFIGURE_ARGS+= --disable-strip \
--with-privsep-path=/var/run/sshd \
--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
-post-install:
+openssh-install:
+ ${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
+ chmod 0700 ${IDIR_OPENSSH}/etc/ssh
+
+openssh-server-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin
@@ -74,28 +82,34 @@ post-install:
${IDIR_OPENSSH_SERVER}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/sbin/sshd \
${IDIR_OPENSSH_SERVER}/usr/sbin
+ # ssh pubkey
+ test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \
+ mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \
+ echo $(ADK_RUNTIME_SSH_PUBKEY) \
+ >$(IDIR_OPENSSH_SERVER)/etc/ssh/authorized_keys; \
+ )
+
+openssh-client-install:
${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT}/etc/ssh
${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT}/usr/bin
${INSTALL_DATA} ${WRKINST}/etc/ssh/ssh_config \
${IDIR_OPENSSH_CLIENT}/etc/ssh
${INSTALL_BIN} ${WRKINST}/usr/bin/{ssh,scp} \
${IDIR_OPENSSH_CLIENT}/usr/bin
+
+openssh-client-utils-install:
${INSTALL_DIR} ${IDIR_OPENSSH_CLIENT_UTILS}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-{add,agent,keyscan} \
${IDIR_OPENSSH_CLIENT_UTILS}/usr/bin
+
+openssh-sftp-client-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
- ${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \
${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
+
+openssh-sftp-server-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \
${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
- chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh
- # ssh pubkey
- test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \
- mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \
- echo $(ADK_RUNTIME_SSH_PUBKEY) \
- >$(IDIR_OPENSSH_SERVER)/etc/ssh/authorized_keys; \
- )
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssh/patches/patch-openbsd-compat_port-tun_c b/package/openssh/patches/patch-openbsd-compat_port-tun_c
index a9ed6434b..55dab2b39 100644
--- a/package/openssh/patches/patch-openbsd-compat_port-tun_c
+++ b/package/openssh/patches/patch-openbsd-compat_port-tun_c
@@ -1,6 +1,6 @@
---- openssh-5.5p1.orig/openbsd-compat/port-tun.c 2008-05-19 07:28:36.000000000 +0200
-+++ openssh-5.5p1/openbsd-compat/port-tun.c 2010-04-21 20:14:00.000000000 +0200
-@@ -213,7 +213,7 @@ sys_tun_infilter(struct Channel *c, char
+--- openssh-5.6p1.orig/openbsd-compat/port-tun.c 2010-08-10 04:47:42.000000000 +0200
++++ openssh-5.6p1/openbsd-compat/port-tun.c 2011-01-27 18:16:39.000000000 +0100
+@@ -215,7 +215,7 @@ sys_tun_infilter(struct Channel *c, char
if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
return (-1);
ptr = (char *)&rbuf[0];
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index d6e6043c1..bb6535814 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ppp
PKG_VERSION:= 2.4.5
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57
PKG_DESCR:= Point-to-Point Protocol software
PKG_SECTION:= ppp
@@ -16,19 +16,19 @@ PKG_MULTI:= 1
PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
-PKG_DEPENDS_PPPOE:= kmod-pppoe
-PKG_DEPENDS_UMTS:= comgt
+PKGSS_PPP_MOD_PPPOE:= kmod-pppoe
+PKGSS_PPP_MOD_PPPUMTS:= comgt
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,PPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PPPOE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPOE},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UMTS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PPP_MOD_PPPUMTS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= minimal
CONFIGURE_ARGS+= --system=Linux
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 04:51:12 +0000