Skip to contentSkip to conversation

proftpd cleanup

PATCH New Paul Eggleton 1 participant 2 messages Oct 30, 2012

lore
Share & tools
lore
#0 lore raw

cover proftpd cleanup

This tidies up the proftpd recipe in preparation for submitting it for merging into meta-networking.

The following changes since commit 6aebac39997b0fdd4df62ad85c5b14457e0d940c:

ffmpeg: add LICENSE_FLAGS (2012-10-12 09:59:56 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/proftpd
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/proftpd

Paul Eggleton (1):
proftpd: add initscript and tidy up recipe

 recipes-extended/proftpd/files/basic.conf.patch   |    2 +-
 recipes-extended/proftpd/files/contrib.patch      |    4 +
 recipes-extended/proftpd/files/default            |    9 +
 recipes-extended/proftpd/files/proftpd-basic.init |  220 +++++++++++++++++++++
 recipes-extended/proftpd/proftpd_1.3.4b.bb        |   72 +++----
 5 files changed, 273 insertions(+), 34 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/default
 create mode 100644 recipes-extended/proftpd/files/proftpd-basic.init
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 proftpd: add initscript and tidy up recipe

* Add initscript, borrowed from Debian with some modifications for compatibility
* Use autotools.bbclass and remove unnecessary configure options
* Use useradd.bbclass to add ftp user/group
* PARALLEL_MAKE = "" is no longer needed, the bug was fixed in 1.3.3c
* Set SUMMARY (which sets DESCRIPTION) and base it on the short description from the website
* Add HOMEPAGE
* Add/fix description in some patches and improve recipe indentation
* Remove unnecessary chown of proftpd binary in postinst script

---
 recipes-extended/proftpd/files/basic.conf.patch   |    2 +-
 recipes-extended/proftpd/files/contrib.patch      |    4 +
 recipes-extended/proftpd/files/default            |    9 +
 recipes-extended/proftpd/files/proftpd-basic.init |  220 +++++++++++++++++++++
 recipes-extended/proftpd/proftpd_1.3.4b.bb        |   72 +++----
 5 files changed, 273 insertions(+), 34 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/default
 create mode 100644 recipes-extended/proftpd/files/proftpd-basic.init
recipes-extended/proftpd/files/basic.conf.patch +1 -1
index 55059f3..4967bed 100644
@@ -1,6 +1,6 @@
 Upstream-Status: Inappropriate [configuration]
 
-proftpd tris to get the IP address from the hostname.
+proftpd tries to get the IP address from the hostname.
 Unluckily now the hostname is not properly configured in /etc/hosts.
 We can use this patch as a workaround.
 
recipes-extended/proftpd/files/contrib.patch +4 -0
index 6d9235a..7e2a8e3 100644
@@ -1,3 +1,7 @@
+The contrib directory now contains its own Makefile which is
+used during installation. It was required to pass DESTDIR through
+when it gets called from the base Makefile.
+
 Upstream-Status: Pending
 
 Signed-off-by: Kevin Strasser <[email protected]>
recipes-extended/proftpd/files/default new file +9 -0
new file mode 100644
index 0000000..b31f36c
@@ -0,0 +1,9 @@
+# Defaults for proftpd initscript
+
+# Master system-wide proftpd switch. The initscript
+# will not run if it is not set to yes.
+RUN="yes"
+
+# Default options.
+# For more exhaustive logging, try "-d 3".
+OPTIONS=""
recipes-extended/proftpd/files/proftpd-basic.init new file +220 -0

220 lines not on this page · raw message

recipes-extended/proftpd/proftpd_1.3.4b.bb +39 -33

94 lines not on this page · raw message

Signature · 1 line
1.7.9.5