Mercurial Mercurial > frugalware-patches.mq / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diet-pure-ftpd.patch: folded w/ upgrade-0.9-diet-pure-ftpd.patch
authorTomas Zeman <tzeman@volny.cz>
Wed, 15 Feb 2012 15:27:17 +0100
changeset 114 368efadb5348
parent 113 37d7b9252b13
child 115 473b0add854d
diet-pure-ftpd.patch: folded w/ upgrade-0.9-diet-pure-ftpd.patch
diet-pure-ftpd.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
upgrade-0.9-diet-pure-ftpd.patch file | annotate | diff | comparison | revisions 
--- a/diet-pure-ftpd.patch	Wed Feb 15 15:26:49 2012 +0100
+++ b/diet-pure-ftpd.patch	Wed Feb 15 15:27:17 2012 +0100
@@ -1,27 +1,11 @@
-From bca72d17e958d2bce147147da167fa17a1cc43f7 Mon Sep 17 00:00:00 2001
 From: Tomas Zeman <tzeman@volny.cz>
 Date: Sun, 16 Dec 2007 12:14:44 +0100
-Subject: [PATCH] diet-pure-ftpd-1.0.21-1-i686:
- *added
+
+diet-pure-ftpd
 
----
- source/dietlibc/diet-pure-ftpd/FrugalBuild        |   39 ++
- source/dietlibc/diet-pure-ftpd/pure-config.pl     |  121 ++++++
- source/dietlibc/diet-pure-ftpd/pure-ftpd.conf     |  435 +++++++++++++++++++++
- source/dietlibc/diet-pure-ftpd/rc.pure-ftpd       |   42 ++
- source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po |   21 +
- 5 files changed, 658 insertions(+), 0 deletions(-)
- create mode 100644 source/dietlibc/diet-pure-ftpd/FrugalBuild
- create mode 100644 source/dietlibc/diet-pure-ftpd/pure-config.pl
- create mode 100644 source/dietlibc/diet-pure-ftpd/pure-ftpd.conf
- create mode 100644 source/dietlibc/diet-pure-ftpd/rc.pure-ftpd
- create mode 100644 source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po
-
-diff --git a/source/dietlibc/diet-pure-ftpd/FrugalBuild b/source/dietlibc/diet-pure-ftpd/FrugalBuild
-new file mode 100644
-index 0000000..0165876
---- /dev/null
-+++ b/source/dietlibc/diet-pure-ftpd/FrugalBuild
+diff -r 8153a8594677 source/dietlibc/diet-pure-ftpd/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-pure-ftpd/FrugalBuild	Wed Feb 15 15:27:06 2012 +0100
 @@ -0,0 +1,39 @@
 +# Maintainer: Tomas Zeman <tzeman@volny.cz>
 +
@@ -29,7 +13,7 @@
 +pkgorig=pure-ftpd
 +pkgname=$branch-$pkgorig
 +pkgver=1.0.21
-+pkgrel=1
++pkgrel=2
 +pkgdesc="A free, secure, production-quality and standard-conformant FTP server"
 +url="http://www.pureftpd.org/"
 +depends=('perl')
@@ -62,11 +46,9 @@
 +	Ffile /etc/pure-ftpd.conf
 +	Fexe /usr/sbin/pure-config.pl
 +}
-diff --git a/source/dietlibc/diet-pure-ftpd/pure-config.pl b/source/dietlibc/diet-pure-ftpd/pure-config.pl
-new file mode 100644
-index 0000000..1f8c28e
---- /dev/null
-+++ b/source/dietlibc/diet-pure-ftpd/pure-config.pl
+diff -r 8153a8594677 source/dietlibc/diet-pure-ftpd/pure-config.pl
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-pure-ftpd/pure-config.pl	Wed Feb 15 15:27:06 2012 +0100
 @@ -0,0 +1,121 @@
 +#! /usr/bin/perl
 +
@@ -189,11 +171,9 @@
 +
 +print "Running: $PUREFTPD ", join(" ", @flg), "\n";
 +exec { $PUREFTPD } ($PUREFTPD, @flg) or die "cannot exec $PUREFTPD: $!";
-diff --git a/source/dietlibc/diet-pure-ftpd/pure-ftpd.conf b/source/dietlibc/diet-pure-ftpd/pure-ftpd.conf
-new file mode 100644
-index 0000000..df983a2
---- /dev/null
-+++ b/source/dietlibc/diet-pure-ftpd/pure-ftpd.conf
+diff -r 8153a8594677 source/dietlibc/diet-pure-ftpd/pure-ftpd.conf
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-pure-ftpd/pure-ftpd.conf	Wed Feb 15 15:27:06 2012 +0100
 @@ -0,0 +1,435 @@
 +############################################################
 +#                                                          #
@@ -630,11 +610,9 @@
 +# By default, both IPv4 and IPv6 are enabled.
 +
 +# IPV6Only                 yes
-diff --git a/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd
-new file mode 100644
-index 0000000..61746ef
---- /dev/null
-+++ b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd
+diff -r 8153a8594677 source/dietlibc/diet-pure-ftpd/rc.pure-ftpd
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd	Wed Feb 15 15:27:06 2012 +0100
 @@ -0,0 +1,42 @@
 +#!/bin/bash
 +
@@ -678,11 +656,9 @@
 +}
 +
 +rc_exec $1
-diff --git a/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po
-new file mode 100644
-index 0000000..b987340
---- /dev/null
-+++ b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po
+diff -r 8153a8594677 source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-pure-ftpd/rc.pure-ftpd-hu.po	Wed Feb 15 15:27:06 2012 +0100
 @@ -0,0 +1,21 @@
 +# Hungarian translations for rc.pure-ftpd package.
 +# Copyright (C) 2006 THE rc.pure-ftpd'S COPYRIGHT HOLDER
@@ -705,6 +681,3 @@
 +#: rc.pure-ftpd:16
 +msgid "Pure-FTPd Server"
 +msgstr "Pure-FTPd szerver"
--- 
-1.5.3.4
-
--- a/series	Wed Feb 15 15:26:49 2012 +0100
+++ b/series	Wed Feb 15 15:27:17 2012 +0100
@@ -32,7 +32,6 @@
 bincimap.patch
 ospam.patch
 diet-pure-ftpd.patch
-upgrade-0.9-diet-pure-ftpd.patch
 vegadns.patch
 upgrade-0.9-vegadns.patch
 perl-appconfig.patch
--- a/upgrade-0.9-diet-pure-ftpd.patch	Wed Feb 15 15:26:49 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diet-pure-ftpd: Upgrade for Frugalware 0.9
-
-diff --git a/source/dietlibc/diet-pure-ftpd/FrugalBuild b/source/dietlibc/diet-pure-ftpd/FrugalBuild
-index 0165876..a3f2eb3 100644
---- a/source/dietlibc/diet-pure-ftpd/FrugalBuild
-+++ b/source/dietlibc/diet-pure-ftpd/FrugalBuild
-@@ -4,7 +4,7 @@ branch=diet
- pkgorig=pure-ftpd
- pkgname=$branch-$pkgorig
- pkgver=1.0.21
--pkgrel=1
-+pkgrel=2
- pkgdesc="A free, secure, production-quality and standard-conformant FTP server"
- url="http://www.pureftpd.org/"
- depends=('perl')
frugalware-patches.mq