[IPFire-SCM] [git.ipfire.org] This git reposit keeps all the patches of the project. branch, master, updated. 4734e676d1ab135f189f83354401d9cf5dab24cc

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "This git reposit keeps all the patches of the project.".

The branch, master has been updated via 4734e676d1ab135f189f83354401d9cf5dab24cc (commit) from 024c2936428a713c8270818d995c9c8054a71a2f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 4734e676d1ab135f189f83354401d9cf5dab24cc Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Feb 26 16:48:59 2010 +0100

Remove a bunch of patches.

-----------------------------------------------------------------------

Summary of changes: fuse/fuse-2.7.4-openfix.patch | 36 - fuse/fuse-2.7.4.-udev_rules.patch | 5 - .../nfs-utils-1.1.6-exp-subtree-warn-off.patch | 12 - nfs-utils/nfs-utils-1.1.6-smnotify-path.patch | 58 -- nfs-utils/nfs-utils-1.1.6-statdpath.patch | 42 -- portmap/portmap-6.0-tcpd.patch | 18 - sqlzma/lzma-457-squashfs-1.patch | 716 -------------------- sqlzma/sqlzma-3.4-1.patch | 587 ---------------- vsftpd/vsftpd-2.2.1-build_ssl.patch | 12 - vsftpd/vsftpd-2.2.1-close-std-fds.patch | 13 - vsftpd/vsftpd-2.2.1-configuration-1.patch | 415 ------------ vsftpd/vsftpd-2.2.1-configuration.patch | 395 ----------- vsftpd/vsftpd-2.2.1-libs-3.patch | 12 - vsftpd/vsftpd-2.2.1-pam_hostname-1.patch | 57 -- vsftpd/vsftpd-2.2.1-pam_hostname.patch | 57 -- 15 files changed, 0 insertions(+), 2435 deletions(-) delete mode 100644 fuse/fuse-2.7.4-openfix.patch delete mode 100644 fuse/fuse-2.7.4.-udev_rules.patch delete mode 100644 nfs-utils/nfs-utils-1.1.6-exp-subtree-warn-off.patch delete mode 100644 nfs-utils/nfs-utils-1.1.6-smnotify-path.patch delete mode 100644 nfs-utils/nfs-utils-1.1.6-statdpath.patch delete mode 100644 portmap/portmap-6.0-tcpd.patch delete mode 100644 sqlzma/lzma-457-squashfs-1.patch delete mode 100644 sqlzma/sqlzma-3.4-1.patch delete mode 100644 vsftpd/vsftpd-2.2.1-build_ssl.patch delete mode 100644 vsftpd/vsftpd-2.2.1-close-std-fds.patch delete mode 100644 vsftpd/vsftpd-2.2.1-configuration-1.patch delete mode 100644 vsftpd/vsftpd-2.2.1-configuration.patch delete mode 100644 vsftpd/vsftpd-2.2.1-libs-3.patch delete mode 100644 vsftpd/vsftpd-2.2.1-pam_hostname-1.patch delete mode 100644 vsftpd/vsftpd-2.2.1-pam_hostname.patch

Difference in files: diff --git a/fuse/fuse-2.7.4-openfix.patch b/fuse/fuse-2.7.4-openfix.patch deleted file mode 100644 index c5a0b3d..0000000 --- a/fuse/fuse-2.7.4-openfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up fuse-2.7.2/lib/fuse.c.BAD fuse-2.7.2/lib/fuse.c ---- lib/fuse.c 2008-01-21 09:55:42.000000000 -0500 -+++ lib/fuse.c 2008-01-21 09:57:20.000000000 -0500 -@@ -633,17 +633,15 @@ static int fuse_compat_open(struct fuse_ - { - int err; - if (!fs->compat || fs->compat >= 25) -- err = fs->op.open(path, fi); -+ err = (fs->op.open)(path, fi); - else if (fs->compat == 22) { - struct fuse_file_info_compat tmp; - memcpy(&tmp, fi, sizeof(tmp)); -- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, -- &tmp); -+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); - memcpy(fi, &tmp, sizeof(tmp)); - fi->fh = tmp.fh; - } else -- err = ((struct fuse_operations_compat2 *) &fs->op) -- ->open(path, fi->flags); -+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); - return err; - } - -diff -up fuse-2.7.2/lib/fuse_lowlevel.c.BAD fuse-2.7.2/lib/fuse_lowlevel.c ---- lib/fuse_lowlevel.c 2008-01-21 09:57:52.000000000 -0500 -+++ lib/fuse_lowlevel.c 2008-01-21 09:58:15.000000000 -0500 -@@ -605,7 +605,7 @@ static void do_open(fuse_req_t req, fuse - fi.flags = arg->flags; - - if (req->f->op.open) -- req->f->op.open(req, nodeid, &fi); -+ (req->f->op.open)(req, nodeid, &fi); - else - fuse_reply_open(req, &fi); - } diff --git a/fuse/fuse-2.7.4.-udev_rules.patch b/fuse/fuse-2.7.4.-udev_rules.patch deleted file mode 100644 index 91e8399..0000000 --- a/fuse/fuse-2.7.4.-udev_rules.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- util/udev.rules 2005-11-03 19:38:05.000000000 +0100 -+++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100 -@@ -1 +1 @@ --KERNEL=="fuse", MODE="0666" -+KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root" diff --git a/nfs-utils/nfs-utils-1.1.6-exp-subtree-warn-off.patch b/nfs-utils/nfs-utils-1.1.6-exp-subtree-warn-off.patch deleted file mode 100644 index 2ff6dff..0000000 --- a/nfs-utils/nfs-utils-1.1.6-exp-subtree-warn-off.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nfs-utils-1.1.1/support/nfs/exports.c.orig nfs-utils-1.1.1/support/nfs/exports.c ---- nfs-utils-1.1.1/support/nfs/exports.c.orig 2007-10-18 23:07:28.000000000 -0400 -+++ nfs-utils-1.1.1/support/nfs/exports.c 2008-01-05 09:01:50.000000000 -0500 -@@ -484,7 +484,7 @@ static int - parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr) - { - struct sec_entry *p; -- int had_subtree_opt = 0; -+ int had_subtree_opt = 1; - char *flname = efname?efname:"command line"; - int flline = efp?efp->x_line:0; - unsigned int active = 0; diff --git a/nfs-utils/nfs-utils-1.1.6-smnotify-path.patch b/nfs-utils/nfs-utils-1.1.6-smnotify-path.patch deleted file mode 100644 index 9a20272..0000000 --- a/nfs-utils/nfs-utils-1.1.6-smnotify-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up nfs-utils-1.1.4/utils/statd/sm-notify.c.orig nfs-utils-1.1.4/utils/statd/sm-notify.c ---- nfs-utils-1.1.4/utils/statd/sm-notify.c.orig 2008-10-17 10:20:09.000000000 -0400 -+++ nfs-utils-1.1.4/utils/statd/sm-notify.c 2008-10-17 11:22:01.000000000 -0400 -@@ -28,11 +28,13 @@ - #include <errno.h> - #include <grp.h> - -+#define STATD_PATH_XTN "statd/" -+ - #ifndef BASEDIR - # ifdef NFS_STATEDIR --# define BASEDIR NFS_STATEDIR -+# define BASEDIR NFS_STATEDIR "/" STATD_PATH_XTN - # else --# define BASEDIR "/var/lib/nfs" -+# define BASEDIR "/var/lib/nfs" "/" STATD_PATH_XTN - # endif - #endif - -diff -up nfs-utils-1.1.4/utils/statd/sm-notify.man.orig nfs-utils-1.1.4/utils/statd/sm-notify.man ---- nfs-utils-1.1.4/utils/statd/sm-notify.man.orig 2008-10-17 10:20:09.000000000 -0400 -+++ nfs-utils-1.1.4/utils/statd/sm-notify.man 2008-10-17 11:22:01.000000000 -0400 -@@ -33,7 +33,7 @@ but this is configurable. - For each NFS client or server machine to be monitored, - .B rpc.statd - creates a file in --.BR /var/lib/nfs/sm ", " -+.BR /var/lib/nfs/statd/sm ", " - and removes the file if monitoring is no longer required. - .PP - When the machine is rebooted, -@@ -47,7 +47,7 @@ Each machine has an - which is basically an integer counter that is incremented - each time the machine reboots. This counter is stored - in --.BR /var/lib/nfs/state , -+.BR /var/lib/nfs/statd/state , - and updated by - .BR sm-notify . - .SS Security -@@ -149,13 +149,13 @@ By default, - .B sm-notify - forks and puts itself in the background after obtaining the - list of hosts from --.BR /var/lib/nfs/sm . -+.BR /var/lib/nfs/statd/sm . - .SH FILES --.BR /var/lib/nfs/state -+.BR /var/lib/nfs/statd/state - .br --.BR /var/lib/nfs/sm/* -+.BR /var/lib/nfs/statd/sm/* - .br --.BR /var/lib/nfs/sm.bak/* -+.BR /var/lib/nfs/statd/sm.bak/* - .br - .BR /var/run/sm-notify.pid - .SH SEE ALSO diff --git a/nfs-utils/nfs-utils-1.1.6-statdpath.patch b/nfs-utils/nfs-utils-1.1.6-statdpath.patch deleted file mode 100644 index 0757831..0000000 --- a/nfs-utils/nfs-utils-1.1.6-statdpath.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- nfs-utils-1.1.0/utils/statd/statd.h.orig 2007-05-10 23:40:57.000000000 -0400 -+++ nfs-utils-1.1.0/utils/statd/statd.h 2007-07-14 05:55:57.000000000 -0400 -@@ -16,10 +16,11 @@ - /* - * Paths and filenames. - */ -+#define STATD_PATH_XTN "statd/" - #if defined(NFS_STATEDIR) --# define DEFAULT_DIR_BASE NFS_STATEDIR "/" -+# define DEFAULT_DIR_BASE NFS_STATEDIR "/" STATD_PATH_XTN - #else --# define DEFAULT_DIR_BASE "/var/lib/nfs/" -+# define DEFAULT_DIR_BASE "/var/lib/nfs/" STATD_PATH_XTN - #endif - - #define DEFAULT_SM_DIR DEFAULT_DIR_BASE "sm" ---- nfs-utils-1.1.0/utils/statd/statd.man.orig 2007-05-10 23:40:57.000000000 -0400 -+++ nfs-utils-1.1.0/utils/statd/statd.man 2007-07-14 05:57:20.000000000 -0400 -@@ -24,7 +24,7 @@ reboots. - For each NFS client or server machine to be monitored, - .B rpc.statd - creates a file in --.BR /var/lib/nfs/sm . -+.BR /var/lib/nfs/statd/sm . - When starting, it normally runs - .B sm-notify - to iterate through these files and notify the -@@ -176,11 +176,11 @@ and send notifications to clients. This - of an NFS export from another server. - - .SH FILES --.BR /var/lib/nfs/state -+.BR /var/lib/nfs/statd/sm/state - .br --.BR /var/lib/nfs/sm/* -+.BR /var/lib/nfs/statd/sm/* - .br --.BR /var/lib/nfs/sm.bak/* -+.BR /var/lib/nfs/statd/sm.bak/* - .SH SEE ALSO - .BR rpc.nfsd(8), - .BR portmap(8) diff --git a/portmap/portmap-6.0-tcpd.patch b/portmap/portmap-6.0-tcpd.patch deleted file mode 100644 index c6af8f8..0000000 --- a/portmap/portmap-6.0-tcpd.patch +++ /dev/null @@ -1,18 +0,0 @@ -Enable compile without tcp-wrappers - -Patch by Timothy Redaelli drizzt@gentoo.org - -http://bugs.gentoo.org/178242 - ---- portmap_6.0/pmap_check.c -+++ portmap_6.0/pmap_check.c -@@ -44,7 +44,9 @@ - #include <netinet/in.h> - #include <rpc/rpcent.h> - #endif -+#ifdef HOSTS_ACCESS - #include <tcpd.h> -+#endif - #include <arpa/inet.h> - #include <grp.h> - diff --git a/sqlzma/lzma-457-squashfs-1.patch b/sqlzma/lzma-457-squashfs-1.patch deleted file mode 100644 index 2167d14..0000000 --- a/sqlzma/lzma-457-squashfs-1.patch +++ /dev/null @@ -1,716 +0,0 @@ -diff -NPur lzma457.orig/C/Compress/Lzma/kmod/Makefile lzma457/C/Compress/Lzma/kmod/Makefile ---- lzma457.orig/C/Compress/Lzma/kmod/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/kmod/Makefile 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,16 @@ -+ -+# Copyright (C) 2006-2008 Junjiro Okajima -+# Copyright (C) 2006-2008 Tomas Matejicek, slax.org -+# -+# LICENSE follows the described one in lzma.txt. -+ -+# $Id: Makefile,v 1.3 2008-03-12 01:49:39 jro Exp $ -+ -+# # the environment variables are not inherited since 2.6.23 -+# ifdef SQLZMA_EXTRA_CFLAGS -+# EXTRA_CFLAGS += ${SQLZMA_EXTRA_CFLAGS} -+# endif -+ -+obj-m += unlzma.o sqlzma.o -+unlzma-y := module.o -+sqlzma-y := uncomp.o -diff -NPur lzma457.orig/C/Compress/Lzma/kmod/module.c lzma457/C/Compress/Lzma/kmod/module.c ---- lzma457.orig/C/Compress/Lzma/kmod/module.c 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/kmod/module.c 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,36 @@ -+ -+/* -+ * Copyright (C) 2006-2007 Junjiro Okajima -+ * Copyright (C) 2006-2007 Tomas Matejicek, slax.org -+ * -+ * LICENSE follows the described one in lzma.txt. -+ */ -+ -+/* $Id: module.c,v 1.1 2007-11-05 05:43:36 jro Exp $ */ -+ -+#include <linux/init.h> -+#include <linux/module.h> -+ -+#include "../LzmaDecode.c" -+ -+EXPORT_SYMBOL(LzmaDecodeProperties); -+EXPORT_SYMBOL(LzmaDecode); -+ -+#if 0 -+static int __init unlzma_init(void) -+{ -+ return 0; -+} -+ -+static void __exit unlzma_exit(void) -+{ -+} -+ -+module_init(unlzma_init); -+module_exit(unlzma_exit); -+#endif -+ -+MODULE_LICENSE("GPL"); -+MODULE_VERSION("$Id: module.c,v 1.1 2007-11-05 05:43:36 jro Exp $"); -+MODULE_DESCRIPTION("LZMA uncompress. " -+ "A tiny wrapper for LzmaDecode.c in LZMA SDK from www.7-zip.org."); -diff -NPur lzma457.orig/C/Compress/Lzma/kmod.mk lzma457/C/Compress/Lzma/kmod.mk ---- lzma457.orig/C/Compress/Lzma/kmod.mk 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/kmod.mk 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,40 @@ -+ -+# Copyright (C) 2006-2007 Junjiro Okajima -+# Copyright (C) 2006-2007 Tomas Matejicek, slax.org -+# -+# LICENSE follows the described one in lzma.txt. -+ -+# $Id: kmod.mk,v 1.1 2007-11-05 05:43:35 jro Exp $ -+ -+ifndef Sqlzma -+$(error Sqlzma is not defined) -+endif -+ifndef KDir -+$(error KDir is not defined) -+endif -+ -+#include makefile.gcc -+ -+Kmod = kmod -+EXTRA_CFLAGS += -Wall -Werror -I${CURDIR} -I${Sqlzma} -+# -D_LZMA_PROB32 -+EXTRA_CFLAGS += $(shell ${CPP} ${CFLAGS} -P testflags.c) -+ -+all: ${Kmod}/uncomp.c -+ ${MAKE} EXTRA_CFLAGS="${EXTRA_CFLAGS}" M=${CURDIR}/${Kmod} \ -+ -C ${KDir} C=0 V=0 modules -+ -+${Kmod}/uncomp.c: uncomp.c -+ ln $< $@ -+ -+clean: clean_kmod -+clean_kmod: -+ ${MAKE} -C ${KDir} M=${CURDIR}/${Kmod} V=0 clean -+ ${RM} ${Kmod}/*~ -+ -@test -e ${Kmod}/uncomp.c && \ -+ diff -q ${Kmod}/uncomp.c uncomp.c > /dev/null && \ -+ find ${Kmod}/uncomp.c -links +1 | xargs -r ${RM} -+ -+# Local variables: ; -+# compile-command: (concat "make Sqlzma=../../../../.. KDir=/lib/modules/`uname -r`/build -f " (file-name-nondirectory (buffer-file-name))); -+# End: ; -diff -NPur lzma457.orig/C/Compress/Lzma/sqlzma.mk lzma457/C/Compress/Lzma/sqlzma.mk ---- lzma457.orig/C/Compress/Lzma/sqlzma.mk 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/sqlzma.mk 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,47 @@ -+ -+# Copyright (C) 2006-2007 Junjiro Okajima -+# Copyright (C) 2006-2007 Tomas Matejicek, slax.org -+# -+# LICENSE follows the described one in lzma.txt. -+ -+# $Id: sqlzma.mk,v 1.1 2007-11-05 05:43:36 jro Exp $ -+ -+ifndef Sqlzma -+$(error Sqlzma is not defined) -+endif -+ -+#include makefile.gcc -+CFLAGS = -c -O2 -Wall -pedantic -D _LZMA_PROB32 -+ -+ifdef KDir -+include kmod.mk -+endif -+ -+ifdef UseDebugFlags -+DebugFlags = -O0 -g -UNDEBUG -+endif -+CFLAGS += -DNDEBUG ${DebugFlags} -+Tgt = libunlzma.a libunlzma_r.a -+ -+all: ${Tgt} -+ -+%_r.c: %.c -+ ln $< $@ -+# -pthread -+%_r.o: CFLAGS += -D_REENTRANT -include pthread.h -+ -+uncomp.o uncomp_r.o: CFLAGS += -I${Sqlzma} -+uncomp.o: uncomp.c ${Sqlzma}/sqlzma.h -+ -+libunlzma.a: uncomp.o LzmaDecode.o -+ ${AR} cr $@ $^ -+libunlzma_r.a: uncomp_r.o LzmaDecode_r.o -+ ${AR} cr $@ $^ -+ -+clean: clean_sqlzma -+clean_sqlzma: -+ $(RM) ${Tgt} uncomp.o uncomp_r.o LzmaDecode_r.o LzmaDecode.o *~ -+ -+# Local variables: ; -+# compile-command: (concat "make Sqlzma=../../../../.. -f " (file-name-nondirectory (buffer-file-name))); -+# End: ; -diff -NPur lzma457.orig/C/Compress/Lzma/testflags.c lzma457/C/Compress/Lzma/testflags.c ---- lzma457.orig/C/Compress/Lzma/testflags.c 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/testflags.c 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,5 @@ -+#ifdef _LZMA_PROB32 -+-D_LZMA_PROB32 -+#else -+-U_LZMA_PROB32 -+#endif -diff -NPur lzma457.orig/C/Compress/Lzma/uncomp.c lzma457/C/Compress/Lzma/uncomp.c ---- lzma457.orig/C/Compress/Lzma/uncomp.c 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/C/Compress/Lzma/uncomp.c 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,223 @@ -+/* -+ * Copyright (C) 2006-2008 Junjiro Okajima -+ * Copyright (C) 2006-2008 Tomas Matejicek, slax.org -+ * -+ * LICENSE follows the described one in lzma.txt. -+ */ -+ -+/* $Id: uncomp.c,v 1.7 2008-03-12 16:58:34 jro Exp $ */ -+ -+/* extract some parts from lzma443/C/7zip/Compress/LZMA_C/LzmaTest.c */ -+ -+#ifndef __KERNEL__ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <errno.h> -+#include <assert.h> -+#include <pthread.h> -+#define unlikely(x) __builtin_expect(!!(x), 0) -+#define BUG_ON(x) assert(!(x)) -+/* sqlzma buffers are always larger than a page. true? */ -+#define kmalloc(sz,gfp) malloc(sz) -+#define kfree(p) free(p) -+#define zlib_inflate(s, f) inflate(s, f) -+#define zlib_inflateInit(s) inflateInit(s) -+#define zlib_inflateReset(s) inflateReset(s) -+#define zlib_inflateEnd(s) inflateEnd(s) -+#else -+#include <linux/init.h> -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/vmalloc.h> -+#ifndef WARN_ON_ONCE -+#define WARN_ON_ONCE(b) WARN_ON(b) -+#endif -+#endif /* __KERNEL__ */ -+ -+#include "sqlzma.h" -+#include "LzmaDecode.h" -+ -+static int LzmaUncompress(struct sqlzma_un *un) -+{ -+ int err, i, ret; -+ SizeT outSize, inProcessed, outProcessed, srclen; -+ /* it's about 24-80 bytes structure, if int is 32-bit */ -+ CLzmaDecoderState state; -+ unsigned char *dst, *src, a[8]; -+ struct sized_buf *sbuf; -+ -+ /* Decode LZMA properties and allocate memory */ -+ err = -EINVAL; -+ src = (void *)un->un_cmbuf; -+ ret = LzmaDecodeProperties(&state.Properties, src, -+ LZMA_PROPERTIES_SIZE); -+ src += LZMA_PROPERTIES_SIZE; -+ if (unlikely(ret != LZMA_RESULT_OK)) -+ goto out; -+ i = LzmaGetNumProbs(&state.Properties); -+ if (unlikely(i <= 0)) -+ i = 1; -+ i *= sizeof(CProb); -+ sbuf = un->un_a + SQUN_PROB; -+ if (unlikely(sbuf->sz < i)) { -+ if (sbuf->buf && sbuf->buf != un->un_prob) -+ kfree(sbuf->buf); -+#ifdef __KERNEL__ -+ printk("%s:%d: %d --> %d\n", __func__, __LINE__, sbuf->sz, i); -+#else -+ printf("%d --> %d\n", sbuf->sz, i); -+#endif -+ err = -ENOMEM; -+ sbuf->sz = 0; -+ sbuf->buf = kmalloc(i, GFP_ATOMIC); -+ if (unlikely(!sbuf->buf)) -+ goto out; -+ sbuf->sz = i; -+ } -+ state.Probs = (void *)sbuf->buf; -+ -+ /* Read uncompressed size */ -+ memcpy(a, src, sizeof(a)); -+ src += sizeof(a); -+ outSize = a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24); -+ -+ err = -EINVAL; -+ dst = un->un_resbuf; -+ if (unlikely(!dst || outSize > un->un_reslen)) -+ goto out; -+ un->un_reslen = outSize; -+ srclen = un->un_cmlen - (src - un->un_cmbuf); -+ -+ /* Decompress */ -+ err = LzmaDecode(&state, src, srclen, &inProcessed, dst, outSize, -+ &outProcessed); -+ if (unlikely(err)) -+ err = -EINVAL; -+ -+ out: -+#ifndef __KERNEL__ -+ if (err) -+ fprintf(stderr, "err %d\n", err); -+#endif -+ return err; -+} -+ -+int sqlzma_un(struct sqlzma_un *un, struct sized_buf *src, -+ struct sized_buf *dst) -+{ -+ int err, by_lzma = 1; -+ if (un->un_lzma && is_lzma(*src->buf)) { -+ un->un_cmbuf = src->buf; -+ un->un_cmlen = src->sz; -+ un->un_resbuf = dst->buf; -+ un->un_reslen = dst->sz; -+ -+ /* this library is thread-safe */ -+ err = LzmaUncompress(un); -+ goto out; -+ } -+ -+ by_lzma = 0; -+ err = zlib_inflateReset(&un->un_stream); -+ if (unlikely(err != Z_OK)) -+ goto out; -+ un->un_stream.next_in = src->buf; -+ un->un_stream.avail_in = src->sz; -+ un->un_stream.next_out = dst->buf; -+ un->un_stream.avail_out = dst->sz; -+ err = zlib_inflate(&un->un_stream, Z_FINISH); -+ if (err == Z_STREAM_END) -+ err = 0; -+ -+ out: -+ if (unlikely(err)) { -+#ifdef __KERNEL__ -+ WARN_ON_ONCE(1); -+#else -+ char a[64] = "ZLIB "; -+ if (by_lzma) { -+ strcpy(a, "LZMA "); -+#ifdef _REENTRANT -+ strerror_r(err, a + 5, sizeof(a) - 5); -+#else -+ strncat(a, strerror(err), sizeof(a) - 5); -+#endif -+ } else -+ strncat(a, zError(err), sizeof(a) - 5); -+ fprintf(stderr, "%s: %.*s\n", __func__, sizeof(a), a); -+#endif -+ } -+ return err; -+} -+ -+int sqlzma_init(struct sqlzma_un *un, int do_lzma, unsigned int res_sz) -+{ -+ int err; -+ -+ err = -ENOMEM; -+ un->un_lzma = do_lzma; -+ memset(un->un_a, 0, sizeof(un->un_a)); -+ un->un_a[SQUN_PROB].buf = un->un_prob; -+ un->un_a[SQUN_PROB].sz = sizeof(un->un_prob); -+ if (res_sz) { -+ un->un_a[SQUN_RESULT].buf = kmalloc(res_sz, GFP_KERNEL); -+ if (unlikely(!un->un_a[SQUN_RESULT].buf)) -+ return err; -+ un->un_a[SQUN_RESULT].sz = res_sz; -+ } -+ -+ un->un_stream.next_in = NULL; -+ un->un_stream.avail_in = 0; -+#ifdef __KERNEL__ -+ un->un_stream.workspace = kmalloc(zlib_inflate_workspacesize(), -+ GFP_KERNEL); -+ if (unlikely(!un->un_stream.workspace)) -+ return err; -+#else -+ un->un_stream.opaque = NULL; -+ un->un_stream.zalloc = Z_NULL; -+ un->un_stream.zfree = Z_NULL; -+#endif -+ err = zlib_inflateInit(&un->un_stream); -+ if (unlikely(err == Z_MEM_ERROR)) -+ return -ENOMEM; -+ BUG_ON(err); -+ return err; -+} -+ -+void sqlzma_fin(struct sqlzma_un *un) -+{ -+ int i; -+ for (i = 0; i < SQUN_LAST; i++) -+ if (un->un_a[i].buf && un->un_a[i].buf != un->un_prob) -+ kfree(un->un_a[i].buf); -+ BUG_ON(zlib_inflateEnd(&un->un_stream) != Z_OK); -+} -+ -+#ifdef __KERNEL__ -+EXPORT_SYMBOL(sqlzma_un); -+EXPORT_SYMBOL(sqlzma_init); -+EXPORT_SYMBOL(sqlzma_fin); -+ -+#if 0 -+static int __init sqlzma_init(void) -+{ -+ return 0; -+} -+ -+static void __exit sqlzma_exit(void) -+{ -+} -+ -+module_init(sqlzma_init); -+module_exit(sqlzma_exit); -+#endif -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Junjiro Okajima <sfjro at users dot sf dot net>"); -+MODULE_VERSION("$Id: uncomp.c,v 1.7 2008-03-12 16:58:34 jro Exp $"); -+MODULE_DESCRIPTION("LZMA uncompress for squashfs. " -+ "Some functions for squashfs to support LZMA and " -+ "a tiny wrapper for LzmaDecode.c in LZMA SDK from www.7-zip.org."); -+#endif -diff -NPur lzma457.orig/CPP/7zip/Compress/LZMA_Alone/comp.cc lzma457/CPP/7zip/Compress/LZMA_Alone/comp.cc ---- lzma457.orig/CPP/7zip/Compress/LZMA_Alone/comp.cc 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/CPP/7zip/Compress/LZMA_Alone/comp.cc 2008-10-29 10:18:14.000000000 -0500 -@@ -0,0 +1,260 @@ -+/* -+ * Copyright (C) 2006-2007 Junjiro Okajima -+ * Copyright (C) 2006-2007 Tomas Matejicek, slax.org -+ * -+ * LICENSE follows the described one in lzma.txt. -+ */ -+ -+/* $Id: comp.cc,v 1.3 2007-11-13 13:27:23 jro Exp $ */ -+ -+// extract some parts from lzma443/C/7zip/Compress/LZMA_Alone/LzmaAlone.cpp -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <assert.h> -+#include <errno.h> -+ -+#include "StdAfx.h" -+#include "../../../Common/MyInitGuid.h" -+//#include "../../../Common/MyWindows.h" -+#include "../../../Common/StringConvert.h" -+//#include "../../../Common/StringToInt.h" -+//#include "../../Common/StreamUtils.h" -+#include "../LZMA/LZMAEncoder.h" -+ -+#include <pthread.h> -+#include <zlib.h> -+#include "sqlzma.h" -+ -+////////////////////////////////////////////////////////////////////// -+ -+class CMemoryStream { -+protected: -+ Bytef *m_data; -+ UInt64 m_limit; -+ UInt64 m_pos; -+ -+public: -+ CMemoryStream(Bytef *data, UInt64 size) -+ : m_data(data), m_limit(size), m_pos(0) {} -+ -+ virtual ~CMemoryStream() {} -+}; -+ -+class CInMemoryStream : public CMemoryStream, public IInStream, -+ public CMyUnknownImp { -+//protected: -+ CMyComPtr<ISequentialInStream> m_stream; -+ -+public: -+ MY_UNKNOWN_IMP1(IInStream); -+ -+ CInMemoryStream(Bytef *data, UInt64 size) -+ : CMemoryStream(data, size), m_stream(this) {} -+ -+ virtual ~CInMemoryStream() {} -+ -+ STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) -+ { -+ UInt64 room = m_limit - m_pos; -+ if (size > room) -+ size = room; -+ if (size) { -+ memcpy(data, m_data + m_pos, size); -+ m_pos += size; -+ } -+ if (processedSize) -+ *processedSize = size; -+ return S_OK; -+ } -+ -+ // disabled all -+ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) { -+ assert(0); -+ return E_NOTIMPL; -+ } -+}; -+ -+class COutMemoryStream : public CMemoryStream, public IOutStream, -+ public CMyUnknownImp { -+//protected: -+ CMyComPtr<ISequentialOutStream> m_stream; -+ -+public: -+ MY_UNKNOWN_IMP1(IOutStream); -+ -+ COutMemoryStream(Bytef *data, UInt64 size) -+ : CMemoryStream(data, size), m_stream(this) {} -+ -+ virtual ~COutMemoryStream() {} -+ -+ UInt32 GetSize() {return m_pos;} -+ -+ STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) { -+ if (m_pos + size > m_limit) -+ return -ENOSPC; -+ memcpy(m_data + m_pos, data, size); -+ m_pos += size; -+ if (processedSize) -+ *processedSize = size; -+ return S_OK; -+ } -+ -+ // disabled all -+ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) { -+ assert(0); -+ return E_NOTIMPL; -+ } -+ STDMETHOD(SetSize)(Int64 newSize) { -+ assert(0); -+ return E_NOTIMPL; -+ } -+}; -+ -+////////////////////////////////////////////////////////////////////// -+ -+static int -+LzmaCompress(Bytef *next_in, uInt avail_in, Bytef *next_out, uInt avail_out, -+ struct sqlzma_opts *opts, uLong *total_out) -+{ -+ int err; -+ HRESULT res; -+ const Byte a[] = { -+ avail_in, avail_in >> 8, avail_in >> 16, avail_in >> 24, -+ 0, 0, 0, 0 -+ }; -+ -+ NCompress::NLZMA::CEncoder encoderSpec; -+ CMyComPtr<ICompressCoder> encoder = &encoderSpec; -+ encoder->AddRef(); -+ CInMemoryStream inStreamSpec(next_in, avail_in); -+ CMyComPtr<ISequentialInStream> inStream = &inStreamSpec; -+ inStream->AddRef(); -+ COutMemoryStream outStreamSpec(next_out, avail_out); -+ CMyComPtr<ISequentialOutStream> outStream = &outStreamSpec; -+ outStream->AddRef(); -+ -+ // these values are dpending upon is_lzma() macro in sqlzma.h -+ const UInt32 dictionary = opts->dicsize; -+ //fprintf(stderr, "dic %u\n", dictionary); -+ const UString mf = L"BT4"; -+ const UInt32 posStateBits = 2; -+ const UInt32 litContextBits = 3; // for normal files -+ // UInt32 litContextBits = 0; // for 32-bit data -+ const UInt32 litPosBits = 0; -+ // UInt32 litPosBits = 2; // for 32-bit data -+ //const UInt32 algorithm = 2; -+ const UInt32 algorithm = 1; -+ const UInt32 numFastBytes = 128; -+ const UInt32 matchFinderCycles = 16 + numFastBytes / 2; -+ //const bool matchFinderCyclesDefined = false; -+ const PROPID propIDs[] = { -+ NCoderPropID::kDictionarySize, -+ NCoderPropID::kPosStateBits, -+ NCoderPropID::kLitContextBits, -+ NCoderPropID::kLitPosBits, -+ NCoderPropID::kAlgorithm, -+ NCoderPropID::kNumFastBytes, -+ NCoderPropID::kMatchFinder, -+ NCoderPropID::kEndMarker, -+ NCoderPropID::kNumThreads, -+ NCoderPropID::kMatchFinderCycles -+ }; -+ const int kNumPropsMax = sizeof(propIDs) / sizeof(propIDs[0]); -+ PROPVARIANT properties[kNumPropsMax]; -+ for (int p = 0; p < 6; p++) -+ properties[p].vt = VT_UI4; -+ properties[0].ulVal = UInt32(dictionary); -+ properties[1].ulVal = UInt32(posStateBits); -+ properties[2].ulVal = UInt32(litContextBits); -+ properties[3].ulVal = UInt32(litPosBits); -+ properties[4].ulVal = UInt32(algorithm); -+ properties[5].ulVal = UInt32(numFastBytes); -+ -+ properties[6].vt = VT_BSTR; -+ properties[6].bstrVal = (BSTR)(const wchar_t *)mf; -+ properties[7].vt = VT_BOOL; -+ properties[7].boolVal = VARIANT_FALSE; // EOS -+ properties[8].vt = VT_UI4; -+ properties[8].ulVal = 1; // numThreads -+ properties[9].vt = VT_UI4; -+ properties[9].ulVal = UInt32(matchFinderCycles); -+ -+ err = -EINVAL; -+ res = encoderSpec.SetCoderProperties(propIDs, properties, -+ kNumPropsMax - 1); -+ if (res) -+ goto out; -+ res = encoderSpec.WriteCoderProperties(outStream); -+ if (res) -+ goto out; -+ -+ UInt32 r; -+ res = outStream->Write(a, sizeof(a), &r); -+ if (res || r != sizeof(a)) -+ goto out; -+ -+ err = encoder->Code(inStream, outStream, 0, /*broken*/0, 0); -+ if (err) -+ goto out; -+ *total_out = outStreamSpec.GetSize(); -+ -+ out: -+ return err; -+} -+ -+////////////////////////////////////////////////////////////////////// -+ -+#define Failure(p) do { \ -+ fprintf(stderr, "%s:%d: please report to jro " \ -+ "{%02x, %02x, %02x, %02x, %02x, %02x, %02x, %02x}\n", \ -+ __func__, __LINE__, \ -+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); \ -+ abort(); \ -+} while(0) -+ -+extern "C" int -+sqlzma_cm(struct sqlzma_opts *opts, z_stream *stream, Bytef *next_in, uInt -+ avail_in, Bytef *next_out, uInt avail_out) -+{ -+ int err; -+ Bytef *p = next_out; -+ uInt l = avail_out; -+ -+ stream->next_in = next_in; -+ stream->avail_in = avail_in; -+ stream->next_out = p; -+ stream->avail_out = l; -+ err = deflate(stream, Z_FINISH); -+ if (err != Z_STREAM_END && err != Z_OK) -+ goto out_err; -+ if (avail_in < stream->total_out) -+ return err; -+ if (is_lzma(*p)) -+ Failure(p); -+ -+ if (opts->try_lzma) { -+ unsigned char a[stream->total_out]; -+ uLong processed; -+ -+ memcpy(a, p, stream->total_out); -+ -+ // malloc family in glibc and stdc++ seems to be thread-safe -+ err = LzmaCompress(next_in, avail_in, p, l, opts, &processed); -+ if (!err && processed <= stream->total_out) { -+ if (!is_lzma(*next_out)) -+ Failure(next_out); -+ stream->total_out = processed; -+ err = Z_STREAM_END; -+ } else { -+ //puts("by zlib"); -+ memcpy(p, a, stream->total_out); -+ err = Z_STREAM_END; -+ } -+ } -+ return err; -+ -+ out_err: -+ fprintf(stderr, "%s: ZLIB err %s\n", __func__, zError(err)); -+ return err; -+} -diff -NPur lzma457.orig/CPP/7zip/Compress/LZMA_Alone/sqlzma.mk lzma457/CPP/7zip/Compress/LZMA_Alone/sqlzma.mk ---- lzma457.orig/CPP/7zip/Compress/LZMA_Alone/sqlzma.mk 1969-12-31 18:00:00.000000000 -0600 -+++ lzma457/CPP/7zip/Compress/LZMA_Alone/sqlzma.mk 2008-10-29 10:18:32.000000000 -0500 -@@ -0,0 +1,57 @@ -+ -+# Copyright (C) 2006-2007 Junjiro Okajima -+# Copyright (C) 2006-2007 Tomas Matejicek, slax.org -+# -+# LICENSE follows the described one in lzma.txt. -+ -+# $Id: sqlzma.mk,v 1.1 2007-11-05 05:43:36 jro Exp $ -+ -+ifndef Sqlzma -+$(error Sqlzma is not defined) -+endif -+ -+include makefile.gcc -+ -+ifdef UseDebugFlags -+DebugFlags = -Wall -O0 -g -UNDEBUG -+endif -+# -pthread -+CXXFLAGS = ${CFLAGS} -D_REENTRANT -include pthread.h -DNDEBUG ${DebugFlags} -+Tgt = liblzma_r.a -+ -+all: ${Tgt} -+ -+RObjs = LZMAEncoder_r.o Alloc_r.o StreamUtils_r.o MatchFinder_r.o \ -+ RangeCoderBit_r.o OutBuffer_r.o 7zCrc_r.o -+ -+%_r.cc: ../LZMA/%.cpp -+ ln $< $@ -+%_r.c: ../../../../C/%.c -+ ln $< $@ -+%_r.c: ../../../../C/Compress/Lz/%.c -+ ln $< $@ -+%_r.cc: ../../Common/%.cpp -+ ln $< $@ -+%_r.cc: ../RangeCoder/%.cpp -+ ln $< $@ -+LZMAEncoder_r.o: CXXFLAGS += -I../LZMA -+Alloc_r.o: CFLAGS += -I../../../../C -+StreamUtils_r.o: CXXFLAGS += -I../../Common -+MatchFinder_r.o: CFLAGS += -I../../../../C/Compress/Lz -+RangeCoderBit_r.o: CXXFLAGS += -I../RangeCoder -+OutBuffer_r.o: CXXFLAGS += -I../../Common -+7zCrc_r.o: CFLAGS += -I../../../../C -+ -+comp.o: CXXFLAGS += -I${Sqlzma} -+comp.o: comp.cc ${Sqlzma}/sqlzma.h -+ -+liblzma_r.a: ${RObjs} comp.o -+ ${AR} cr $@ $^ -+ -+clean: clean_sqlzma -+clean_sqlzma: -+ $(RM) comp.o *_r.o ${Tgt} *~ -+ -+# Local variables: ; -+# compile-command: (concat "make Sqlzma=../../../../.. -f " (file-name-nondirectory (buffer-file-name))); -+# End: ; diff --git a/sqlzma/sqlzma-3.4-1.patch b/sqlzma/sqlzma-3.4-1.patch deleted file mode 100644 index f9cb37c..0000000 --- a/sqlzma/sqlzma-3.4-1.patch +++ /dev/null @@ -1,587 +0,0 @@ -diff -NPur squashfs3.4.orig/squashfs-tools/Makefile squashfs3.4/squashfs-tools/Makefile ---- squashfs3.4.orig/squashfs-tools/Makefile 2008-08-26 02:10:13.000000000 -0500 -+++ squashfs3.4/squashfs-tools/Makefile 2008-10-29 18:46:48.000000000 -0500 -@@ -1,24 +1,37 @@ -+ifndef Sqlzma -+$(error Sqlzma is not defined) -+endif -+ - INSTALL_DIR = /usr/local/bin - - INCLUDEDIR = . - - CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 -+ifdef UseDebugFlags -+DebugFlags = -g -Wall -Wno-unused-variable -O0 -UNDEBUG -+endif -+CFLAGS += -I${Sqlzma} -D_REENTRANT -DNDEBUG ${DebugFlags} -+LDFLAGS += -L${LzmaAlone} -L${LzmaC} - - all: mksquashfs unsquashfs - - mksquashfs: mksquashfs.o read_fs.o sort.o -- $(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ -+ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -lunlzma_r -llzma_r -lstdc++ -o $@ - --mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h -+mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \ -+ ${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h \ -+ ${LzmaAlone}/liblzma_r.a ${LzmaC}/libunlzma_r.a - --read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h -+read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h \ -+ ${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h - - sort.o: sort.c squashfs_fs.h global.h sort.h - - unsquashfs: unsquashfs.o -- $(CC) unsquashfs.o -lz -lpthread -lm -o $@ -+ $(CC) $(LDFLAGS) unsquashfs.o -lz -lpthread -lm -lunlzma -o $@ - --unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h -+unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h \ -+ ${Sqlzma}/sqlzma.h ${Sqlzma}/sqmagic.h ${LzmaC}/libunlzma.a - - clean: - -rm -f *.o mksquashfs unsquashfs -diff -NPur squashfs3.4.orig/squashfs-tools/mksquashfs.c squashfs3.4/squashfs-tools/mksquashfs.c ---- squashfs3.4.orig/squashfs-tools/mksquashfs.c 2008-08-26 02:01:39.000000000 -0500 -+++ squashfs3.4/squashfs-tools/mksquashfs.c 2008-10-29 18:29:48.000000000 -0500 -@@ -62,6 +62,8 @@ - #include "mksquashfs.h" - #include "global.h" - #include "sort.h" -+#include "sqlzma.h" -+#include "sqmagic.h" - - #ifdef SQUASHFS_TRACE - #define TRACE(s, args...) do { \ -@@ -123,6 +125,11 @@ - squashfs_uid uids[SQUASHFS_UIDS], guids[SQUASHFS_GUIDS]; - int block_offset; - int file_count = 0, sym_count = 0, dev_count = 0, dir_count = 0, fifo_count = 0, sock_count = 0; -+struct sqlzma_un un; -+struct sqlzma_opts sqlzma_opts = { -+ .try_lzma = 1, -+ .dicsize = SQUASHFS_FILE_SIZE -+}; - - /* write position within data section */ - long long bytes = 0, total_bytes = 0; -@@ -827,21 +834,8 @@ - BAD_ERROR("zlib::compress failed, unknown error %d\n", res); - } - -- stream->next_in = (unsigned char *) s; -- stream->avail_in = size; -- stream->next_out = (unsigned char *) d; -- stream->avail_out = block_size; -- -- res = deflate(stream, Z_FINISH); -- if(res != Z_STREAM_END && res != Z_OK) { -- if(res == Z_STREAM_ERROR) -- BAD_ERROR("zlib::compress failed, stream state inconsistent\n"); -- else if(res == Z_BUF_ERROR) -- BAD_ERROR("zlib::compress failed, no progress possible\n"); -- else -- BAD_ERROR("zlib::compress failed, unknown error %d\n", res); -- } -- -+ res = sqlzma_cm(&sqlzma_opts, stream, (void *)s, size, (void *)d, -+ block_size); - c_byte = stream->total_out; - - if(res != Z_STREAM_END || c_byte >= size) { -@@ -1450,6 +1444,11 @@ - unsigned long bytes = block_size; - char *data; - char cbuffer[block_size]; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[] = { -+ {.buf = (void *)cbuffer, .sz = size}, -+ {.buf = (void *)buffer->data, .sz = bytes} -+ }; - - if(compressed_buffer) - data = compressed_buffer->data; -@@ -1458,14 +1457,10 @@ - read_bytes(fd, start_block, size, data); - } - -- if((res = uncompress((unsigned char *) buffer->data, &bytes, (const unsigned char *) data, size)) != Z_OK) { -- if(res == Z_MEM_ERROR) -- BAD_ERROR("zlib::uncompress failed, not enough memory\n"); -- else if(res == Z_BUF_ERROR) -- BAD_ERROR("zlib::uncompress failed, not enough room in output buffer\n"); -- else -- BAD_ERROR("zlib::uncompress failed, unknown error %d\n", res); -- } -+ sbuf[Src].buf = data; -+ res = sqlzma_un(&un, sbuf + Src, sbuf + Dst); -+ if (res) -+ BAD_ERROR("%s:%d: res %d\n", __func__, __LINE__, res); - } else if(compressed_buffer) - memcpy(buffer->data, compressed_buffer->data, size); - else -@@ -2001,6 +1995,7 @@ - break; - } - } -+ return NULL; - } - - -@@ -2274,6 +2269,7 @@ - printf("] %*lld/%*lld", max_digits, current, max_digits, max); - printf(" %3lld%%", current * 100 / max); - fflush(stdout); -+ return; - } - - -@@ -2973,7 +2969,7 @@ - - void dir_scan2(squashfs_inode *inode, struct dir_info *dir_info) - { -- int squashfs_type; -+ int squashfs_type = -1; - int duplicate_file; - char *pathname = dir_info->pathname; - struct directory dir; -@@ -3576,7 +3572,8 @@ - printf("This program is distributed in the hope that it will be useful,\n");\ - printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");\ - printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");\ -- printf("GNU General Public License for more details.\n"); -+ printf("GNU General Public License for more details.\n");\ -+ printf("and LZMA support for slax.org by jro.\n"); - int main(int argc, char *argv[]) - { - struct stat buf, source_buf; -@@ -3595,6 +3592,7 @@ - #endif - - pthread_mutex_init(&progress_mutex, NULL); -+ un.un_lzma = 1; - block_log = slog(block_size); - if(argc > 1 && strcmp(argv[1], "-version") == 0) { - VERSION(); -@@ -3662,24 +3660,33 @@ - ERROR("%s: -fragment-queue should be 1 megabyte or larger\n", argv[0]); - exit(1); - } -- } else if(strcmp(argv[i], "-b") == 0) { -+ } else if(strcmp(argv[i], "-b") == 0 -+ || strcmp(argv[i], "-lzmadic") == 0) { -+ long bs; -+ unsigned int bl; - if(++i == argc) { -- ERROR("%s: -b missing block size\n", argv[0]); -+ ERROR("%s: -b|-lzmadic missing block size\n", argv[0]); - exit(1); - } -- block_size = strtol(argv[i], &b, 10); -+ bs = strtol(argv[i], &b, 10); - if(*b == 'm' || *b == 'M') -- block_size *= 1048576; -+ bs *= 1048576; - else if(*b == 'k' || *b == 'K') -- block_size *= 1024; -+ bs *= 1024; - else if(*b != '\0') { -- ERROR("%s: -b invalid block size\n", argv[0]); -+ ERROR("%s: -b|-lzmadic invalid size\n", argv[0]); - exit(1); - } -- if((block_log = slog(block_size)) == 0) { -- ERROR("%s: -b block size not power of two or not between 4096 and 1Mbyte\n", argv[0]); -+ bl = slog(bs); -+ if(bl == 0) { -+ ERROR("%s: -b|-lzmadic size not power of two or not between 4096 and 1Mbyte\n", argv[0]); - exit(1); - } -+ if (!strcmp(argv[i - 1], "-b")) { -+ block_size = bs; -+ block_log = bl; -+ } -+ sqlzma_opts.dicsize = bs; - } else if(strcmp(argv[i], "-ef") == 0) { - if(++i == argc) { - ERROR("%s: -ef missing filename\n", argv[0]); -@@ -3784,6 +3791,9 @@ - exit(1); - } - root_name = argv[i]; -+ } else if(strcmp(argv[i], "-nolzma") == 0) { -+ un.un_lzma = 0; -+ sqlzma_opts.try_lzma = 0; - } else if(strcmp(argv[i], "-version") == 0) { - VERSION(); - } else { -@@ -3834,6 +3844,12 @@ - ERROR("-ef <exclude_file>\tlist of exclude dirs/files. One per line\n"); - ERROR("-wildcards\t\tAllow extended shell wildcards (globbing) to be used in\n\t\t\texclude dirs/files\n"); - ERROR("-regex\t\t\tAllow POSIX regular expressions to be used in exclude\n\t\t\tdirs/files\n"); -+ ERROR("-lzmadic <dic_size>\tset the LZMA dictionary" -+ " size to <dic_size>\n" -+ "\t\t\tDefault value always follow the block" -+ " size\n" -+ "\t\t\tUse this alone or AFTER -b option\n"); -+ ERROR("-nolzma\t\t\tnever try LZMA compression\n"); - exit(1); - } - } -@@ -3945,6 +3961,7 @@ - - be = orig_be; - block_log = slog(block_size = sBlk.block_size); -+ //sqlzma_opts.dicsize = block_size; - s_minor = sBlk.s_minor; - noI = SQUASHFS_UNCOMPRESSED_INODES(sBlk.flags); - noD = SQUASHFS_UNCOMPRESSED_DATA(sBlk.flags); -@@ -3958,10 +3975,18 @@ - - initialise_threads(); - -+ i = sqlzma_init(&un, un.un_lzma, 0); -+ if (i != Z_OK) { -+ ERROR("%s:%d: %d\n", __func__, __LINE__, i); -+ EXIT_MKSQUASHFS(); -+ } -+ - if(delete) { - printf("Creating %s %d.%d filesystem on %s, block size %d.\n", - be ? "big endian" : "little endian", SQUASHFS_MAJOR, s_minor, argv[source + 1], block_size); - bytes = sizeof(squashfs_super_block); -+ if (sqlzma_opts.try_lzma) -+ printf("lzmadic %u\n", sqlzma_opts.dicsize); - } else { - unsigned int last_directory_block, inode_dir_offset, inode_dir_file_size, root_inode_size, - inode_dir_start_block, uncompressed_data, compressed_data, inode_dir_inode_number, -@@ -3985,6 +4010,8 @@ - - printf("Appending to existing %s %d.%d filesystem on %s, block size %d\n", be ? "big endian" : - "little endian", SQUASHFS_MAJOR, s_minor, argv[source + 1], block_size); -+ if (sqlzma_opts.try_lzma) -+ printf("lzmadic %u\n", sqlzma_opts.dicsize); - printf("All -be, -le, -b, -noI, -noD, -noF, -check_data, no-duplicates, no-fragments, -always-use-fragments and -exportable options ignored\n"); - printf("\nIf appending is not wanted, please re-run with -noappend specified!\n\n"); - -@@ -4081,7 +4108,9 @@ - dir_scan(&inode, "", scan1_encomp_readdir); - sBlk.root_inode = inode; - sBlk.inodes = inode_count; -- sBlk.s_magic = SQUASHFS_MAGIC; -+ sBlk.s_magic = SQUASHFS_MAGIC_LZMA; -+ if (!un.un_lzma) -+ sBlk.s_magic = SQUASHFS_MAGIC; - sBlk.s_major = SQUASHFS_MAJOR; - sBlk.s_minor = s_minor; - sBlk.block_size = block_size; -@@ -4180,6 +4209,8 @@ - exportable ? "Exportable " : "", be ? "Big endian" : "Little endian", block_size, - noD ? "uncompressed" : "compressed", noI ? "uncompressed" : "compressed", - no_fragments ? "no" : noF ? "uncompressed" : "compressed", duplicate_checking ? "" : "not "); -+ if (sqlzma_opts.try_lzma) -+ printf("lzmadic %u\n", sqlzma_opts.dicsize); - printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, bytes / (1024.0 * 1024.0)); - printf("\t%.2f%% of uncompressed filesystem size (%.2f Kbytes)\n", - ((float) bytes / total_bytes) * 100.0, total_bytes / 1024.0); -diff -NPur squashfs3.4.orig/squashfs-tools/read_fs.c squashfs3.4/squashfs-tools/read_fs.c ---- squashfs3.4.orig/squashfs-tools/read_fs.c 2008-08-19 23:46:08.000000000 -0500 -+++ squashfs3.4/squashfs-tools/read_fs.c 2008-10-29 18:29:48.000000000 -0500 -@@ -46,6 +46,8 @@ - #include <squashfs_fs.h> - #include "read_fs.h" - #include "global.h" -+#include "sqlzma.h" -+#include "sqmagic.h" - - #include <stdlib.h> - -@@ -62,6 +64,7 @@ - } while(0) - - int swap; -+extern struct sqlzma_un un; - - int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk) - { -@@ -81,19 +84,20 @@ - char buffer[SQUASHFS_METADATA_SIZE]; - int res; - unsigned long bytes = SQUASHFS_METADATA_SIZE; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[] = { -+ {.buf = (void *)buffer}, -+ {.buf = (void *)block, .sz = bytes} -+ }; - - c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte); - read_bytes(fd, start + offset, c_byte, buffer); - -- if((res = uncompress(block, &bytes, (const unsigned char *) buffer, c_byte)) != Z_OK) { -- if(res == Z_MEM_ERROR) -- ERROR("zlib::uncompress failed, not enough memory\n"); -- else if(res == Z_BUF_ERROR) -- ERROR("zlib::uncompress failed, not enough room in output buffer\n"); -- else -- ERROR("zlib::uncompress failed, unknown error %d\n", res); -- return 0; -- } -+ sbuf[Src].sz = c_byte; -+ res = sqlzma_un(&un, sbuf + Src, sbuf + Dst); -+ if (res) -+ abort(); -+ bytes = un.un_reslen; - if(next) - *next = start + offset + c_byte; - return bytes; -@@ -351,18 +355,30 @@ - - /* Check it is a SQUASHFS superblock */ - swap = 0; -- if(sBlk->s_magic != SQUASHFS_MAGIC) { -- if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) { -- squashfs_super_block sblk; -- ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source); -- SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk); -- memcpy(sBlk, &sblk, sizeof(squashfs_super_block)); -- swap = 1; -- } else { -- ERROR("Can't find a SQUASHFS superblock on %s\n", source); -- goto failed_mount; -- } -- } -+ switch (sBlk->s_magic) { -+ squashfs_super_block sblk; -+ -+ case SQUASHFS_MAGIC_LZMA: -+ if (!un.un_lzma) -+ goto bad; -+ break; -+ case SQUASHFS_MAGIC: -+ break; -+ case SQUASHFS_MAGIC_LZMA_SWAP: -+ if (!un.un_lzma) -+ goto bad; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_SWAP: -+ ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source); -+ SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk); -+ memcpy(sBlk, &sblk, sizeof(squashfs_super_block)); -+ swap = 1; -+ break; -+ bad: -+ default: -+ ERROR("Can't find a SQUASHFS superblock on %s\n", source); -+ goto failed_mount; -+ } - - /* Check the MAJOR & MINOR versions */ - if(sBlk->s_major != SQUASHFS_MAJOR || sBlk->s_minor > SQUASHFS_MINOR) { -diff -NPur squashfs3.4.orig/squashfs-tools/unsquashfs.c squashfs3.4/squashfs-tools/unsquashfs.c ---- squashfs3.4.orig/squashfs-tools/unsquashfs.c 2008-08-26 09:01:54.000000000 +0200 -+++ squashfs3.4/squashfs-tools/unsquashfs.c 2008-11-24 06:27:26.000000000 +0100 -@@ -59,6 +59,8 @@ - #include "squashfs_fs.h" - #include "read_fs.h" - #include "global.h" -+#include "sqlzma.h" -+#include "sqmagic.h" - - #ifdef SQUASHFS_TRACE - #define TRACE(s, args...) do { \ -@@ -201,6 +203,7 @@ - int lsonly = FALSE, info = FALSE, force = FALSE, short_ls = TRUE, use_regex = FALSE; - char **created_inode; - int root_process; -+struct sqlzma_un un; - int columns; - int rotate = 0; - pthread_mutex_t screen_mutex; -@@ -569,6 +572,8 @@ - return 1; - } - -+ /* printf("i%d ", inode->inode_number); */ -+ - if((user = getpwuid(inode->uid)) == NULL) { - sprintf(dummy, "%d", inode->uid); - userstr = dummy; -@@ -687,22 +692,21 @@ - char buffer[SQUASHFS_METADATA_SIZE]; - int res; - unsigned long bytes = SQUASHFS_METADATA_SIZE; -+ enum {Src, Dst}; -+ struct sized_buf sbuf[] = { -+ {.buf = (void *)buffer}, -+ {.buf = (void *)block, .sz = bytes} -+ }; - - c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte); - if(read_bytes(start + offset, c_byte, buffer) == FALSE) - goto failed; - -- res = uncompress((unsigned char *) block, &bytes, (const unsigned char *) buffer, c_byte); -- -- if(res != Z_OK) { -- if(res == Z_MEM_ERROR) -- ERROR("zlib::uncompress failed, not enough memory\n"); -- else if(res == Z_BUF_ERROR) -- ERROR("zlib::uncompress failed, not enough room in output buffer\n"); -- else -- ERROR("zlib::uncompress failed, unknown error %d\n", res); -- goto failed; -- } -+ sbuf[Src].sz = c_byte; -+ res = sqlzma_un(&un, sbuf + Src, sbuf + Dst); -+ if (res) -+ abort(); -+ bytes = un.un_reslen; - if(next) - *next = start + offset + c_byte; - return bytes; -@@ -729,20 +733,19 @@ - TRACE("read_data_block: block @0x%llx, %d %s bytes\n", start, SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte), SQUASHFS_COMPRESSED_BLOCK(c_byte) ? "compressed" : "uncompressed"); - - if(SQUASHFS_COMPRESSED_BLOCK(size)) { -+ enum {Src, Dst}; -+ struct sized_buf sbuf[] = { -+ {.buf = (void *)data, .sz = c_byte}, -+ {.buf = (void *)block, .sz = bytes} -+ }; -+ - if(read_bytes(start, c_byte, data) == FALSE) - return 0; - -- res = uncompress((unsigned char *) block, &bytes, (const unsigned char *) data, c_byte); -- -- if(res != Z_OK) { -- if(res == Z_MEM_ERROR) -- ERROR("zlib::uncompress failed, not enough memory\n"); -- else if(res == Z_BUF_ERROR) -- ERROR("zlib::uncompress failed, not enough room in output buffer\n"); -- else -- ERROR("zlib::uncompress failed, unknown error %d\n", res); -- return 0; -- } -+ res = sqlzma_un(&un, sbuf + Src, sbuf + Dst); -+ if (res) -+ abort(); -+ bytes = un.un_reslen; - - return bytes; - } else { -@@ -2160,19 +2163,27 @@ - read_bytes(SQUASHFS_START, sizeof(squashfs_super_block), (char *) &sBlk); - - /* Check it is a SQUASHFS superblock */ -+ un.un_lzma = 1; - swap = 0; -- if(sBlk.s_magic != SQUASHFS_MAGIC) { -- if(sBlk.s_magic == SQUASHFS_MAGIC_SWAP) { -- squashfs_super_block sblk; -- ERROR("Reading a different endian SQUASHFS filesystem on %s\n", source); -- SQUASHFS_SWAP_SUPER_BLOCK(&sblk, &sBlk); -- memcpy(&sBlk, &sblk, sizeof(squashfs_super_block)); -- swap = 1; -- } else { -- ERROR("Can't find a SQUASHFS superblock on %s\n", source); -- goto failed_mount; -- } -- } -+ switch (sBlk.s_magic) { -+ squashfs_super_block sblk; -+ case SQUASHFS_MAGIC: -+ un.un_lzma = 0; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_LZMA: -+ break; -+ case SQUASHFS_MAGIC_SWAP: -+ un.un_lzma = 0; -+ /*FALLTHROUGH*/ -+ case SQUASHFS_MAGIC_LZMA_SWAP: -+ ERROR("Reading a different endian SQUASHFS filesystem on %s\n", source); -+ SQUASHFS_SWAP_SUPER_BLOCK(&sblk, &sBlk); -+ memcpy(&sBlk, &sblk, sizeof(squashfs_super_block)); -+ swap = 1; -+ default: -+ ERROR("Can't find a SQUASHFS superblock on %s\n", source); -+ goto failed_mount; -+ } - - /* Check the MAJOR & MINOR versions */ - if(sBlk.s_major == 1 || sBlk.s_major == 2) { -@@ -2334,23 +2345,23 @@ - void *deflator(void *arg) - { - char tmp[block_size]; -+ struct sqlzma_un *thread_un = (struct sqlzma_un *) arg; - - while(1) { - struct cache_entry *entry = queue_get(to_deflate); - int res; - unsigned long bytes = block_size; -- -- res = uncompress((unsigned char *) tmp, &bytes, (const unsigned char *) entry->data, SQUASHFS_COMPRESSED_SIZE_BLOCK(entry->size)); -- -- if(res != Z_OK) { -- if(res == Z_MEM_ERROR) -- ERROR("zlib::uncompress failed, not enough memory\n"); -- else if(res == Z_BUF_ERROR) -- ERROR("zlib::uncompress failed, not enough room in output buffer\n"); -- else -- ERROR("zlib::uncompress failed, unknown error %d\n", res); -- } else -- memcpy(entry->data, tmp, bytes); -+ enum {Src, Dst}; -+ struct sized_buf sbuf[] = { -+ {.buf = (void *)entry->data, .sz = SQUASHFS_COMPRESSED_SIZE_BLOCK(entry->size)}, -+ {.buf = (void *)tmp, .sz = bytes} -+ }; -+ -+ res = sqlzma_un(thread_un, sbuf + Src, sbuf + Dst); -+ if(res) -+ abort(); -+ bytes = thread_un->un_reslen; -+ memcpy(entry->data, tmp, bytes); - - /* block has been either successfully decompressed, or an error - * occurred, clear pending flag, set error appropriately and -@@ -2448,7 +2459,12 @@ - pthread_mutex_init(&fragment_mutex, NULL); - - for(i = 0; i < processors; i++) { -- if(pthread_create(&deflator_thread[i], NULL, deflator, NULL) != 0 ) -+ struct sqlzma_un *thread_un = malloc(sizeof(struct sqlzma_un)); -+ if(thread_un == NULL) -+ EXIT_UNSQUASH("Failed to allocate memory for sqlzma_un\n"); -+ if(sqlzma_init(thread_un, un.un_lzma, 0) != Z_OK) -+ EXIT_UNSQUASH("Failed to initialize: sqlzma_init\n"); -+ if(pthread_create(&deflator_thread[i], NULL, deflator, thread_un) != 0 ) - EXIT_UNSQUASH("Failed to create thread\n"); - } - -@@ -2526,7 +2542,8 @@ - printf("This program is distributed in the hope that it will be useful,\n");\ - printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");\ - printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");\ -- printf("GNU General Public License for more details.\n"); -+ printf("GNU General Public License for more details.\n");\ -+ printf("and LZMA support for slax.org by jro.\n"); - int main(int argc, char *argv[]) - { - char *dest = "squashfs-root"; -@@ -2672,6 +2689,11 @@ - EXIT_UNSQUASH("failed to allocate created_inode\n"); - - memset(created_inode, 0, sBlk.inodes * sizeof(char *)); -+ i = sqlzma_init(&un, un.un_lzma, 0); -+ if (i != Z_OK) { -+ fputs("sqlzma_init failed", stderr); -+ abort(); -+ } - - read_uids_guids(); - diff --git a/vsftpd/vsftpd-2.2.1-build_ssl.patch b/vsftpd/vsftpd-2.2.1-build_ssl.patch deleted file mode 100644 index e2ca633..0000000 --- a/vsftpd/vsftpd-2.2.1-build_ssl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vsftpd-2.1.0/builddefs.h.build_ssl vsftpd-2.1.0/builddefs.h ---- vsftpd-2.1.0/builddefs.h.build_ssl 2009-01-08 18:49:33.000000000 +0100 -+++ vsftpd-2.1.0/builddefs.h 2009-01-08 18:49:41.000000000 +0100 -@@ -3,7 +3,7 @@ - - #undef VSF_BUILD_TCPWRAPPERS - #define VSF_BUILD_PAM --#undef VSF_BUILD_SSL -+#define VSF_BUILD_SSL - - #endif /* VSF_BUILDDEFS_H */ - diff --git a/vsftpd/vsftpd-2.2.1-close-std-fds.patch b/vsftpd/vsftpd-2.2.1-close-std-fds.patch deleted file mode 100644 index 73da6af..0000000 --- a/vsftpd/vsftpd-2.2.1-close-std-fds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up vsftpd-2.0.7/standalone.c.close-fds vsftpd-2.0.7/standalone.c ---- vsftpd-2.0.7/standalone.c.close-fds 2008-09-08 23:36:32.000000000 -0400 -+++ vsftpd-2.0.7/standalone.c 2008-09-08 23:37:53.000000000 -0400 -@@ -131,6 +131,9 @@ vsf_standalone_main(void) - die("could not bind listening IPv6 socket"); - } - } -+ vsf_sysutil_close(0); -+ vsf_sysutil_close(1); -+ vsf_sysutil_close(2); - retval = vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG); - if (vsf_sysutil_retval_is_error(retval)) - { diff --git a/vsftpd/vsftpd-2.2.1-configuration-1.patch b/vsftpd/vsftpd-2.2.1-configuration-1.patch deleted file mode 100644 index 352a00d..0000000 --- a/vsftpd/vsftpd-2.2.1-configuration-1.patch +++ /dev/null @@ -1,415 +0,0 @@ -diff -up vsftpd-2.2.0/defs.h.configuration vsftpd-2.2.0/defs.h ---- vsftpd-2.2.0/defs.h.configuration 2009-01-07 21:22:22.000000000 +0100 -+++ vsftpd-2.2.0/defs.h 2009-08-04 07:37:01.000000000 +0200 -@@ -1,7 +1,7 @@ - #ifndef VSF_DEFS_H - #define VSF_DEFS_H - --#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" -+#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf" - - #define VSFTP_COMMAND_FD 0 - -diff -up vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README ---- vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration 2008-02-02 02:30:40.000000000 +0100 -+++ vsftpd-2.2.0/EXAMPLE/INTERNET_SITE_NOINETD/README 2009-08-04 07:37:01.000000000 +0200 -@@ -17,7 +17,7 @@ even per-connect-IP configurability. - - To use this example config: - --1) Copy the vsftpd.conf file in this directory to /etc/vsftpd.conf. -+1) Copy the vsftpd.conf file in this directory to /etc/vsftpd/vsftpd.conf. - - 2) Start up vsftpd, e.g. - vsftpd & -@@ -51,5 +51,5 @@ in the vsftpd.conf: - listen_address=192.168.1.2 - - And launch vsftpd with a specific config file like this: --vsftpd /etc/vsftpd.conf.site1 & -+vsftpd /etc/vsftpd/vsftpd.conf.site1 & - -diff -up vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README.configuration vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README ---- vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README.configuration 2008-02-02 02:30:40.000000000 +0100 -+++ vsftpd-2.2.0/EXAMPLE/INTERNET_SITE/README 2009-08-04 07:37:01.000000000 +0200 -@@ -41,13 +41,13 @@ no_access = 192.168.1.3 - As an example of how to ban certain sites from connecting, 192.168.1.3 will - be denied access. - --banner_fail = /etc/vsftpd.busy_banner -+banner_fail = /etc/vsftpd/busy_banner - - This is the file to display to users if the connection is refused for whatever - reason (too many users, IP banned). - - Example of how to populate it: --echo "421 Server busy, please try later." > /etc/vsftpd.busy_banner -+echo "421 Server busy, please try later." > /etc/vsftpd/busy_banner - - log_on_success += PID HOST DURATION - log_on_failure += HOST -@@ -62,7 +62,7 @@ Step 2) Set up your vsftpd configuration - - An example file is supplied. Install it like this: - --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - Let's example the contents of the file: - -diff -up vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README.configuration vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README ---- vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README.configuration 2008-02-02 02:30:40.000000000 +0100 -+++ vsftpd-2.2.0/EXAMPLE/PER_IP_CONFIG/README 2009-08-04 07:37:01.000000000 +0200 -@@ -20,12 +20,12 @@ directory: hosts.allow. It lives at /etc - - Let's have a look at the example: - --vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd_tcp_wrap.conf -+vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd/tcp_wrap.conf - vsftpd: 192.168.1.4: DENY - - The first line: - If a client connects from 192.168.1.3, then vsftpd will apply the vsftpd --config file /etc/vsftpd_tcp_wrap.conf to the session! These settings are -+config file /etc/vsftpd/tcp_wrap.conf to the session! These settings are - applied ON TOP of the default vsftpd.conf. - This is obviously very powerful. You might use this to apply different - access restrictions for some IPs (e.g. the ability to upload). -diff -up vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README.configuration vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README ---- vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README.configuration 2008-02-02 02:30:40.000000000 +0100 -+++ vsftpd-2.2.0/EXAMPLE/VIRTUAL_USERS/README 2009-08-04 07:37:01.000000000 +0200 -@@ -15,7 +15,7 @@ See example file "logins.txt" - this spe - "fred" with password "bar". - Whilst logged in as root, create the actual database file like this: - --db_load -T -t hash -f logins.txt /etc/vsftpd_login.db -+db_load -T -t hash -f logins.txt /etc/vsftpd/login.db - (Requires the Berkeley db program installed). - NOTE: Many systems have multiple versions of "db" installed, so you may - need to use e.g. db3_load for correct operation. This is known to affect -@@ -23,10 +23,10 @@ some Debian systems. The core issue is t - database to be a specific db version (often db3, whereas db4 may be installed - on your system). - --This will create /etc/vsftpd_login.db. Obviously, you may want to make sure -+This will create /etc/vsftpd/login.db. Obviously, you may want to make sure - the permissions are restricted: - --chmod 600 /etc/vsftpd_login.db -+chmod 600 /etc/vsftpd/login.db - - For more information on maintaing your login database, look around for - documentation on "Berkeley DB", e.g. -@@ -37,8 +37,8 @@ Step 2) Create a PAM file which uses you - - See the example file vsftpd.pam. It contains two lines: - --auth required /lib/security/pam_userdb.so db=/etc/vsftpd_login --account required /lib/security/pam_userdb.so db=/etc/vsftpd_login -+auth required /lib/security/pam_userdb.so db=/etc/vsftpd/login -+account required /lib/security/pam_userdb.so db=/etc/vsftpd/login - - This tells PAM to authenticate users using our new database. Copy this PAM - file to the PAM directory - typically /etc/pam.d/ -@@ -108,9 +108,9 @@ pasv_max_port=30999 - These put a port range on passive FTP incoming requests - very useful if - you are configuring a firewall. - --Copy the example vsftpd.conf file to /etc: -+Copy the example vsftpd.conf file to /etc/vsftpd: - --cp vsftpd.conf /etc/ -+cp vsftpd.conf /etc/vsftpd/ - - - Step 5) Start up vsftpd. -diff -up vsftpd-2.2.0/FAQ.configuration vsftpd-2.2.0/FAQ ---- vsftpd-2.2.0/FAQ.configuration 2009-02-18 23:33:04.000000000 +0100 -+++ vsftpd-2.2.0/FAQ 2009-08-04 07:37:01.000000000 +0200 -@@ -34,7 +34,7 @@ needs this user to run bits of itself wi - Q) Help! Local users cannot log in. - A) There are various possible problems. - A1) By default, vsftpd disables any logins other than anonymous logins. Put --local_enable=YES in your /etc/vsftpd.conf to allow local users to log in. -+local_enable=YES in your /etc/vsftpd/vsftpd.conf to allow local users to log in. - A2) vsftpd tries to link with PAM. (Run "ldd vsftpd" and look for libpam to - find out whether this has happened or not). If vsftpd links with PAM, then - you will need to have a PAM file installed for the vsftpd service. There is -@@ -46,12 +46,12 @@ system have a "shadow.h" file in the inc - A4) If you are not using PAM, then vsftpd will do its own check for a valid - user shell in /etc/shells. You may need to disable this if you use an invalid - shell to disable logins other than FTP logins. Put check_shell=NO in your --/etc/vsftpd.conf. -+/etc/vsftpd/vsftpd.conf. - - Q) Help! Uploads or other write commands give me "500 Unknown command.". - A) By default, write commands, including uploads and new directories, are - disabled. This is a security measure. To enable writes, put write_enable=YES --in your /etc/vsftpd.conf. -+in your /etc/vsftpd/vsftpd.conf. - - Q) Help! What are the security implications referred to in the - "chroot_local_user" option? -@@ -87,7 +87,7 @@ A2) Alternatively, run as many copies as - mode. Use "listen_address=x.x.x.x" to set the virtual IP. - - Q) Help! Does vsftpd support virtual users? --A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd.conf. This -+A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd/vsftpd.conf. This - has the effect of mapping every non-anonymous successful login to the local - username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb - module to provide authentication against an external (i.e. non-/etc/passwd) -diff -up vsftpd-2.2.0/INSTALL.configuration vsftpd-2.2.0/INSTALL ---- vsftpd-2.2.0/INSTALL.configuration 2008-02-02 02:30:39.000000000 +0100 -+++ vsftpd-2.2.0/INSTALL 2009-08-04 07:37:01.000000000 +0200 -@@ -56,14 +56,14 @@ cp vsftpd.8 /usr/local/man/man8 - - "make install" doesn't copy the sample config file. It is recommended you - do this: --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - Step 4) Smoke test (without an inetd). - - vsftpd can run standalone or via an inetd (such as inetd or xinetd). You will - typically get more control running vsftpd from an inetd. But first we will run - it without, so we can check things are going well so far. --Edit /etc/vsftpd.conf, and add this line at the bottom: -+Edit /etc/vsftpd/vsftpd.conf, and add this line at the bottom: - - listen=YES - -@@ -135,11 +135,11 @@ cp RedHat/vsftpd.pam /etc/pam.d/ftp - Step 7) Customize your configuration - - As well as the above three pre-requisites, you are recommended to install a --config file. The default location for the config file is /etc/vsftpd.conf. -+config file. The default location for the config file is /etc/vsftpd/vsftpd.conf. - There is a sample vsftpd.conf in the distribution tarball. You probably want --to copy that to /etc/vsftpd.conf as a basis for modification, i.e.: -+to copy that to /etc/vsftpd/vsftpd.conf as a basis for modification, i.e.: - --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - The default configuration allows neither local user logins nor anonymous - uploads. You may wish to change these defaults. -diff -up vsftpd-2.2.0/README.configuration vsftpd-2.2.0/README ---- vsftpd-2.2.0/README.configuration 2009-07-07 22:23:22.000000000 +0200 -+++ vsftpd-2.2.0/README 2009-08-04 07:37:01.000000000 +0200 -@@ -37,3 +37,8 @@ All configuration options are documented - Various example configurations are discussed in the EXAMPLE directory. - Frequently asked questions are tackled in the FAQ file. - -+Important Note -+============== -+The location of configuration files was changed to /etc/vsftpd/. If you want -+to migrate your old conf files from /etc (files vsftpd.xxxx.rpmsave) use -+/etc/vsfptd/vsftpd_conf_migrate.sh -diff -up vsftpd-2.2.0/tunables.c.configuration vsftpd-2.2.0/tunables.c ---- vsftpd-2.2.0/tunables.c.configuration 2009-07-15 22:08:27.000000000 +0200 -+++ vsftpd-2.2.0/tunables.c 2009-08-04 07:37:01.000000000 +0200 -@@ -186,7 +186,7 @@ tunables_load_defaults() - tunable_listen_ipv6 = 0; - tunable_dual_log_enable = 0; - tunable_syslog_enable = 0; -- tunable_background = 0; -+ tunable_background = 1; - tunable_virtual_use_local_privs = 0; - tunable_session_support = 0; - tunable_download_enable = 1; -@@ -254,11 +254,11 @@ tunables_load_defaults() - install_str_setting(".message", &tunable_message_file); - install_str_setting("nobody", &tunable_nopriv_user); - install_str_setting(0, &tunable_ftpd_banner); -- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file); -- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file); -+ install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file); -+ install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file); - install_str_setting("ftp", &tunable_pam_service_name); - install_str_setting("ftp", &tunable_guest_username); -- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file); -+ install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file); - install_str_setting(0, &tunable_anon_root); - install_str_setting(0, &tunable_local_root); - install_str_setting(0, &tunable_banner_file); -@@ -271,7 +271,7 @@ tunables_load_defaults() - install_str_setting(0, &tunable_hide_file); - install_str_setting(0, &tunable_deny_file); - install_str_setting(0, &tunable_user_sub_token); -- install_str_setting("/etc/vsftpd.email_passwords", -+ install_str_setting("/etc/vsftpd/email_passwords", - &tunable_email_password_file); - install_str_setting("/usr/share/ssl/certs/vsftpd.pem", - &tunable_rsa_cert_file); -diff -up vsftpd-2.2.0/vsftpd.8.configuration vsftpd-2.2.0/vsftpd.8 ---- vsftpd-2.2.0/vsftpd.8.configuration 2009-07-17 22:56:23.000000000 +0200 -+++ vsftpd-2.2.0/vsftpd.8 2009-08-04 07:40:27.000000000 +0200 -@@ -21,7 +21,7 @@ itself will listen on the network. This - recommended. It is activated by setting - .Pa listen=YES - in --.Pa /etc/vsftpd.conf . -+.Pa /etc/vsftpd/vsftpd.conf . - Direct execution of the - .Nm vsftpd - binary will then launch the FTP service ready for immediate client connections. -@@ -33,7 +33,7 @@ as root. Any command line option not sta - as a config file that will be loaded. Note that config files are loaded in the - strict order that they are encountered on the command line. - If no config files are specified, the default configuration file of --.Pa /etc/vsftpd.conf -+.Pa /etc/vsftpd/vsftpd.conf - will be loaded, after all other command line options are processed. - .Pp - Supported options are: -@@ -47,14 +47,14 @@ their appearance on the command line, in - config files. - .El - .Sh EXAMPLES --vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah -+vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah - .Pp - That example overrides vsftpd's built-in default for the "listen" option to be --NO, but then loads /etc/vsftpd.conf which may override that setting. Finally, -+NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally, - the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd - setting and any identical setting that was in the config file. - .Sh FILES --.Pa /etc/vsftpd.conf -+.Pa /etc/vsftpd/vsftpd.conf - .Sh SEE ALSO - .Xr vsftpd.conf 5 - .end -diff -up vsftpd-2.2.0/vsftpd.conf.5.configuration vsftpd-2.2.0/vsftpd.conf.5 ---- vsftpd-2.2.0/vsftpd.conf.5.configuration 2009-07-17 22:57:04.000000000 +0200 -+++ vsftpd-2.2.0/vsftpd.conf.5 2009-08-04 07:37:01.000000000 +0200 -@@ -4,7 +4,7 @@ vsftpd.conf - config file for vsftpd - .SH DESCRIPTION - vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By - default, vsftpd looks for this file at the location --.BR /etc/vsftpd.conf . -+.BR /etc/vsftpd/vsftpd.conf . - However, you may override this by specifying a command line argument to - vsftpd. The command line argument is the pathname of the configuration file - for vsftpd. This behaviour is useful because you may wish to use an advanced -@@ -110,7 +110,7 @@ When enabled, and vsftpd is started in " - the listener process. i.e. control will immediately be returned to the shell - which launched vsftpd. - --Default: NO -+Default: YES - .TP - .B check_shell - Note! This option only has an effect for non-PAM builds of vsftpd. If disabled, -@@ -138,7 +138,7 @@ chroot() jail in their home directory up - different if chroot_local_user is set to YES. In this case, the list becomes - a list of users which are NOT to be placed in a chroot() jail. - By default, the file containing this list is --/etc/vsftpd.chroot_list, but you may override this with the -+/etc/vsftpd/chroot_list, but you may override this with the - .BR chroot_list_file - setting. - -@@ -177,7 +177,7 @@ Default: NO - .B deny_email_enable - If activated, you may provide a list of anonymous password e-mail responses - which cause login to be denied. By default, the file containing this list is --/etc/vsftpd.banned_emails, but you may override this with the -+/etc/vsftpd/banned_emails, but you may override this with the - .BR banned_email_file - setting. - -@@ -433,7 +433,7 @@ anonymous logins are prevented unless th - file specified by the - .BR email_password_file - setting. The file format is one password per line, no extra whitespace. The --default filename is /etc/vsftpd.email_passwords. -+default filename is /etc/vsftpd/email_passwords. - - Default: NO - .TP -@@ -764,7 +764,7 @@ passwords which are not permitted. This - .BR deny_email_enable - is enabled. - --Default: /etc/vsftpd.banned_emails -+Default: /etc/vsftpd/banned_emails - .TP - .B banner_file - This option is the name of a file containing text to display when someone -@@ -801,7 +801,7 @@ is enabled. If the option - is enabled, then the list file becomes a list of users to NOT place in a - chroot() jail. - --Default: /etc/vsftpd.chroot_list -+Default: /etvsftpd.confc/vsftpd.chroot_list - .TP - .B cmds_allowed - This options specifies a comma separated list of allowed FTP commands (post -@@ -862,7 +862,7 @@ This option can be used to provide an al - .BR secure_email_list_enable - setting. - --Default: /etc/vsftpd.email_passwords -+Default: /etc/vsftpd/email_passwords - .TP - .B ftp_username - This is the name of the user we use for handling anonymous FTP. The home -@@ -985,10 +985,10 @@ the manual page, on a per-user basis. Us - with an example. If you set - .BR user_config_dir - to be --.BR /etc/vsftpd_user_conf -+.BR /etc/vsftpd/user_conf - and then log on as the user "chris", then vsftpd will apply the settings in - the file --.BR /etc/vsftpd_user_conf/chris -+.BR /etc/vsftpd/user_conf/chris - for the duration of the session. The format of this file is as detailed in - this manual page! PLEASE NOTE that not all settings are effective on a - per-user basis. For example, many settings only prior to the user's session -@@ -1024,7 +1024,7 @@ This option is the name of the file load - .BR userlist_enable - option is active. - --Default: /etc/vsftpd.user_list -+Default: /etc/vsftpd/user_list - .TP - .B vsftpd_log_file - This option is the name of the file to which we write the vsftpd style -diff -up vsftpd-2.2.0/vsftpd.conf.configuration vsftpd-2.2.0/vsftpd.conf ---- vsftpd-2.2.0/vsftpd.conf.configuration 2009-06-17 22:05:28.000000000 +0200 -+++ vsftpd-2.2.0/vsftpd.conf 2009-08-04 07:53:13.000000000 +0200 -@@ -1,4 +1,4 @@ --# Example config file /etc/vsftpd.conf -+# Example config file /etc/vsftpd/vsftpd.conf - # - # The default compiled in settings are fairly paranoid. This sample file - # loosens things up a bit, to make the ftp daemon more usable. -@@ -87,7 +87,7 @@ connect_from_port_20=YES - # useful for combatting certain DoS attacks. - #deny_email_enable=YES - # (default follows) --#banned_email_file=/etc/vsftpd.banned_emails -+#banned_email_file=/etc/vsftpd/banned_emails - # - # You may specify an explicit list of local users to chroot() to their home - # directory. If chroot_local_user is YES, then this list becomes a list of -@@ -95,7 +95,7 @@ connect_from_port_20=YES - #chroot_local_user=YES - #chroot_list_enable=YES - # (default follows) --#chroot_list_file=/etc/vsftpd.chroot_list -+#chroot_list_file=/etc/vsftpd/chroot_list - # - # You may activate the "-R" option to the builtin ls. This is disabled by - # default to avoid remote users being able to cause excessive I/O on large -@@ -112,3 +112,7 @@ listen=YES - # sockets, you must run two copies of vsftpd whith two configuration files. - # Make sure, that one of the listen options is commented !! - #listen_ipv6=YES -+ -+pam_service_name=vsftpd -+userlist_enable=YES -+tcp_wrappers=YES diff --git a/vsftpd/vsftpd-2.2.1-configuration.patch b/vsftpd/vsftpd-2.2.1-configuration.patch deleted file mode 100644 index 8e3b715..0000000 --- a/vsftpd/vsftpd-2.2.1-configuration.patch +++ /dev/null @@ -1,395 +0,0 @@ -diff -up vsftpd-2.1.0/defs.h.configuration vsftpd-2.1.0/defs.h ---- vsftpd-2.1.0/defs.h.configuration 2009-01-08 18:01:13.000000000 +0100 -+++ vsftpd-2.1.0/defs.h 2009-01-08 18:01:23.000000000 +0100 -@@ -1,7 +1,7 @@ - #ifndef VSF_DEFS_H - #define VSF_DEFS_H - --#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" -+#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf" - - #define VSFTP_COMMAND_FD 0 - -diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README ---- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README.configuration 2009-01-08 18:17:07.000000000 +0100 -+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE_NOINETD/README 2009-01-08 18:15:07.000000000 +0100 -@@ -17,7 +17,7 @@ even per-connect-IP configurability. - - To use this example config: - --1) Copy the vsftpd.conf file in this directory to /etc/vsftpd.conf. -+1) Copy the vsftpd.conf file in this directory to /etc/vsftpd/vsftpd.conf. - - 2) Start up vsftpd, e.g. - vsftpd & -@@ -51,5 +51,5 @@ in the vsftpd.conf: - listen_address=192.168.1.2 - - And launch vsftpd with a specific config file like this: --vsftpd /etc/vsftpd.conf.site1 & -+vsftpd /etc/vsftpd/vsftpd.conf.site1 & - -diff -up vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README ---- vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README.configuration 2009-01-08 18:15:29.000000000 +0100 -+++ vsftpd-2.1.0/EXAMPLE/INTERNET_SITE/README 2009-01-08 18:16:13.000000000 +0100 -@@ -41,13 +41,13 @@ no_access = 192.168.1.3 - As an example of how to ban certain sites from connecting, 192.168.1.3 will - be denied access. - --banner_fail = /etc/vsftpd.busy_banner -+banner_fail = /etc/vsftpd/busy_banner - - This is the file to display to users if the connection is refused for whatever - reason (too many users, IP banned). - - Example of how to populate it: --echo "421 Server busy, please try later." > /etc/vsftpd.busy_banner -+echo "421 Server busy, please try later." > /etc/vsftpd/busy_banner - - log_on_success += PID HOST DURATION - log_on_failure += HOST -@@ -62,7 +62,7 @@ Step 2) Set up your vsftpd configuration - - An example file is supplied. Install it like this: - --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - Let's example the contents of the file: - -diff -up vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README ---- vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README.configuration 2009-01-08 18:19:14.000000000 +0100 -+++ vsftpd-2.1.0/EXAMPLE/PER_IP_CONFIG/README 2009-01-08 18:19:35.000000000 +0100 -@@ -20,12 +20,12 @@ directory: hosts.allow. It lives at /etc - - Let's have a look at the example: - --vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd_tcp_wrap.conf -+vsftpd: 192.168.1.3: setenv VSFTPD_LOAD_CONF /etc/vsftpd/tcp_wrap.conf - vsftpd: 192.168.1.4: DENY - - The first line: - If a client connects from 192.168.1.3, then vsftpd will apply the vsftpd --config file /etc/vsftpd_tcp_wrap.conf to the session! These settings are -+config file /etc/vsftpd/tcp_wrap.conf to the session! These settings are - applied ON TOP of the default vsftpd.conf. - This is obviously very powerful. You might use this to apply different - access restrictions for some IPs (e.g. the ability to upload). -diff -up vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README ---- vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README.configuration 2009-01-08 18:18:04.000000000 +0100 -+++ vsftpd-2.1.0/EXAMPLE/VIRTUAL_USERS/README 2009-01-08 18:18:53.000000000 +0100 -@@ -15,7 +15,7 @@ See example file "logins.txt" - this spe - "fred" with password "bar". - Whilst logged in as root, create the actual database file like this: - --db_load -T -t hash -f logins.txt /etc/vsftpd_login.db -+db_load -T -t hash -f logins.txt /etc/vsftpd/login.db - (Requires the Berkeley db program installed). - NOTE: Many systems have multiple versions of "db" installed, so you may - need to use e.g. db3_load for correct operation. This is known to affect -@@ -23,10 +23,10 @@ some Debian systems. The core issue is t - database to be a specific db version (often db3, whereas db4 may be installed - on your system). - --This will create /etc/vsftpd_login.db. Obviously, you may want to make sure -+This will create /etc/vsftpd/login.db. Obviously, you may want to make sure - the permissions are restricted: - --chmod 600 /etc/vsftpd_login.db -+chmod 600 /etc/vsftpd/login.db - - For more information on maintaing your login database, look around for - documentation on "Berkeley DB", e.g. -@@ -37,8 +37,8 @@ Step 2) Create a PAM file which uses you - - See the example file vsftpd.pam. It contains two lines: - --auth required /lib/security/pam_userdb.so db=/etc/vsftpd_login --account required /lib/security/pam_userdb.so db=/etc/vsftpd_login -+auth required /lib/security/pam_userdb.so db=/etc/vsftpd/login -+account required /lib/security/pam_userdb.so db=/etc/vsftpd/login - - This tells PAM to authenticate users using our new database. Copy this PAM - file to the PAM directory - typically /etc/pam.d/ -@@ -108,9 +108,9 @@ pasv_max_port=30999 - These put a port range on passive FTP incoming requests - very useful if - you are configuring a firewall. - --Copy the example vsftpd.conf file to /etc: -+Copy the example vsftpd.conf file to /etc/vsftpd: - --cp vsftpd.conf /etc/ -+cp vsftpd.conf /etc/vsftpd/ - - - Step 5) Start up vsftpd. -diff -up vsftpd-2.1.0/FAQ.configuration vsftpd-2.1.0/FAQ ---- vsftpd-2.1.0/FAQ.configuration 2009-01-08 17:58:39.000000000 +0100 -+++ vsftpd-2.1.0/FAQ 2009-01-08 18:01:04.000000000 +0100 -@@ -34,7 +34,7 @@ needs this user to run bits of itself wi - Q) Help! Local users cannot log in. - A) There are various possible problems. - A1) By default, vsftpd disables any logins other than anonymous logins. Put --local_enable=YES in your /etc/vsftpd.conf to allow local users to log in. -+local_enable=YES in your /etc/vsftpd/vsftpd.conf to allow local users to log in. - A2) vsftpd tries to link with PAM. (Run "ldd vsftpd" and look for libpam to - find out whether this has happened or not). If vsftpd links with PAM, then - you will need to have a PAM file installed for the vsftpd service. There is -@@ -46,12 +46,12 @@ system have a "shadow.h" file in the inc - A4) If you are not using PAM, then vsftpd will do its own check for a valid - user shell in /etc/shells. You may need to disable this if you use an invalid - shell to disable logins other than FTP logins. Put check_shell=NO in your --/etc/vsftpd.conf. -+/etc/vsftpd/vsftpd.conf. - - Q) Help! Uploads or other write commands give me "500 Unknown command.". - A) By default, write commands, including uploads and new directories, are - disabled. This is a security measure. To enable writes, put write_enable=YES --in your /etc/vsftpd.conf. -+in your /etc/vsftpd/vsftpd.conf. - - Q) Help! What are the security implications referred to in the - "chroot_local_user" option? -@@ -87,7 +87,7 @@ A2) Alternatively, run as many copies as - mode. Use "listen_address=x.x.x.x" to set the virtual IP. - - Q) Help! Does vsftpd support virtual users? --A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd.conf. This -+A) Yes, via PAM integration. Set "guest_enable=YES" in /etc/vsftpd/vsftpd.conf. This - has the effect of mapping every non-anonymous successful login to the local - username specified in "guest_username". Then, use PAM and (e.g.) its pam_userdb - module to provide authentication against an external (i.e. non-/etc/passwd) -diff -up vsftpd-2.1.0/INSTALL.configuration vsftpd-2.1.0/INSTALL ---- vsftpd-2.1.0/INSTALL.configuration 2009-01-08 18:01:36.000000000 +0100 -+++ vsftpd-2.1.0/INSTALL 2009-01-08 18:03:30.000000000 +0100 -@@ -56,14 +56,14 @@ cp vsftpd.8 /usr/local/man/man8 - - "make install" doesn't copy the sample config file. It is recommended you - do this: --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - Step 4) Smoke test (without an inetd). - - vsftpd can run standalone or via an inetd (such as inetd or xinetd). You will - typically get more control running vsftpd from an inetd. But first we will run - it without, so we can check things are going well so far. --Edit /etc/vsftpd.conf, and add this line at the bottom: -+Edit /etc/vsftpd/vsftpd.conf, and add this line at the bottom: - - listen=YES - -@@ -135,11 +135,11 @@ cp RedHat/vsftpd.pam /etc/pam.d/ftp - Step 7) Customize your configuration - - As well as the above three pre-requisites, you are recommended to install a --config file. The default location for the config file is /etc/vsftpd.conf. -+config file. The default location for the config file is /etc/vsftpd/vsftpd.conf. - There is a sample vsftpd.conf in the distribution tarball. You probably want --to copy that to /etc/vsftpd.conf as a basis for modification, i.e.: -+to copy that to /etc/vsftpd/vsftpd.conf as a basis for modification, i.e.: - --cp vsftpd.conf /etc -+cp vsftpd.conf /etc/vsftpd - - The default configuration allows neither local user logins nor anonymous - uploads. You may wish to change these defaults. -diff -up vsftpd-2.1.0/README.configuration vsftpd-2.1.0/README ---- vsftpd-2.1.0/README.configuration 2009-01-08 18:13:37.000000000 +0100 -+++ vsftpd-2.1.0/README 2009-01-08 18:14:21.000000000 +0100 -@@ -37,3 +37,8 @@ All configuration options are documented - Various example configurations are discussed in the EXAMPLE directory. - Frequently asked questions are tackled in the FAQ file. - -+Important Note -+============== -+The location of configuration files was changed to /etc/vsftpd/. If you want -+to migrate your old conf files from /etc (files vsftpd.xxxx.rpmsave) use -+/etc/vsfptd/vsftpd_conf_migrate.sh -diff -up vsftpd-2.1.0/tunables.c.configuration vsftpd-2.1.0/tunables.c ---- vsftpd-2.1.0/tunables.c.configuration 2009-01-08 18:20:05.000000000 +0100 -+++ vsftpd-2.1.0/tunables.c 2009-01-08 18:22:13.000000000 +0100 -@@ -184,7 +184,7 @@ tunables_load_defaults() - tunable_listen_ipv6 = 0; - tunable_dual_log_enable = 0; - tunable_syslog_enable = 0; -- tunable_background = 0; -+ tunable_background = 1; - tunable_virtual_use_local_privs = 0; - tunable_session_support = 0; - tunable_download_enable = 1; -@@ -250,11 +250,11 @@ tunables_load_defaults() - install_str_setting(".message", &tunable_message_file); - install_str_setting("nobody", &tunable_nopriv_user); - install_str_setting(0, &tunable_ftpd_banner); -- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file); -- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file); -+ install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file); -+ install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file); - install_str_setting("ftp", &tunable_pam_service_name); - install_str_setting("ftp", &tunable_guest_username); -- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file); -+ install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file); - install_str_setting(0, &tunable_anon_root); - install_str_setting(0, &tunable_local_root); - install_str_setting(0, &tunable_banner_file); -@@ -267,7 +267,7 @@ tunables_load_defaults() - install_str_setting(0, &tunable_hide_file); - install_str_setting(0, &tunable_deny_file); - install_str_setting(0, &tunable_user_sub_token); -- install_str_setting("/etc/vsftpd.email_passwords", -+ install_str_setting("/etc/vsftpd/email_passwords", - &tunable_email_password_file); - install_str_setting("/usr/share/ssl/certs/vsftpd.pem", - &tunable_rsa_cert_file); -diff -up vsftpd-2.1.0/vsftpd.8.configuration vsftpd-2.1.0/vsftpd.8 ---- vsftpd-2.1.0/vsftpd.8.configuration 2009-01-08 18:03:47.000000000 +0100 -+++ vsftpd-2.1.0/vsftpd.8 2009-01-08 18:04:02.000000000 +0100 -@@ -21,7 +21,7 @@ itself will listen on the network. This - recommended. It is activated by setting - .Pa listen=YES - in --.Pa /etc/vsftpd.conf . -+.Pa /etc/vsftpd/vsftpd.conf . - Direct execution of the - .Nm vsftpd - binary will then launch the FTP service ready for immediate client connections. -@@ -30,6 +30,6 @@ An optional - .Op configuration file - may be given on the command line. This file must be owned as root if running as - root. The default configuration file is --.Pa /etc/vsftpd.conf . -+.Pa /etc/vsftpd/vsftpd.conf . - .Sh SEE ALSO - .Xr vsftpd.conf 5 -diff -up vsftpd-2.1.0/vsftpd.conf.5.configuration vsftpd-2.1.0/vsftpd.conf.5 ---- vsftpd-2.1.0/vsftpd.conf.5.configuration 2009-01-08 18:04:53.000000000 +0100 -+++ vsftpd-2.1.0/vsftpd.conf.5 2009-01-08 18:29:33.000000000 +0100 -@@ -4,7 +4,7 @@ vsftpd.conf - config file for vsftpd - .SH DESCRIPTION - vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By - default, vsftpd looks for this file at the location --.BR /etc/vsftpd.conf . -+.BR /etc/vsftpd/vsftpd.conf . - However, you may override this by specifying a command line argument to - vsftpd. The command line argument is the pathname of the configuration file - for vsftpd. This behaviour is useful because you may wish to use an advanced -@@ -110,7 +110,7 @@ When enabled, and vsftpd is started in " - the listener process. i.e. control will immediately be returned to the shell - which launched vsftpd. - --Default: NO -+Default: YES - .TP - .B check_shell - Note! This option only has an effect for non-PAM builds of vsftpd. If disabled, -@@ -138,7 +138,7 @@ chroot() jail in their home directory up - different if chroot_local_user is set to YES. In this case, the list becomes - a list of users which are NOT to be placed in a chroot() jail. - By default, the file containing this list is --/etc/vsftpd.chroot_list, but you may override this with the -+/etc/vsftpd/chroot_list, but you may override this with the - .BR chroot_list_file - setting. - -@@ -177,7 +177,7 @@ Default: NO - .B deny_email_enable - If activated, you may provide a list of anonymous password e-mail responses - which cause login to be denied. By default, the file containing this list is --/etc/vsftpd.banned_emails, but you may override this with the -+/etc/vsftpd/banned_emails, but you may override this with the - .BR banned_email_file - setting. - -@@ -430,7 +430,7 @@ anonymous logins are prevented unless th - file specified by the - .BR email_password_file - setting. The file format is one password per line, no extra whitespace. The --default filename is /etc/vsftpd.email_passwords. -+default filename is /etc/vsftpd/email_passwords. - - Default: NO - .TP -@@ -761,7 +761,7 @@ passwords which are not permitted. This - .BR deny_email_enable - is enabled. - --Default: /etc/vsftpd.banned_emails -+Default: /etc/vsftpd/banned_emails - .TP - .B banner_file - This option is the name of a file containing text to display when someone -@@ -798,7 +798,7 @@ is enabled. If the option - is enabled, then the list file becomes a list of users to NOT place in a - chroot() jail. - --Default: /etc/vsftpd.chroot_list -+Default: /etvsftpd.confc/vsftpd.chroot_list - .TP - .B cmds_allowed - This options specifies a comma separated list of allowed FTP commands (post -@@ -859,7 +859,7 @@ This option can be used to provide an al - .BR secure_email_list_enable - setting. - --Default: /etc/vsftpd.email_passwords -+Default: /etc/vsftpd/email_passwords - .TP - .B ftp_username - This is the name of the user we use for handling anonymous FTP. The home -@@ -982,10 +982,10 @@ the manual page, on a per-user basis. Us - with an example. If you set - .BR user_config_dir - to be --.BR /etc/vsftpd_user_conf -+.BR /etc/vsftpd/user_conf - and then log on as the user "chris", then vsftpd will apply the settings in - the file --.BR /etc/vsftpd_user_conf/chris -+.BR /etc/vsftpd/user_conf/chris - for the duration of the session. The format of this file is as detailed in - this manual page! PLEASE NOTE that not all settings are effective on a - per-user basis. For example, many settings only prior to the user's session -@@ -1021,7 +1021,7 @@ This option is the name of the file load - .BR userlist_enable - option is active. - --Default: /etc/vsftpd.user_list -+Default: /etc/vsftpd/user_list - .TP - .B vsftpd_log_file - This option is the name of the file to which we write the vsftpd style -diff -up vsftpd-2.1.0/vsftpd.conf.configuration vsftpd-2.1.0/vsftpd.conf ---- vsftpd-2.1.0/vsftpd.conf.configuration 2009-01-08 17:54:33.000000000 +0100 -+++ vsftpd-2.1.0/vsftpd.conf 2009-01-08 18:20:55.000000000 +0100 -@@ -1,4 +1,4 @@ --# Example config file /etc/vsftpd.conf -+# Example config file /etc/vsftpd/vsftpd.conf - # - # The default compiled in settings are fairly paranoid. This sample file - # loosens things up a bit, to make the ftp daemon more usable. -@@ -87,14 +87,14 @@ connect_from_port_20=YES - # useful for combatting certain DoS attacks. - #deny_email_enable=YES - # (default follows) --#banned_email_file=/etc/vsftpd.banned_emails -+#banned_email_file=/etc/vsftpd/banned_emails - # - # You may specify an explicit list of local users to chroot() to their home - # directory. If chroot_local_user is YES, then this list becomes a list of - # users to NOT chroot(). - #chroot_list_enable=YES - # (default follows) --#chroot_list_file=/etc/vsftpd.chroot_list -+#chroot_list_file=/etc/vsftpd/chroot_list - # - # You may activate the "-R" option to the builtin ls. This is disabled by - # default to avoid remote users being able to cause excessive I/O on large -@@ -111,3 +111,7 @@ listen=YES - # sockets, you must run two copies of vsftpd whith two configuration files. - # Make sure, that one of the listen options is commented !! - #listen_ipv6=YES -+ -+pam_service_name=vsftpd -+userlist_enable=YES -+tcp_wrappers=YES diff --git a/vsftpd/vsftpd-2.2.1-libs-3.patch b/vsftpd/vsftpd-2.2.1-libs-3.patch deleted file mode 100644 index 8b34205..0000000 --- a/vsftpd/vsftpd-2.2.1-libs-3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vsftpd-2.1.0/Makefile.libs vsftpd-2.1.0/Makefile ---- vsftpd-2.1.0/Makefile.libs 2009-01-08 18:55:39.000000000 +0100 -+++ vsftpd-2.1.0/Makefile 2009-01-08 18:55:57.000000000 +0100 -@@ -5,7 +5,7 @@ IFLAGS = -idirafter dummyinc - #CFLAGS = -g - CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion - --LIBS = `./vsf_findlibs.sh` -+LIBS = -lnsl -lpam -lcap -ldl -lssl - LINK = -Wl,-s - - OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ diff --git a/vsftpd/vsftpd-2.2.1-pam_hostname-1.patch b/vsftpd/vsftpd-2.2.1-pam_hostname-1.patch deleted file mode 100644 index 18f7695..0000000 --- a/vsftpd/vsftpd-2.2.1-pam_hostname-1.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c ---- vsftpd-2.2.0/sysdeputil.c.pam_hostname 2009-08-08 03:51:10.000000000 +0200 -+++ vsftpd-2.2.0/sysdeputil.c 2009-08-24 12:24:07.220623773 +0200 -@@ -16,6 +16,10 @@ - #include "tunables.h" - #include "builddefs.h" - -+/* For gethostbyaddr, inet_addr */ -+#include <netdb.h> -+#include <arpa/inet.h> -+ - /* For Linux, this adds nothing :-) */ - #include "port/porting_junk.h" - -@@ -325,6 +329,10 @@ vsf_sysdep_check_auth(struct mystr* p_us - const struct mystr* p_remote_host) - { - int retval; -+#ifdef PAM_RHOST -+ struct sockaddr_in sin; -+ struct hostent *host; -+#endif - pam_item_t item; - const char* pam_user_name = 0; - struct pam_conv the_conv = -@@ -345,7 +353,12 @@ vsf_sysdep_check_auth(struct mystr* p_us - return 0; - } - #ifdef PAM_RHOST -- retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host)); -+ sin.sin_addr.s_addr = inet_addr(str_getbuf(p_remote_host)); -+ host = gethostbyaddr((char*)&sin.sin_addr.s_addr,sizeof(struct in_addr),AF_INET); -+ if (host != (struct hostent*)0) -+ retval = pam_set_item(s_pamh, PAM_RHOST, host->h_name); -+ else -+ retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host)); - if (retval != PAM_SUCCESS) - { - (void) pam_end(s_pamh, retval); -@@ -558,7 +571,7 @@ vsf_sysdep_has_capabilities(void) - } - return s_runtime_has_caps; - } -- -+ - #ifndef VSF_SYSDEP_HAVE_LIBCAP - static int - do_checkcap(void) -@@ -1080,7 +1093,7 @@ vsf_sysutil_recv_fd(const int sock_fd) - msg.msg_flags = 0; - /* In case something goes wrong, set the fd to -1 before the syscall */ - p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg)); -- *p_fd = -1; -+ *p_fd = -1; - retval = recvmsg(sock_fd, &msg, 0); - if (retval != 1) - { diff --git a/vsftpd/vsftpd-2.2.1-pam_hostname.patch b/vsftpd/vsftpd-2.2.1-pam_hostname.patch deleted file mode 100644 index 3d15920..0000000 --- a/vsftpd/vsftpd-2.2.1-pam_hostname.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up vsftpd-2.1.0/sysdeputil.c.pam_hostname vsftpd-2.1.0/sysdeputil.c ---- vsftpd-2.1.0/sysdeputil.c.pam_hostname 2008-12-17 22:40:56.000000000 +0100 -+++ vsftpd-2.1.0/sysdeputil.c 2009-01-15 15:38:14.000000000 +0100 -@@ -16,6 +16,10 @@ - #include "tunables.h" - #include "builddefs.h" - -+/* For gethostbyaddr, inet_addr */ -+#include <netdb.h> -+#include <arpa/inet.h> -+ - /* For Linux, this adds nothing :-) */ - #include "port/porting_junk.h" - -@@ -296,6 +300,10 @@ vsf_sysdep_check_auth(const struct mystr - const struct mystr* p_remote_host) - { - int retval; -+#ifdef PAM_RHOST -+ struct sockaddr_in sin; -+ struct hostent *host; -+#endif - struct pam_conv the_conv = - { - &pam_conv_func, -@@ -314,7 +322,12 @@ vsf_sysdep_check_auth(const struct mystr - return 0; - } - #ifdef PAM_RHOST -- retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host)); -+ sin.sin_addr.s_addr = inet_addr(str_getbuf(p_remote_host)); -+ host = gethostbyaddr((char*)&sin.sin_addr.s_addr,sizeof(struct in_addr),AF_INET); -+ if (host != (struct hostent*)0) -+ retval = pam_set_item(s_pamh, PAM_RHOST, host->h_name); -+ else -+ retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host)); - if (retval != PAM_SUCCESS) - { - (void) pam_end(s_pamh, retval); -@@ -516,7 +529,7 @@ vsf_sysdep_has_capabilities(void) - } - return s_runtime_has_caps; - } -- -+ - #ifndef VSF_SYSDEP_HAVE_LIBCAP - static int - do_checkcap(void) -@@ -1038,7 +1051,7 @@ vsf_sysutil_recv_fd(const int sock_fd) - msg.msg_flags = 0; - /* In case something goes wrong, set the fd to -1 before the syscall */ - p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg)); -- *p_fd = -1; -+ *p_fd = -1; - retval = recvmsg(sock_fd, &msg, 0); - if (retval != 1) - {

hooks/post-receive -- This git reposit keeps all the patches of the project.