X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fproftpd%2FMakefile;h=9fab01cfdf78d095f378db43fd9527f00400c0ee;hb=ab6a5afcf0106706ea5d64b72de8decff73e5967;hp=91db76f688a2f54ae296f1743a074862ab5d93ce;hpb=4b158bc4e5db15d7b39d92827ad1107b3cbdc9c9;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 91db76f688..9fab01cfdf 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,22 +1,22 @@
-# 
-# Copyright (C) 2009 OpenWrt.org
+#
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=proftpd
-PKG_VERSION:=1.3.2a
+PKG_VERSION:=1.3.3a
 PKG_RELEASE:=1
-PKG_SOURCE_URL:=ftp://ftp.proftpd.org/distrib/source
-PKG_MD5SUM:=ad3cbb5db30c5ae39e09b308892392b3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL=1
+PKG_SOURCE_URL:=ftp://ftp.proftpd.org/distrib/source
+PKG_MD5SUM:=55ae8b32c9f5c00340188b7094c36ffc
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,6 +26,11 @@ define Package/proftpd
   CATEGORY:=Network
   TITLE:=ProFTPD FTP server
   URL:=http://www.proftpd.org/
+  MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl> 
+endef
+
+define Package/proftpd/conffiles
+/etc/proftpd.conf
 endef
 
 TARGET_CPPFLAGS += \
@@ -33,20 +38,60 @@ TARGET_CPPFLAGS += \
 
 MAKE_FLAGS += \
 	INSTALL_USER=$(shell id -u) \
-	INSTALL_GROUP=$(shell id -g) \
-	INSTALL_STRIP=""
+	INSTALL_GROUP=$(shell id -g)
 
 CONFIGURE_ARGS += \
-	--disable-cap
+	--disable-cap \
+	--enable-devel \
 
 define Package/proftpd/install
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-	rm -rf \
-		$(1)/usr/include \
-		$(1)/usr/share \
-		$(1)/usr/man \
-		$(1)/usr/lib/pkgconfig \
-		$(1)/var
+	$(INSTALL_DIR) $(1)/etc
+	$(if $(CONFIG_IPV6),,$(SED) 's/^UseIPv6/#UseIPv6/' $(PKG_INSTALL_DIR)/etc/proftpd.conf)
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/proftpd.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/proftpd.init $(1)/etc/init.d/proftpd
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ftp{count,top,who} $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{ftpshut,proftpd} $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/in.proftpd $(1)/usr/sbin/
+endef
+
+define Package/proftpd/postinst
+#!/bin/sh
+
+name=ftp
+id=55
+home=/home/$${name}
+shell=/bin/ash
+
+# 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}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd
+fi
 endef
 
 $(eval $(call BuildPackage,proftpd))