Changeset 7233c03 in freewrt

Timestamp:

Jul 19, 2006, 1:42:51 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

fd8198f

Parents:

3397da8

Message:

• add a separate sshd user
• use the new uid/gid functions
• rename init script,standardize

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@291 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/openssh

Files:

• Makefile (modified) (3 diffs)
• ipkg/openssh-server.postinst (modified) (1 diff)

package/openssh/Makefile

@@ -5 +5 @@
 PKG_NAME:=openssh
 PKG_VERSION:=4.2p1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MD5SUM:=df899194a340c933944b193477c628fa
+PKG_START_SERVICE:=50
 
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -69 +70 @@
                         --without-pam \
                         --without-x \
+                    --with-privsep-user=sshd \
+                        --with-privsep-path=/var/run/sshd \
         );
         touch $@
@@ -103 +106 @@
         $(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/
         install -m0755 -d $(IDIR_OPENSSH_SERVER)/etc/init.d
-        install -m0755 ./files/S50sshd $(IDIR_OPENSSH_SERVER)/etc/init.d/
+        install -m0755 ./files/sshd.init \
+                $(IDIR_OPENSSH_SERVER)/etc/init.d/$(PKG_START_SERVICE)sshd
         install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/bin
         $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/

package/openssh/ipkg/openssh-server.postinst

@@ -1 +1 @@
 #!/bin/sh
-
-name=sshd
-id=99
-
-# do not change below
-# check if we are on real system
-if [ -z "${IPKG_INSTROOT}" ]; then
-        # create copies of passwd and group, if we use squashfs
-        rootfs=`mount |awk '/root/ { print $5 }'`
-        if [ "$rootfs" = "squashfs" ]; then
-                if [ -h /etc/group ]; then
-                        rm /etc/group
-                        cp /rom/etc/group /etc/group
-                fi
-                if [ -h /etc/passwd ]; then
-                        rm /etc/passwd
-                        cp /rom/etc/passwd /etc/passwd
-                fi
-        fi
-fi
-
-echo ""
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then 
-        echo "adding group $name to /etc/group"
-        echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group  
-fi
-
-if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then 
-        echo "adding user $name to /etc/passwd"
-        echo "${name}:x:${id}:${id}:${name}:/var/empty/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
-fi
+. $IPKG_INSTROOT/etc/functions.sh
+add_user sshd $(get_next_uid) $(get_next_gid) /var/run/sshd
+add_group sshd $(get_next_gid)
+add_rcconf sshd "sshd=NO"