IPFire-SCM June 2011

ipfire-scm@lists.ipfire.org

1 participants
66 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1b4fd15a1f06918ff00ebd7c37599a6b8f8f2d3c
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via 1b4fd15a1f06918ff00ebd7c37599a6b8f8f2d3c (commit) via c8d45ec4653850518ef81c70785a58b72f148c8e (commit) from 2da87bd58e78a09ce8d6423e3ab19a6a87c879ab (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 1b4fd15a1f06918ff00ebd7c37599a6b8f8f2d3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 21:30:49 2011 +0200 libuser: Update to 0.57.1. commit c8d45ec4653850518ef81c70785a58b72f148c8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 19:51:48 2011 +0200 Remove bootchart2. Systemd comes with the same functionality. ----------------------------------------------------------------------- Summary of changes: pkgs/bootchart2/bootchart2.nm | 50 ----------------------------------------- pkgs/libuser/libuser.nm | 4 +- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 pkgs/bootchart2/bootchart2.nm Difference in files: diff --git a/pkgs/bootchart2/bootchart2.nm b/pkgs/bootchart2/bootchart2.nm deleted file mode 100644 index 69a0316..0000000 --- a/pkgs/bootchart2/bootchart2.nm +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = bootchart2 -PKG_VER = 0.12.2 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUPS = System/Statistics -PKG_URL = http://github.com/mmeeks/bootchart -PKG_LICENSE = GPLv2 -PKG_SUMMARY = Graphs the boot process. - -define PKG_DESCRIPTION - Graphs the boot process of the system and lets the user see what \ - consumes the most time and cpu power or I/O performance. -endef - -PKG_TARBALL = $(THISAPP).tar.bz2 - -define STAGE_BUILD - cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP) && make install-collector DESTDIR=$(BUILDROOT) -endef diff --git a/pkgs/libuser/libuser.nm b/pkgs/libuser/libuser.nm index 5d8e65b..a5bd8e9 100644 --- a/pkgs/libuser/libuser.nm +++ b/pkgs/libuser/libuser.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libuser -PKG_VER = 0.56.9 +PKG_VER = 0.57.1 PKG_REL = 1 PKG_MAINTAINER = @@ -43,7 +43,7 @@ define PKG_DESCRIPTION library uses pluggable back-ends to interface to its data sources. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.xz PKG_PACKAGES += $(PKG_NAME)-devel hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2da87bd58e78a09ce8d6423e3ab19a6a87c879ab
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via 2da87bd58e78a09ce8d6423e3ab19a6a87c879ab (commit) from b0cc67f047e6aad1dfe2cc909b425380496fd9f1 (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 2da87bd58e78a09ce8d6423e3ab19a6a87c879ab Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 19:41:14 2011 +0200 git: Build with perl. perl is needed to support "git add -i". Closes #205. ----------------------------------------------------------------------- Summary of changes: pkgs/git/git.nm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/pkgs/git/git.nm b/pkgs/git/git.nm index bcf3435..78ae590 100644 --- a/pkgs/git/git.nm +++ b/pkgs/git/git.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = git PKG_VER = 1.7.3.2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Development/Tools @@ -34,7 +34,8 @@ PKG_URL = http://git-scm.com/ PKG_LICENSE = GPLv2 PKG_SUMMARY = Fast Version Control System. -PKG_BUILD_DEPS+= expat-devel gettext libcurl-devel openssl-devel zlib-devel +PKG_BUILD_DEPS+= expat-devel gettext libcurl-devel openssl-devel perl-devel \ + zlib-devel PKG_DEPS += less openssh-clients rsync /usr/bin/vi define PKG_DESCRIPTION @@ -49,7 +50,6 @@ define STAGE_PREPARE_CMDS echo "CFLAGS = $(CFLAGS)" > $(DIR_APP)/config.mak echo "BLK_SHA1 = 1" >> $(DIR_APP)/config.mak echo "NEEDS_CRYPTO_WITH_SSL = 1" >> $(DIR_APP)/config.mak - echo "NO_PERL = 1" >> $(DIR_APP)/config.mak echo "NO_PYTHON = 1" >> $(DIR_APP)/config.mak echo "NO_TCLTK = 1" >> $(DIR_APP)/config.mak echo "ETC_GITCONFIG = /etc/gitconfig" >> $(DIR_APP)/config.mak hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b0cc67f047e6aad1dfe2cc909b425380496fd9f1
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via b0cc67f047e6aad1dfe2cc909b425380496fd9f1 (commit) via 8e74d2007414e2808734cdf7a134a3132ce2bc32 (commit) from 279e68f51e243ffb038bce3928961f5201191391 (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 b0cc67f047e6aad1dfe2cc909b425380496fd9f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 19:12:31 2011 +0200 kernel: Change /proc group to gid 10 (=wheel). grsecurity provides a feature to restrict access to /proc. In our particular setting, nobody than root is allow to access all of the /proc fs, but as we need some processes to get access to it as well (snmpd, radvd, ...) we need a group to allow that. I have choosen "wheel" as it is recommended by spengler. commit 8e74d2007414e2808734cdf7a134a3132ce2bc32 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 18:52:41 2011 +0200 radvd: Fix URL of the website. ----------------------------------------------------------------------- Summary of changes: pkgs/kernel/config | 2 +- pkgs/kernel/kernel.nm | 2 +- pkgs/radvd/radvd.nm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/kernel/config b/pkgs/kernel/config index fd7aad4..9070eff 100644 --- a/pkgs/kernel/config +++ b/pkgs/kernel/config @@ -4086,7 +4086,7 @@ CONFIG_GRKERNSEC_ACL_TIMEOUT=30 CONFIG_GRKERNSEC_PROC=y # CONFIG_GRKERNSEC_PROC_USER is not set CONFIG_GRKERNSEC_PROC_USERGROUP=y -CONFIG_GRKERNSEC_PROC_GID=1001 +CONFIG_GRKERNSEC_PROC_GID=10 CONFIG_GRKERNSEC_PROC_ADD=y CONFIG_GRKERNSEC_LINK=y CONFIG_GRKERNSEC_FIFO=y diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm index f78e178..4f637c7 100644 --- a/pkgs/kernel/kernel.nm +++ b/pkgs/kernel/kernel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = linux PKG_VER = 2.6.39 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = System/Kernels diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index 558f35d..c26f072 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,11 +26,11 @@ include $(PKGROOT)/Include PKG_NAME = radvd PKG_VER = 1.8 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = System/Daemons -PKG_URL = http://flex.sourceforge.net/ +PKG_URL = http://www.litech.org/radvd/ PKG_LICENSE = BSD with advertising PKG_SUMMARY = A Router Advertisement daemon. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 279e68f51e243ffb038bce3928961f5201191391
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via 279e68f51e243ffb038bce3928961f5201191391 (commit) via 9fe82af4514d8786729f9d68cf6d5b75311f31a3 (commit) from 625871f8ceb183d283ac695e2624d61cf0423dfb (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 279e68f51e243ffb038bce3928961f5201191391 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 18:43:09 2011 +0200 libselinux: Remove python module. This causes some trouble with our build system and I think we do not need it. At least we do not need it now. commit 9fe82af4514d8786729f9d68cf6d5b75311f31a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 11 18:42:35 2011 +0200 radvd: Update to 1.8. ----------------------------------------------------------------------- Summary of changes: pkgs/libselinux/libselinux.nm | 7 +++++-- pkgs/radvd/radvd.nm | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/libselinux/libselinux.nm b/pkgs/libselinux/libselinux.nm index 4093117..a1a141a 100644 --- a/pkgs/libselinux/libselinux.nm +++ b/pkgs/libselinux/libselinux.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = libselinux PKG_VER = 2.0.96 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -44,7 +44,7 @@ endef PKG_TARBALL = $(THISAPP).tgz -PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils python-selinux +PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils #python-selinux # Package information for libselinux-utils PKG_SUMMARY-$(PKG_NAME_REAL)-utils = SELinux libselinux utilies. @@ -91,4 +91,7 @@ define STAGE_INSTALL_CMDS # Move binaries from /sbin to /usr/sbin mv $(BUILDROOT)/sbin/* $(BUILDROOT)/usr/sbin + + # Remove python module + rm -rvf $(BUILDROOT)/usr/lib/python* endef diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index c2a9c7a..558f35d 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = radvd -PKG_VER = 1.7 -PKG_REL = 3 +PKG_VER = 1.8 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Daemons hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ee11332d40ab1482cf9a89f6aaf6cb49d56c9726
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 2.x development tree". The branch, next has been updated via ee11332d40ab1482cf9a89f6aaf6cb49d56c9726 (commit) via 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c (commit) via b571e4c234092bf3a6d209482b99946a1c7948d9 (commit) from 5c5fd846ac363475256679ad8b0ac94502d82686 (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 ee11332d40ab1482cf9a89f6aaf6cb49d56c9726 Merge: 5c5fd84 714df8d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 11 14:44:23 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 7 ++++--- config/rootfiles/packages/ipfireseeder | 2 +- lfs/clamav | 6 +++--- lfs/ipfireseeder | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index fae43b8..b08aec6 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,18 +10,19 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.9 +usr/lib/libclamav.so.6.1.10 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.9 +usr/lib/libclamunrar.so.6.1.10 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.9 +usr/lib/libclamunrar_iface.so.6.1.10 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav +#usr/share/man/man1/clambc.1 #usr/share/man/man1/clamconf.1 #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 866d173..f103232 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core49.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/clamav b/lfs/clamav index a9d9709..6226fe4 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.97 +VER = 0.97.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 15 +PAK_VER = 16 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b +$(DL_FILE)_MD5 = 4f3fb74ff1098c25eef8e10721478c29 install : $(TARGET) diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 2292c3e..e08e51e 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core49.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 24 +PAK_VER = 25 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e +$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c
by git＠ipfire.org 11 Jun '11

11 Jun '11

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 "IPFire 2.x development tree". The branch, master has been updated via 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c (commit) via b571e4c234092bf3a6d209482b99946a1c7948d9 (commit) from 81f77047dbe9f840977e59619720ae7823dd87ab (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 714df8de9724e5f1fc8dbbd37802c74bd21fbd8c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 11 14:40:56 2011 +0200 ipfireseeder: seed core49. commit b571e4c234092bf3a6d209482b99946a1c7948d9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jun 11 11:23:02 2011 +0200 clamav: update to 0.97.1. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 7 ++++--- config/rootfiles/packages/ipfireseeder | 2 +- lfs/clamav | 6 +++--- lfs/ipfireseeder | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index fae43b8..b08aec6 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,18 +10,19 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.9 +usr/lib/libclamav.so.6.1.10 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.9 +usr/lib/libclamunrar.so.6.1.10 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.9 +usr/lib/libclamunrar_iface.so.6.1.10 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav +#usr/share/man/man1/clambc.1 #usr/share/man/man1/clamconf.1 #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 866d173..f103232 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core49.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/clamav b/lfs/clamav index a9d9709..6226fe4 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.97 +VER = 0.97.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 15 +PAK_VER = 16 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 605ed132b2f8e89df11064adea2b183b +$(DL_FILE)_MD5 = 4f3fb74ff1098c25eef8e10721478c29 install : $(TARGET) diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 2292c3e..e08e51e 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core49.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 24 +PAK_VER = 25 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e +$(DL_FILE)_MD5 = 0da274af552f5de5b0f65102b17631f1 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 625871f8ceb183d283ac695e2624d61cf0423dfb
by git＠ipfire.org 10 Jun '11

10 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via 625871f8ceb183d283ac695e2624d61cf0423dfb (commit) from 48e451a7e47ee58d5c16c98c4ec658c382c86f07 (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 625871f8ceb183d283ac695e2624d61cf0423dfb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jun 9 21:29:12 2011 +0200 radvd: Improve systemd service file. ----------------------------------------------------------------------- Summary of changes: pkgs/radvd/radvd.nm | 2 +- pkgs/radvd/systemd/radvd.service | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index b9c97ad..c2a9c7a 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = radvd PKG_VER = 1.7 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/radvd/systemd/radvd.service b/pkgs/radvd/systemd/radvd.service index 1006c75..05d0552 100644 --- a/pkgs/radvd/systemd/radvd.service +++ b/pkgs/radvd/systemd/radvd.service @@ -1,9 +1,12 @@ [Unit] Description=Router Advertisement Daemon +Requires=network.target After=network.target [Service] -ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -m stderr_syslog +ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd +Type=forking +PIDFile=/var/run/radvd/radvd.pid [Install] WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 48e451a7e47ee58d5c16c98c4ec658c382c86f07
by git＠ipfire.org 04 Jun '11

04 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via 48e451a7e47ee58d5c16c98c4ec658c382c86f07 (commit) via 109f657eada08444d744a43379de5a989decc0a3 (commit) via 4f1f4ba14a8452536c6227793962b32f983c86fc (commit) via 8d3f5467a72e4b4058a597e9e740ec03c68020cc (commit) via 703b1e14b006e0d4a716d7622e0b7fc85bfcc1b0 (commit) via d3d5a42141aefd9d249520ecc4434a60b6705c08 (commit) from d69919baac0125bc8524d52accb9964c29f82b57 (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 48e451a7e47ee58d5c16c98c4ec658c382c86f07 Merge: d3d5a42 109f657 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 5 01:05:39 2011 +0200 Merge remote-tracking branch 'stevee/systemd-update' commit 109f657eada08444d744a43379de5a989decc0a3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 4 23:13:34 2011 +0200 lighttpd: Rebuild for tmpfile. commit 4f1f4ba14a8452536c6227793962b32f983c86fc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 4 23:12:27 2011 +0200 freeradius: Rebuild for tmpfile. commit 8d3f5467a72e4b4058a597e9e740ec03c68020cc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 4 23:11:17 2011 +0200 radvd: Rebuild for tmpfile. commit 703b1e14b006e0d4a716d7622e0b7fc85bfcc1b0 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 4 23:05:57 2011 +0200 systemd: Update to version 28. commit d3d5a42141aefd9d249520ecc4434a60b6705c08 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jun 4 23:04:45 2011 +0200 build-essentials: Add support for systemd tmpfiles. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Constants | 2 + pkgs/build-essentials/buildsystem/Functions | 11 +++++++ pkgs/freeradius/freeradius.nm | 2 +- .../{freeradius.tmpfile => freeradius.tmpfiles} | 0 pkgs/lighttpd/lighttpd.nm | 2 +- .../{lighttpd.tmpfile => lighttpd.tmpfiles} | 0 pkgs/radvd/radvd.nm | 2 +- pkgs/radvd/{radvd.tmpfile => radvd.tmpfiles} | 0 ...manpages.patch => systemd-28-no-manpages.patch} | 30 +++++++++++-------- pkgs/systemd/systemd.nm | 4 +- 11 files changed, 36 insertions(+), 19 deletions(-) rename pkgs/freeradius/{freeradius.tmpfile => freeradius.tmpfiles} (100%) rename pkgs/lighttpd/{lighttpd.tmpfile => lighttpd.tmpfiles} (100%) rename pkgs/radvd/{radvd.tmpfile => radvd.tmpfiles} (100%) rename pkgs/systemd/patches/{systemd-24-no-manpages.patch => systemd-28-no-manpages.patch} (80%) Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 67b5e89..3164b8e 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 17 +PKG_REL = 18 PKG_EPOCH = 1 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index e506d6a..19a5e8a 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -49,6 +49,7 @@ CONFIGURE_OPTIONS = \ --prefix=/usr SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_TMPFILES_DIR = /usr/lib/tmpfiles.d ############################################################################### # @@ -149,6 +150,7 @@ PKG_DEFAULT_FILES += $(wildcard $(DIR_SOURCE)/default/*) PKG_PAM_FILES = $(wildcard $(DIR_SOURCE)/*.pam) PKG_PAM_FILES += $(wildcard $(DIR_SOURCE)/pam.d/*) PKG_SYSTEMD_FILES += $(wildcard $(DIR_SOURCE)/systemd/*) +PKG_SYSTEMD_TMPFILES += $(wildcard $(DIR_SOURCE)/*.tmpfiles) ############################################################################### # diff --git a/pkgs/build-essentials/buildsystem/Functions b/pkgs/build-essentials/buildsystem/Functions index b4a629c..90776ff 100644 --- a/pkgs/build-essentials/buildsystem/Functions +++ b/pkgs/build-essentials/buildsystem/Functions @@ -69,6 +69,16 @@ define DO_INSTALL_SYSTEMD $(foreach file,$(PKG_SYSTEMD_FILES),$(call __INSTALL_SYSTEMD,$(file))) endef +define __INSTALL_SYSTEMD_TMPFILES + -mkdir -pv $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR) + cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)$(SYSTEMD_TMPFILES_DIR)/$(subst .tmpfiles,.conf,$(notdir $(1))) + +endef + +define DO_INSTALL_SYSTEMD_TMPFILES + $(foreach file,$(PKG_SYSTEMD_TMPFILES),$(call __INSTALL_SYSTEMD_TMPFILES,$(file))) +endef + define __INSTALL_PAM -mkdir -pv $(BUILDROOT)/etc/pam.d cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/pam.d/$(subst .pam,,$(notdir $(1))) @@ -142,6 +152,7 @@ define DO_INSTALL $(DO_INSTALL_DEFAULT) $(DO_INSTALL_SYSTEMD) + $(DO_INSTALL_SYSTEMD_TMPFILES) $(DO_INSTALL_PAM) @echo "#####################################################################" diff --git a/pkgs/freeradius/freeradius.nm b/pkgs/freeradius/freeradius.nm index 81f3fd5..4cc46b0 100644 --- a/pkgs/freeradius/freeradius.nm +++ b/pkgs/freeradius/freeradius.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = freeradius-server PKG_VER = 2.1.9 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/freeradius/freeradius.tmpfile b/pkgs/freeradius/freeradius.tmpfile deleted file mode 100644 index f06f7f3..0000000 --- a/pkgs/freeradius/freeradius.tmpfile +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/radiusd 0750 root root - - diff --git a/pkgs/freeradius/freeradius.tmpfiles b/pkgs/freeradius/freeradius.tmpfiles new file mode 100644 index 0000000..f06f7f3 --- /dev/null +++ b/pkgs/freeradius/freeradius.tmpfiles @@ -0,0 +1,2 @@ +d /var/run/radiusd 0750 root root - + diff --git a/pkgs/lighttpd/lighttpd.nm b/pkgs/lighttpd/lighttpd.nm index fefdfd9..ee53eba 100644 --- a/pkgs/lighttpd/lighttpd.nm +++ b/pkgs/lighttpd/lighttpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = lighttpd PKG_VER = 1.4.28 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = Networking/Webservers diff --git a/pkgs/lighttpd/lighttpd.tmpfile b/pkgs/lighttpd/lighttpd.tmpfile deleted file mode 100644 index b1fdefd..0000000 --- a/pkgs/lighttpd/lighttpd.tmpfile +++ /dev/null @@ -1 +0,0 @@ -d /var/run/lighttpd 0750 lighttpd lighttpd - diff --git a/pkgs/lighttpd/lighttpd.tmpfiles b/pkgs/lighttpd/lighttpd.tmpfiles new file mode 100644 index 0000000..b1fdefd --- /dev/null +++ b/pkgs/lighttpd/lighttpd.tmpfiles @@ -0,0 +1 @@ +d /var/run/lighttpd 0750 lighttpd lighttpd - diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm index 53d51c6..b9c97ad 100644 --- a/pkgs/radvd/radvd.nm +++ b/pkgs/radvd/radvd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = radvd PKG_VER = 1.7 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = System/Daemons diff --git a/pkgs/radvd/radvd.tmpfile b/pkgs/radvd/radvd.tmpfile deleted file mode 100644 index 8bab232..0000000 --- a/pkgs/radvd/radvd.tmpfile +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/radvd 0750 radvd radvd - - diff --git a/pkgs/radvd/radvd.tmpfiles b/pkgs/radvd/radvd.tmpfiles new file mode 100644 index 0000000..8bab232 --- /dev/null +++ b/pkgs/radvd/radvd.tmpfiles @@ -0,0 +1,2 @@ +d /var/run/radvd 0750 radvd radvd - + diff --git a/pkgs/systemd/patches/systemd-24-no-manpages.patch b/pkgs/systemd/patches/systemd-24-no-manpages.patch deleted file mode 100644 index 693a24e..0000000 --- a/pkgs/systemd/patches/systemd-24-no-manpages.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Nur old/Makefile.am new/Makefile.am ---- old/Makefile.am 2011-04-06 21:28:41.000000000 +0200 -+++ new/Makefile.am 2011-04-08 19:45:31.779256001 +0200 -@@ -530,73 +530,13 @@ - src/readahead-common.h \ - src/ask-password-api.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/modules-load.d.5 \ -- man/binfmt.d.5 \ -- man/sysctl.d.5 -- --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+MANPAGES = - --nodist_man_MANS = \ -- man/systemd.special.7 -+MANPAGES_ALIAS = -+ -+dist_man_MANS = -+ -+nodist_man_MANS = - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/patches/systemd-28-no-manpages.patch b/pkgs/systemd/patches/systemd-28-no-manpages.patch new file mode 100644 index 0000000..9685c60 --- /dev/null +++ b/pkgs/systemd/patches/systemd-28-no-manpages.patch @@ -0,0 +1,87 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2011-05-26 19:18:54.000000000 +0200 ++++ b/Makefile.am 2011-06-04 20:56:50.863488131 +0200 +@@ -567,79 +567,13 @@ + src/readahead-common.h \ + src/ask-password-api.h + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- man/shutdown.8 \ +- man/pam_systemd.8 \ +- man/systemd.conf.5 \ +- man/tmpfiles.d.5 \ +- man/hostname.5 \ +- man/machine-id.5 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 ++MANPAGES = # + +-if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 +-endif ++MANPAGES_ALIAS = # + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++dist_man_MANS = # + +-nodist_man_MANS = \ +- man/systemd.special.7 ++nodist_man_MANS = # + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm index 9ea2a18..4105734 100644 --- a/pkgs/systemd/systemd.nm +++ b/pkgs/systemd/systemd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = systemd -PKG_VER = 24 +PKG_VER = 28 PKG_REL = 1 PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> @@ -44,7 +44,7 @@ endef PKG_CONFLICTS += upstart -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-units $(PKG_NAME)-devel hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d69919baac0125bc8524d52accb9964c29f82b57
by git＠ipfire.org 04 Jun '11

04 Jun '11

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 "IPFire 3.x development tree". The branch, master has been updated via d69919baac0125bc8524d52accb9964c29f82b57 (commit) via 89b03d6dbcd6fa327de83eadb0f5420414135b75 (commit) via c5f30e1905f1abc742206804c3972d4acd8f2023 (commit) via 0bc5d371f2c01305cbede3024c45e02a12b69850 (commit) from 50263b0b8312ec35fe6dcee5486fb6518907e005 (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 d69919baac0125bc8524d52accb9964c29f82b57 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 4 19:04:46 2011 +0200 lldpd: Fix syntax error in systemd file. commit 89b03d6dbcd6fa327de83eadb0f5420414135b75 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 4 19:04:35 2011 +0200 rstp: Fix syntax error in systemd file. commit c5f30e1905f1abc742206804c3972d4acd8f2023 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 4 19:04:03 2011 +0200 network: Fix syntax error in systemd file. commit 0bc5d371f2c01305cbede3024c45e02a12b69850 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 4 15:26:10 2011 +0200 ppp: Fix for IPv6. pppd was not compiled properly for IPv6 and I needed to fix that. Anyway, there were lots of other fixes applied. ----------------------------------------------------------------------- Summary of changes: pkgs/lldpd/lldpd.nm | 2 +- pkgs/lldpd/systemd/lldpd.service | 2 +- pkgs/network/network.nm | 2 +- pkgs/network/systemd/network.service | 2 +- pkgs/ppp/patches/ppp-2.3.6-sample.patch | 295 ++ pkgs/ppp/patches/ppp-2.4.1-varargs.patch | 12 + .../ppp/patches/ppp-2.4.2-change_resolv_conf.patch | 61 + pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch | 10 + pkgs/ppp/patches/ppp-2.4.3-fix.patch | 115 + pkgs/ppp/patches/ppp-2.4.3-fix64.patch | 10 + pkgs/ppp/patches/ppp-2.4.3-make.patch | 91 + pkgs/ppp/patches/ppp-2.4.4-cbcp.patch | 11 + pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch | 615 +++++ pkgs/ppp/patches/ppp-2.4.4-lib64.patch | 89 + pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch | 2917 ++++++++++++++++++++ pkgs/ppp/patches/ppp-2.4.5-eth.patch | 124 + pkgs/ppp/patches/ppp-2.4.5-lock.patch | 12 + pkgs/ppp/patches/ppp-2.4.5-man.patch | 94 + pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch | 13 + pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch | 34 +- pkgs/ppp/ppp.nm | 9 +- pkgs/rstp/rstp.nm | 2 +- pkgs/rstp/systemd/rstp.service | 2 +- 23 files changed, 4495 insertions(+), 29 deletions(-) create mode 100644 pkgs/ppp/patches/ppp-2.3.6-sample.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.1-varargs.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.3-fix.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.3-fix64.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.3-make.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.4-cbcp.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.4-lib64.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.5-eth.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.5-lock.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.5-man.patch create mode 100644 pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch Difference in files: diff --git a/pkgs/lldpd/lldpd.nm b/pkgs/lldpd/lldpd.nm index 1d76203..bf67054 100644 --- a/pkgs/lldpd/lldpd.nm +++ b/pkgs/lldpd/lldpd.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = lldpd PKG_VER = 0.5.2 -PKG_REL = 4 +PKG_REL = 5 PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/lldpd/systemd/lldpd.service b/pkgs/lldpd/systemd/lldpd.service index 1fa1215..49b454b 100644 --- a/pkgs/lldpd/systemd/lldpd.service +++ b/pkgs/lldpd/systemd/lldpd.service @@ -4,7 +4,7 @@ After=network.target [Service] RemainAfterExit=yes -ExecPreStart=/sbin/modprobe 8021q +ExecStartPre=/sbin/modprobe 8021q ExecStart=/usr/sbin/lldpd -c [Install] diff --git a/pkgs/network/network.nm b/pkgs/network/network.nm index 6fc792f..6ea02f4 100644 --- a/pkgs/network/network.nm +++ b/pkgs/network/network.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = network PKG_VER = 0.99.0 -PKG_REL = 4 +PKG_REL = 5 PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/pkgs/network/systemd/network.service b/pkgs/network/systemd/network.service index 0f65bcc..4509a35 100644 --- a/pkgs/network/systemd/network.service +++ b/pkgs/network/systemd/network.service @@ -5,7 +5,7 @@ Before=network.target [Service] Type=oneshot RemainAfterExit=yes -ExecPreStart=/sbin/network init +ExecStartPre=/sbin/network init ExecStart=/sbin/network start ExecStop=/sbin/network stop diff --git a/pkgs/ppp/patches/ppp-2.3.6-sample.patch b/pkgs/ppp/patches/ppp-2.3.6-sample.patch new file mode 100644 index 0000000..92eee6c --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.3.6-sample.patch @@ -0,0 +1,295 @@ +--- ppp-2.3.3/sample/auth-down.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/auth-down Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# ++# A program or script which is executed after the remote system ++# successfully authenticates itself. It is executed with the parameters ++# <interface-name> <peer-name> <user-name> <tty-device> <speed> ++# ++ ++# ++# The environment is cleared before executing this script ++# so the path must be reset ++# ++PATH=/usr/sbin:/sbin:/usr/bin:/bin ++export PATH ++ ++echo auth-down `date +'%y/%m/%d %T'` $* >> /var/log/pppstats ++ ++# last line +--- ppp-2.3.3/sample/auth-up.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/auth-up Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,17 @@ ++#!/bin/sh ++# ++# A program or script which is executed after the remote system ++# successfully authenticates itself. It is executed with the parameters ++# <interface-name> <peer-name> <user-name> <tty-device> <speed> ++# ++ ++# ++# The environment is cleared before executing this script ++# so the path must be reset ++# ++PATH=/usr/sbin:/sbin:/usr/bin:/bin ++export PATH ++ ++echo auth-up `date +'%y/%m/%d %T'` $* >> /var/log/pppstats ++ ++# last line +--- ppp-2.3.3/sample/ip-down.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/ip-down Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,22 @@ ++#!/bin/sh ++# ++# This script is run by the pppd _after_ the link is brought down. ++# It should be used to delete routes, unset IP addresses etc. ++# ++# This script is called with the following arguments: ++# Arg Name Example ++# $1 Interface name ppp0 ++# $2 The tty ttyS1 ++# $3 The link speed 38400 ++# $4 Local IP number 12.34.56.78 ++# $5 Peer IP number 12.34.56.99 ++# ++ ++# ++# The environment is cleared before executing this script ++# so the path must be reset ++# ++PATH=/usr/sbin:/sbin:/usr/bin:/bin ++export PATH ++ ++# last line +--- ppp-2.3.3/sample/ip-up.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/ip-up Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,23 @@ ++#!/bin/sh ++# ++# This script is run by the pppd after the link is established. ++# It should be used to add routes, set IP address, run the mailq ++# etc. ++# ++# This script is called with the following arguments: ++# Arg Name Example ++# $1 Interface name ppp0 ++# $2 The tty ttyS1 ++# $3 The link speed 38400 ++# $4 Local IP number 12.34.56.78 ++# $5 Peer IP number 12.34.56.99 ++# ++ ++# ++# The environment is cleared before executing this script ++# so the path must be reset ++# ++PATH=/usr/sbin:/sbin:/usr/bin:/bin ++export PATH ++ ++# last line +--- ppp-2.3.3/sample/options.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/options Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,153 @@ ++# /etc/ppp/options ++ ++# The name of this server. Often, the FQDN is used here. ++#name <host> ++ ++# Enforce the use of the hostname as the name of the local system for ++# authentication purposes (overrides the name option). ++usehostname ++ ++# If no local IP address is given, pppd will use the first IP address ++# that belongs to the local hostname. If "noipdefault" is given, this ++# is disabled and the peer will have to supply an IP address. ++noipdefault ++ ++# With this option, pppd will accept the peer's idea of our local IP ++# address, even if the local IP address was specified in an option. ++#ipcp-accept-local ++ ++# With this option, pppd will accept the peer's idea of its (remote) IP ++# address, even if the remote IP address was specified in an option. ++#ipcp-accept-remote ++ ++# Specify which DNS Servers the incoming Win95 or WinNT Connection should use ++# Two Servers can be remotely configured ++#ms-dns 192.168.1.1 ++#ms-dns 192.168.1.2 ++ ++# Specify which WINS Servers the incoming connection Win95 or WinNT should use ++#wins-addr 192.168.1.50 ++#wins-addr 192.168.1.51 ++ ++# enable this on a server that already has a permanent default route ++#nodefaultroute ++ ++# Run the executable or shell command specified after pppd has terminated ++# the link. This script could, for example, issue commands to the modem ++# to cause it to hang up if hardware modem control signals were not ++# available. ++# If mgetty is running, it will reset the modem anyway. So there is no need ++# to do it here. ++#disconnect "chat -- \d+++\d\c OK ath0 OK" ++ ++# Increase debugging level (same as -d). The debug output is written ++# to syslog LOG_LOCAL2. ++debug ++ ++# Enable debugging code in the kernel-level PPP driver. The argument n ++# is a number which is the sum of the following values: 1 to enable ++# general debug messages, 2 to request that the contents of received ++# packets be printed, and 4 to request that the contents of transmitted ++# packets be printed. ++#kdebug n ++ ++# Require the peer to authenticate itself before allowing network ++# packets to be sent or received. ++# Please do not disable this setting. It is expected to be standard in ++# future releases of pppd. Use the call option (see manpage) to disable ++# authentication for specific peers. ++#auth ++ ++# authentication can either be pap or chap. As most people only want to ++# use pap, you can also disable chap: ++#require-pap ++#refuse-chap ++ ++# Use hardware flow control (i.e. RTS/CTS) to control the flow of data ++# on the serial port. ++crtscts ++ ++# Specifies that pppd should use a UUCP-style lock on the serial device ++# to ensure exclusive access to the device. ++lock ++ ++# Use the modem control lines. ++modem ++ ++# async character map -- 32-bit hex; each bit is a character ++# that needs to be escaped for pppd to receive it. 0x00000001 ++# represents '\x01', and 0x80000000 represents '\x1f'. ++# To allow pppd to work over a rlogin/telnet connection, ou should escape ++# XON (^Q), XOFF (^S) and ^]: (The peer should use "escape ff".) ++#asyncmap 200a0000 ++asyncmap 0 ++ ++# Specifies that certain characters should be escaped on transmission ++# (regardless of whether the peer requests them to be escaped with its ++# async control character map). The characters to be escaped are ++# specified as a list of hex numbers separated by commas. Note that ++# almost any character can be specified for the escape option, unlike ++# the asyncmap option which only allows control characters to be ++# specified. The characters which may not be escaped are those with hex ++# values 0x20 - 0x3f or 0x5e. ++#escape 11,13,ff ++ ++# Set the MRU [Maximum Receive Unit] value to <n> for negotiation. pppd ++# will ask the peer to send packets of no more than <n> bytes. The ++# minimum MRU value is 128. The default MRU value is 1500. A value of ++# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 ++# bytes of data). ++#mru 542 ++ ++# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer ++# requests a smaller value via MRU negotiation, pppd will request that ++# the kernel networking code send data packets of no more than n bytes ++# through the PPP network interface. ++#mtu <n> ++ ++# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot" ++# notation (e.g. 255.255.255.0). ++#netmask 255.255.255.0 ++ ++# Don't fork to become a background process (otherwise pppd will do so ++# if a serial device is specified). ++nodetach ++ ++# Set the assumed name of the remote system for authentication purposes ++# to <n>. ++#remotename <n> ++ ++# Add an entry to this system's ARP [Address Resolution Protocol] ++# table with the IP address of the peer and the Ethernet address of this ++# system. {proxyarp,noproxyarp} ++proxyarp ++ ++# Use the system password database for authenticating the peer using ++# PAP. Note: mgetty already provides this option. If this is specified ++# then dialin from users using a script under Linux to fire up ppp wont work. ++#login ++ ++# If this option is given, pppd will send an LCP echo-request frame to ++# the peer every n seconds. Under Linux, the echo-request is sent when ++# no packets have been received from the peer for n seconds. Normally ++# the peer should respond to the echo-request by sending an echo-reply. ++# This option can be used with the lcp-echo-failure option to detect ++# that the peer is no longer connected. ++lcp-echo-interval 30 ++ ++# If this option is given, pppd will presume the peer to be dead if n ++# LCP echo-requests are sent without receiving a valid LCP echo-reply. ++# If this happens, pppd will terminate the connection. Use of this ++# option requires a non-zero value for the lcp-echo-interval parameter. ++# This option can be used to enable pppd to terminate after the physical ++# connection has been broken (e.g., the modem has hung up) in ++# situations where no hardware modem control lines are available. ++lcp-echo-failure 4 ++ ++# Specifies that pppd should disconnect if the link is idle for n seconds. ++idle 600 ++ ++# Disable the IPXCP and IPX protocols. ++noipx ++ ++# ---<End of File>--- +--- ppp-2.3.3/sample/options.ttyXX.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/options.ttyXX Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,14 @@ ++# If you need to set up multiple serial lines then copy this file to ++# options.<ttyname> for each tty with a modem on it. ++# ++# The options.tty file will assign an IP address to each PPP connection ++# as it comes up. They must all be distinct! ++# ++# Example: ++# options.ttyS1 for com2 under DOS. ++# ++# Edit the following line so that the first IP address ++# mentioned is the ip address of the serial port while the second ++# is the IP address of your host ++# ++hostname-s1:hostname +--- ppp-2.3.3/sample/pap-secrets.sample Tue Jan 6 17:53:27 1998 ++++ ppp-2.3.3/sample/pap-secrets Tue Jan 6 17:53:27 1998 +@@ -0,0 +1,28 @@ ++# Secrets for authentication using PAP ++# client server secret IP addresses ++ ++# OUTBOUND CONNECTIONS ++# Here you should add your userid password to connect to your providers via ++# pap. The * means that the password is to be used for ANY host you connect ++# to. Thus you do not have to worry about the foreign machine name. Just ++# replace password with your password. ++# If you have different providers with different passwords then you better ++# remove the following line. ++#hostname * password ++ ++# INBOUND CONNECTIONS ++#client hostname <password> 192.168.1.1 ++ ++# If you add "auth login -chap +pap" to /etc/mgetty+sendfax/login.config, ++# all users in /etc/passwd can use their password for pap-authentication. ++# ++# Every regular user can use PPP and has to use passwords from /etc/passwd ++#* hostname "" ++# UserIDs that cannot use PPP at all. Check your /etc/passwd and add any ++# other accounts that should not be able to use pppd! Replace hostname ++# with your local hostname. ++#guest hostname "*" - ++#master hostname "*" - ++#root hostname "*" - ++#support hostname "*" - ++#stats hostname "*" - diff --git a/pkgs/ppp/patches/ppp-2.4.1-varargs.patch b/pkgs/ppp/patches/ppp-2.4.1-varargs.patch new file mode 100644 index 0000000..0f757ec --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.1-varargs.patch @@ -0,0 +1,12 @@ +diff -up ppp-2.4.4/pppd/utils.c.varargs ppp-2.4.4/pppd/utils.c +--- ppp-2.4.4/pppd/utils.c.varargs 2004-11-04 05:02:26.000000000 -0500 ++++ ppp-2.4.4/pppd/utils.c 2008-08-28 17:34:29.000000000 -0400 +@@ -290,7 +290,7 @@ vslprintf(buf, buflen, fmt, args) + #if 0 /* not used, and breaks on S/390, apparently */ + case 'r': + f = va_arg(args, char *); +-#ifndef __powerpc__ ++#if !defined (__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__x86_64__) + n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list)); + #else + /* On the powerpc, a va_list is an array of 1 structure */ diff --git a/pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch b/pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch new file mode 100644 index 0000000..99c9beb --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.2-change_resolv_conf.patch @@ -0,0 +1,61 @@ +diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8 +--- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 06:22:49.000000000 -0600 ++++ ppp-2.4.3/pppd/pppd.8 2005-08-03 22:10:34.000000000 -0500 +@@ -1035,7 +1035,7 @@ Ask the peer for up to 2 DNS server addr + by the peer (if any) are passed to the /etc/ppp/ip\-up script in the + environment variables DNS1 and DNS2, and the environment variable + USEPEERDNS will be set to 1. In addition, pppd will create an +-/etc/ppp/resolv.conf file containing one or two nameserver lines with ++/var/run/ppp/resolv.conf file containing one or two nameserver lines with + the address(es) supplied by the peer. + .TP + .B user \fIname +--- ppp-2.4.2/scripts/ip-down.local.add.change_resolv_conf 1999-02-27 05:32:42.000000000 +0100 ++++ ppp-2.4.2/scripts/ip-down.local.add 2004-09-14 14:36:20.058008752 +0200 +@@ -9,12 +9,13 @@ + # + # Nick Walker (nickwalker(a)email.com) + # ++. /etc/sysconfig/network-scripts/network-functions + +-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then +- if [ -f /etc/ppp/resolv.prev ]; then +- cp -f /etc/ppp/resolv.prev /etc/resolv.conf ++if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then ++ if [ -f /var/run/ppp/resolv.prev ]; then ++ change_resolv_conf /var/run/ppp/resolv.prev + else +- rm -f /etc/resolv.conf ++ change_resolv_conf + fi + fi + +--- ppp-2.4.2/scripts/ip-up.local.add.change_resolv_conf 1999-11-15 04:28:10.000000000 +0100 ++++ ppp-2.4.2/scripts/ip-up.local.add 2004-09-14 14:37:39.129061828 +0200 +@@ -9,16 +9,19 @@ + # + # Nick Walker (nickwalker(a)email.com) + # ++. /etc/sysconfig/network-scripts/network-functions + +-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then +- rm -f /etc/ppp/resolv.prev ++if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then ++ rm -f /var/run/ppp/resolv.prev + if [ -f /etc/resolv.conf ]; then +- cp /etc/resolv.conf /etc/ppp/resolv.prev +- grep domain /etc/ppp/resolv.prev > /etc/resolv.conf +- grep search /etc/ppp/resolv.prev >> /etc/resolv.conf +- cat /etc/ppp/resolv.conf >> /etc/resolv.conf ++ cp /etc/resolv.conf /var/run/ppp/resolv.prev ++ rscf=/var/run/ppp/resolv.new ++ grep domain /var/run/ppp/resolv.prev > $rscf ++ grep search /var/run/ppp/resolv.prev >> $rscf ++ change_resolv_conf $rscf ++ rm -f $rscf + else +- cp /etc/ppp/resolv.conf /etc ++ change_resolv_conf /var/run/ppp/resolv.conf + fi + fi + diff --git a/pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch b/pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch new file mode 100644 index 0000000..897e4fd --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.2-pppoatm-make.patch @@ -0,0 +1,10 @@ +diff -up ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.atm-make ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux +--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.atm-make 2008-08-28 17:36:10.000000000 -0400 ++++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2008-08-28 17:36:56.000000000 -0400 +@@ -1,5 +1,5 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = $(RPM_OPT_FLAGS) + CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC + LDFLAGS = -shared + INSTALL = install diff --git a/pkgs/ppp/patches/ppp-2.4.3-fix.patch b/pkgs/ppp/patches/ppp-2.4.3-fix.patch new file mode 100644 index 0000000..3df6db1 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.3-fix.patch @@ -0,0 +1,115 @@ +--- ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c.fix 2004-11-04 11:07:37.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c 2004-11-22 16:00:24.522462124 +0100 +@@ -13,6 +13,8 @@ + #include "pppoe.h" + #include "pppd/pppd.h" + ++void warn __P((char *, ...)); /* log a warning message */ ++ + #include <string.h> + #include <stdlib.h> + #include <errno.h> +--- ppp-2.4.3/pppd/ipv6cp.c.fix 2004-11-13 03:28:15.000000000 +0100 ++++ ppp-2.4.3/pppd/ipv6cp.c 2004-11-22 16:00:27.049114044 +0100 +@@ -151,6 +151,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <netdb.h> +@@ -1064,7 +1065,9 @@ + return (rc); /* Return final code */ + } + +- ++#if defined(SOL2) || defined(__linux__) ++int ether_to_eui64(eui64_t *p_eui64); ++#endif + /* + * ipv6_check_options - check that any IP-related options are OK, + * and assign appropriate defaults. +--- ppp-2.4.3/pppdump/deflate.c.fix 2004-02-02 04:36:46.000000000 +0100 ++++ ppp-2.4.3/pppdump/deflate.c 2004-11-22 16:02:18.071820020 +0100 +@@ -39,6 +39,7 @@ + #include <sys/types.h> + #include <stdio.h> + #include <stddef.h> ++#include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include "ppp_defs.h" +@@ -237,8 +238,8 @@ + { + struct deflate_state *state = (struct deflate_state *) arg; + u_char *rptr, *wptr; +- int rlen, olen, ospace; +- int seq, i, flush, r, decode_proto; ++ int rlen, olen; ++ int seq, r; + + rptr = mi; + if (*rptr == 0) +--- ppp-2.4.3/pppdump/bsd-comp.c.fix 2004-02-02 04:36:46.000000000 +0100 ++++ ppp-2.4.3/pppdump/bsd-comp.c 2004-11-22 16:00:27.052113631 +0100 +@@ -383,7 +383,7 @@ + || options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS + || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION + || BSD_NBITS(options[2]) != db->maxbits +- || decomp && db->lens == NULL) ++ || (decomp && db->lens == NULL)) + return 0; + + if (decomp) { +@@ -556,11 +556,11 @@ + u_int n_bits = db->n_bits; + u_int tgtbitno = 32-n_bits; /* bitno when we have a code */ + struct bsd_dict *dictp; +- int explen, i, seq, len; ++ int explen, seq, len; + u_int incode, oldcode, finchar; + u_char *p, *rptr, *wptr; + int ilen; +- int dlen, space, codelen, extra; ++ int dlen=0, codelen, extra; + + rptr = cmsg; + if (*rptr == 0) +@@ -616,7 +616,7 @@ + } + + if (incode > max_ent + 2 || incode > db->maxmaxcode +- || incode > max_ent && oldcode == CLEAR) { ++ || (incode > max_ent && oldcode == CLEAR)) { + if (db->debug) { + printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ", + db->unit, incode, oldcode); +--- ppp-2.4.3/pppdump/pppdump.c.fix 2004-02-02 04:36:46.000000000 +0100 ++++ ppp-2.4.3/pppdump/pppdump.c 2004-11-22 16:00:27.054113356 +0100 +@@ -34,6 +34,7 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include <stdio.h> ++#include <stdlib.h> + #include <unistd.h> + #include <stdlib.h> + #include <time.h> +@@ -191,7 +192,7 @@ + show_time(f, c); + break; + default: +- printf("?%.2x\n"); ++ printf("?%.2x\n", c); + } + } + } +@@ -421,7 +422,7 @@ + show_time(f, c); + break; + default: +- printf("?%.2x\n"); ++ printf("?%.2x\n", c); + } + } + } diff --git a/pkgs/ppp/patches/ppp-2.4.3-fix64.patch b/pkgs/ppp/patches/ppp-2.4.3-fix64.patch new file mode 100644 index 0000000..8a2c794 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.3-fix64.patch @@ -0,0 +1,10 @@ +--- ppp-2.4.3/pppd/sha1.c.fix64 2004-10-25 01:28:02.000000000 +0200 ++++ ppp-2.4.3/pppd/sha1.c 2004-11-22 16:44:16.850768926 +0100 +@@ -18,6 +18,7 @@ + + #include <string.h> + #include <netinet/in.h> /* htonl() */ ++#include <sys/types.h> /* u_int32_t */ + #include <net/ppp_defs.h> + #include "sha1.h" + diff --git a/pkgs/ppp/patches/ppp-2.4.3-make.patch b/pkgs/ppp/patches/ppp-2.4.3-make.patch new file mode 100644 index 0000000..4716ac1 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.3-make.patch @@ -0,0 +1,91 @@ +--- ppp-2.4.3/pppd/Makefile.linux.make 2004-11-13 13:02:22.000000000 +0100 ++++ ppp-2.4.3/pppd/Makefile.linux 2004-11-22 15:46:49.871309478 +0100 +@@ -30,10 +30,10 @@ + include .depend + endif + +-# CC = gcc ++CC = gcc + # +-COPTS = -O2 -pipe -Wall -g +-LIBS = ++COPTS = -Wall $(RPM_OPT_FLAGS) ++LIBS = -lutil + + # Uncomment the next 2 lines to include support for Microsoft's + # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. +@@ -61,8 +61,8 @@ + USE_TDB=y + + HAS_SHADOW=y +-#USE_PAM=y +-#HAVE_INET6=y ++USE_PAM=y ++HAVE_INET6=y + + # Enable plugins + PLUGIN=y +--- ppp-2.4.3/pppd/plugins/Makefile.linux.make 2004-11-14 08:57:35.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-22 15:46:49.873309203 +0100 +@@ -1,5 +1,5 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = $(RPM_OPT_FLAGS) + CFLAGS = $(COPTS) -I.. -I../../include -fPIC + LDFLAGS = -shared + INSTALL = install +--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make 2004-11-14 08:02:31.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2004-11-22 15:49:08.858233692 +0100 +@@ -12,7 +12,7 @@ + INSTALL = install + + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make 2004-11-14 08:58:37.000000000 +0100 ++++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-22 15:46:49.875308929 +0100 +@@ -25,7 +25,7 @@ + # Version is set ONLY IN THE MAKEFILE! Don't delete this! + RP_VERSION=3.8p + +-COPTS=-O2 -g ++COPTS=$(RPM_OPT_FLAGS) + CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' + all: rp-pppoe.so pppoe-discovery + +--- ppp-2.4.3/pppdump/Makefile.linux.make 2004-10-31 02:36:52.000000000 +0200 ++++ ppp-2.4.3/pppdump/Makefile.linux 2004-11-22 15:48:16.795379237 +0100 +@@ -2,7 +2,7 @@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + +-CFLAGS= -O -I../include/net ++CFLAGS= $(RPM_OPT_FLAGS) -I../include/net + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install +--- ppp-2.4.3/pppstats/Makefile.linux.make 2004-10-31 23:09:03.000000000 +0100 ++++ ppp-2.4.3/pppstats/Makefile.linux 2004-11-22 15:46:49.872309341 +0100 +@@ -10,7 +10,7 @@ + PPPSTATOBJS = pppstats.o + + #CC = gcc +-COPTS = -O ++COPTS = $(RPM_OPT_FLAGS) + COMPILE_FLAGS = -I../include + LIBS = + +--- ppp-2.4.3/chat/Makefile.linux.make 2004-11-03 12:51:47.000000000 +0100 ++++ ppp-2.4.3/chat/Makefile.linux 2004-11-22 15:47:59.445760450 +0100 +@@ -10,7 +10,7 @@ + CDEF4= -DFNDELAY=O_NDELAY # Old name value + CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) + +-COPTS= -O2 -g -pipe ++COPTS= $(RPM_OPT_FLAGS) + CFLAGS= $(COPTS) $(CDEFS) + + INSTALL= install diff --git a/pkgs/ppp/patches/ppp-2.4.4-cbcp.patch b/pkgs/ppp/patches/ppp-2.4.4-cbcp.patch new file mode 100644 index 0000000..da8c6b2 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.4-cbcp.patch @@ -0,0 +1,11 @@ +--- ppp-2.4.4/pppd/Makefile.linux.cbcp 2006-07-19 16:11:41.000000000 +0200 ++++ ppp-2.4.4/pppd/Makefile.linux 2006-07-19 16:11:42.000000000 +0200 +@@ -69,7 +69,7 @@ + PLUGIN=y + + # Enable Microsoft proprietary Callback Control Protocol +-#CBCP=y ++CBCP=y + + # Enable EAP SRP-SHA1 authentication (requires libsrp) + #USE_SRP=y diff --git a/pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch b/pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch new file mode 100644 index 0000000..7c3c060 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.4-fd_leak.patch @@ -0,0 +1,615 @@ +diff -up ppp-2.4.4/pppd/auth.c.fd_leak ppp-2.4.4/pppd/auth.c +--- ppp-2.4.4/pppd/auth.c.fd_leak 2006-06-18 13:26:00.000000000 +0200 ++++ ppp-2.4.4/pppd/auth.c 2009-10-08 21:22:59.789547513 +0200 +@@ -428,7 +428,7 @@ setupapfile(argv) + option_error("unable to reset uid before opening %s: %m", fname); + return 0; + } +- ufile = fopen(fname, "r"); ++ ufile = fopen_r(fname); + if (seteuid(euid) == -1) + fatal("unable to regain privileges: %m"); + if (ufile == NULL) { +@@ -1414,7 +1414,7 @@ check_passwd(unit, auser, userlen, apass + filename = _PATH_UPAPFILE; + addrs = opts = NULL; + ret = UPAP_AUTHNAK; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) { + error("Can't open PAP password file %s: %m", filename); + +@@ -1511,7 +1511,7 @@ null_login(unit) + if (ret <= 0) { + filename = _PATH_UPAPFILE; + addrs = NULL; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) + return 0; + check_access(f, filename); +@@ -1558,7 +1558,7 @@ get_pap_passwd(passwd) + } + + filename = _PATH_UPAPFILE; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) + return 0; + check_access(f, filename); +@@ -1596,7 +1596,7 @@ have_pap_secret(lacks_ipp) + } + + filename = _PATH_UPAPFILE; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) + return 0; + +@@ -1641,7 +1641,7 @@ have_chap_secret(client, server, need_ip + } + + filename = _PATH_CHAPFILE; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) + return 0; + +@@ -1683,7 +1683,7 @@ have_srp_secret(client, server, need_ip, + struct wordlist *addrs; + + filename = _PATH_SRPFILE; +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) + return 0; + +@@ -1739,7 +1739,7 @@ get_secret(unit, client, server, secret, + addrs = NULL; + secbuf[0] = 0; + +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + if (f == NULL) { + error("Can't open chap secret file %s: %m", filename); + return 0; +@@ -1796,7 +1796,7 @@ get_srp_secret(unit, client, server, sec + filename = _PATH_SRPFILE; + addrs = NULL; + +- fp = fopen(filename, "r"); ++ fp = fopen_r(filename); + if (fp == NULL) { + error("Can't open srp secret file %s: %m", filename); + return 0; +@@ -2202,7 +2202,7 @@ scan_authfile(f, client, server, secret, + */ + if (word[0] == '@' && word[1] == '/') { + strlcpy(atfile, word+1, sizeof(atfile)); +- if ((sf = fopen(atfile, "r")) == NULL) { ++ if ((sf = fopen_r(atfile)) == NULL) { + warn("can't open indirect secret file %s", atfile); + continue; + } +diff -up ppp-2.4.4/pppd/eap.c.fd_leak ppp-2.4.4/pppd/eap.c +--- ppp-2.4.4/pppd/eap.c.fd_leak 2004-11-09 23:39:25.000000000 +0100 ++++ ppp-2.4.4/pppd/eap.c 2009-10-08 21:22:59.791544181 +0200 +@@ -1226,7 +1226,7 @@ mode_t modebits; + + if ((path = name_of_pn_file()) == NULL) + return (-1); +- fd = open(path, modebits, S_IRUSR | S_IWUSR); ++ fd = open_fd(path, modebits, S_IRUSR | S_IWUSR); + err = errno; + free(path); + errno = err; +diff -up ppp-2.4.4/pppd/main.c.fd_leak ppp-2.4.4/pppd/main.c +--- ppp-2.4.4/pppd/main.c.fd_leak 2009-10-08 21:22:59.769544859 +0200 ++++ ppp-2.4.4/pppd/main.c 2009-10-08 21:30:32.356546561 +0200 +@@ -201,6 +201,8 @@ int ngroups; /* How many groups valid + + static struct timeval start_time; /* Time when link was started. */ + ++static int cloexec_works; /* controlls setting FD_CLOEXEC flag up */ ++ + static struct pppd_stats old_link_stats; + struct pppd_stats link_stats; + unsigned link_connect_time; +@@ -245,6 +247,7 @@ static void holdoff_end __P((void *)); + static void forget_child __P((int pid, int status)); + static int reap_kids __P((void)); + static void childwait_end __P((void *)); ++static void check_cloexec __P((int)); + + #ifdef USE_TDB + static void update_db_entry __P((void)); +@@ -419,7 +422,7 @@ main(argc, argv) + die(0); + + /* Make sure fds 0, 1, 2 are open to somewhere. */ +- fd_devnull = open(_PATH_DEVNULL, O_RDWR); ++ fd_devnull = open_fd(_PATH_DEVNULL, O_RDWR); + if (fd_devnull < 0) + fatal("Couldn't open %s: %m", _PATH_DEVNULL); + while (fd_devnull <= 2) { +@@ -865,6 +866,104 @@ holdoff_end(arg) + new_phase(PHASE_DORMANT); + } + ++ ++/* ++ * check_cloexec - checks for FD_CLOEXEC flag and adds it if necessary ++ */ ++static void ++check_cloexec(int fd) ++{ ++ if (cloexec_works == 0) { ++ int fl = fcntl(fd, F_GETFD); ++ cloexec_works = (fl & FD_CLOEXEC) ? 1 : -1; ++ } ++ if (cloexec_works > 0) ++ return; ++ fcntl(fd, F_SETFD, FD_CLOEXEC); ++ return; ++} ++ ++/* ++ * socket_fd - create an endpoint for communication. uses FD_CLOEXEC if supported ++ */ ++int ++socket_fd(int domain, int type, int protocol) ++{ ++ int fd; ++ ++#ifdef SOCK_CLOEXEC ++ if (cloexec_works != -1) ++ type |= SOCK_CLOEXEC; ++#endif ++ fd = socket(domain, type, protocol); ++ if (fd == -1) ++ return -1; ++ check_cloexec(fd); ++ return fd; ++} ++ ++/* ++ * open_fd - open file with FD_CLOEXEC flag ++ */ ++int ++open_fd(const char *path, int flags) ++{ ++ int fd; ++ ++#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC) ++ if (cloexec_works != -1) ++ flags |= O_CLOEXEC; ++#endif ++ fd = open(path, flags); ++ if (fd == -1) ++ return -1; ++ check_cloexec(fd); ++ return fd; ++} ++ ++/* ++ * open_fd_mmode - open file with FD_CLOEXEC flag ++ */ ++int ++open_fd_mode(const char *path, int flags, int mode) ++{ ++ int fd; ++ ++#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC) ++ if (cloexec_works != -1) ++ flags |= O_CLOEXEC; ++#endif ++ fd = open(path, flags, mode); ++ if (fd == -1) ++ return -1; ++ check_cloexec(fd); ++ return fd; ++} ++ ++/* ++ * fopen_r - open file with FD_CLOEXEC flag ++ */ ++FILE * ++fopen_r(const char *path) ++{ ++ FILE *f; ++ ++#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC) ++ if (cloexec_works != -1) { ++ f = fopen(path, "re"); ++ if (f != NULL) { ++ check_cloexec(fileno(f)); ++ return f; ++ } ++ } ++#endif ++ f = fopen(path, "r"); ++ if (f == NULL) ++ return NULL; ++ check_cloexec(fileno(f)); ++ return f; ++} ++ + /* List of protocol names, to make our messages a little more informative. */ + struct protocol_list { + u_short proto; +@@ -1618,7 +1717,7 @@ device_script(program, in, out, dont_wai + if (log_to_fd >= 0) + errfd = log_to_fd; + else +- errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); ++ errfd = open_fd_mode(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); + + ++conn_running; + pid = safe_fork(in, out, errfd); +diff -up ppp-2.4.4/pppd/options.c.fd_leak ppp-2.4.4/pppd/options.c +--- ppp-2.4.4/pppd/options.c.fd_leak 2006-06-18 13:26:00.000000000 +0200 ++++ ppp-2.4.4/pppd/options.c 2009-10-08 21:22:59.797544174 +0200 +@@ -409,7 +409,7 @@ options_from_file(filename, must_exist, + option_error("unable to drop privileges to open %s: %m", filename); + return 0; + } +- f = fopen(filename, "r"); ++ f = fopen_r(filename); + err = errno; + if (check_prot && seteuid(euid) == -1) + fatal("unable to regain privileges"); +@@ -1528,9 +1528,9 @@ setlogfile(argv) + option_error("unable to drop permissions to open %s: %m", *argv); + return 0; + } +- fd = open(*argv, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0644); ++ fd = open_fd_mode(*argv, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0644); + if (fd < 0 && errno == EEXIST) +- fd = open(*argv, O_WRONLY | O_APPEND); ++ fd = open_fd(*argv, O_WRONLY | O_APPEND); + err = errno; + if (!privileged_option && seteuid(euid) == -1) + fatal("unable to regain privileges: %m"); +diff -up ppp-2.4.4/pppd/pppd.h.fd_leak ppp-2.4.4/pppd/pppd.h +--- ppp-2.4.4/pppd/pppd.h.fd_leak 2005-08-26 01:59:34.000000000 +0200 ++++ ppp-2.4.4/pppd/pppd.h 2009-10-08 21:22:59.800544904 +0200 +@@ -494,6 +494,10 @@ int ppp_send_config __P((int, int, u_in + int ppp_recv_config __P((int, int, u_int32_t, int, int)); + const char *protocol_name __P((int)); + void remove_pidfiles __P((void)); ++int socket_fd __P((int, int, int)); ++int open_fd __P((const char *, int)); ++int open_fd_mode __P((const char *, int, int)); ++FILE *fopen_r __P((const char *)); + void lock_db __P((void)); + void unlock_db __P((void)); + +diff -up ppp-2.4.4/pppd/sys-linux.c.fd_leak ppp-2.4.4/pppd/sys-linux.c +--- ppp-2.4.4/pppd/sys-linux.c.fd_leak 2009-10-08 21:22:59.778544744 +0200 ++++ ppp-2.4.4/pppd/sys-linux.c 2009-10-08 21:22:59.803544377 +0200 +@@ -308,12 +308,12 @@ static int modify_flags(int fd, int clea + void sys_init(void) + { + /* Get an internet socket for doing socket ioctls. */ +- sock_fd = socket(AF_INET, SOCK_DGRAM, 0); ++ sock_fd = socket_fd(AF_INET, SOCK_DGRAM, 0); + if (sock_fd < 0) + fatal("Couldn't create IP socket: %m(%d)", errno); + + #ifdef INET6 +- sock6_fd = socket(AF_INET6, SOCK_DGRAM, 0); ++ sock6_fd = socket_fd(AF_INET6, SOCK_DGRAM, 0); + if (sock6_fd < 0) + sock6_fd = -errno; /* save errno for later */ + #endif +@@ -459,7 +459,7 @@ int generic_establish_ppp (int fd) + goto err; + } + dbglog("using channel %d", chindex); +- fd = open("/dev/ppp", O_RDWR); ++ fd = open_fd("/dev/ppp", O_RDWR); + if (fd < 0) { + error("Couldn't reopen /dev/ppp: %m"); + goto err; +@@ -619,7 +619,7 @@ static int make_ppp_unit() + dbglog("in make_ppp_unit, already had /dev/ppp open?"); + close(ppp_dev_fd); + } +- ppp_dev_fd = open("/dev/ppp", O_RDWR); ++ ppp_dev_fd = open_fd("/dev/ppp", O_RDWR); + if (ppp_dev_fd < 0) + fatal("Couldn't open /dev/ppp: %m"); + flags = fcntl(ppp_dev_fd, F_GETFL); +@@ -693,7 +693,7 @@ int bundle_attach(int ifnum) + if (!new_style_driver) + return -1; + +- master_fd = open("/dev/ppp", O_RDWR); ++ master_fd = open_fd("/dev/ppp", O_RDWR); + if (master_fd < 0) + fatal("Couldn't open /dev/ppp: %m"); + if (ioctl(master_fd, PPPIOCATTACH, &ifnum) < 0) { +@@ -1412,7 +1412,7 @@ static char *path_to_procfs(const char * + /* Default the mount location of /proc */ + strlcpy (proc_path, "/proc", sizeof(proc_path)); + proc_path_len = 5; +- fp = fopen(MOUNTED, "r"); ++ fp = fopen_r(MOUNTED); + if (fp != NULL) { + while ((mntent = getmntent(fp)) != NULL) { + if (strcmp(mntent->mnt_type, MNTTYPE_IGNORE) == 0) +@@ -1472,7 +1472,7 @@ static int open_route_table (void) + close_route_table(); + + path = path_to_procfs("/net/route"); +- route_fd = fopen (path, "r"); ++ route_fd = fopen_r(path); + if (route_fd == NULL) { + error("can't open routing table %s: %m", path); + return 0; +@@ -1713,7 +1713,7 @@ int sifproxyarp (int unit, u_int32_t his + if (tune_kernel) { + forw_path = path_to_procfs("/sys/net/ipv4/ip_forward"); + if (forw_path != 0) { +- int fd = open(forw_path, O_WRONLY); ++ int fd = open_fd(forw_path, O_WRONLY); + if (fd >= 0) { + if (write(fd, "1", 1) != 1) + error("Couldn't enable IP forwarding: %m"); +@@ -1857,7 +1857,7 @@ get_if_hwaddr(u_char *addr, char *name) + struct ifreq ifreq; + int ret, sock_fd; + +- sock_fd = socket(AF_INET, SOCK_DGRAM, 0); ++ sock_fd = socket_fd(AF_INET, SOCK_DGRAM, 0); + if (sock_fd < 0) + return 0; + memset(&ifreq.ifr_hwaddr, 0, sizeof(struct sockaddr)); +@@ -2030,7 +2030,7 @@ int ppp_available(void) + sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch); + kernel_version = KVERSION(osmaj, osmin, ospatch); + +- fd = open("/dev/ppp", O_RDWR); ++ fd = open_fd("/dev/ppp", O_RDWR); + if (fd >= 0) { + new_style_driver = 1; + +@@ -2068,7 +2068,7 @@ int ppp_available(void) + /* + * Open a socket for doing the ioctl operations. + */ +- s = socket(AF_INET, SOCK_DGRAM, 0); ++ s = socket_fd(AF_INET, SOCK_DGRAM, 0); + if (s < 0) + return 0; + +@@ -2318,7 +2318,7 @@ int sifaddr (int unit, u_int32_t our_adr + int fd; + + path = path_to_procfs("/sys/net/ipv4/ip_dynaddr"); +- if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) { ++ if (path != 0 && (fd = open_fd(path, O_WRONLY)) >= 0) { + if (write(fd, "1", 1) != 1) + error("Couldn't enable dynamic IP addressing: %m"); + close(fd); +@@ -2494,7 +2494,7 @@ get_pty(master_fdp, slave_fdp, slave_nam + /* + * Try the unix98 way first. + */ +- mfd = open("/dev/ptmx", O_RDWR); ++ mfd = open_fd("/dev/ptmx", O_RDWR); + if (mfd >= 0) { + int ptn; + if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) { +@@ -2505,7 +2505,7 @@ get_pty(master_fdp, slave_fdp, slave_nam + if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0) + warn("Couldn't unlock pty slave %s: %m", pty_name); + #endif +- if ((sfd = open(pty_name, O_RDWR | O_NOCTTY)) < 0) ++ if ((sfd = open_fd(pty_name, O_RDWR | O_NOCTTY)) < 0) + warn("Couldn't open pty slave %s: %m", pty_name); + } + } +@@ -2516,10 +2516,10 @@ get_pty(master_fdp, slave_fdp, slave_nam + for (i = 0; i < 64; ++i) { + slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x", + 'p' + i / 16, i % 16); +- mfd = open(pty_name, O_RDWR, 0); ++ mfd = open_fd_mode(pty_name, O_RDWR, 0); + if (mfd >= 0) { + pty_name[5] = 't'; +- sfd = open(pty_name, O_RDWR | O_NOCTTY, 0); ++ sfd = open_fd_mode(pty_name, O_RDWR | O_NOCTTY, 0); + if (sfd >= 0) { + fchown(sfd, uid, -1); + fchmod(sfd, S_IRUSR | S_IWUSR); +@@ -2784,7 +2784,7 @@ ether_to_eui64(eui64_t *p_eui64) + int skfd; + const unsigned char *ptr; + +- skfd = socket(PF_INET6, SOCK_DGRAM, 0); ++ skfd = socket_fd(PF_INET6, SOCK_DGRAM, 0); + if(skfd == -1) + { + warn("could not open IPv6 socket"); +diff -up ppp-2.4.4/pppd/tdb.c.fd_leak ppp-2.4.4/pppd/tdb.c +--- ppp-2.4.4/pppd/tdb.c.fd_leak 2004-11-13 08:13:07.000000000 +0100 ++++ ppp-2.4.4/pppd/tdb.c 2009-10-08 21:22:59.806583590 +0200 +@@ -1724,7 +1724,7 @@ TDB_CONTEXT *tdb_open_ex(const char *nam + goto internal; + } + +- if ((tdb->fd = open(name, open_flags, mode)) == -1) { ++ if ((tdb->fd = open_fd_mode(name, open_flags, mode)) == -1) { + TDB_LOG((tdb, 5, "tdb_open_ex: could not open file %s: %s\n", + name, strerror(errno))); + goto fail; /* errno set by open(2) */ +@@ -1967,7 +1967,7 @@ int tdb_reopen(TDB_CONTEXT *tdb) + } + if (close(tdb->fd) != 0) + TDB_LOG((tdb, 0, "tdb_reopen: WARNING closing tdb->fd failed!\n")); +- tdb->fd = open(tdb->name, tdb->open_flags & ~(O_CREAT|O_TRUNC), 0); ++ tdb->fd = open_fd_mode(tdb->name, tdb->open_flags & ~(O_CREAT|O_TRUNC), 0); + if (tdb->fd == -1) { + TDB_LOG((tdb, 0, "tdb_reopen: open failed (%s)\n", strerror(errno))); + goto fail; +diff -up ppp-2.4.4/pppd/tty.c.fd_leak ppp-2.4.4/pppd/tty.c +--- ppp-2.4.4/pppd/tty.c.fd_leak 2006-06-04 09:04:57.000000000 +0200 ++++ ppp-2.4.4/pppd/tty.c 2009-10-08 21:22:59.809544300 +0200 +@@ -569,7 +569,7 @@ int connect_tty() + status = EXIT_OPEN_FAILED; + goto errret; + } +- real_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); ++ real_ttyfd = open_fd_mode(devnam, O_NONBLOCK | O_RDWR, 0); + err = errno; + if (prio < OPRIO_ROOT && seteuid(0) == -1) + fatal("Unable to regain privileges"); +@@ -723,7 +723,7 @@ int connect_tty() + if (connector == NULL && modem && devnam[0] != 0) { + int i; + for (;;) { +- if ((i = open(devnam, O_RDWR)) >= 0) ++ if ((i = open_fd(devnam, O_RDWR)) >= 0) + break; + if (errno != EINTR) { + error("Failed to reopen %s: %m", devnam); +@@ -896,7 +896,8 @@ open_socket(dest) + *sep = ':'; + + /* get a socket and connect it to the other end */ +- sock = socket(PF_INET, SOCK_STREAM, 0); ++ //sock = socket(PF_INET, SOCK_STREAM, 0); ++ sock = socket_fd(PF_INET, SOCK_STREAM, 0); + if (sock < 0) { + error("Can't create socket: %m"); + return -1; +diff -up ppp-2.4.4/pppd/utils.c.fd_leak ppp-2.4.4/pppd/utils.c +--- ppp-2.4.4/pppd/utils.c.fd_leak 2009-10-08 21:22:59.620325739 +0200 ++++ ppp-2.4.4/pppd/utils.c 2009-10-08 21:22:59.811573725 +0200 +@@ -931,14 +931,14 @@ lock(dev) + slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", LOCK_DIR, dev); + #endif + +- while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) { ++ while ((fd = open_fd_mode(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) { + if (errno != EEXIST) { + error("Can't create lock file %s: %m", lock_file); + break; + } + + /* Read the lock file to find out who has the device locked. */ +- fd = open(lock_file, O_RDONLY, 0); ++ fd = open_fd_mode(lock_file, O_RDONLY, 0); + if (fd < 0) { + if (errno == ENOENT) /* This is just a timing problem. */ + continue; +@@ -1017,7 +1017,7 @@ relock(pid) + + if (lock_file[0] == 0) + return -1; +- fd = open(lock_file, O_WRONLY, 0); ++ fd = open_fd_mode(lock_file, O_WRONLY, 0); + if (fd < 0) { + error("Couldn't reopen lock file %s: %m", lock_file); + lock_file[0] = 0; +diff -up ppp-2.4.5/pppd/plugins/pppoatm/pppoatm.c.test ppp-2.4.5/pppd/plugins/pppoatm/pppoatm.c +--- ppp-2.4.5/pppd/plugins/pppoatm/pppoatm.c.test 2010-11-16 09:56:56.083707000 +0100 ++++ ppp-2.4.5/pppd/plugins/pppoatm/pppoatm.c 2010-11-16 09:56:59.382707272 +0100 +@@ -137,7 +137,11 @@ static int connect_pppoatm(void) + + if (!device_got_set) + no_device_given_pppoatm(); ++#ifdef SOCK_CLOEXEC ++ fd = socket(AF_ATMPVC, SOCK_DGRAM | SOCK_CLOEXEC, 0); ++#else + fd = socket(AF_ATMPVC, SOCK_DGRAM, 0); ++#endif + if (fd < 0) + fatal("failed to create socket: %m"); + memset(&qos, 0, sizeof qos); +diff -up ppp-2.4.5/pppd/plugins/pppol2tp/openl2tp.c.test ppp-2.4.5/pppd/plugins/pppol2tp/openl2tp.c +--- ppp-2.4.5/pppd/plugins/pppol2tp/openl2tp.c.test 2010-11-16 09:58:17.499711288 +0100 ++++ ppp-2.4.5/pppd/plugins/pppol2tp/openl2tp.c 2010-11-16 10:00:15.791706960 +0100 +@@ -83,7 +83,11 @@ static int openl2tp_client_create(void) + int result; + + if (openl2tp_fd < 0) { ++#ifdef SOCK_CLOEXEC ++ openl2tp_fd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0); ++#else + openl2tp_fd = socket(PF_UNIX, SOCK_DGRAM, 0); ++#endif + if (openl2tp_fd < 0) { + error("openl2tp connection create: %m"); + return -ENOTCONN; +diff -up ppp-2.4.5/pppd/plugins/pppol2tp/pppol2tp.c.test ppp-2.4.5/pppd/plugins/pppol2tp/pppol2tp.c +--- ppp-2.4.5/pppd/plugins/pppol2tp/pppol2tp.c.test 2010-11-16 09:57:44.448709467 +0100 ++++ ppp-2.4.5/pppd/plugins/pppol2tp/pppol2tp.c 2010-11-16 09:59:32.877707001 +0100 +@@ -208,7 +208,11 @@ static void send_config_pppol2tp(int mtu + struct ifreq ifr; + int fd; + ++#ifdef SOCK_CLOEXEC ++ fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); ++#else + fd = socket(AF_INET, SOCK_DGRAM, 0); ++#endif + if (fd >= 0) { + memset (&ifr, '\0', sizeof (ifr)); + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); +diff -up ppp-2.4.5/pppd/plugins/rp-pppoe/if.c.test ppp-2.4.5/pppd/plugins/rp-pppoe/if.c +--- ppp-2.4.5/pppd/plugins/rp-pppoe/if.c.test 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/if.c 2010-11-16 09:54:03.973706239 +0100 +@@ -116,6 +116,10 @@ openInterface(char const *ifname, UINT16 + stype = SOCK_PACKET; + #endif + ++#ifdef SOCK_CLOEXEC ++ stype |= SOCK_CLOEXEC; ++#endif ++ + if ((fd = socket(domain, stype, htons(type))) < 0) { + /* Give a more helpful message for the common error case */ + if (errno == EPERM) { +diff -up ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c.test ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c +--- ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c.test 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c 2010-11-16 09:40:23.355707001 +0100 +@@ -158,7 +158,11 @@ PPPOEConnectDevice(void) + ppp_session_number = ntohs(conn->session); + + /* Make the session socket */ ++#ifdef SOCK_CLOEXEC ++ conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM | SOCK_CLOEXEC, PX_PROTO_OE); ++#else + conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE); ++#endif + if (conn->sessionSocket < 0) { + error("Failed to create PPPoE socket: %m"); + goto errout; +@@ -289,7 +293,11 @@ PPPoEDevnameHook(char *cmd, char **argv, + } + + /* Open a socket */ ++#ifdef SOCK_CLOEXEC ++ if ((fd = socket(PF_PACKET, SOCK_RAW | SOCK_CLOEXEC, 0)) < 0) { ++#else + if ((fd = socket(PF_PACKET, SOCK_RAW, 0)) < 0) { ++#endif + r = 0; + } + +diff -up ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c.test ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c +--- ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c.test 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c 2010-11-16 09:55:08.726707003 +0100 +@@ -121,6 +121,10 @@ openInterface(char const *ifname, UINT16 + stype = SOCK_PACKET; + #endif + ++#ifdef SOCK_CLOEXEC ++ stype |= SOCK_CLOEXEC; ++#endif ++ + if ((fd = socket(domain, stype, htons(type))) < 0) { + /* Give a more helpful message for the common error case */ + if (errno == EPERM) { diff --git a/pkgs/ppp/patches/ppp-2.4.4-lib64.patch b/pkgs/ppp/patches/ppp-2.4.4-lib64.patch new file mode 100644 index 0000000..b842048 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.4-lib64.patch @@ -0,0 +1,89 @@ +--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200 ++++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux 2006-07-24 20:44:56.000000000 +0200 +@@ -15,7 +15,7 @@ + + DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin +-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION) ++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION) + + PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + +--- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200 ++++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux 2006-07-24 20:44:45.000000000 +0200 +@@ -5,7 +5,7 @@ + + DESTDIR = $(INSTROOT)@DESTDIR@ + MANDIR = $(DESTDIR)/share/man/man8 +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + +--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64 2004-11-14 02:12:10.000000000 +0100 ++++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2006-07-24 20:44:29.000000000 +0200 +@@ -6,8 +6,8 @@ + + #*********************************************************************** + +-DESTDIR = $(INSTROOT)@DESTDIR@ +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++DESTDIR = $(INSTROOT)@DESTDIR@ ++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + +--- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200 ++++ ppp-2.4.4/pppd/plugins/Makefile.linux 2006-07-24 20:43:40.000000000 +0200 +@@ -7,7 +7,7 @@ + DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION) + + SUBDIRS := rp-pppoe pppoatm pppol2tp + # Uncomment the next line to include the radius authentication plugin +--- ppp-2.4.4/pppd/Makefile.linux.lib64 2006-07-24 20:43:40.000000000 +0200 ++++ ppp-2.4.4/pppd/Makefile.linux 2006-07-24 20:43:40.000000000 +0200 +@@ -8,6 +8,7 @@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + INCDIR = $(DESTDIR)/include ++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null) + + TARGETS = pppd + +@@ -32,7 +33,7 @@ + + CC = gcc + # +-COPTS = -Wall $(RPM_OPT_FLAGS) ++COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\" + LIBS = -lutil + + # Uncomment the next 2 lines to include support for Microsoft's +--- ppp-2.4.4/pppd/pathnames.h.lib64 2005-08-26 01:59:34.000000000 +0200 ++++ ppp-2.4.4/pppd/pathnames.h 2006-07-24 20:43:40.000000000 +0200 +@@ -57,7 +57,7 @@ + + #ifdef PLUGIN + #ifdef __STDC__ +-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION ++#define _PATH_PLUGIN LIBDIR "/pppd/" VERSION + #else /* __STDC__ */ + #define _PATH_PLUGIN "/usr/lib/pppd" + #endif /* __STDC__ */ +--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.lib64 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2010-08-05 16:33:53.964898629 +0200 +@@ -6,8 +6,8 @@ + + #*********************************************************************** + +-DESTDIR = @DESTDIR@ +-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) ++DESTDIR = $(INSTROOT)@DESTDIR@ ++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + diff --git a/pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch b/pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch new file mode 100644 index 0000000..eb6c2a6 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.5-eaptls-mppe-0.99.patch @@ -0,0 +1,2917 @@ +diff -Naur ppp-2.4.5/README.eap-tls ppp-2.4.5-eaptls-mppe-0.99/README.eap-tls +--- ppp-2.4.5/README.eap-tls 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/README.eap-tls 2010-10-01 15:17:54.205272328 +0200 +@@ -0,0 +1,169 @@ ++EAP-TLS authentication support for PPP ++====================================== ++ ++1. Intro ++ ++ The Extensible Authentication Protocol (EAP; RFC 3748) is a ++ security protocol that can be used with PPP. It provides a means ++ to plug in multiple optional authentication methods. ++ ++ Transport Level Security (TLS; RFC 2246) provides for mutual ++ authentication, integrity-protected ciphersuite negotiation and ++ key exchange between two endpoints. It also provides for optional ++ MPPE encryption. ++ ++ EAP-TLS (RFC 2716) incapsulates the TLS messages in EAP packets, ++ allowing TLS mutual authentication to be used as a generic EAP ++ mechanism. It also provides optional encryption using the MPPE ++ protocol. ++ ++ This patch provide EAP-TLS support to pppd. ++ This authentication method can be used in both client or server ++ mode. ++ ++2. Building ++ ++ To build pppd with EAP-TLS support, OpenSSL (http://www.openssl.org) ++ is required. Any version from 0.9.7 should work. ++ ++ Configure, compile, and install as usual. ++ ++3. Configuration ++ ++ On the client side there are two ways to configure EAP-TLS: ++ ++ 1. supply the appropriate 'ca', 'cert' and 'key' command-line parameters ++ ++ 2. edit the /etc/ppp/eaptls-client file. ++ Insert a line for each system with which you use EAP-TLS. ++ The line is composed of this fields separated by tab: ++ ++ - Client name ++ The name used by the client for authentication, can be * ++ - Server name ++ The name of the server, can be * ++ - Client certificate file ++ The file containing the certificate chain for the ++ client in PEM format ++ - Server certificate file ++ If you want to specify the certificate that the ++ server is allowed to use, put the certificate file name. ++ Else put a dash '-'. ++ - CA certificate file ++ The file containing the trusted CA certificates in PEM ++ format. ++ - Client private key file ++ The file containing the client private key in PEM format. ++ ++ ++ On the server side edit the /etc/ppp/eaptls-server file. ++ Insert a line for each system with which you use EAP-TLS. ++ The line is composed of this fields separated by tab: ++ ++ - Client name ++ The name used by the client for authentication, can be * ++ - Server name ++ The name of the server, can be * ++ - Client certificate file ++ If you want to specify the certificate that the ++ client is allowed to use, put the certificate file name. ++ Else put a dash '-'. ++ - Server certificate file ++ The file containing the certificate chain for the ++ server in PEM format ++ - CA certificate file ++ The file containing the trusted CA certificates in PEM ++ format. ++ - Client private key file ++ The file containing the server private key in PEM format. ++ - addresses ++ A list of IP addresses the client is allowed to use. ++ ++ ++ OpenSSL engine support is included starting with v0.95 of this patch. ++ Currently the only engine tested is the 'pkcs11' engine (hardware token ++ support). To use the 'pksc11' engine: ++ - Use a special private key fileiname in the /etc/ppp/eaptls-client file: ++ <engine>:<identifier> ++ e.g. ++ pkcs11:123456 ++ ++ - The certificate can also be loaded from the 'pkcs11' engine using ++ a special client certificate filename in the /etc/ppp/eaptls-client file: ++ <engine>:<identifier> ++ e.g. ++ pkcs11:123456 ++ ++ - Create an /etc/ppp/openssl.cnf file to load the right OpenSSL engine prior ++ to starting 'pppd'. A sample openssl.cnf file is ++ ++ openssl_conf = openssl_def ++ ++ [ openssl_def ] ++ engines = engine_section ++ ++ [ engine_section ] ++ pkcs11 = pkcs11_section ++ ++ [ pkcs11_section ] ++ engine_id = pkcs11 ++ dynamic_path = /usr/lib64/openssl/engines/engine_pkcs11.so ++ MODULE_PATH = /usr/lib64/libeTPkcs11.so ++ init = 0 ++ ++ - There are two ways to specify a password/PIN for the PKCS11 engine: ++ - inside the openssl.cnf file using ++ PIN = your-secret-pin ++ Note The keyword 'PIN' is case sensitive! ++ - Using the 'password' in the ppp options file. ++ From v0.97 of the eap-tls patch the password can also be supplied ++ using the appropriate 'eaptls_passwd_hook' (see plugins/passprompt.c ++ for an example). ++ ++ ++4. Options ++ ++ These pppd options are available: ++ ++ ca <ca-file> ++ Use the CA public certificate found in <ca-file> in PEM format ++ cert <cert-file> ++ Use the client public certificate found in <cert-file> in PEM format ++ or in engine:engine_id format ++ key <key-file> ++ Use the client private key found in <key-file> in PEM format ++ or in engine:engine_id format ++ crl-dir <dir> ++ Use CRL files from dir. It contains CRL files in PEM ++ format and each file contains a CRL. The files are looked up ++ by the issuer name hash value. Use the c_rehash utility ++ to create necessary links. ++ need-peer-eap ++ If the peer doesn't ask us to authenticate or doesn't use eap ++ to authenticate us, disconnect. ++ ++ Note: ++ password-encrypted certificates can be used as of v0.94 of this ++ patch. The password for the eap-tls.key file is specified using ++ the regular ++ password .... ++ statement in the ppp options file, or by using the appropriate ++ plugin which supplies a 'eaptls_passwd_hook' routine. ++ ++5. Connecting ++ ++ If you're setting up a pppd server, edit the EAP-TLS configuration file ++ as written above and then run pppd with the 'auth' option to authenticate ++ the client. The EAP-TLS method will be used if the other eap methods can't ++ be used (no secrets). ++ ++ If you're setting up a client, edit the configuration file and then run ++ pppd with 'remotename' option to specify the server name. Add the ++ 'need-peer-eap' option if you want to be sure the peer ask you to ++ authenticate (and to use eap) and to disconnect if it doesn't. ++ ++6. Notes ++ ++ This is experimental code. ++ Send suggestions and comments to Jan Just Keijser <janjust(a)nikhef.nl> ++ +diff -Naur ppp-2.4.5/etc.ppp/eaptls-client ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/eaptls-client +--- ppp-2.4.5/etc.ppp/eaptls-client 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/eaptls-client 2010-10-01 15:17:54.205272328 +0200 +@@ -0,0 +1,10 @@ ++# Parameters for authentication using EAP-TLS (client) ++ ++# client name (can be *) ++# server name (can be *) ++# client certificate file (required) ++# server certificate file (optional, if unused put '-') ++# CA certificate file (required) ++# client private key file (required) ++ ++#client server /root/cert/client.crt - /root/cert/ca.crt /root/cert/client.key +diff -Naur ppp-2.4.5/etc.ppp/eaptls-server ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/eaptls-server +--- ppp-2.4.5/etc.ppp/eaptls-server 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/eaptls-server 2010-10-01 15:17:54.205272328 +0200 +@@ -0,0 +1,11 @@ ++# Parameters for authentication using EAP-TLS (server) ++ ++# client name (can be *) ++# server name (can be *) ++# client certificate file (optional, if unused put '-') ++# server certificate file (required) ++# CA certificate file (required) ++# server private key file (required) ++# allowed addresses (required, can be *) ++ ++#client server - /root/cert/server.crt /root/cert/ca.crt /root/cert/server.key 192.168.1.0/24 +diff -Naur ppp-2.4.5/etc.ppp/openssl.cnf ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/openssl.cnf +--- ppp-2.4.5/etc.ppp/openssl.cnf 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/etc.ppp/openssl.cnf 2010-10-01 15:17:54.206272162 +0200 +@@ -0,0 +1,14 @@ ++openssl_conf = openssl_def ++ ++[ openssl_def ] ++engines = engine_section ++ ++[ engine_section ] ++pkcs11 = pkcs11_section ++ ++[ pkcs11_section ] ++engine_id = pkcs11 ++dynamic_path = /usr/lib64/openssl/engines/engine_pkcs11.so ++MODULE_PATH = /usr/lib64/libeTPkcs11.so ++init = 0 ++ +diff -Naur ppp-2.4.5/linux/Makefile.top ppp-2.4.5-eaptls-mppe-0.99/linux/Makefile.top +--- ppp-2.4.5/linux/Makefile.top 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/linux/Makefile.top 2010-10-01 15:17:54.206272162 +0200 +@@ -26,7 +26,7 @@ + cd pppdump; $(MAKE) $(MFLAGS) install + + install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \ +- $(ETCDIR)/chap-secrets ++ $(ETCDIR)/chap-secrets $(ETCDIR)/eaptls-server $(ETCDIR)/eaptls-client + + install-devel: + cd pppd; $(MAKE) $(MFLAGS) install-devel +@@ -37,6 +37,10 @@ + $(INSTALL) -c -m 600 etc.ppp/pap-secrets $@ + $(ETCDIR)/chap-secrets: + $(INSTALL) -c -m 600 etc.ppp/chap-secrets $@ ++$(ETCDIR)/eaptls-server: ++ $(INSTALL) -c -m 600 etc.ppp/eaptls-server $@ ++$(ETCDIR)/eaptls-client: ++ $(INSTALL) -c -m 600 etc.ppp/eaptls-client $@ + + $(BINDIR): + $(INSTALL) -d -m 755 $@ +diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5-eaptls-mppe-0.99/pppd/Makefile.linux +--- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/Makefile.linux 2010-10-01 15:17:54.207272272 +0200 +@@ -73,6 +73,9 @@ + # Enable EAP SRP-SHA1 authentication (requires libsrp) + #USE_SRP=y + ++# Enable EAP-TLS authentication (requires libssl and libcurl) ++USE_EAPTLS=y ++ + MAXOCTETS=y + + INCLUDE_DIRS= -I../include +@@ -112,6 +115,15 @@ + PPPDOBJS += sha1.o + endif + ++# EAP-TLS ++ifdef USE_EAPTLS ++CFLAGS += -DUSE_EAPTLS=1 -I/usr/kerberos/include ++LIBS += -lssl -lcrypto ++PPPDSRC += eap-tls.c ++HEADERS += eap-tls.h ++PPPDOBJS += eap-tls.o ++endif ++ + ifdef HAS_SHADOW + CFLAGS += -DHAS_SHADOW + #LIBS += -lshadow $(LIBS) +diff -Naur ppp-2.4.5/pppd/auth.c ppp-2.4.5-eaptls-mppe-0.99/pppd/auth.c +--- ppp-2.4.5/pppd/auth.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/auth.c 2010-10-01 15:17:54.210272021 +0200 +@@ -109,6 +109,9 @@ + #include "upap.h" + #include "chap-new.h" + #include "eap.h" ++#ifdef USE_EAPTLS ++#include "eap-tls.h" ++#endif + #ifdef CBCP_SUPPORT + #include "cbcp.h" + #endif +@@ -183,6 +186,11 @@ + /* Hook for a plugin to get the CHAP password for authenticating us */ + int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL; + ++#ifdef USE_EAPTLS ++/* Hook for a plugin to get the EAP-TLS password for authenticating us */ ++int (*eaptls_passwd_hook) __P((char *user, char *passwd)) = NULL; ++#endif ++ + /* Hook for a plugin to say whether it is OK if the peer + refuses to authenticate. */ + int (*null_auth_hook) __P((struct wordlist **paddrs, +@@ -238,6 +246,13 @@ + bool explicit_user = 0; /* Set if "user" option supplied */ + bool explicit_passwd = 0; /* Set if "password" option supplied */ + char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ ++#ifdef USE_EAPTLS ++char *cacert_file = NULL; /* CA certificate file (pem format) */ ++char *cert_file = NULL; /* client certificate file (pem format) */ ++char *privkey_file = NULL; /* client private key file (pem format) */ ++char *crl_dir = NULL; /* directory containing CRL files */ ++bool need_peer_eap = 0; /* Require peer to authenticate us */ ++#endif + + static char *uafname; /* name of most recent +ua file */ + +@@ -254,6 +269,19 @@ + static int have_chap_secret __P((char *, char *, int, int *)); + static int have_srp_secret __P((char *client, char *server, int need_ip, + int *lacks_ipp)); ++ ++#ifdef USE_EAPTLS ++static int have_eaptls_secret_server ++__P((char *client, char *server, int need_ip, int *lacks_ipp)); ++static int have_eaptls_secret_client __P((char *client, char *server)); ++static int scan_authfile_eaptls __P((FILE * f, char *client, char *server, ++ char *cli_cert, char *serv_cert, ++ char *ca_cert, char *pk, ++ struct wordlist ** addrs, ++ struct wordlist ** opts, ++ char *filename, int flags)); ++#endif ++ + static int ip_addr_check __P((u_int32_t, struct permitted_ip *)); + static int scan_authfile __P((FILE *, char *, char *, char *, + struct wordlist **, struct wordlist **, +@@ -401,6 +429,14 @@ + "Set telephone number(s) which are allowed to connect", + OPT_PRIV | OPT_A2LIST }, + ++#ifdef USE_EAPTLS ++ { "ca", o_string, &cacert_file, "EAP-TLS CA certificate in PEM format" }, ++ { "cert", o_string, &cert_file, "EAP-TLS client certificate in PEM format" }, ++ { "key", o_string, &privkey_file, "EAP-TLS client private key in PEM format" }, ++ { "crl-dir", o_string, &crl_dir, "Use CRLs in directory" }, ++ { "need-peer-eap", o_bool, &need_peer_eap, ++ "Require the peer to authenticate us", 1 }, ++#endif /* USE_EAPTLS */ + { NULL } + }; + +@@ -731,6 +767,9 @@ + lcp_options *wo = &lcp_wantoptions[unit]; + lcp_options *go = &lcp_gotoptions[unit]; + lcp_options *ho = &lcp_hisoptions[unit]; ++#ifdef USE_EAPTLS ++ lcp_options *ao = &lcp_allowoptions[unit]; ++#endif + int i; + struct protent *protp; + +@@ -765,6 +804,22 @@ + } + } + ++#ifdef USE_EAPTLS ++ if (need_peer_eap && !ao->neg_eap) { ++ warn("eap required to authenticate us but no suitable secrets"); ++ lcp_close(unit, "couldn't negotiate eap"); ++ status = EXIT_AUTH_TOPEER_FAILED; ++ return; ++ } ++ ++ if (need_peer_eap && !ho->neg_eap) { ++ warn("peer doesn't want to authenticate us with eap"); ++ lcp_close(unit, "couldn't negotiate eap"); ++ status = EXIT_PEER_AUTH_FAILED; ++ return; ++ } ++#endif ++ + new_phase(PHASE_AUTHENTICATE); + auth = 0; + if (go->neg_eap) { +@@ -1278,6 +1333,15 @@ + our_name, 1, &lacks_ip); + } + ++#ifdef USE_EAPTLS ++ if (!can_auth && wo->neg_eap) { ++ can_auth = ++ have_eaptls_secret_server((explicit_remote ? remote_name : ++ NULL), our_name, 1, &lacks_ip); ++ ++ } ++#endif ++ + if (auth_required && !can_auth && noauth_addrs == NULL) { + if (default_auth) { + option_error( +@@ -1332,7 +1396,11 @@ + passwd[0] != 0 || + (hadchap == 1 || (hadchap == -1 && have_chap_secret(user, + (explicit_remote? remote_name: NULL), 0, NULL))) || +- have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL)); ++ have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL) ++#ifdef USE_EAPTLS ++ || have_eaptls_secret_client(user, (explicit_remote? remote_name: NULL))) ++#endif ++ ; + + hadchap = -1; + if (go->neg_upap && !uselogin && !have_pap_secret(NULL)) +@@ -1347,8 +1415,14 @@ + !have_chap_secret((explicit_remote? remote_name: NULL), our_name, + 1, NULL))) && + !have_srp_secret((explicit_remote? remote_name: NULL), our_name, 1, +- NULL)) ++ NULL) ++#ifdef USE_EAPTLS ++ && !have_eaptls_secret_server((explicit_remote? remote_name: NULL), ++ our_name, 1, NULL) ++#endif ++ ) + go->neg_eap = 0; ++ + } + + +@@ -1706,6 +1780,7 @@ + } + + ++ + /* + * get_secret - open the CHAP secret file and return the secret + * for authenticating the given client on the given server. +@@ -2358,3 +2433,335 @@ + + auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL, 0); + } ++ ++ ++#ifdef USE_EAPTLS ++static int ++have_eaptls_secret_server(client, server, need_ip, lacks_ipp) ++ char *client; ++ char *server; ++ int need_ip; ++ int *lacks_ipp; ++{ ++ FILE *f; ++ int ret; ++ char *filename; ++ struct wordlist *addrs; ++ char servcertfile[MAXWORDLEN]; ++ char clicertfile[MAXWORDLEN]; ++ char cacertfile[MAXWORDLEN]; ++ char pkfile[MAXWORDLEN]; ++ ++ filename = _PATH_EAPTLSSERVFILE; ++ f = fopen(filename, "r"); ++ if (f == NULL) ++ return 0; ++ ++ if (client != NULL && client[0] == 0) ++ client = NULL; ++ else if (server != NULL && server[0] == 0) ++ server = NULL; ++ ++ ret = ++ scan_authfile_eaptls(f, client, server, clicertfile, servcertfile, ++ cacertfile, pkfile, &addrs, NULL, filename, ++ 0); ++ ++ fclose(f); ++ ++/* ++ if (ret >= 0 && !eaptls_init_ssl(1, cacertfile, servcertfile, ++ clicertfile, pkfile)) ++ ret = -1; ++*/ ++ ++ if (ret >= 0 && need_ip && !some_ip_ok(addrs)) { ++ if (lacks_ipp != 0) ++ *lacks_ipp = 1; ++ ret = -1; ++ } ++ if (addrs != 0) ++ free_wordlist(addrs); ++ ++ return ret >= 0; ++} ++ ++ ++static int ++have_eaptls_secret_client(client, server) ++ char *client; ++ char *server; ++{ ++ FILE *f; ++ int ret; ++ char *filename; ++ struct wordlist *addrs = NULL; ++ char servcertfile[MAXWORDLEN]; ++ char clicertfile[MAXWORDLEN]; ++ char cacertfile[MAXWORDLEN]; ++ char pkfile[MAXWORDLEN]; ++ ++ if (client != NULL && client[0] == 0) ++ client = NULL; ++ else if (server != NULL && server[0] == 0) ++ server = NULL; ++ ++ if (cacert_file && cert_file && privkey_file) ++ return 1; ++ ++ filename = _PATH_EAPTLSCLIFILE; ++ f = fopen(filename, "r"); ++ if (f == NULL) ++ return 0; ++ ++ ret = ++ scan_authfile_eaptls(f, client, server, clicertfile, servcertfile, ++ cacertfile, pkfile, &addrs, NULL, filename, ++ 0); ++ fclose(f); ++ ++/* ++ if (ret >= 0 && !eaptls_init_ssl(0, cacertfile, clicertfile, ++ servcertfile, pkfile)) ++ ret = -1; ++*/ ++ ++ if (addrs != 0) ++ free_wordlist(addrs); ++ ++ return ret >= 0; ++} ++ ++ ++static int ++scan_authfile_eaptls(f, client, server, cli_cert, serv_cert, ca_cert, pk, ++ addrs, opts, filename, flags) ++ FILE *f; ++ char *client; ++ char *server; ++ char *cli_cert; ++ char *serv_cert; ++ char *ca_cert; ++ char *pk; ++ struct wordlist **addrs; ++ struct wordlist **opts; ++ char *filename; ++ int flags; ++{ ++ int newline; ++ int got_flag, best_flag; ++ struct wordlist *ap, *addr_list, *alist, **app; ++ char word[MAXWORDLEN]; ++ ++ if (addrs != NULL) ++ *addrs = NULL; ++ if (opts != NULL) ++ *opts = NULL; ++ addr_list = NULL; ++ if (!getword(f, word, &newline, filename)) ++ return -1; /* file is empty??? */ ++ newline = 1; ++ best_flag = -1; ++ for (;;) { ++ /* ++ * Skip until we find a word at the start of a line. ++ */ ++ while (!newline && getword(f, word, &newline, filename)); ++ if (!newline) ++ break; /* got to end of file */ ++ ++ /* ++ * Got a client - check if it's a match or a wildcard. ++ */ ++ got_flag = 0; ++ if (client != NULL && strcmp(word, client) != 0 && !ISWILD(word)) { ++ newline = 0; ++ continue; ++ } ++ if (!ISWILD(word)) ++ got_flag = NONWILD_CLIENT; ++ ++ /* ++ * Now get a server and check if it matches. ++ */ ++ if (!getword(f, word, &newline, filename)) ++ break; ++ if (newline) ++ continue; ++ if (!ISWILD(word)) { ++ if (server != NULL && strcmp(word, server) != 0) ++ continue; ++ got_flag |= NONWILD_SERVER; ++ } ++ ++ /* ++ * Got some sort of a match - see if it's better than what ++ * we have already. ++ */ ++ if (got_flag <= best_flag) ++ continue; ++ ++ /* ++ * Get the cli_cert ++ */ ++ if (!getword(f, word, &newline, filename)) ++ break; ++ if (newline) ++ continue; ++ if (strcmp(word, "-") != 0) { ++ strlcpy(cli_cert, word, MAXWORDLEN); ++ } else ++ cli_cert[0] = 0; ++ ++ /* ++ * Get serv_cert ++ */ ++ if (!getword(f, word, &newline, filename)) ++ break; ++ if (newline) ++ continue; ++ if (strcmp(word, "-") != 0) { ++ strlcpy(serv_cert, word, MAXWORDLEN); ++ } else ++ serv_cert[0] = 0; ++ ++ /* ++ * Get ca_cert ++ */ ++ if (!getword(f, word, &newline, filename)) ++ break; ++ if (newline) ++ continue; ++ strlcpy(ca_cert, word, MAXWORDLEN); ++ ++ /* ++ * Get pk ++ */ ++ if (!getword(f, word, &newline, filename)) ++ break; ++ if (newline) ++ continue; ++ strlcpy(pk, word, MAXWORDLEN); ++ ++ ++ /* ++ * Now read address authorization info and make a wordlist. ++ */ ++ app = &alist; ++ for (;;) { ++ if (!getword(f, word, &newline, filename) || newline) ++ break; ++ ap = (struct wordlist *) ++ malloc(sizeof(struct wordlist) + strlen(word) + 1); ++ if (ap == NULL) ++ novm("authorized addresses"); ++ ap->word = (char *) (ap + 1); ++ strcpy(ap->word, word); ++ *app = ap; ++ app = &ap->next; ++ } ++ *app = NULL; ++ /* ++ * This is the best so far; remember it. ++ */ ++ best_flag = got_flag; ++ if (addr_list) ++ free_wordlist(addr_list); ++ addr_list = alist; ++ ++ if (!newline) ++ break; ++ } ++ ++ /* scan for a -- word indicating the start of options */ ++ for (app = &addr_list; (ap = *app) != NULL; app = &ap->next) ++ if (strcmp(ap->word, "--") == 0) ++ break; ++ /* ap = start of options */ ++ if (ap != NULL) { ++ ap = ap->next; /* first option */ ++ free(*app); /* free the "--" word */ ++ *app = NULL; /* terminate addr list */ ++ } ++ if (opts != NULL) ++ *opts = ap; ++ else if (ap != NULL) ++ free_wordlist(ap); ++ if (addrs != NULL) ++ *addrs = addr_list; ++ else if (addr_list != NULL) ++ free_wordlist(addr_list); ++ ++ return best_flag; ++} ++ ++ ++int ++get_eaptls_secret(unit, client, server, clicertfile, servcertfile, ++ cacertfile, pkfile, am_server) ++ int unit; ++ char *client; ++ char *server; ++ char *clicertfile; ++ char *servcertfile; ++ char *cacertfile; ++ char *pkfile; ++ int am_server; ++{ ++ FILE *fp; ++ int ret; ++ char *filename = NULL; ++ struct wordlist *addrs = NULL; ++ struct wordlist *opts = NULL; ++ ++ /* in client mode the ca+cert+privkey can also be specified as options */ ++ if (!am_server && cacert_file && cert_file && privkey_file ) ++ { ++ strlcpy( clicertfile, cert_file, MAXWORDLEN ); ++ strlcpy( cacertfile, cacert_file, MAXWORDLEN ); ++ strlcpy( pkfile, privkey_file, MAXWORDLEN ); ++ servcertfile[0] = '\0'; ++ } ++ else ++ { ++ filename = (am_server ? _PATH_EAPTLSSERVFILE : _PATH_EAPTLSCLIFILE); ++ addrs = NULL; ++ ++ fp = fopen(filename, "r"); ++ if (fp == NULL) ++ { ++ error("Can't open eap-tls secret file %s: %m", filename); ++ return 0; ++ } ++ ++ check_access(fp, filename); ++ ++ ret = scan_authfile_eaptls(fp, client, server, clicertfile, servcertfile, ++ cacertfile, pkfile, &addrs, &opts, filename, 0); ++ ++ fclose(fp); ++ ++ if (ret < 0) return 0; ++ } ++ ++ if (eaptls_passwd_hook) ++ { ++ dbglog( "Calling eaptls password hook" ); ++ if ( (*eaptls_passwd_hook)(pkfile, passwd) < 0) ++ { ++ error("Unable to obtain EAP-TLS password for %s (%s) from plugin", ++ client, pkfile); ++ return 0; ++ } ++ } ++ if (am_server) ++ set_allowed_addrs(unit, addrs, opts); ++ else if (opts != NULL) ++ free_wordlist(opts); ++ if (addrs != NULL) ++ free_wordlist(addrs); ++ ++ return 1; ++} ++#endif ++ +diff -Naur ppp-2.4.5/pppd/ccp.c ppp-2.4.5-eaptls-mppe-0.99/pppd/ccp.c +--- ppp-2.4.5/pppd/ccp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/ccp.c 2010-10-01 15:17:54.211272258 +0200 +@@ -540,6 +540,9 @@ + if (go->mppe) { + ccp_options *ao = &ccp_allowoptions[f->unit]; + int auth_mschap_bits = auth_done[f->unit]; ++#ifdef USE_EAPTLS ++ int auth_eap_bits = auth_done[f->unit]; ++#endif + int numbits; + + /* +@@ -567,8 +570,23 @@ + lcp_close(f->unit, "MPPE required but not available"); + return; + } ++ ++#ifdef USE_EAPTLS ++ /* ++ * MPPE is also possible in combination with EAP-TLS. ++ * It is not possible to detect if we're doing EAP or EAP-TLS ++ * at this stage, hence we accept all forms of EAP. If TLS is ++ * not used then the MPPE keys will not be derived anyway. ++ */ ++ /* Leave only the eap auth bits set */ ++ auth_eap_bits &= (EAP_WITHPEER | EAP_PEER ); ++ ++ if ((numbits == 0) && (auth_eap_bits == 0)) { ++ error("MPPE required, but MS-CHAP[v2] nor EAP-TLS auth are performed."); ++#else + if (!numbits) { +- error("MPPE required, but MS-CHAP[v2] auth not performed."); ++ error("MPPE required, but MS-CHAP[v2] auth not performed."); ++#endif + lcp_close(f->unit, "MPPE required but not available"); + return; + } +diff -Naur ppp-2.4.5/pppd/chap-md5.c ppp-2.4.5-eaptls-mppe-0.99/pppd/chap-md5.c +--- ppp-2.4.5/pppd/chap-md5.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/chap-md5.c 2010-10-01 15:17:54.212272142 +0200 +@@ -36,7 +36,11 @@ + #include "chap-new.h" + #include "chap-md5.h" + #include "magic.h" ++#ifdef USE_EAPTLS ++#include "eap-tls.h" ++#else + #include "md5.h" ++#endif /* USE_EAPTLS */ + + #define MD5_HASH_SIZE 16 + #define MD5_MIN_CHALLENGE 16 +diff -Naur ppp-2.4.5/pppd/eap-tls.c ppp-2.4.5-eaptls-mppe-0.99/pppd/eap-tls.c +--- ppp-2.4.5/pppd/eap-tls.c 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/eap-tls.c 2010-10-05 15:12:45.881615580 +0200 +@@ -0,0 +1,1174 @@ ++/* ++ * eap-tls.c - EAP-TLS implementation for PPP ++ * ++ * Copyright (c) Beniamino Galvani 2005 All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name(s) of the authors of this software must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. ++ * ++ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ */ ++ ++#include <string.h> ++#include <unistd.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++ ++#include <openssl/conf.h> ++#include <openssl/engine.h> ++#include <openssl/hmac.h> ++#include <openssl/err.h> ++#include <openssl/x509v3.h> ++ ++#include "pppd.h" ++#include "eap.h" ++#include "eap-tls.h" ++#include "fsm.h" ++#include "lcp.h" ++#include "pathnames.h" ++ ++/* The openssl configuration file and engines can be loaded only once */ ++static CONF *ssl_config = NULL; ++static ENGINE *cert_engine = NULL; ++static ENGINE *pkey_engine = NULL; ++ ++#ifdef MPPE ++ ++/* ++ * TLS PRF from RFC 2246 ++ */ ++static void P_hash(const EVP_MD *evp_md, ++ const unsigned char *secret, unsigned int secret_len, ++ const unsigned char *seed, unsigned int seed_len, ++ unsigned char *out, unsigned int out_len) ++{ ++ HMAC_CTX ctx_a, ctx_out; ++ unsigned char a[HMAC_MAX_MD_CBLOCK]; ++ unsigned int size; ++ ++ HMAC_CTX_init(&ctx_a); ++ HMAC_CTX_init(&ctx_out); ++ HMAC_Init_ex(&ctx_a, secret, secret_len, evp_md, NULL); ++ HMAC_Init_ex(&ctx_out, secret, secret_len, evp_md, NULL); ++ ++ size = HMAC_size(&ctx_out); ++ ++ /* Calculate A(1) */ ++ HMAC_Update(&ctx_a, seed, seed_len); ++ HMAC_Final(&ctx_a, a, NULL); ++ ++ while (1) { ++ /* Calculate next part of output */ ++ HMAC_Update(&ctx_out, a, size); ++ HMAC_Update(&ctx_out, seed, seed_len); ++ ++ /* Check if last part */ ++ if (out_len < size) { ++ HMAC_Final(&ctx_out, a, NULL); ++ memcpy(out, a, out_len); ++ break; ++ } ++ ++ /* Place digest in output buffer */ ++ HMAC_Final(&ctx_out, out, NULL); ++ HMAC_Init_ex(&ctx_out, NULL, 0, NULL, NULL); ++ out += size; ++ out_len -= size; ++ ++ /* Calculate next A(i) */ ++ HMAC_Init_ex(&ctx_a, NULL, 0, NULL, NULL); ++ HMAC_Update(&ctx_a, a, size); ++ HMAC_Final(&ctx_a, a, NULL); ++ } ++ ++ HMAC_CTX_cleanup(&ctx_a); ++ HMAC_CTX_cleanup(&ctx_out); ++ memset(a, 0, sizeof(a)); ++} ++ ++static void PRF(const unsigned char *secret, unsigned int secret_len, ++ const unsigned char *seed, unsigned int seed_len, ++ unsigned char *out, unsigned char *buf, unsigned int out_len) ++{ ++ unsigned int i; ++ unsigned int len = (secret_len + 1) / 2; ++ const unsigned char *s1 = secret; ++ const unsigned char *s2 = secret + (secret_len - len); ++ ++ P_hash(EVP_md5(), s1, len, seed, seed_len, out, out_len); ++ P_hash(EVP_sha1(), s2, len, seed, seed_len, buf, out_len); ++ ++ for (i=0; i < out_len; i++) { ++ out[i] ^= buf[i]; ++ } ++} ++ ++#define EAPTLS_MPPE_KEY_LEN 32 ++ ++/* ++ * Generate keys according to RFC 2716 and add to reply ++ */ ++void eaptls_gen_mppe_keys(struct eaptls_session *ets, const char *prf_label, ++ int client) ++{ ++ unsigned char out[4*EAPTLS_MPPE_KEY_LEN], buf[4*EAPTLS_MPPE_KEY_LEN]; ++ unsigned char seed[64 + 2*SSL3_RANDOM_SIZE]; ++ unsigned char *p = seed; ++ SSL *s = ets->ssl; ++ size_t prf_size; ++ ++ prf_size = strlen(prf_label); ++ ++ memcpy(p, prf_label, prf_size); ++ p += prf_size; ++ ++ memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE); ++ p += SSL3_RANDOM_SIZE; ++ prf_size += SSL3_RANDOM_SIZE; ++ ++ memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE); ++ prf_size += SSL3_RANDOM_SIZE; ++ ++ PRF(s->session->master_key, s->session->master_key_length, ++ seed, prf_size, out, buf, sizeof(out)); ++ ++ /* ++ * We now have the master send and receive keys. ++ * From these, generate the session send and receive keys. ++ * (see RFC3079 / draft-ietf-pppext-mppe-keys-03.txt for details) ++ */ ++ if (client) ++ { ++ p = out; ++ BCOPY( p, mppe_send_key, sizeof(mppe_send_key) ); ++ p += EAPTLS_MPPE_KEY_LEN; ++ BCOPY( p, mppe_recv_key, sizeof(mppe_recv_key) ); ++ } ++ else ++ { ++ p = out; ++ BCOPY( p, mppe_recv_key, sizeof(mppe_recv_key) ); ++ p += EAPTLS_MPPE_KEY_LEN; ++ BCOPY( p, mppe_send_key, sizeof(mppe_send_key) ); ++ } ++ ++ mppe_keys_set = 1; ++} ++ ++#endif ++ ++void log_ssl_errors( void ) ++{ ++ unsigned long ssl_err = ERR_get_error(); ++ ++ if (ssl_err != 0) ++ dbglog("EAP-TLS SSL error stack:"); ++ while (ssl_err != 0) { ++ dbglog( ERR_error_string( ssl_err, NULL ) ); ++ ssl_err = ERR_get_error(); ++ } ++} ++ ++ ++int password_callback (char *buf, int size, int rwflag, void *u) ++{ ++ if (buf) ++ { ++ strncpy (buf, passwd, size); ++ return strlen (buf); ++ } ++ return 0; ++} ++ ++ ++CONF *eaptls_ssl_load_config( void ) ++{ ++ CONF *config; ++ int ret_code; ++ long error_line = 33; ++ ++ config = NCONF_new( NULL ); ++ dbglog( "Loading OpenSSL config file" ); ++ ret_code = NCONF_load( config, _PATH_OPENSSLCONFFILE, &error_line ); ++ if (ret_code == 0) ++ { ++ warn( "EAP-TLS: Error in OpenSSL config file %s at line %d", _PATH_OPENSSLCONFFILE, error_line ); ++ NCONF_free( config ); ++ config = NULL; ++ ERR_clear_error(); ++ } ++ ++ dbglog( "Loading OpenSSL built-ins" ); ++ ENGINE_load_builtin_engines(); ++ OPENSSL_load_builtin_modules(); ++ ++ dbglog( "Loading OpenSSL configured modules" ); ++ if (CONF_modules_load( config, NULL, 0 ) <= 0 ) ++ { ++ warn( "EAP-TLS: Error loading OpenSSL modules" ); ++ log_ssl_errors(); ++ config = NULL; ++ } ++ ++ return config; ++} ++ ++ENGINE *eaptls_ssl_load_engine( char *engine_name ) ++{ ++ ENGINE *e = NULL; ++ ++ dbglog( "Enabling OpenSSL auto engines" ); ++ ENGINE_register_all_complete(); ++ ++ dbglog( "Loading OpenSSL '%s' engine support", engine_name ); ++ e = ENGINE_by_id( engine_name ); ++ if (!e) ++ { ++ dbglog( "EAP-TLS: Cannot load '%s' engine support, trying 'dynamic'", engine_name ); ++ e = ENGINE_by_id( "dynamic" ); ++ if (e) ++ { ++ if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine_name, 0) ++ || !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0)) ++ { ++ warn( "EAP-TLS: Error loading dynamic engine '%s'", engine_name ); ++ log_ssl_errors(); ++ ENGINE_free(e); ++ e = NULL; ++ } ++ } ++ else ++ { ++ warn( "EAP-TLS: Cannot load dynamic engine support" ); ++ } ++ } ++ ++ if (e) ++ { ++ dbglog( "Initialising engine" ); ++ if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) ++ { ++ warn( "EAP-TLS: Cannot use that engine" ); ++ log_ssl_errors(); ++ ENGINE_free(e); ++ e = NULL; ++ } ++ } ++ ++ return e; ++} ++ ++/* ++ * Initialize the SSL stacks and tests if certificates, key and crl ++ * for client or server use can be loaded. ++ */ ++SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, ++ char *certfile, char *peer_certfile, char *privkeyfile) ++{ ++ char *cert_engine_name = NULL; ++ char *cert_identifier = NULL; ++ char *pkey_engine_name = NULL; ++ char *pkey_identifier = NULL; ++ SSL_CTX *ctx; ++ X509_STORE *certstore; ++ X509_LOOKUP *lookup; ++ X509 *tmp; ++ ++ /* ++ * Without these can't continue ++ */ ++ if (!cacertfile[0]) ++ { ++ error("EAP-TLS: CA certificate missing"); ++ return NULL; ++ } ++ ++ if (!certfile[0]) ++ { ++ error("EAP-TLS: User certificate missing"); ++ return NULL; ++ } ++ ++ if (!privkeyfile[0]) ++ { ++ error("EAP-TLS: User private key missing"); ++ return NULL; ++ } ++ ++ SSL_library_init(); ++ SSL_load_error_strings(); ++ ++ ctx = SSL_CTX_new(TLSv1_method()); ++ ++ if (!ctx) { ++ error("EAP-TLS: Cannot initialize SSL CTX context"); ++ goto fail; ++ } ++ ++ /* if the certificate filename is of the form engine:id. e.g. ++ pkcs11:12345 ++ then we try to load and use this engine. ++ If the certificate filename starts with a / or . then we ++ ALWAYS assume it is a file and not an engine/pkcs11 identifier ++ */ ++ if ( index( certfile, '/' ) == NULL && index( certfile, '.') == NULL ) ++ { ++ cert_identifier = index( certfile, ':' ); ++ ++ if (cert_identifier) ++ { ++ cert_engine_name = certfile; ++ *cert_identifier = '\0'; ++ cert_identifier++; ++ ++ dbglog( "Found certificate engine '%s'", cert_engine_name ); ++ dbglog( "Found certificate identifier '%s'", cert_identifier ); ++ } ++ } ++ ++ /* if the privatekey filename is of the form engine:id. e.g. ++ pkcs11:12345 ++ then we try to load and use this engine. ++ If the privatekey filename starts with a / or . then we ++ ALWAYS assume it is a file and not an engine/pkcs11 identifier ++ */ ++ if ( index( privkeyfile, '/' ) == NULL && index( privkeyfile, '.') == NULL ) ++ { ++ pkey_identifier = index( privkeyfile, ':' ); ++ ++ if (pkey_identifier) ++ { ++ pkey_engine_name = privkeyfile; ++ *pkey_identifier = '\0'; ++ pkey_identifier++; ++ ++ dbglog( "Found privatekey engine '%s'", pkey_engine_name ); ++ dbglog( "Found privatekey identifier '%s'", pkey_identifier ); ++ } ++ } ++ ++ if (cert_identifier && pkey_identifier) ++ { ++ if (strlen( cert_identifier ) == 0) ++ { ++ if (strlen( pkey_identifier ) == 0) ++ error( "EAP-TLS: both the certificate and privatekey identifiers are missing!" ); ++ else ++ { ++ dbglog( "Substituting privatekey identifier for certificate identifier" ); ++ cert_identifier = pkey_identifier; ++ } ++ } ++ else ++ { ++ if (strlen( pkey_identifier ) == 0) ++ { ++ dbglog( "Substituting certificate identifier for privatekey identifier" ); ++ pkey_identifier = cert_identifier; ++ } ++ } ++ ++ } ++ ++ /* load the openssl config file only once */ ++ if (!ssl_config) ++ { ++ if (cert_engine_name || pkey_engine_name) ++ ssl_config = eaptls_ssl_load_config(); ++ ++ if (ssl_config && cert_engine_name) ++ cert_engine = eaptls_ssl_load_engine( cert_engine_name ); ++ ++ if (ssl_config && pkey_engine_name) ++ { ++ /* don't load the same engine twice */ ++ if ( strcmp( cert_engine_name, pkey_engine_name) == 0 ) ++ pkey_engine = cert_engine; ++ else ++ pkey_engine = eaptls_ssl_load_engine( pkey_engine_name ); ++ } ++ } ++ ++ SSL_CTX_set_default_passwd_cb (ctx, password_callback); ++ ++ if (!SSL_CTX_load_verify_locations(ctx, cacertfile, NULL)) ++ { ++ error("EAP-TLS: Cannot load or verify CA file %s", cacertfile); ++ goto fail; ++ } ++ ++ if (init_server) ++ SSL_CTX_set_client_CA_list(ctx, SSL_load_client_CA_file(cacertfile)); ++ ++ if (cert_engine) ++ { ++ struct ++ { ++ const char *s_slot_cert_id; ++ X509 *cert; ++ } cert_info; ++ ++ cert_info.s_slot_cert_id = cert_identifier; ++ cert_info.cert = NULL; ++ ++ if (!ENGINE_ctrl_cmd( cert_engine, "LOAD_CERT_CTRL", 0, &cert_info, NULL, 0 ) ) ++ { ++ error( "EAP-TLS: Error loading certificate with id '%s' from engine", cert_identifier ); ++ goto fail; ++ } ++ ++ if (cert_info.cert) ++ { ++ dbglog( "Got the certificate, adding it to SSL context" ); ++ dbglog( "subject = %s", X509_NAME_oneline( X509_get_subject_name( cert_info.cert ), NULL, 0 ) ); ++ if (SSL_CTX_use_certificate(ctx, cert_info.cert) <= 0) ++ { ++ error("EAP-TLS: Cannot use PKCS11 certificate %s", cert_identifier); ++ goto fail; ++ } ++ } ++ else ++ { ++ warn("EAP-TLS: Cannot load PKCS11 key %s", cert_identifier); ++ log_ssl_errors(); ++ } ++ } ++ else ++ { ++ if (!SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM)) ++ { ++ error( "EAP-TLS: Cannot use public certificate %s", certfile ); ++ goto fail; ++ } ++ } ++ ++ if (pkey_engine) ++ { ++ EVP_PKEY *pkey = NULL; ++ PW_CB_DATA cb_data; ++ ++ cb_data.password = passwd; ++ cb_data.prompt_info = pkey_identifier; ++ ++ dbglog( "Loading private key '%s' from engine", pkey_identifier ); ++ pkey = ENGINE_load_private_key(pkey_engine, pkey_identifier, NULL, &cb_data); ++ if (pkey) ++ { ++ dbglog( "Got the private key, adding it to SSL context" ); ++ if (SSL_CTX_use_PrivateKey(ctx, pkey) <= 0) ++ { ++ error("EAP-TLS: Cannot use PKCS11 key %s", pkey_identifier); ++ goto fail; ++ } ++ } ++ else ++ { ++ warn("EAP-TLS: Cannot load PKCS11 key %s", pkey_identifier); ++ log_ssl_errors(); ++ } ++ } ++ else ++ { ++ if (!SSL_CTX_use_PrivateKey_file(ctx, privkeyfile, SSL_FILETYPE_PEM)) ++ { ++ error("EAP-TLS: Cannot use private key %s", privkeyfile); ++ goto fail; ++ } ++ } ++ ++ if (SSL_CTX_check_private_key(ctx) != 1) { ++ error("EAP-TLS: Private key %s fails security check", privkeyfile); ++ goto fail; ++ } ++ ++ SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); ++ SSL_CTX_set_verify_depth(ctx, 5); ++ SSL_CTX_set_verify(ctx, ++ SSL_VERIFY_PEER | ++ SSL_VERIFY_FAIL_IF_NO_PEER_CERT, ++ &ssl_verify_callback); ++ ++ if (crl_dir) { ++ if (!(certstore = SSL_CTX_get_cert_store(ctx))) { ++ error("EAP-TLS: Failed to get certificate store"); ++ goto fail; ++ } ++ ++ if (!(lookup = ++ X509_STORE_add_lookup(certstore, X509_LOOKUP_hash_dir()))) { ++ error("EAP-TLS: Store lookup for CRL failed"); ++ ++ goto fail; ++ } ++ ++ X509_LOOKUP_add_dir(lookup, crl_dir, X509_FILETYPE_PEM); ++ X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK); ++ } ++ ++ /* ++ * If a peer certificate file was specified, it must be valid, else fail ++ */ ++ if (peer_certfile[0]) { ++ if (!(tmp = get_X509_from_file(peer_certfile))) { ++ error("EAP-TLS: Error loading client certificate from file %s", ++ peer_certfile); ++ goto fail; ++ } ++ X509_free(tmp); ++ } ++ ++ return ctx; ++ ++fail: ++ log_ssl_errors(); ++ SSL_CTX_free(ctx); ++ return NULL; ++} ++ ++/* ++ * Determine the maximum packet size by looking at the LCP handshake ++ */ ++ ++int eaptls_get_mtu(int unit) ++{ ++ int mtu, mru; ++ ++ lcp_options *wo = &lcp_wantoptions[unit]; ++ lcp_options *go = &lcp_gotoptions[unit]; ++ lcp_options *ho = &lcp_hisoptions[unit]; ++ lcp_options *ao = &lcp_allowoptions[unit]; ++ ++ mtu = ho->neg_mru? ho->mru: PPP_MRU; ++ mru = go->neg_mru? MAX(wo->mru, go->mru): PPP_MRU; ++ mtu = MIN(MIN(mtu, mru), ao->mru)- PPP_HDRLEN - 10; ++ ++ dbglog("MTU = %d", mtu); ++ return mtu; ++} ++ ++ ++/* ++ * Init the ssl handshake (server mode) ++ */ ++int eaptls_init_ssl_server(eap_state * esp) ++{ ++ struct eaptls_session *ets; ++ char servcertfile[MAXWORDLEN]; ++ char clicertfile[MAXWORDLEN]; ++ char cacertfile[MAXWORDLEN]; ++ char pkfile[MAXWORDLEN]; ++ /* ++ * Allocate new eaptls session ++ */ ++ esp->es_server.ea_session = malloc(sizeof(struct eaptls_session)); ++ if (!esp->es_server.ea_session) ++ fatal("Allocation error"); ++ ets = esp->es_server.ea_session; ++ ++ if (!esp->es_server.ea_peer) { ++ error("EAP-TLS: Error: client name not set (BUG)"); ++ return 0; ++ } ++ ++ strncpy(ets->peer, esp->es_server.ea_peer, MAXWORDLEN); ++ ++ dbglog( "getting eaptls secret" ); ++ if (!get_eaptls_secret(esp->es_unit, esp->es_server.ea_peer, ++ esp->es_server.ea_name, clicertfile, ++ servcertfile, cacertfile, pkfile, 1)) { ++ error( "EAP-TLS: Cannot get secret/password for client \"%s\", server \"%s\"", ++ esp->es_server.ea_peer, esp->es_server.ea_name ); ++ return 0; ++ } ++ ++ ets->mtu = eaptls_get_mtu(esp->es_unit); ++ ++ ets->ctx = eaptls_init_ssl(1, cacertfile, servcertfile, clicertfile, pkfile); ++ if (!ets->ctx) ++ goto fail; ++ ++ if (!(ets->ssl = SSL_new(ets->ctx))) ++ goto fail; ++ ++ /* ++ * Set auto-retry to avoid timeouts on BIO_read ++ */ ++ SSL_set_mode(ets->ssl, SSL_MODE_AUTO_RETRY); ++ ++ /* ++ * Initialize the BIOs we use to read/write to ssl engine ++ */ ++ ets->into_ssl = BIO_new(BIO_s_mem()); ++ ets->from_ssl = BIO_new(BIO_s_mem()); ++ SSL_set_bio(ets->ssl, ets->into_ssl, ets->from_ssl); ++ ++ SSL_set_msg_callback(ets->ssl, ssl_msg_callback); ++ SSL_set_msg_callback_arg(ets->ssl, ets); ++ ++ /* ++ * Attach the session struct to the connection, so we can later ++ * retrieve it when doing certificate verification ++ */ ++ SSL_set_ex_data(ets->ssl, 0, ets); ++ ++ SSL_set_accept_state(ets->ssl); ++ ++ ets->data = NULL; ++ ets->datalen = 0; ++ ets->alert_sent = 0; ++ ets->alert_recv = 0; ++ ++ /* ++ * If we specified the client certificate file, store it in ets->peercertfile, ++ * so we can check it later in ssl_verify_callback() ++ */ ++ if (clicertfile[0]) ++ strncpy(&ets->peercertfile[0], clicertfile, MAXWORDLEN); ++ else ++ ets->peercertfile[0] = 0; ++ ++ return 1; ++ ++fail: ++ SSL_CTX_free(ets->ctx); ++ return 0; ++} ++ ++/* ++ * Init the ssl handshake (client mode) ++ */ ++int eaptls_init_ssl_client(eap_state * esp) ++{ ++ struct eaptls_session *ets; ++ char servcertfile[MAXWORDLEN]; ++ char clicertfile[MAXWORDLEN]; ++ char cacertfile[MAXWORDLEN]; ++ char pkfile[MAXWORDLEN]; ++ ++ /* ++ * Allocate new eaptls session ++ */ ++ esp->es_client.ea_session = malloc(sizeof(struct eaptls_session)); ++ if (!esp->es_client.ea_session) ++ fatal("Allocation error"); ++ ets = esp->es_client.ea_session; ++ ++ /* ++ * If available, copy server name in ets; it will be used in cert ++ * verify ++ */ ++ if (esp->es_client.ea_peer) ++ strncpy(ets->peer, esp->es_client.ea_peer, MAXWORDLEN); ++ else ++ ets->peer[0] = 0; ++ ++ ets->mtu = eaptls_get_mtu(esp->es_unit); ++ ++ dbglog( "calling get_eaptls_secret" ); ++ if (!get_eaptls_secret(esp->es_unit, esp->es_client.ea_name, ++ esp->es_client.ea_peer, clicertfile, ++ servcertfile, cacertfile, pkfile, 0)) { ++ error( "EAP-TLS: Cannot get secret/password for client \"%s\", server \"%s\"", ++ esp->es_client.ea_name, esp->es_client.ea_peer ); ++ return 0; ++ } ++ ++ dbglog( "calling eaptls_init_ssl" ); ++ ets->ctx = eaptls_init_ssl(0, cacertfile, clicertfile, servcertfile, pkfile); ++ if (!ets->ctx) ++ goto fail; ++ ++ ets->ssl = SSL_new(ets->ctx); ++ ++ if (!ets->ssl) ++ goto fail; ++ ++ /* ++ * Initialize the BIOs we use to read/write to ssl engine ++ */ ++ dbglog( "Initializing SSL BIOs" ); ++ ets->into_ssl = BIO_new(BIO_s_mem()); ++ ets->from_ssl = BIO_new(BIO_s_mem()); ++ SSL_set_bio(ets->ssl, ets->into_ssl, ets->from_ssl); ++ ++ SSL_set_msg_callback(ets->ssl, ssl_msg_callback); ++ SSL_set_msg_callback_arg(ets->ssl, ets); ++ ++ /* ++ * Attach the session struct to the connection, so we can later ++ * retrieve it when doing certificate verification ++ */ ++ SSL_set_ex_data(ets->ssl, 0, ets); ++ ++ SSL_set_connect_state(ets->ssl); ++ ++ ets->data = NULL; ++ ets->datalen = 0; ++ ets->alert_sent = 0; ++ ets->alert_recv = 0; ++ ++ /* ++ * If we specified the server certificate file, store it in ++ * ets->peercertfile, so we can check it later in ++ * ssl_verify_callback() ++ */ ++ if (servcertfile[0]) ++ strncpy(ets->peercertfile, servcertfile, MAXWORDLEN); ++ else ++ ets->peercertfile[0] = 0; ++ ++ return 1; ++ ++fail: ++ dbglog( "eaptls_init_ssl_client: fail" ); ++ SSL_CTX_free(ets->ctx); ++ return 0; ++ ++} ++ ++void eaptls_free_session(struct eaptls_session *ets) ++{ ++ if (ets->ssl) ++ SSL_free(ets->ssl); ++ ++ if (ets->ctx) ++ SSL_CTX_free(ets->ctx); ++ ++ free(ets); ++} ++ ++/* ++ * Handle a received packet, reassembling fragmented messages and ++ * passing them to the ssl engine ++ */ ++int eaptls_receive(struct eaptls_session *ets, u_char * inp, int len) ++{ ++ u_char flags; ++ u_int tlslen; ++ u_char dummy[65536]; ++ ++ GETCHAR(flags, inp); ++ len--; ++ ++ if (flags & EAP_TLS_FLAGS_LI && !ets->data) { ++ ++ /* ++ * This is the first packet of a message ++ */ ++ ++ GETLONG(tlslen, inp); ++ len -= 4; ++ ++ if (tlslen > EAP_TLS_MAX_LEN) { ++ error("Error: tls message length > %d, truncated", ++ EAP_TLS_MAX_LEN); ++ tlslen = EAP_TLS_MAX_LEN; ++ } ++ ++ /* ++ * Allocate memory for the whole message ++ */ ++ ets->data = malloc(tlslen); ++ if (!ets->data) ++ fatal("EAP TLS: allocation error\n"); ++ ++ ets->datalen = 0; ++ ets->tlslen = tlslen; ++ ++ } ++ else if (flags & EAP_TLS_FLAGS_LI && ets->data) { ++ /* ++ * Non first with LI (strange...) ++ */ ++ ++ GETLONG(tlslen, inp); ++ len -= 4; ++ ++ } ++ else if (!ets->data) { ++ /* ++ * A non fragmented message without LI flag ++ */ ++ ++ ets->data = malloc(len); ++ if (!ets->data) ++ fatal("EAP TLS: allocation error\n"); ++ ++ ets->datalen = 0; ++ ets->tlslen = len; ++ } ++ ++ if (flags & EAP_TLS_FLAGS_MF) ++ ets->frag = 1; ++ else ++ ets->frag = 0; ++ ++ if (len + ets->datalen > ets->tlslen) { ++ warn("EAP TLS: received data > TLS message length"); ++ return 1; ++ } ++ ++ BCOPY(inp, ets->data + ets->datalen, len); ++ ets->datalen += len; ++ ++ if (!ets->frag) { ++ ++ /* ++ * If we have the whole message, pass it to ssl ++ */ ++ ++ if (ets->datalen != ets->tlslen) { ++ warn("EAP TLS: received data != TLS message length"); ++ return 1; ++ } ++ ++ if (BIO_write(ets->into_ssl, ets->data, ets->datalen) == -1) ++ log_ssl_errors(); ++ ++ SSL_read(ets->ssl, dummy, 65536); ++ ++ free(ets->data); ++ ets->data = NULL; ++ ets->datalen = 0; ++ } ++ ++ return 0; ++} ++ ++/* ++ * Return an eap-tls packet in outp. ++ * A TLS message read from the ssl engine is buffered in ets->data. ++ * At each call we control if there is buffered data and send a ++ * packet of mtu bytes. ++ */ ++int eaptls_send(struct eaptls_session *ets, u_char ** outp) ++{ ++ bool first = 0; ++ int size; ++ u_char fromtls[65536]; ++ int res; ++ u_char *start; ++ ++ start = *outp; ++ ++ if (!ets->data) { ++ ++ if(!ets->alert_sent) ++ SSL_read(ets->ssl, fromtls, 65536); ++ ++ /* ++ * Read from ssl ++ */ ++ if ((res = BIO_read(ets->from_ssl, fromtls, 65536)) == -1) ++ fatal("No data from BIO_read"); ++ ++ ets->datalen = res; ++ ++ ets->data = malloc(ets->datalen); ++ BCOPY(fromtls, ets->data, ets->datalen); ++ ++ ets->offset = 0; ++ first = 1; ++ ++ } ++ ++ size = ets->datalen - ets->offset; ++ ++ if (size > ets->mtu) { ++ size = ets->mtu; ++ ets->frag = 1; ++ } else ++ ets->frag = 0; ++ ++ PUTCHAR(EAPT_TLS, *outp); ++ ++ /* ++ * Set right flags and length if necessary ++ */ ++ if (ets->frag && first) { ++ PUTCHAR(EAP_TLS_FLAGS_LI | EAP_TLS_FLAGS_MF, *outp); ++ PUTLONG(ets->datalen, *outp); ++ } else if (ets->frag) { ++ PUTCHAR(EAP_TLS_FLAGS_MF, *outp); ++ } else ++ PUTCHAR(0, *outp); ++ ++ /* ++ * Copy the data in outp ++ */ ++ BCOPY(ets->data + ets->offset, *outp, size); ++ INCPTR(size, *outp); ++ ++ /* ++ * Copy the packet in retransmission buffer ++ */ ++ BCOPY(start, &ets->rtx[0], *outp - start); ++ ets->rtx_len = *outp - start; ++ ++ ets->offset += size; ++ ++ if (ets->offset >= ets->datalen) { ++ ++ /* ++ * The whole message has been sent ++ */ ++ ++ free(ets->data); ++ ets->data = NULL; ++ ets->datalen = 0; ++ ets->offset = 0; ++ } ++ ++ return 0; ++} ++ ++/* ++ * Get the sent packet from the retransmission buffer ++ */ ++void eaptls_retransmit(struct eaptls_session *ets, u_char ** outp) ++{ ++ BCOPY(ets->rtx, *outp, ets->rtx_len); ++ INCPTR(ets->rtx_len, *outp); ++} ++ ++/* ++ * Verify a certificate. ++ * Most of the work (signatures and issuer attributes checking) ++ * is done by ssl; we check the CN in the peer certificate ++ * against the peer name. ++ */ ++int ssl_verify_callback(int preverify_ok, X509_STORE_CTX * ctx) ++{ ++ char subject[256]; ++ char cn_str[256]; ++ X509 *peer_cert; ++ int err, depth; ++ int ok = preverify_ok; ++ SSL *ssl; ++ struct eaptls_session *ets; ++ ++ peer_cert = X509_STORE_CTX_get_current_cert(ctx); ++ err = X509_STORE_CTX_get_error(ctx); ++ depth = X509_STORE_CTX_get_error_depth(ctx); ++ ++ dbglog("certificate verify depth: %d", depth); ++ ++ if (auth_required && !ok) { ++ X509_NAME_oneline(X509_get_subject_name(peer_cert), ++ subject, 256); ++ ++ X509_NAME_get_text_by_NID(X509_get_subject_name(peer_cert), ++ NID_commonName, cn_str, 256); ++ ++ dbglog("Certificate verification error:\n depth: %d CN: %s" ++ "\n err: %d (%s)\n", depth, cn_str, err, ++ X509_verify_cert_error_string(err)); ++ ++ return 0; ++ } ++ ++ ssl = X509_STORE_CTX_get_ex_data(ctx, ++ SSL_get_ex_data_X509_STORE_CTX_idx()); ++ ++ ets = (struct eaptls_session *)SSL_get_ex_data(ssl, 0); ++ ++ if (ets == NULL) { ++ error("Error: SSL_get_ex_data returned NULL"); ++ return 0; ++ } ++ ++ log_ssl_errors(); ++ ++ if (!depth) { /* This is the peer certificate */ ++ ++ X509_NAME_oneline(X509_get_subject_name(peer_cert), ++ subject, 256); ++ ++ X509_NAME_get_text_by_NID(X509_get_subject_name(peer_cert), ++ NID_commonName, cn_str, 256); ++ ++ /* ++ * If acting as client and the name of the server wasn't specified ++ * explicitely, we can't verify the server authenticity ++ */ ++ if (!ets->peer[0]) { ++ warn("Peer name not specified: no check"); ++ return 1; ++ } ++ ++ /* ++ * Check the CN ++ */ ++ if (strcmp(cn_str, ets->peer)) { ++ error ++ ("Certificate verification error: CN (%s) != peer_name (%s)", ++ cn_str, ets->peer); ++ return 0; ++ } ++ ++ warn("Certificate CN: %s , peer name %s", cn_str, ets->peer); ++ ++ /* ++ * If a peer certificate file was specified, here we check it ++ */ ++ if (ets->peercertfile[0]) { ++ if (ssl_cmp_certs(&ets->peercertfile[0], peer_cert) ++ != 0) { ++ error ++ ("Peer certificate doesn't match stored certificate"); ++ return 0; ++ } ++ } ++ } ++ ++ return 1; ++} ++ ++/* ++ * Compare a certificate with the one stored in a file ++ */ ++int ssl_cmp_certs(char *filename, X509 * a) ++{ ++ X509 *b; ++ int ret; ++ ++ if (!(b = get_X509_from_file(filename))) ++ return 1; ++ ++ ret = X509_cmp(a, b); ++ X509_free(b); ++ ++ return ret; ++ ++} ++ ++X509 *get_X509_from_file(char *filename) ++{ ++ FILE *fp; ++ X509 *ret; ++ ++ if (!(fp = fopen(filename, "r"))) ++ return NULL; ++ ++ ret = PEM_read_X509(fp, NULL, NULL, NULL); ++ ++ fclose(fp); ++ ++ return ret; ++} ++ ++/* ++ * Every sent & received message this callback function is invoked, ++ * so we know when alert messages have arrived or are sent and ++ * we can print debug information about TLS handshake. ++ */ ++void ++ssl_msg_callback(int write_p, int version, int content_type, ++ const void *buf, size_t len, SSL * ssl, void *arg) ++{ ++ char string[256]; ++ struct eaptls_session *ets = (struct eaptls_session *)arg; ++ unsigned char code; ++ ++ if(write_p) ++ strcpy(string, " -> "); ++ else ++ strcpy(string, " <- "); ++ ++ ++ switch(content_type) { ++ ++ case SSL3_RT_ALERT: ++ strcat(string, "Alert: "); ++ code = ((const unsigned char *)buf)[1]; ++ ++ if (write_p) { ++ ets->alert_sent = 1; ++ ets->alert_sent_desc = code; ++ } else { ++ ets->alert_recv = 1; ++ ets->alert_recv_desc = code; ++ } ++ ++ strcat(string, SSL_alert_desc_string_long(code)); ++ break; ++ ++ case SSL3_RT_CHANGE_CIPHER_SPEC: ++ strcat(string, "ChangeCipherSpec"); ++ break; ++ ++ case SSL3_RT_HANDSHAKE: ++ ++ strcat(string, "Handshake: "); ++ code = ((const unsigned char *)buf)[0]; ++ ++ switch(code) { ++ case SSL3_MT_HELLO_REQUEST: ++ strcat(string,"Hello Request"); ++ break; ++ case SSL3_MT_CLIENT_HELLO: ++ strcat(string,"Client Hello"); ++ break; ++ case SSL3_MT_SERVER_HELLO: ++ strcat(string,"Server Hello"); ++ break; ++ case SSL3_MT_CERTIFICATE: ++ strcat(string,"Certificate"); ++ break; ++ case SSL3_MT_SERVER_KEY_EXCHANGE: ++ strcat(string,"Server Key Exchange"); ++ break; ++ case SSL3_MT_CERTIFICATE_REQUEST: ++ strcat(string,"Certificate Request"); ++ break; ++ case SSL3_MT_SERVER_DONE: ++ strcat(string,"Server Hello Done"); ++ break; ++ case SSL3_MT_CERTIFICATE_VERIFY: ++ strcat(string,"Certificate Verify"); ++ break; ++ case SSL3_MT_CLIENT_KEY_EXCHANGE: ++ strcat(string,"Client Key Exchange"); ++ break; ++ case SSL3_MT_FINISHED: ++ strcat(string,"Finished"); ++ break; ++ ++ default: ++ sprintf( string, "Handshake: Unknown SSL3 code received: %d", code ); ++ } ++ break; ++ ++ default: ++ sprintf( string, "SSL message contains unknown content type: %d", content_type ); ++ ++ } ++ ++ /* Alert messages must always be displayed */ ++ if(content_type == SSL3_RT_ALERT) ++ error("%s", string); ++ else ++ dbglog("%s", string); ++} ++ +diff -Naur ppp-2.4.5/pppd/eap-tls.h ppp-2.4.5-eaptls-mppe-0.99/pppd/eap-tls.h +--- ppp-2.4.5/pppd/eap-tls.h 1970-01-01 01:00:00.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/eap-tls.h 2010-10-01 15:17:54.213271816 +0200 +@@ -0,0 +1,107 @@ ++/* ++ * eap-tls.h ++ * ++ * Copyright (c) Beniamino Galvani 2005 All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name(s) of the authors of this software must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. ++ * ++ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ */ ++ ++#ifndef __EAP_TLS_H__ ++#define __EAP_TLS_H__ ++ ++#include "eap.h" ++ ++#include <openssl/ssl.h> ++#include <openssl/bio.h> ++#include <openssl/md5.h> ++ ++#define EAP_TLS_FLAGS_LI 128 /* length included flag */ ++#define EAP_TLS_FLAGS_MF 64 /* more fragments flag */ ++#define EAP_TLS_FLAGS_START 32 /* start flag */ ++ ++#define EAP_TLS_MAX_LEN 65536 /* max eap tls packet size */ ++ ++struct eaptls_session ++{ ++ u_char *data; /* buffered data */ ++ int datalen; /* buffered data len */ ++ int offset; /* from where to send */ ++ int tlslen; /* total length of tls data */ ++ bool frag; /* packet is fragmented */ ++ SSL_CTX *ctx; ++ SSL *ssl; /* ssl connection */ ++ BIO *from_ssl; ++ BIO *into_ssl; ++ char peer[MAXWORDLEN]; /* peer name */ ++ char peercertfile[MAXWORDLEN]; ++ bool alert_sent; ++ u_char alert_sent_desc; ++ bool alert_recv; ++ u_char alert_recv_desc; ++ char rtx[65536]; /* retransmission buffer */ ++ int rtx_len; ++ int mtu; /* unit mtu */ ++}; ++ ++typedef struct pw_cb_data ++{ ++ const void *password; ++ const char *prompt_info; ++} PW_CB_DATA; ++ ++ ++int ssl_verify_callback(int, X509_STORE_CTX *); ++void ssl_msg_callback(int write_p, int version, int ct, const void *buf, ++ size_t len, SSL * ssl, void *arg); ++ ++X509 *get_X509_from_file(char *filename); ++int ssl_cmp_certs(char *filename, X509 * a); ++ ++SSL_CTX *eaptls_init_ssl(int init_server, char *cacertfile, ++ char *certfile, char *peer_certfile, char *privkeyfile); ++int eaptls_init_ssl_server(eap_state * esp); ++int eaptls_init_ssl_client(eap_state * esp); ++void eaptls_free_session(struct eaptls_session *ets); ++ ++int eaptls_receive(struct eaptls_session *ets, u_char * inp, int len); ++int eaptls_send(struct eaptls_session *ets, u_char ** outp); ++void eaptls_retransmit(struct eaptls_session *ets, u_char ** outp); ++ ++int get_eaptls_secret(int unit, char *client, char *server, ++ char *clicertfile, char *servcertfile, char *cacertfile, ++ char *pkfile, int am_server); ++ ++#ifdef MPPE ++#include "mppe.h" /* MPPE_MAX_KEY_LEN */ ++extern u_char mppe_send_key[MPPE_MAX_KEY_LEN]; ++extern u_char mppe_recv_key[MPPE_MAX_KEY_LEN]; ++extern int mppe_keys_set; ++ ++void eaptls_gen_mppe_keys(struct eaptls_session *ets, const char *prf_label, int client); ++ ++#endif ++ ++#endif +diff -Naur ppp-2.4.5/pppd/eap.c ppp-2.4.5-eaptls-mppe-0.99/pppd/eap.c +--- ppp-2.4.5/pppd/eap.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/eap.c 2010-01-29 16:31:29.000000000 +0100 +@@ -43,6 +43,11 @@ + * Based on draft-ietf-pppext-eap-srp-03.txt. + */ + ++/* ++ * Modification by Beniamino Galvani, Mar 2005 ++ * Implemented EAP-TLS authentication ++ */ ++ + #define RCSID "$Id: eap.c,v 1.4 2004/11/09 22:39:25 paulus Exp $" + + /* +@@ -62,8 +67,12 @@ + + #include "pppd.h" + #include "pathnames.h" +-#include "md5.h" + #include "eap.h" ++#ifdef USE_EAPTLS ++#include "eap-tls.h" ++#else ++#include "md5.h" ++#endif /* USE_EAPTLS */ + + #ifdef USE_SRP + #include <t_pwd.h> +@@ -209,6 +218,9 @@ + esp->es_server.ea_id = (u_char)(drand48() * 0x100); + esp->es_client.ea_timeout = EAP_DEFREQTIME; + esp->es_client.ea_maxrequests = EAP_DEFALLOWREQ; ++#ifdef USE_EAPTLS ++ esp->es_client.ea_using_eaptls = 0; ++#endif /* USE_EAPTLS */ + } + + /* +@@ -436,8 +448,16 @@ + u_char vals[2]; + struct b64state bs; + #endif /* USE_SRP */ ++#ifdef USE_EAPTLS ++ struct eaptls_session *ets; ++ int secret_len; ++ char secret[MAXWORDLEN]; ++#endif /* USE_EAPTLS */ + + esp->es_server.ea_timeout = esp->es_savedtime; ++#ifdef USE_EAPTLS ++ esp->es_server.ea_prev_state = esp->es_server.ea_state; ++#endif /* USE_EAPTLS */ + switch (esp->es_server.ea_state) { + case eapBadAuth: + return; +@@ -562,9 +582,81 @@ + break; + } + #endif /* USE_SRP */ ++#ifdef USE_EAPTLS ++ if (!get_secret(esp->es_unit, esp->es_server.ea_peer, ++ esp->es_server.ea_name, secret, &secret_len, 1)) { ++ ++ esp->es_server.ea_state = eapTlsStart; ++ break; ++ } ++#endif /* USE_EAPTLS */ ++ + esp->es_server.ea_state = eapMD5Chall; + break; + ++#ifdef USE_EAPTLS ++ case eapTlsStart: ++ /* Initialize ssl session */ ++ if(!eaptls_init_ssl_server(esp)) { ++ esp->es_server.ea_state = eapBadAuth; ++ break; ++ } ++ ++ esp->es_server.ea_state = eapTlsRecv; ++ break; ++ ++ case eapTlsRecv: ++ ets = (struct eaptls_session *) esp->es_server.ea_session; ++ ++ if(ets->alert_sent) { ++ esp->es_server.ea_state = eapTlsSendAlert; ++ break; ++ } ++ ++ if (status) { ++ esp->es_server.ea_state = eapBadAuth; ++ break; ++ } ++ ets = (struct eaptls_session *) esp->es_server.ea_session; ++ ++ if(ets->frag) ++ esp->es_server.ea_state = eapTlsSendAck; ++ else ++ esp->es_server.ea_state = eapTlsSend; ++ break; ++ ++ case eapTlsSend: ++ ets = (struct eaptls_session *) esp->es_server.ea_session; ++ ++ if(SSL_is_init_finished(ets->ssl)) { ++ esp->es_server.ea_state = eapTlsRecvClient; ++ break; ++ } ++ ++ if(ets->frag) ++ esp->es_server.ea_state = eapTlsRecvAck; ++ else ++ esp->es_server.ea_state = eapTlsRecv; ++ break; ++ ++ case eapTlsSendAck: ++ esp->es_server.ea_state = eapTlsRecv; ++ break; ++ ++ case eapTlsRecvAck: ++ if (status) { ++ esp->es_server.ea_state = eapBadAuth; ++ break; ++ } ++ ++ esp->es_server.ea_state = eapTlsSend; ++ break; ++ ++ case eapTlsSendAlert: ++ esp->es_server.ea_state = eapTlsRecvAlertAck; ++ break; ++#endif /* USE_EAPTLS */ ++ + case eapSRP1: + #ifdef USE_SRP + ts = (struct t_server *)esp->es_server.ea_session; +@@ -718,6 +810,30 @@ + INCPTR(esp->es_server.ea_namelen, outp); + break; + ++#ifdef USE_EAPTLS ++ case eapTlsStart: ++ PUTCHAR(EAPT_TLS, outp); ++ PUTCHAR(EAP_TLS_FLAGS_START, outp); ++ eap_figure_next_state(esp, 0); ++ break; ++ ++ case eapTlsSend: ++ eaptls_send(esp->es_server.ea_session, &outp); ++ eap_figure_next_state(esp, 0); ++ break; ++ ++ case eapTlsSendAck: ++ PUTCHAR(EAPT_TLS, outp); ++ PUTCHAR(0, outp); ++ eap_figure_next_state(esp, 0); ++ break; ++ ++ case eapTlsSendAlert: ++ eaptls_send(esp->es_server.ea_session, &outp); ++ eap_figure_next_state(esp, 0); ++ break; ++#endif /* USE_EAPTLS */ ++ + #ifdef USE_SRP + case eapSRP1: + PUTCHAR(EAPT_SRP, outp); +@@ -904,11 +1020,57 @@ + eap_server_timeout(arg) + void *arg; + { ++#ifdef USE_EAPTLS ++ u_char *outp; ++ u_char *lenloc; ++ int outlen; ++#endif /* USE_EAPTLS */ ++ + eap_state *esp = (eap_state *) arg; + + if (!eap_server_active(esp)) + return; + ++#ifdef USE_EAPTLS ++ switch(esp->es_server.ea_prev_state) { ++ ++ /* ++ * In eap-tls the state changes after a request, so we return to ++ * previous state ... ++ */ ++ case(eapTlsStart): ++ case(eapTlsSendAck): ++ esp->es_server.ea_state = esp->es_server.ea_prev_state; ++ break; ++ ++ /* ++ * ... or resend the stored data ++ */ ++ case(eapTlsSend): ++ case(eapTlsSendAlert): ++ outp = outpacket_buf; ++ MAKEHEADER(outp, PPP_EAP); ++ PUTCHAR(EAP_REQUEST, outp); ++ PUTCHAR(esp->es_server.ea_id, outp); ++ lenloc = outp; ++ INCPTR(2, outp); ++ ++ eaptls_retransmit(esp->es_server.ea_session, &outp); ++ ++ outlen = (outp - outpacket_buf) - PPP_HDRLEN; ++ PUTSHORT(outlen, lenloc); ++ output(esp->es_unit, outpacket_buf, outlen + PPP_HDRLEN); ++ esp->es_server.ea_requests++; ++ ++ if (esp->es_server.ea_timeout > 0) ++ TIMEOUT(eap_server_timeout, esp, esp->es_server.ea_timeout); ++ ++ return; ++ default: ++ break; ++ } ++#endif /* USE_EAPTLS */ ++ + /* EAP ID number must not change on timeout. */ + eap_send_request(esp); + } +@@ -1166,6 +1328,81 @@ + } + #endif /* USE_SRP */ + ++#ifdef USE_EAPTLS ++/* ++ * Send an EAP-TLS response message with tls data ++ */ ++static void ++eap_tls_response(esp, id) ++eap_state *esp; ++u_char id; ++{ ++ u_char *outp; ++ int outlen; ++ u_char *lenloc; ++ ++ outp = outpacket_buf; ++ ++ MAKEHEADER(outp, PPP_EAP); ++ ++ PUTCHAR(EAP_RESPONSE, outp); ++ PUTCHAR(id, outp); ++ ++ lenloc = outp; ++ INCPTR(2, outp); ++ ++ /* ++ If the id in the request is unchanged, we must retransmit ++ the old data ++ */ ++ if(id == esp->es_client.ea_id) ++ eaptls_retransmit(esp->es_client.ea_session, &outp); ++ else ++ eaptls_send(esp->es_client.ea_session, &outp); ++ ++ outlen = (outp - outpacket_buf) - PPP_HDRLEN; ++ PUTSHORT(outlen, lenloc); ++ ++ output(esp->es_unit, outpacket_buf, PPP_HDRLEN + outlen); ++ ++ esp->es_client.ea_id = id; ++ ++} ++ ++/* ++ * Send an EAP-TLS ack ++ */ ++static void ++eap_tls_sendack(esp, id) ++eap_state *esp; ++u_char id; ++{ ++ u_char *outp; ++ int outlen; ++ u_char *lenloc; ++ ++ outp = outpacket_buf; ++ ++ MAKEHEADER(outp, PPP_EAP); ++ ++ PUTCHAR(EAP_RESPONSE, outp); ++ PUTCHAR(id, outp); ++ esp->es_client.ea_id = id; ++ ++ lenloc = outp; ++ INCPTR(2, outp); ++ ++ PUTCHAR(EAPT_TLS, outp); ++ PUTCHAR(0, outp); ++ ++ outlen = (outp - outpacket_buf) - PPP_HDRLEN; ++ PUTSHORT(outlen, lenloc); ++ ++ output(esp->es_unit, outpacket_buf, PPP_HDRLEN + outlen); ++ ++} ++#endif /* USE_EAPTLS */ ++ + static void + eap_send_nak(esp, id, type) + eap_state *esp; +@@ -1320,6 +1557,11 @@ + char rhostname[256]; + MD5_CTX mdContext; + u_char hash[MD5_SIGNATURE_SIZE]; ++#ifdef USE_EAPTLS ++ u_char flags; ++ struct eaptls_session *ets = esp->es_client.ea_session; ++#endif /* USE_EAPTLS */ ++ + #ifdef USE_SRP + struct t_client *tc; + struct t_num sval, gval, Nval, *Ap, Bval; +@@ -1456,6 +1698,90 @@ + esp->es_client.ea_namelen); + break; + ++#ifdef USE_EAPTLS ++ case EAPT_TLS: ++ ++ switch(esp->es_client.ea_state) { ++ ++ case eapListen: ++ ++ GETCHAR(flags, inp); ++ if(flags & EAP_TLS_FLAGS_START){ ++ ++ esp->es_client.ea_using_eaptls = 1; ++ ++ if (explicit_remote){ ++ esp->es_client.ea_peer = strdup(remote_name); ++ esp->es_client.ea_peerlen = strlen(remote_name); ++ } else ++ esp->es_client.ea_peer = NULL; ++ ++ /* Init ssl session */ ++ if(!eaptls_init_ssl_client(esp)) { ++ dbglog("cannot init ssl"); ++ eap_send_nak(esp, id, EAPT_TLS); ++ esp->es_client.ea_using_eaptls = 0; ++ break; ++ } ++ ++ ets = esp->es_client.ea_session; ++ eap_tls_response(esp, id); ++ esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck : ++ eapTlsRecv); ++ break; ++ } ++ ++ /* The server has sent a bad start packet. */ ++ eap_send_nak(esp, id, EAPT_TLS); ++ break; ++ ++ case eapTlsRecvAck: ++ eap_tls_response(esp, id); ++ esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck : ++ eapTlsRecv); ++ break; ++ ++ case eapTlsRecv: ++ eaptls_receive(ets, inp, len); ++ ++ if(ets->frag) { ++ eap_tls_sendack(esp, id); ++ esp->es_client.ea_state = eapTlsRecv; ++ break; ++ } ++ ++ if(ets->alert_recv) { ++ eap_tls_sendack(esp, id); ++ esp->es_client.ea_state = eapTlsRecvFailure; ++ break; ++ } ++ ++ /* Check if TLS handshake is finished */ ++ if(SSL_is_init_finished(ets->ssl)){ ++#ifdef MPPE ++ eaptls_gen_mppe_keys( ets, "client EAP encryption", 1 ); ++#endif ++ eaptls_free_session(ets); ++ eap_tls_sendack(esp, id); ++ esp->es_client.ea_state = eapTlsRecvSuccess; ++ break; ++ } ++ ++ eap_tls_response(esp,id); ++ esp->es_client.ea_state = (ets->frag ? eapTlsRecvAck : ++ eapTlsRecv); ++ ++ break; ++ ++ default: ++ eap_send_nak(esp, id, EAPT_TLS); ++ esp->es_client.ea_using_eaptls = 0; ++ break; ++ } ++ ++ break; ++#endif /* USE_EAPTLS */ ++ + #ifdef USE_SRP + case EAPT_SRP: + if (len < 1) { +@@ -1737,6 +2063,11 @@ + u_char dig[SHA_DIGESTSIZE]; + #endif /* USE_SRP */ + ++#ifdef USE_EAPTLS ++ struct eaptls_session *ets; ++ u_char flags; ++#endif /* USE_EAPTLS */ ++ + if (esp->es_server.ea_id != id) { + dbglog("EAP: discarding Response %d; expected ID %d", id, + esp->es_server.ea_id); +@@ -1776,6 +2107,60 @@ + eap_figure_next_state(esp, 0); + break; + ++#ifdef USE_EAPTLS ++ case EAPT_TLS: ++ switch(esp->es_server.ea_state) { ++ ++ case eapTlsRecv: ++ ets = (struct eaptls_session *) esp->es_server.ea_session; ++ eap_figure_next_state(esp, ++ eaptls_receive(esp->es_server.ea_session, inp, len)); ++ ++ if(ets->alert_recv) { ++ eap_send_failure(esp); ++ break; ++ } ++ break; ++ ++ case eapTlsRecvAck: ++ if(len > 1) { ++ dbglog("EAP-TLS ACK with extra data"); ++ } ++ eap_figure_next_state(esp, 0); ++ break; ++ ++ case eapTlsRecvClient: ++ /* Receive authentication response from client */ ++ ++ GETCHAR(flags, inp); ++ ++ if(len == 1 && !flags) { /* Ack = ok */ ++#ifdef MPPE ++ eaptls_gen_mppe_keys( esp->es_server.ea_session, "client EAP encryption", 0 ); ++#endif ++ eap_send_success(esp); ++ } ++ else { /* failure */ ++ eaptls_receive(esp->es_server.ea_session, inp, len); ++ warn("Server authentication failed"); ++ eap_send_failure(esp); ++ } ++ ++ eaptls_free_session(esp->es_server.ea_session); ++ ++ break; ++ ++ case eapTlsRecvAlertAck: ++ eap_send_failure(esp); ++ break; ++ ++ default: ++ eap_figure_next_state(esp, 1); ++ break; ++ } ++ break; ++#endif /* USE_EAPTLS */ ++ + case EAPT_NOTIFICATION: + dbglog("EAP unexpected Notification; response discarded"); + break; +@@ -1807,6 +2192,13 @@ + esp->es_server.ea_state = eapMD5Chall; + break; + ++#ifdef USE_EAPTLS ++ /* Send EAP-TLS start packet */ ++ case EAPT_TLS: ++ esp->es_server.ea_state = eapTlsStart; ++ break; ++#endif /* USE_EAPTLS */ ++ + default: + dbglog("EAP: peer requesting unknown Type %d", vallen); + switch (esp->es_server.ea_state) { +@@ -2018,13 +2410,27 @@ + int id; + int len; + { +- if (esp->es_client.ea_state != eapOpen && !eap_client_active(esp)) { ++ if (esp->es_client.ea_state != eapOpen && !eap_client_active(esp) ++#ifdef USE_EAPTLS ++ && esp->es_client.ea_state != eapTlsRecvSuccess ++#endif /* USE_EAPTLS */ ++ ) { + dbglog("EAP unexpected success message in state %s (%d)", + eap_state_name(esp->es_client.ea_state), + esp->es_client.ea_state); + return; + } + ++#ifdef USE_EAPTLS ++ if(esp->es_client.ea_using_eaptls && esp->es_client.ea_state != ++ eapTlsRecvSuccess) { ++ dbglog("EAP-TLS unexpected success message in state %s (%d)", ++ eap_state_name(esp->es_client.ea_state), ++ esp->es_client.ea_state); ++ return; ++ } ++#endif /* USE_EAPTLS */ ++ + if (esp->es_client.ea_timeout > 0) { + UNTIMEOUT(eap_client_timeout, (void *)esp); + } +@@ -2150,6 +2556,9 @@ + int code, id, len, rtype, vallen; + u_char *pstart; + u_int32_t uval; ++#ifdef USE_EAPTLS ++ u_char flags; ++#endif /* USE_EAPTLS */ + + if (inlen < EAP_HEADERLEN) + return (0); +@@ -2214,6 +2623,24 @@ + } + break; + ++#ifdef USE_EAPTLS ++ case EAPT_TLS: ++ if (len < 1) ++ break; ++ GETCHAR(flags, inp); ++ len--; ++ ++ if(flags == 0 && len == 0){ ++ printer(arg, " Ack"); ++ break; ++ } ++ ++ printer(arg, flags & EAP_TLS_FLAGS_LI ? " L":" -"); ++ printer(arg, flags & EAP_TLS_FLAGS_MF ? "M":"-"); ++ printer(arg, flags & EAP_TLS_FLAGS_START ? "S":"- "); ++ break; ++#endif /* USE_EAPTLS */ ++ + case EAPT_SRP: + if (len < 3) + goto truncated; +@@ -2325,6 +2752,25 @@ + } + break; + ++#ifdef USE_EAPTLS ++ case EAPT_TLS: ++ if (len < 1) ++ break; ++ GETCHAR(flags, inp); ++ len--; ++ ++ if(flags == 0 && len == 0){ ++ printer(arg, " Ack"); ++ break; ++ } ++ ++ printer(arg, flags & EAP_TLS_FLAGS_LI ? " L":" -"); ++ printer(arg, flags & EAP_TLS_FLAGS_MF ? "M":"-"); ++ printer(arg, flags & EAP_TLS_FLAGS_START ? "S":"- "); ++ ++ break; ++#endif /* USE_EAPTLS */ ++ + case EAPT_NAK: + if (len <= 0) { + printer(arg, " <missing hint>"); +@@ -2426,3 +2872,4 @@ + + return (inp - pstart); + } ++ +diff -Naur ppp-2.4.5/pppd/eap.h ppp-2.4.5-eaptls-mppe-0.99/pppd/eap.h +--- ppp-2.4.5/pppd/eap.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/eap.h 2010-10-01 15:17:54.214270927 +0200 +@@ -84,6 +84,16 @@ + eapClosed, /* Authentication not in use */ + eapListen, /* Client ready (and timer running) */ + eapIdentify, /* EAP Identify sent */ ++ eapTlsStart, /* Send EAP-TLS start packet */ ++ eapTlsRecv, /* Receive EAP-TLS tls data */ ++ eapTlsSendAck, /* Send EAP-TLS ack */ ++ eapTlsSend, /* Send EAP-TLS tls data */ ++ eapTlsRecvAck, /* Receive EAP-TLS ack */ ++ eapTlsRecvClient, /* Receive EAP-TLS auth response from client*/ ++ eapTlsSendAlert, /* Send EAP-TLS tls alert (server)*/ ++ eapTlsRecvAlertAck, /* Receive EAP-TLS ack after sending alert */ ++ eapTlsRecvSuccess, /* Receive EAP success */ ++ eapTlsRecvFailure, /* Receive EAP failure */ + eapSRP1, /* Sent EAP SRP-SHA1 Subtype 1 */ + eapSRP2, /* Sent EAP SRP-SHA1 Subtype 2 */ + eapSRP3, /* Sent EAP SRP-SHA1 Subtype 3 */ +@@ -95,9 +105,18 @@ + + #define EAP_STATES \ + "Initial", "Pending", "Closed", "Listen", "Identify", \ ++ "TlsStart", "TlsRecv", "TlsSendAck", "TlsSend", "TlsRecvAck", "TlsRecvClient",\ ++ "TlsSendAlert", "TlsRecvAlertAck" , "TlsRecvSuccess", "TlsRecvFailure", \ + "SRP1", "SRP2", "SRP3", "MD5Chall", "Open", "SRP4", "BadAuth" + +-#define eap_client_active(esp) ((esp)->es_client.ea_state == eapListen) ++#ifdef USE_EAPTLS ++#define eap_client_active(esp) ((esp)->es_client.ea_state != eapInitial ||\ ++ (esp)->es_client.ea_state != eapPending ||\ ++ (esp)->es_client.ea_state != eapClosed) ++#else ++#define eap_client_active(esp) ((esp)->es_client.ea_state == eapListen) ++#endif /* USE_EAPTLS */ ++ + #define eap_server_active(esp) \ + ((esp)->es_server.ea_state >= eapIdentify && \ + (esp)->es_server.ea_state <= eapMD5Chall) +@@ -112,11 +131,17 @@ + u_short ea_namelen; /* Length of our name */ + u_short ea_peerlen; /* Length of peer's name */ + enum eap_state_code ea_state; ++#ifdef USE_EAPTLS ++ enum eap_state_code ea_prev_state; ++#endif + u_char ea_id; /* Current id */ + u_char ea_requests; /* Number of Requests sent/received */ + u_char ea_responses; /* Number of Responses */ + u_char ea_type; /* One of EAPT_* */ + u_int32_t ea_keyflags; /* SRP shared key usage flags */ ++#ifdef USE_EAPTLS ++ bool ea_using_eaptls; ++#endif + }; + + /* +@@ -139,7 +164,12 @@ + * Timeouts. + */ + #define EAP_DEFTIMEOUT 3 /* Timeout (seconds) for rexmit */ ++#ifdef USE_EAPTLS ++#define EAP_DEFTRANSMITS 30 /* max # times to transmit */ ++ /* certificates can be long ... */ ++#else + #define EAP_DEFTRANSMITS 10 /* max # times to transmit */ ++#endif /* USE_EAPTLS */ + #define EAP_DEFREQTIME 20 /* Time to wait for peer request */ + #define EAP_DEFALLOWREQ 20 /* max # times to accept requests */ + +diff -Naur ppp-2.4.5/pppd/md5.c ppp-2.4.5-eaptls-mppe-0.99/pppd/md5.c +--- ppp-2.4.5/pppd/md5.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/md5.c 2010-10-01 15:17:54.214270927 +0200 +@@ -33,6 +33,8 @@ + *********************************************************************** + */ + ++#ifndef USE_EAPTLS ++ + #include <string.h> + #include "md5.h" + +@@ -305,3 +307,5 @@ + ** End of md5.c ** + ******************************** (cut) ******************************** + */ ++#endif /* USE_EAPTLS */ ++ +diff -Naur ppp-2.4.5/pppd/md5.h ppp-2.4.5-eaptls-mppe-0.99/pppd/md5.h +--- ppp-2.4.5/pppd/md5.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/md5.h 2010-10-01 15:17:54.215271014 +0200 +@@ -36,6 +36,7 @@ + ** documentation and/or software. ** + *********************************************************************** + */ ++#ifndef USE_EAPTLS + + #ifndef __MD5_INCLUDE__ + +@@ -63,3 +64,5 @@ + + #define __MD5_INCLUDE__ + #endif /* __MD5_INCLUDE__ */ ++ ++#endif /* USE_EAPTLS */ +diff -Naur ppp-2.4.5/pppd/options.c ppp-2.4.5-eaptls-mppe-0.99/pppd/options.c +--- ppp-2.4.5/pppd/options.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/options.c 2010-10-01 15:17:54.215271014 +0200 +@@ -119,6 +119,10 @@ + bool dryrun; /* print out option values and exit */ + char *domain; /* domain name set by domain option */ + int child_wait = 5; /* # seconds to wait for children at exit */ ++#ifdef USE_EAPTLS ++bool only_update_crl_server = 0; /* update server crl and exit */ ++bool only_update_crl_client = 0; /* update client crl and exit */ ++#endif /* USE_EAPTLS */ + + #ifdef MAXOCTETS + unsigned int maxoctets = 0; /* default - no limit */ +@@ -320,6 +324,12 @@ + { "mo-timeout", o_int, &maxoctets_timeout, + "Check for traffic limit every N seconds", OPT_PRIO | OPT_LLIMIT | 1 }, + #endif ++#ifdef USE_EAPTLS ++ { "only-update-crl-server", o_bool, &only_update_crl_server, ++ "Update server CA CRLs and exit", 1 }, ++ { "only-update-crl-client", o_bool, &only_update_crl_client, ++ "Update client CA CRLs and exit", 1 }, ++#endif /* USE_EAPTLS */ + + { NULL } + }; +diff -Naur ppp-2.4.5/pppd/pathnames.h ppp-2.4.5-eaptls-mppe-0.99/pppd/pathnames.h +--- ppp-2.4.5/pppd/pathnames.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/pathnames.h 2010-10-01 15:17:54.215271014 +0200 +@@ -21,6 +21,13 @@ + #define _PATH_UPAPFILE _ROOT_PATH "/etc/ppp/pap-secrets" + #define _PATH_CHAPFILE _ROOT_PATH "/etc/ppp/chap-secrets" + #define _PATH_SRPFILE _ROOT_PATH "/etc/ppp/srp-secrets" ++ ++#ifdef USE_EAPTLS ++#define _PATH_EAPTLSCLIFILE _ROOT_PATH "/etc/ppp/eaptls-client" ++#define _PATH_EAPTLSSERVFILE _ROOT_PATH "/etc/ppp/eaptls-server" ++#define _PATH_OPENSSLCONFFILE _ROOT_PATH "/etc/ppp/openssl.cnf" ++#endif /* USE_EAPTLS */ ++ + #define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options" + #define _PATH_IPUP _ROOT_PATH "/etc/ppp/ip-up" + #define _PATH_IPDOWN _ROOT_PATH "/etc/ppp/ip-down" +diff -Naur ppp-2.4.5/pppd/plugins/Makefile.linux ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/Makefile.linux +--- ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/Makefile.linux 2010-10-01 15:17:54.215271014 +0200 +@@ -4,6 +4,9 @@ + LDFLAGS = -shared + INSTALL = install + ++# EAP-TLS ++CFLAGS += -DUSE_EAPTLS=1 ++ + DESTDIR = $(INSTROOT)@DESTDIR@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 +diff -Naur ppp-2.4.5/pppd/plugins/passprompt.c ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/passprompt.c +--- ppp-2.4.5/pppd/plugins/passprompt.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/passprompt.c 2010-10-01 15:17:54.215271014 +0200 +@@ -107,4 +107,7 @@ + { + add_options(options); + pap_passwd_hook = promptpass; ++#ifdef USE_EAPTLS ++ eaptls_passwd_hook = promptpass; ++#endif + } +diff -Naur ppp-2.4.5/pppd/plugins/passwordfd.c ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/passwordfd.c +--- ppp-2.4.5/pppd/plugins/passwordfd.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/plugins/passwordfd.c 2010-10-01 15:17:54.216270820 +0200 +@@ -79,4 +79,9 @@ + + chap_check_hook = pwfd_check; + chap_passwd_hook = pwfd_passwd; ++ ++#ifdef USE_EAPTLS ++ eaptls_check_hook = pwfd_check; ++ eaptls_passwd_hook = pwfd_passwd; ++#endif + } +diff -Naur ppp-2.4.5/pppd/pppd.h ppp-2.4.5-eaptls-mppe-0.99/pppd/pppd.h +--- ppp-2.4.5/pppd/pppd.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5-eaptls-mppe-0.99/pppd/pppd.h 2010-10-01 15:17:54.216270820 +0200 +@@ -320,6 +320,10 @@ + extern bool dryrun; /* check everything, print options, exit */ + extern int child_wait; /* # seconds to wait for children at end */ + ++#ifdef USE_EAPTLS ++extern char *crl_dir; ++#endif /* USE_EAPTLS */ ++ + #ifdef MAXOCTETS + extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ + extern int maxoctets_dir; /* Direction : +@@ -717,6 +721,11 @@ + extern int (*chap_passwd_hook) __P((char *user, char *passwd)); + extern void (*multilink_join_hook) __P((void)); + ++#ifdef USE_EAPTLS ++extern int (*eaptls_check_hook) __P((void)); ++extern int (*eaptls_passwd_hook) __P((char *user, char *passwd)); ++#endif ++ + /* Let a plugin snoop sent and received packets. Useful for L2TP */ + extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); + extern void (*snoop_send_hook) __P((unsigned char *p, int len)); diff --git a/pkgs/ppp/patches/ppp-2.4.5-eth.patch b/pkgs/ppp/patches/ppp-2.4.5-eth.patch new file mode 100644 index 0000000..0e7e525 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.5-eth.patch @@ -0,0 +1,124 @@ +diff -up ppp-2.4.5/pppd/ether.c.inc.eth ppp-2.4.5/pppd/ether.c.inc +--- ppp-2.4.5/pppd/ether.c.inc.eth 2011-06-01 10:28:35.356139063 +0200 ++++ ppp-2.4.5/pppd/ether.c.inc 2011-06-01 11:20:37.876897352 +0200 +@@ -0,0 +1,46 @@ ++#define PREF_ETH "eth" ++#define PREF_EM "em" ++ ++static char *dev_file = "/proc/self/net/dev"; ++ ++/* ++ * get_first_ethernet - return the name of the first ethernet-style ++ * interface on this system. ++ */ ++char * ++get_first_ethernet() ++{ ++ FILE *f; ++ char buf[255], *dv, *smc; ++ char pci[16]; ++ ++ memset(pci, 0, sizeof(pci)); ++ if ((f = fopen(dev_file, "r")) != NULL) ++ { ++ // go through network dev file ++ while (fgets (buf, sizeof(buf), f) != NULL) ++ { ++ // the line describes interface ++ if ((smc = strchr(buf, ':')) != NULL) ++ { ++ // trim white characters ++ for (dv=buf, *smc=0; *dv <= ' '; dv++) ; ++ // is "eth" (originial ethernet name) or "em" (ethernet on board) ++ if (!strncmp(dv, PREF_ETH, strlen(PREF_ETH)) || ++ !strncmp(dv, PREF_EM, strlen(PREF_EM))) ++ { ++ return strdup(dv); ++ } ++ // remember the first pci NIC-card ++ if (strlen(pci) == 0 && dv[0] == 'p' && isdigit(dv[1])) ++ { ++ strcpy(pci, dv); ++ } ++ } ++ } ++ fclose(f); ++ } ++ // return pci NIC-card or nil if no if name ++ return strlen(pci) > 0 ? strdup(pci) : 0L; ++} ++ +diff -up ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c.eth ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c +--- ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c.eth 2011-06-01 09:39:13.099343548 +0200 ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/pppoe-discovery.c 2011-06-01 11:41:02.188252304 +0200 +@@ -47,6 +47,8 @@ + #include <net/if_arp.h> + #endif + ++#include "../../ether.c.inc" ++ + char *xstrdup(const char *s); + void usage(void); + +@@ -686,7 +688,7 @@ int main(int argc, char *argv[]) + + /* default interface name */ + if (!conn->ifName) +- conn->ifName = strdup("eth0"); ++ conn->ifName = get_first_ethernet(); + + conn->discoverySocket = -1; + conn->sessionSocket = -1; +diff -up ppp-2.4.5/pppd/sys-linux.c.eth ppp-2.4.5/pppd/sys-linux.c +--- ppp-2.4.5/pppd/sys-linux.c.eth 2011-06-01 09:39:13.074343397 +0200 ++++ ppp-2.4.5/pppd/sys-linux.c 2011-06-01 11:50:13.736565685 +0200 +@@ -144,6 +144,8 @@ + #include <sys/locks.h> + #endif + ++#include "ether.c.inc" ++ + #ifdef INET6 + #ifndef _LINUX_IN6_H + /* +@@ -1869,16 +1871,6 @@ get_if_hwaddr(u_char *addr, char *name) + return ret; + } + +-/* +- * get_first_ethernet - return the name of the first ethernet-style +- * interface on this system. +- */ +-char * +-get_first_ethernet() +-{ +- return "eth0"; +-} +- + /******************************************************************** + * + * Return user specified netmask, modified by any mask we might determine +@@ -2783,6 +2775,7 @@ ether_to_eui64(eui64_t *p_eui64) + struct ifreq ifr; + int skfd; + const unsigned char *ptr; ++ char warn_msg[80]; + + skfd = socket_fd(PF_INET6, SOCK_DGRAM, 0); + if(skfd == -1) +@@ -2791,11 +2784,13 @@ ether_to_eui64(eui64_t *p_eui64) + return 0; + } + +- strcpy(ifr.ifr_name, "eth0"); ++ strcpy(ifr.ifr_name, get_first_ethernet()); + if(ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) + { + close(skfd); +- warn("could not obtain hardware address for eth0"); ++ snprintf(warn_msg, sizeof(warn_msg), ++ "could not obtain hardware address for %s", ifr.ifr_name); ++ warn(warn_msg); + return 0; + } + close(skfd); diff --git a/pkgs/ppp/patches/ppp-2.4.5-lock.patch b/pkgs/ppp/patches/ppp-2.4.5-lock.patch new file mode 100644 index 0000000..6bda620 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.5-lock.patch @@ -0,0 +1,12 @@ +diff -up ppp-2.4.5/pppd/utils.c.lock ppp-2.4.5/pppd/utils.c +--- ppp-2.4.5/pppd/utils.c.lock 2011-05-30 15:30:36.432371849 +0200 ++++ ppp-2.4.5/pppd/utils.c 2011-05-30 15:30:48.575495854 +0200 +@@ -859,7 +859,7 @@ complete_read(int fd, void *buf, size_t + /* Procedures for locking the serial device using a lock file. */ + #ifndef LOCK_DIR + #ifdef __linux__ +-#define LOCK_DIR "/var/lock" ++#define LOCK_DIR "/var/lock/ppp" + #else + #ifdef SVR4 + #define LOCK_DIR "/var/spool/locks" diff --git a/pkgs/ppp/patches/ppp-2.4.5-man.patch b/pkgs/ppp/patches/ppp-2.4.5-man.patch new file mode 100644 index 0000000..9ad4f2e --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.5-man.patch @@ -0,0 +1,94 @@ +--- ppp-2.4.5/chat/chat.8.man 2010-12-16 10:20:08.000000000 +0000 ++++ ppp-2.4.5/chat/chat.8 2010-12-19 16:40:31.000000000 +0000 +@@ -50,7 +50,7 @@ + to \fIstderr\fR. + .TP + .B \-E +-Enables environment variable substituion within chat scripts using the ++Enables environment variable substitution within chat scripts using the + standard \fI$xxx\fR syntax. + .TP + .B \-v +@@ -77,7 +77,7 @@ + error messages from being sent to the SYSLOG. + .TP + .B \-T \fI<phone number> +-Pass in an arbitary string, usually a phone number, that will be ++Pass in an arbitrary string, usually a phone number, that will be + substituted for the \\T substitution metacharacter in a send string. + .TP + .B \-U \fI<phone number 2> +@@ -204,7 +204,7 @@ + .LP + \fBSAY\fR strings must be enclosed in single or double quotes. If + carriage return and line feed are needed in the string to be output, +-you must explicitely add them to your string. ++you must explicitly add them to your string. + .LP + The SAY strings could be used to give progress messages in sections of + the script where you want to have 'ECHO OFF' but still let the user +@@ -457,7 +457,7 @@ + Environment variables are available within chat scripts, if the \fI\-E\fR + option was specified in the command line. The metacharacter \fI$\fR is used + to introduce the name of the environment variable to substitute. If the +-substition fails, because the requested environment variable is not set, ++substitution fails, because the requested environment variable is not set, + \fInothing\fR is replaced for the variable. + .SH TERMINATION CODES + The \fIchat\fR program will terminate with the following completion +--- ppp-2.4.5/pppd/pppd.8.man 2010-12-16 10:20:10.000000000 +0000 ++++ ppp-2.4.5/pppd/pppd.8 2010-12-21 23:26:50.000000000 +0000 +@@ -195,7 +195,7 @@ + .TP + .B ipv6 \fI<local_interface_identifier>\fR,\fI<remote_interface_identifier> + Set the local and/or remote 64-bit interface identifier. Either one may be +-omitted. The identifier must be specified in standard ascii notation of ++omitted. The identifier must be specified in standard ASCII notation of + IPv6 addresses (e.g. ::dead:beef). If the + \fIipv6cp\-use\-ipaddr\fR + option is given, the local identifier is the local IPv4 address (see above). +@@ -328,7 +328,7 @@ + The \fIdemand\fR option implies the \fIpersist\fR option. If this + behaviour is not desired, use the \fInopersist\fR option after the + \fIdemand\fR option. The \fIidle\fR and \fIholdoff\fR +-options are also useful in conjuction with the \fIdemand\fR option. ++options are also useful in conjunction with the \fIdemand\fR option. + .TP + .B domain \fId + Append the domain name \fId\fR to the local host name for authentication +@@ -515,7 +515,7 @@ + send before it rejects the options. The default value is 3. + .TP + .B ipxcp\-max\-terminate \fIn +-Set the maximum nuber of IPXCP terminate request frames before the ++Set the maximum number of IPXCP terminate request frames before the + local system considers that the peer is not listening to them. The + default value is 3. + .TP +@@ -907,7 +907,7 @@ + device. The \fIscript\fR will be run in a child process with the + pseudo-tty master as its standard input and output. An explicit + device name may not be given if this option is used. (Note: if the +-\fIrecord\fR option is used in conjuction with the \fIpty\fR option, ++\fIrecord\fR option is used in conjunction with the \fIpty\fR option, + the child process will have pipes on its standard input and output.) + .TP + .B receive\-all +@@ -1015,7 +1015,7 @@ + .TP + .B srp\-use\-pseudonym + When operating as an EAP SRP\-SHA1 client, attempt to use the pseudonym +-stored in ~/.ppp_psuedonym first as the identity, and save in this ++stored in ~/.ppp_pseudonym first as the identity, and save in this + file any pseudonym offered by the peer during authentication. + .TP + .B sync +@@ -1885,7 +1885,7 @@ + prior written permission. + .LP + 4. Redistributions of any form whatsoever must retain the following +- acknowledgments: ++ acknowledgements: + .br + "This product includes software developed by Computing Services + at Carnegie Mellon University (http://www.cmu.edu/computing/)." diff --git a/pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch b/pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch new file mode 100644 index 0000000..e2f0e29 --- /dev/null +++ b/pkgs/ppp/patches/ppp-2.4.5-ppp_resolv.patch @@ -0,0 +1,13 @@ +diff -up ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv ppp-2.4.5/scripts/ip-up.local.add +--- ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv 2010-07-13 10:29:23.227943994 +0200 ++++ ppp-2.4.5/scripts/ip-up.local.add 2010-07-13 10:32:27.729695487 +0200 +@@ -18,6 +18,9 @@ if [ -n "$USEPEERDNS" -a -f /var/run/ppp + rscf=/var/run/ppp/resolv.new + grep domain /var/run/ppp/resolv.prev > $rscf + grep search /var/run/ppp/resolv.prev >> $rscf ++ if [ -f /var/run/ppp/resolv.conf ]; then ++ cat /var/run/ppp/resolv.conf >> $rscf ++ fi + change_resolv_conf $rscf + rm -f $rscf + else diff --git a/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch b/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch index 2c49927..bd01883 100644 --- a/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch +++ b/pkgs/ppp/patches/ppp-2.4.5-var_run_ppp.patch @@ -1,30 +1,30 @@ diff -up ppp-2.4.5/pppd/pathnames.h.var_run_ppp ppp-2.4.5/pppd/pathnames.h ---- ppp-2.4.5/pppd/pathnames.h.var_run_ppp 2010-02-12 16:36:14.479362718 +0100 -+++ ppp-2.4.5/pppd/pathnames.h 2010-02-12 16:38:24.995330994 +0100 -@@ -7,9 +7,13 @@ +--- ppp-2.4.5/pppd/pathnames.h.var_run_ppp 2010-11-23 10:14:24.557427000 +0100 ++++ ppp-2.4.5/pppd/pathnames.h 2010-11-23 10:24:07.432426793 +0100 +@@ -6,8 +6,9 @@ + #ifdef HAVE_PATHS_H #include <paths.h> - -+#define _SUBPATH_PPP "ppp/" +- ++#define _PPP_SUBDIR "ppp/" #else /* HAVE_PATHS_H */ ++#define _PPP_SUBDIR #ifndef _PATH_VARRUN #define _PATH_VARRUN "/etc/ppp/" -+#define _SUBPATH_PPP -+#else -+#define _SUBPATH_PPP "ppp/" #endif - #define _PATH_DEVNULL "/dev/null" - #endif /* HAVE_PATHS_H */ -@@ -46,10 +50,10 @@ +@@ -46,13 +54,9 @@ #endif /* IPX_CHANGE */ #ifdef __STDC__ -#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN "pppd2.tdb" -+#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN _SUBPATH_PPP "pppd2.tdb" ++#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb" #else /* __STDC__ */ - #ifdef HAVE_PATHS_H +-#ifdef HAVE_PATHS_H -#define _PATH_PPPDB "/var/run/pppd2.tdb" -+#define _PATH_PPPDB "/var/run/ppp/pppd2.tdb" - #else - #define _PATH_PPPDB "/etc/ppp/pppd2.tdb" - #endif +-#else +-#define _PATH_PPPDB "/etc/ppp/pppd2.tdb" +-#endif ++#define _PATH_PPPDB _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb" + #endif /* __STDC__ */ + + #ifdef PLUGIN diff --git a/pkgs/ppp/ppp.nm b/pkgs/ppp/ppp.nm index 0eb7774..de1eebb 100644 --- a/pkgs/ppp/ppp.nm +++ b/pkgs/ppp/ppp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = ppp PKG_VER = 2.4.5 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = System/Daemons @@ -34,7 +34,7 @@ PKG_URL = ftp://ftp.samba.org/pub/ppp/ PKG_LICENSE = BSD and LGPLv2+ and GPLv2+ and Public Domain PKG_SUMMARY = The PPP (Point-to-Point Protocol) daemon. -PKG_BUILD_DEPS+= libpcap-devel linux-atm-devel pam-devel +PKG_BUILD_DEPS+= libpcap-devel linux-atm-devel openssl-devel pam-devel define PKG_DESCRIPTION The ppp package contains the PPP (Point-to-Point Protocol) daemon and \ @@ -49,8 +49,6 @@ PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-devel define STAGE_PREPARE_CMDS - cd $(DIR_APP) && sed -e "s/^LIBS =/LIBS=-lutil/" -i pppd/Makefile.linux - cd $(DIR_APP) && sed -e "s@^RUNDIR .*@RUNDIR = /var/run/ppp@" \ -e "s@^LOGDIR .*@LOGDIR = /var/log/ppp@" \ -i linux/Makefile.top @@ -67,8 +65,7 @@ define STAGE_BUILD ./configure \ --prefix=/usr - cd $(DIR_APP) && make CC="gcc $(CFLAGS)" $(PARALLELISMFLAGS) \ - HAVE_INET6=yes USE_PAM=y + cd $(DIR_APP) && make CC="gcc $(CFLAGS)" $(PARALLELISMFLAGS) endef define STAGE_INSTALL diff --git a/pkgs/rstp/rstp.nm b/pkgs/rstp/rstp.nm index bb28a46..e51c362 100644 --- a/pkgs/rstp/rstp.nm +++ b/pkgs/rstp/rstp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = rstp PKG_VER = 0.21 -PKG_REL = 3 +PKG_REL = 4 PKG_MAINTAINER = PKG_GROUPS = Networking/Tools diff --git a/pkgs/rstp/systemd/rstp.service b/pkgs/rstp/systemd/rstp.service index f501ad2..d322a39 100644 --- a/pkgs/rstp/systemd/rstp.service +++ b/pkgs/rstp/systemd/rstp.service @@ -4,7 +4,7 @@ Before=network.service [Service] RemainAfterExit=yes -ExecPreStart=/sbin/modprobe net_pf_17 +ExecStartPre=/sbin/modprobe net_pf_17 ExecStart=/sbin/rstpd -d [Install] hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5c5fd846ac363475256679ad8b0ac94502d82686
by git＠ipfire.org 02 Jun '11

02 Jun '11

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 "IPFire 2.x development tree". The branch, next has been updated via 5c5fd846ac363475256679ad8b0ac94502d82686 (commit) via 81f77047dbe9f840977e59619720ae7823dd87ab (commit) via 9c27eca8e4b7b722fd86add8b6659633ac7c63bc (commit) from 3ced8695afbc62b95b52d53be4ca64086a700e39 (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 5c5fd846ac363475256679ad8b0ac94502d82686 Merge: 3ced869 81f7704 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jun 2 19:16:38 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/client175/site.conf | 12 +- config/rootfiles/packages/client175 | 3 + config/rootfiles/packages/sane | 593 +++++++++++++++++++---------------- lfs/client175 | 10 +- lfs/sane | 34 +-- 5 files changed, 337 insertions(+), 315 deletions(-) Difference in files: diff --git a/config/client175/site.conf b/config/client175/site.conf index f98d8e8..9abe832 100644 --- a/config/client175/site.conf +++ b/config/client175/site.conf @@ -1,7 +1,4 @@ # Edit this file as needed and save it as: site.conf -# # and ; at the begining of lines indicate comments. Remove the ; to -# activate a setting. -# # The application will work without it but tag editing will not work # without saving this file as site.conf with the correct music_directory # set. @@ -12,6 +9,7 @@ # from this server via the music_directory option configured below. mpd_host: "localhost" mpd_port: 6600 +;server_root: "/client175" # Location of the music directory, required for editing tags. This variable # is also used to identify the folder for a given file in local cover lookups. @@ -21,17 +19,17 @@ music_directory: "/var/mp3" # to limit which one it listens on. "0.0.0.0" listens on all interfaces. server.socket_host: "0.0.0.0" -# Don't run this as root in order to use port 80! This app was not built +# Don't run this as root in order to use port 80! This app was not built # to be secure, it must be run with limited access. Default is port 8080. server.socket_port: 8800 # Setting the 'run_as' variable will allow you to start the process as root # and drop the privelages to a restricted user account during server startup. -# This feature is useful when starting client175 during the init process +# This feature is useful when starting client175 during the init process # and/or when starting as root to run on port 80. ;run_as: "user" -# Setting environment to production removes the verbose console output +# Setting environment to production removes the verbose console output # and disables auto-reload on file changes. environment: "production" @@ -41,7 +39,7 @@ environment: "production" include_playlist_counts: True # List of local locations to search for cover art. The server will check -# these locations for covers before using web services. The following +# these locations for covers before using web services. The following # variables are available fo substitution: # {folder} Folder a given file is in # {artist} Artist name diff --git a/config/rootfiles/packages/client175 b/config/rootfiles/packages/client175 index e659623..6e366c2 100644 --- a/config/rootfiles/packages/client175 +++ b/config/rootfiles/packages/client175 @@ -46,6 +46,7 @@ srv/client175/cherrypy/process/wspbus.py #srv/client175/cherrypy/wsgiserver srv/client175/cherrypy/wsgiserver/__init__.py srv/client175/covers.py +srv/client175/httpd.conf.example srv/client175/lyricwiki.py #srv/client175/metadata srv/client175/metadata/COPYING @@ -99,6 +100,7 @@ srv/client175/site.conf srv/client175/static/COPYING.txt srv/client175/static/Thumbs.db srv/client175/static/covers +srv/client175/static/covers/album_blank.png #srv/client175/static/ext srv/client175/static/ext/ext-all-debug.js srv/client175/static/ext/ext-all.js @@ -2844,6 +2846,7 @@ srv/client175/static/icons/fugue/folder-horizontal.png srv/client175/static/icons/fugue/folder-microphone.png srv/client175/static/icons/fugue/folder-open-document-music.png srv/client175/static/icons/fugue/folder-open.png +srv/client175/static/icons/fugue/gear.png srv/client175/static/icons/fugue/globe--plus.png srv/client175/static/icons/fugue/home.png srv/client175/static/icons/fugue/information-frame.png diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane index 8e91815..411243e 100644 --- a/config/rootfiles/packages/sane +++ b/config/rootfiles/packages/sane @@ -1,104 +1,6 @@ -usr/bin/gamma4scanimage -usr/bin/sane-config -usr/bin/sane-find-scanner -usr/bin/scanimage -#usr/doc/sane-1.0.19 -usr/doc/sane-1.0.19/AUTHORS -usr/doc/sane-1.0.19/COPYING -usr/doc/sane-1.0.19/ChangeLog -usr/doc/sane-1.0.19/LICENSE -usr/doc/sane-1.0.19/NEWS -usr/doc/sane-1.0.19/PROBLEMS -usr/doc/sane-1.0.19/PROJECTS -usr/doc/sane-1.0.19/README -#usr/doc/sane-1.0.19/README.aix -#usr/doc/sane-1.0.19/README.beos -#usr/doc/sane-1.0.19/README.darwin -#usr/doc/sane-1.0.19/README.djpeg -#usr/doc/sane-1.0.19/README.freebsd -#usr/doc/sane-1.0.19/README.hp-ux -usr/doc/sane-1.0.19/README.linux -#usr/doc/sane-1.0.19/README.netbsd -#usr/doc/sane-1.0.19/README.openbsd -#usr/doc/sane-1.0.19/README.os2 -#usr/doc/sane-1.0.19/README.solaris -#usr/doc/sane-1.0.19/README.unixware2 -#usr/doc/sane-1.0.19/README.unixware7 -usr/doc/sane-1.0.19/README.windows -#usr/doc/sane-1.0.19/README.zeta -usr/doc/sane-1.0.19/backend-writing.txt -#usr/doc/sane-1.0.19/canon -usr/doc/sane-1.0.19/canon/canon.changes -usr/doc/sane-1.0.19/canon/canon.install2700F.txt -#usr/doc/sane-1.0.19/gt68xx -usr/doc/sane-1.0.19/gt68xx/gt68xx.CHANGES -usr/doc/sane-1.0.19/gt68xx/gt68xx.TODO -#usr/doc/sane-1.0.19/leo -usr/doc/sane-1.0.19/leo/leo.txt -#usr/doc/sane-1.0.19/matsushita -usr/doc/sane-1.0.19/matsushita/matsushita.txt -#usr/doc/sane-1.0.19/mustek -usr/doc/sane-1.0.19/mustek/mustek.CHANGES -#usr/doc/sane-1.0.19/mustek_usb -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.CHANGES -usr/doc/sane-1.0.19/mustek_usb/mustek_usb.TODO -#usr/doc/sane-1.0.19/mustek_usb2 -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.CHANGES -usr/doc/sane-1.0.19/mustek_usb2/mustek_usb2.TODO -#usr/doc/sane-1.0.19/niash -usr/doc/sane-1.0.19/niash/niash.TODO -#usr/doc/sane-1.0.19/plustek -usr/doc/sane-1.0.19/plustek/FAQ -usr/doc/sane-1.0.19/plustek/MakeModule.sh -#usr/doc/sane-1.0.19/plustek/Makefile.kernel24 -usr/doc/sane-1.0.19/plustek/Makefile.kernel26 -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.changes -usr/doc/sane-1.0.19/plustek/Plustek-PARPORT.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB-TODO.txt -usr/doc/sane-1.0.19/plustek/Plustek-USB.changes -usr/doc/sane-1.0.19/plustek/Plustek-USB.txt -usr/doc/sane-1.0.19/sane-backends-external.html -usr/doc/sane-1.0.19/sane-backends.html -usr/doc/sane-1.0.19/sane-mfgs-external.html -usr/doc/sane-1.0.19/sane-mfgs.html -#usr/doc/sane-1.0.19/sceptre -usr/doc/sane-1.0.19/sceptre/s1200.txt -#usr/doc/sane-1.0.19/teco -usr/doc/sane-1.0.19/teco/teco1.txt -usr/doc/sane-1.0.19/teco/teco2.txt -usr/doc/sane-1.0.19/teco/teco3.txt -#usr/doc/sane-1.0.19/u12 -usr/doc/sane-1.0.19/u12/U12.changes -usr/doc/sane-1.0.19/u12/U12.todo -#usr/doc/sane-1.0.19/umax -usr/doc/sane-1.0.19/umax/negative-types.txt -usr/doc/sane-1.0.19/umax/sane-logo.jpg -usr/doc/sane-1.0.19/umax/sane-umax-advanced-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-advanced.jpg -usr/doc/sane-1.0.19/umax/sane-umax-astra-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-config-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-histogram.jpg -usr/doc/sane-1.0.19/umax/sane-umax-mirage-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-not-listed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-others-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-parport-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-powerlook-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-scanner-clones-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-speed-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard-options-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-standard.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text2.jpg -usr/doc/sane-1.0.19/umax/sane-umax-text4.jpg -usr/doc/sane-1.0.19/umax/sane-umax-uc-doc.html -usr/doc/sane-1.0.19/umax/sane-umax-vista-doc.html -usr/doc/sane-1.0.19/umax/sane-umax.jpg -usr/doc/sane-1.0.19/umax/umax.BUGS -usr/doc/sane-1.0.19/umax/umax.CHANGES -usr/doc/sane-1.0.19/umax/umax.FAQ -usr/doc/sane-1.0.19/umax/umax.TODO +etc/rc.d/rc0.d/K10sane +etc/rc.d/rc3.d/S95sane +etc/rc.d/rc6.d/K10sane #etc/sane.d etc/sane.d/abaton.conf etc/sane.d/agfafocus.conf @@ -109,14 +11,17 @@ etc/sane.d/avision.conf etc/sane.d/bh.conf etc/sane.d/canon.conf etc/sane.d/canon630u.conf +etc/sane.d/canon_dr.conf etc/sane.d/cardscan.conf etc/sane.d/coolscan.conf etc/sane.d/coolscan2.conf +etc/sane.d/coolscan3.conf etc/sane.d/dc210.conf etc/sane.d/dc240.conf etc/sane.d/dc25.conf etc/sane.d/dell1600n_net.conf etc/sane.d/dll.conf +etc/sane.d/dll.d etc/sane.d/dmc.conf etc/sane.d/epjitsu.conf etc/sane.d/epson.conf @@ -130,21 +35,27 @@ etc/sane.d/hp4200.conf etc/sane.d/hp5400.conf etc/sane.d/hs2p.conf etc/sane.d/ibm.conf +etc/sane.d/kodak.conf etc/sane.d/leo.conf etc/sane.d/lexmark.conf etc/sane.d/ma1509.conf +etc/sane.d/magicolor.conf etc/sane.d/matsushita.conf etc/sane.d/microtek.conf etc/sane.d/microtek2.conf etc/sane.d/mustek.conf +etc/sane.d/mustek_pp.conf etc/sane.d/mustek_usb.conf etc/sane.d/nec.conf etc/sane.d/net.conf +etc/sane.d/p5.conf etc/sane.d/pie.conf +etc/sane.d/pixma.conf etc/sane.d/plustek.conf etc/sane.d/plustek_pp.conf etc/sane.d/qcam.conf etc/sane.d/ricoh.conf +etc/sane.d/rts8891.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf etc/sane.d/sceptre.conf @@ -163,414 +74,546 @@ etc/sane.d/u12.conf etc/sane.d/umax.conf etc/sane.d/umax1220u.conf etc/sane.d/umax_pp.conf -etc/sane.d/v4l.conf +etc/sane.d/xerox_mfp.conf +usr/bin/gamma4scanimage +usr/bin/sane-config +usr/bin/sane-find-scanner +usr/bin/scanimage +usr/doc/sane-1.0.22 +usr/doc/sane-1.0.22/AUTHORS +usr/doc/sane-1.0.22/COPYING +usr/doc/sane-1.0.22/ChangeLog +usr/doc/sane-1.0.22/LICENSE +usr/doc/sane-1.0.22/NEWS +usr/doc/sane-1.0.22/PROBLEMS +usr/doc/sane-1.0.22/PROJECTS +usr/doc/sane-1.0.22/README +#usr/doc/sane-1.0.22/README.aix +#usr/doc/sane-1.0.22/README.beos +#usr/doc/sane-1.0.22/README.darwin +usr/doc/sane-1.0.22/README.djpeg +#usr/doc/sane-1.0.22/README.freebsd +#usr/doc/sane-1.0.22/README.hp-ux +usr/doc/sane-1.0.22/README.linux +#usr/doc/sane-1.0.22/README.netbsd +#usr/doc/sane-1.0.22/README.openbsd +#usr/doc/sane-1.0.22/README.os2 +#usr/doc/sane-1.0.22/README.solaris +#usr/doc/sane-1.0.22/README.unixware2 +#usr/doc/sane-1.0.22/README.unixware7 +#usr/doc/sane-1.0.22/README.windows +#usr/doc/sane-1.0.22/README.zeta +#usr/doc/sane-1.0.22/backend-writing.txt +usr/doc/sane-1.0.22/canon +usr/doc/sane-1.0.22/canon/canon.changes +usr/doc/sane-1.0.22/canon/canon.install2700F.txt +#usr/doc/sane-1.0.22/gt68xx +usr/doc/sane-1.0.22/gt68xx/gt68xx.CHANGES +usr/doc/sane-1.0.22/gt68xx/gt68xx.TODO +#usr/doc/sane-1.0.22/leo +usr/doc/sane-1.0.22/leo/leo.txt +#usr/doc/sane-1.0.22/matsushita +usr/doc/sane-1.0.22/matsushita/matsushita.txt +#usr/doc/sane-1.0.22/mustek +usr/doc/sane-1.0.22/mustek/mustek.CHANGES +#usr/doc/sane-1.0.22/mustek_usb +usr/doc/sane-1.0.22/mustek_usb/mustek_usb.CHANGES +usr/doc/sane-1.0.22/mustek_usb/mustek_usb.TODO +#usr/doc/sane-1.0.22/mustek_usb2 +usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.CHANGES +usr/doc/sane-1.0.22/mustek_usb2/mustek_usb2.TODO +#usr/doc/sane-1.0.22/niash +usr/doc/sane-1.0.22/niash/niash.TODO +#usr/doc/sane-1.0.22/plustek +usr/doc/sane-1.0.22/plustek/FAQ +usr/doc/sane-1.0.22/plustek/MakeModule.sh +#usr/doc/sane-1.0.22/plustek/Makefile.kernel24 +usr/doc/sane-1.0.22/plustek/Makefile.kernel26 +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT-TODO.txt +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.changes +usr/doc/sane-1.0.22/plustek/Plustek-PARPORT.txt +usr/doc/sane-1.0.22/plustek/Plustek-USB-TODO.txt +usr/doc/sane-1.0.22/plustek/Plustek-USB.changes +usr/doc/sane-1.0.22/plustek/Plustek-USB.txt +usr/doc/sane-1.0.22/sane-backends-external.html +usr/doc/sane-1.0.22/sane-backends.html +usr/doc/sane-1.0.22/sane-mfgs-external.html +usr/doc/sane-1.0.22/sane-mfgs.html +#usr/doc/sane-1.0.22/sceptre +usr/doc/sane-1.0.22/sceptre/s1200.txt +#usr/doc/sane-1.0.22/teco +usr/doc/sane-1.0.22/teco/teco1.txt +usr/doc/sane-1.0.22/teco/teco2.txt +usr/doc/sane-1.0.22/teco/teco3.txt +#usr/doc/sane-1.0.22/u12 +usr/doc/sane-1.0.22/u12/U12.changes +usr/doc/sane-1.0.22/u12/U12.todo +#usr/doc/sane-1.0.22/umax +usr/doc/sane-1.0.22/umax/negative-types.txt +usr/doc/sane-1.0.22/umax/sane-logo.jpg +usr/doc/sane-1.0.22/umax/sane-umax-advanced-options-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-advanced.jpg +usr/doc/sane-1.0.22/umax/sane-umax-astra-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-config-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-histogram.jpg +usr/doc/sane-1.0.22/umax/sane-umax-mirage-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-not-listed-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-others-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-parport-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-powerlook-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-scanner-clones-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-speed-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-standard-options-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-standard.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text2.jpg +usr/doc/sane-1.0.22/umax/sane-umax-text4.jpg +usr/doc/sane-1.0.22/umax/sane-umax-uc-doc.html +usr/doc/sane-1.0.22/umax/sane-umax-vista-doc.html +usr/doc/sane-1.0.22/umax/sane-umax.jpg +usr/doc/sane-1.0.22/umax/umax.BUGS +usr/doc/sane-1.0.22/umax/umax.CHANGES +usr/doc/sane-1.0.22/umax/umax.FAQ +usr/doc/sane-1.0.22/umax/umax.TODO #usr/include/sane usr/include/sane/sane.h usr/include/sane/saneopts.h -usr/lib/libsane.la +#usr/lib/libsane.la usr/lib/libsane.so usr/lib/libsane.so.1 -usr/lib/libsane.so.1.0.19 +usr/lib/libsane.so.1.0.22 #usr/lib/sane #usr/lib/sane/libsane-abaton.la usr/lib/sane/libsane-abaton.so usr/lib/sane/libsane-abaton.so.1 -usr/lib/sane/libsane-abaton.so.1.0.19 +usr/lib/sane/libsane-abaton.so.1.0.22 #usr/lib/sane/libsane-agfafocus.la usr/lib/sane/libsane-agfafocus.so usr/lib/sane/libsane-agfafocus.so.1 -usr/lib/sane/libsane-agfafocus.so.1.0.19 +usr/lib/sane/libsane-agfafocus.so.1.0.22 #usr/lib/sane/libsane-apple.la usr/lib/sane/libsane-apple.so usr/lib/sane/libsane-apple.so.1 -usr/lib/sane/libsane-apple.so.1.0.19 +usr/lib/sane/libsane-apple.so.1.0.22 #usr/lib/sane/libsane-artec.la usr/lib/sane/libsane-artec.so usr/lib/sane/libsane-artec.so.1 -usr/lib/sane/libsane-artec.so.1.0.19 +usr/lib/sane/libsane-artec.so.1.0.22 #usr/lib/sane/libsane-artec_eplus48u.la usr/lib/sane/libsane-artec_eplus48u.so usr/lib/sane/libsane-artec_eplus48u.so.1 -usr/lib/sane/libsane-artec_eplus48u.so.1.0.19 +usr/lib/sane/libsane-artec_eplus48u.so.1.0.22 #usr/lib/sane/libsane-as6e.la usr/lib/sane/libsane-as6e.so usr/lib/sane/libsane-as6e.so.1 -usr/lib/sane/libsane-as6e.so.1.0.19 +usr/lib/sane/libsane-as6e.so.1.0.22 #usr/lib/sane/libsane-avision.la usr/lib/sane/libsane-avision.so usr/lib/sane/libsane-avision.so.1 -usr/lib/sane/libsane-avision.so.1.0.19 +usr/lib/sane/libsane-avision.so.1.0.22 #usr/lib/sane/libsane-bh.la usr/lib/sane/libsane-bh.so usr/lib/sane/libsane-bh.so.1 -usr/lib/sane/libsane-bh.so.1.0.19 +usr/lib/sane/libsane-bh.so.1.0.22 #usr/lib/sane/libsane-canon.la usr/lib/sane/libsane-canon.so usr/lib/sane/libsane-canon.so.1 -usr/lib/sane/libsane-canon.so.1.0.19 +usr/lib/sane/libsane-canon.so.1.0.22 #usr/lib/sane/libsane-canon630u.la usr/lib/sane/libsane-canon630u.so usr/lib/sane/libsane-canon630u.so.1 -usr/lib/sane/libsane-canon630u.so.1.0.19 +usr/lib/sane/libsane-canon630u.so.1.0.22 +#usr/lib/sane/libsane-canon_dr.la +usr/lib/sane/libsane-canon_dr.so +usr/lib/sane/libsane-canon_dr.so.1 +usr/lib/sane/libsane-canon_dr.so.1.0.22 #usr/lib/sane/libsane-cardscan.la usr/lib/sane/libsane-cardscan.so usr/lib/sane/libsane-cardscan.so.1 -usr/lib/sane/libsane-cardscan.so.1.0.19 +usr/lib/sane/libsane-cardscan.so.1.0.22 #usr/lib/sane/libsane-coolscan.la usr/lib/sane/libsane-coolscan.so usr/lib/sane/libsane-coolscan.so.1 -usr/lib/sane/libsane-coolscan.so.1.0.19 +usr/lib/sane/libsane-coolscan.so.1.0.22 #usr/lib/sane/libsane-coolscan2.la usr/lib/sane/libsane-coolscan2.so usr/lib/sane/libsane-coolscan2.so.1 -usr/lib/sane/libsane-coolscan2.so.1.0.19 +usr/lib/sane/libsane-coolscan2.so.1.0.22 +#usr/lib/sane/libsane-coolscan3.la +usr/lib/sane/libsane-coolscan3.so +usr/lib/sane/libsane-coolscan3.so.1 +usr/lib/sane/libsane-coolscan3.so.1.0.22 #usr/lib/sane/libsane-dc210.la usr/lib/sane/libsane-dc210.so usr/lib/sane/libsane-dc210.so.1 -usr/lib/sane/libsane-dc210.so.1.0.19 +usr/lib/sane/libsane-dc210.so.1.0.22 #usr/lib/sane/libsane-dc240.la usr/lib/sane/libsane-dc240.so usr/lib/sane/libsane-dc240.so.1 -usr/lib/sane/libsane-dc240.so.1.0.19 +usr/lib/sane/libsane-dc240.so.1.0.22 #usr/lib/sane/libsane-dc25.la usr/lib/sane/libsane-dc25.so usr/lib/sane/libsane-dc25.so.1 -usr/lib/sane/libsane-dc25.so.1.0.19 +usr/lib/sane/libsane-dc25.so.1.0.22 #usr/lib/sane/libsane-dell1600n_net.la usr/lib/sane/libsane-dell1600n_net.so usr/lib/sane/libsane-dell1600n_net.so.1 -usr/lib/sane/libsane-dell1600n_net.so.1.0.19 +usr/lib/sane/libsane-dell1600n_net.so.1.0.22 #usr/lib/sane/libsane-dll.la usr/lib/sane/libsane-dll.so usr/lib/sane/libsane-dll.so.1 -usr/lib/sane/libsane-dll.so.1.0.19 +usr/lib/sane/libsane-dll.so.1.0.22 #usr/lib/sane/libsane-dmc.la usr/lib/sane/libsane-dmc.so usr/lib/sane/libsane-dmc.so.1 -usr/lib/sane/libsane-dmc.so.1.0.19 +usr/lib/sane/libsane-dmc.so.1.0.22 #usr/lib/sane/libsane-epjitsu.la usr/lib/sane/libsane-epjitsu.so usr/lib/sane/libsane-epjitsu.so.1 -usr/lib/sane/libsane-epjitsu.so.1.0.19 +usr/lib/sane/libsane-epjitsu.so.1.0.22 #usr/lib/sane/libsane-epson.la usr/lib/sane/libsane-epson.so usr/lib/sane/libsane-epson.so.1 -usr/lib/sane/libsane-epson.so.1.0.19 +usr/lib/sane/libsane-epson.so.1.0.22 #usr/lib/sane/libsane-epson2.la usr/lib/sane/libsane-epson2.so usr/lib/sane/libsane-epson2.so.1 -usr/lib/sane/libsane-epson2.so.1.0.19 +usr/lib/sane/libsane-epson2.so.1.0.22 #usr/lib/sane/libsane-fujitsu.la usr/lib/sane/libsane-fujitsu.so usr/lib/sane/libsane-fujitsu.so.1 -usr/lib/sane/libsane-fujitsu.so.1.0.19 +usr/lib/sane/libsane-fujitsu.so.1.0.22 #usr/lib/sane/libsane-genesys.la usr/lib/sane/libsane-genesys.so usr/lib/sane/libsane-genesys.so.1 -usr/lib/sane/libsane-genesys.so.1.0.19 +usr/lib/sane/libsane-genesys.so.1.0.22 #usr/lib/sane/libsane-gt68xx.la usr/lib/sane/libsane-gt68xx.so usr/lib/sane/libsane-gt68xx.so.1 -usr/lib/sane/libsane-gt68xx.so.1.0.19 +usr/lib/sane/libsane-gt68xx.so.1.0.22 #usr/lib/sane/libsane-hp.la usr/lib/sane/libsane-hp.so usr/lib/sane/libsane-hp.so.1 -usr/lib/sane/libsane-hp.so.1.0.19 +usr/lib/sane/libsane-hp.so.1.0.22 #usr/lib/sane/libsane-hp3500.la usr/lib/sane/libsane-hp3500.so usr/lib/sane/libsane-hp3500.so.1 -usr/lib/sane/libsane-hp3500.so.1.0.19 +usr/lib/sane/libsane-hp3500.so.1.0.22 #usr/lib/sane/libsane-hp3900.la usr/lib/sane/libsane-hp3900.so usr/lib/sane/libsane-hp3900.so.1 -usr/lib/sane/libsane-hp3900.so.1.0.19 +usr/lib/sane/libsane-hp3900.so.1.0.22 #usr/lib/sane/libsane-hp4200.la usr/lib/sane/libsane-hp4200.so usr/lib/sane/libsane-hp4200.so.1 -usr/lib/sane/libsane-hp4200.so.1.0.19 +usr/lib/sane/libsane-hp4200.so.1.0.22 #usr/lib/sane/libsane-hp5400.la usr/lib/sane/libsane-hp5400.so usr/lib/sane/libsane-hp5400.so.1 -usr/lib/sane/libsane-hp5400.so.1.0.19 +usr/lib/sane/libsane-hp5400.so.1.0.22 #usr/lib/sane/libsane-hp5590.la usr/lib/sane/libsane-hp5590.so usr/lib/sane/libsane-hp5590.so.1 -usr/lib/sane/libsane-hp5590.so.1.0.19 +usr/lib/sane/libsane-hp5590.so.1.0.22 #usr/lib/sane/libsane-hpljm1005.la usr/lib/sane/libsane-hpljm1005.so usr/lib/sane/libsane-hpljm1005.so.1 -usr/lib/sane/libsane-hpljm1005.so.1.0.19 +usr/lib/sane/libsane-hpljm1005.so.1.0.22 #usr/lib/sane/libsane-hs2p.la usr/lib/sane/libsane-hs2p.so usr/lib/sane/libsane-hs2p.so.1 -usr/lib/sane/libsane-hs2p.so.1.0.19 +usr/lib/sane/libsane-hs2p.so.1.0.22 #usr/lib/sane/libsane-ibm.la usr/lib/sane/libsane-ibm.so usr/lib/sane/libsane-ibm.so.1 -usr/lib/sane/libsane-ibm.so.1.0.19 +usr/lib/sane/libsane-ibm.so.1.0.22 +#usr/lib/sane/libsane-kodak.la +usr/lib/sane/libsane-kodak.so +usr/lib/sane/libsane-kodak.so.1 +usr/lib/sane/libsane-kodak.so.1.0.22 +#usr/lib/sane/libsane-kvs1025.la +usr/lib/sane/libsane-kvs1025.so +usr/lib/sane/libsane-kvs1025.so.1 +usr/lib/sane/libsane-kvs1025.so.1.0.22 +#usr/lib/sane/libsane-kvs20xx.la +usr/lib/sane/libsane-kvs20xx.so +usr/lib/sane/libsane-kvs20xx.so.1 +usr/lib/sane/libsane-kvs20xx.so.1.0.22 #usr/lib/sane/libsane-leo.la usr/lib/sane/libsane-leo.so usr/lib/sane/libsane-leo.so.1 -usr/lib/sane/libsane-leo.so.1.0.19 +usr/lib/sane/libsane-leo.so.1.0.22 #usr/lib/sane/libsane-lexmark.la usr/lib/sane/libsane-lexmark.so usr/lib/sane/libsane-lexmark.so.1 -usr/lib/sane/libsane-lexmark.so.1.0.19 +usr/lib/sane/libsane-lexmark.so.1.0.22 #usr/lib/sane/libsane-ma1509.la usr/lib/sane/libsane-ma1509.so usr/lib/sane/libsane-ma1509.so.1 -usr/lib/sane/libsane-ma1509.so.1.0.19 +usr/lib/sane/libsane-ma1509.so.1.0.22 +#usr/lib/sane/libsane-magicolor.la +usr/lib/sane/libsane-magicolor.so +usr/lib/sane/libsane-magicolor.so.1 +usr/lib/sane/libsane-magicolor.so.1.0.22 #usr/lib/sane/libsane-matsushita.la usr/lib/sane/libsane-matsushita.so usr/lib/sane/libsane-matsushita.so.1 -usr/lib/sane/libsane-matsushita.so.1.0.19 +usr/lib/sane/libsane-matsushita.so.1.0.22 #usr/lib/sane/libsane-microtek.la usr/lib/sane/libsane-microtek.so usr/lib/sane/libsane-microtek.so.1 -usr/lib/sane/libsane-microtek.so.1.0.19 +usr/lib/sane/libsane-microtek.so.1.0.22 #usr/lib/sane/libsane-microtek2.la usr/lib/sane/libsane-microtek2.so usr/lib/sane/libsane-microtek2.so.1 -usr/lib/sane/libsane-microtek2.so.1.0.19 +usr/lib/sane/libsane-microtek2.so.1.0.22 #usr/lib/sane/libsane-mustek.la usr/lib/sane/libsane-mustek.so usr/lib/sane/libsane-mustek.so.1 -usr/lib/sane/libsane-mustek.so.1.0.19 +usr/lib/sane/libsane-mustek.so.1.0.22 +#usr/lib/sane/libsane-mustek_pp.la +usr/lib/sane/libsane-mustek_pp.so +usr/lib/sane/libsane-mustek_pp.so.1 +usr/lib/sane/libsane-mustek_pp.so.1.0.22 #usr/lib/sane/libsane-mustek_usb.la usr/lib/sane/libsane-mustek_usb.so usr/lib/sane/libsane-mustek_usb.so.1 -usr/lib/sane/libsane-mustek_usb.so.1.0.19 -#usr/lib/sane/libsane-mustek_usb2.la -usr/lib/sane/libsane-mustek_usb2.so -usr/lib/sane/libsane-mustek_usb2.so.1 -usr/lib/sane/libsane-mustek_usb2.so.1.0.19 +usr/lib/sane/libsane-mustek_usb.so.1.0.22 #usr/lib/sane/libsane-nec.la usr/lib/sane/libsane-nec.so usr/lib/sane/libsane-nec.so.1 -usr/lib/sane/libsane-nec.so.1.0.19 +usr/lib/sane/libsane-nec.so.1.0.22 #usr/lib/sane/libsane-net.la usr/lib/sane/libsane-net.so usr/lib/sane/libsane-net.so.1 -usr/lib/sane/libsane-net.so.1.0.19 +usr/lib/sane/libsane-net.so.1.0.22 #usr/lib/sane/libsane-niash.la usr/lib/sane/libsane-niash.so usr/lib/sane/libsane-niash.so.1 -usr/lib/sane/libsane-niash.so.1.0.19 +usr/lib/sane/libsane-niash.so.1.0.22 +#usr/lib/sane/libsane-p5.la +usr/lib/sane/libsane-p5.so +usr/lib/sane/libsane-p5.so.1 +usr/lib/sane/libsane-p5.so.1.0.22 #usr/lib/sane/libsane-pie.la usr/lib/sane/libsane-pie.so usr/lib/sane/libsane-pie.so.1 -usr/lib/sane/libsane-pie.so.1.0.19 +usr/lib/sane/libsane-pie.so.1.0.22 #usr/lib/sane/libsane-pixma.la usr/lib/sane/libsane-pixma.so usr/lib/sane/libsane-pixma.so.1 -usr/lib/sane/libsane-pixma.so.1.0.19 +usr/lib/sane/libsane-pixma.so.1.0.22 #usr/lib/sane/libsane-plustek.la usr/lib/sane/libsane-plustek.so usr/lib/sane/libsane-plustek.so.1 -usr/lib/sane/libsane-plustek.so.1.0.19 +usr/lib/sane/libsane-plustek.so.1.0.22 #usr/lib/sane/libsane-plustek_pp.la usr/lib/sane/libsane-plustek_pp.so usr/lib/sane/libsane-plustek_pp.so.1 -usr/lib/sane/libsane-plustek_pp.so.1.0.19 +usr/lib/sane/libsane-plustek_pp.so.1.0.22 #usr/lib/sane/libsane-qcam.la usr/lib/sane/libsane-qcam.so usr/lib/sane/libsane-qcam.so.1 -usr/lib/sane/libsane-qcam.so.1.0.19 +usr/lib/sane/libsane-qcam.so.1.0.22 #usr/lib/sane/libsane-ricoh.la usr/lib/sane/libsane-ricoh.so usr/lib/sane/libsane-ricoh.so.1 -usr/lib/sane/libsane-ricoh.so.1.0.19 +usr/lib/sane/libsane-ricoh.so.1.0.22 +#usr/lib/sane/libsane-rts8891.la +usr/lib/sane/libsane-rts8891.so +usr/lib/sane/libsane-rts8891.so.1 +usr/lib/sane/libsane-rts8891.so.1.0.22 #usr/lib/sane/libsane-s9036.la usr/lib/sane/libsane-s9036.so usr/lib/sane/libsane-s9036.so.1 -usr/lib/sane/libsane-s9036.so.1.0.19 +usr/lib/sane/libsane-s9036.so.1.0.22 #usr/lib/sane/libsane-sceptre.la usr/lib/sane/libsane-sceptre.so usr/lib/sane/libsane-sceptre.so.1 -usr/lib/sane/libsane-sceptre.so.1.0.19 +usr/lib/sane/libsane-sceptre.so.1.0.22 #usr/lib/sane/libsane-sharp.la usr/lib/sane/libsane-sharp.so usr/lib/sane/libsane-sharp.so.1 -usr/lib/sane/libsane-sharp.so.1.0.19 +usr/lib/sane/libsane-sharp.so.1.0.22 #usr/lib/sane/libsane-sm3600.la usr/lib/sane/libsane-sm3600.so usr/lib/sane/libsane-sm3600.so.1 -usr/lib/sane/libsane-sm3600.so.1.0.19 +usr/lib/sane/libsane-sm3600.so.1.0.22 #usr/lib/sane/libsane-sm3840.la usr/lib/sane/libsane-sm3840.so usr/lib/sane/libsane-sm3840.so.1 -usr/lib/sane/libsane-sm3840.so.1.0.19 +usr/lib/sane/libsane-sm3840.so.1.0.22 #usr/lib/sane/libsane-snapscan.la usr/lib/sane/libsane-snapscan.so usr/lib/sane/libsane-snapscan.so.1 -usr/lib/sane/libsane-snapscan.so.1.0.19 +usr/lib/sane/libsane-snapscan.so.1.0.22 #usr/lib/sane/libsane-sp15c.la usr/lib/sane/libsane-sp15c.so usr/lib/sane/libsane-sp15c.so.1 -usr/lib/sane/libsane-sp15c.so.1.0.19 +usr/lib/sane/libsane-sp15c.so.1.0.22 #usr/lib/sane/libsane-st400.la usr/lib/sane/libsane-st400.so usr/lib/sane/libsane-st400.so.1 -usr/lib/sane/libsane-st400.so.1.0.19 +usr/lib/sane/libsane-st400.so.1.0.22 #usr/lib/sane/libsane-stv680.la usr/lib/sane/libsane-stv680.so usr/lib/sane/libsane-stv680.so.1 -usr/lib/sane/libsane-stv680.so.1.0.19 +usr/lib/sane/libsane-stv680.so.1.0.22 #usr/lib/sane/libsane-tamarack.la usr/lib/sane/libsane-tamarack.so usr/lib/sane/libsane-tamarack.so.1 -usr/lib/sane/libsane-tamarack.so.1.0.19 +usr/lib/sane/libsane-tamarack.so.1.0.22 #usr/lib/sane/libsane-teco1.la usr/lib/sane/libsane-teco1.so usr/lib/sane/libsane-teco1.so.1 -usr/lib/sane/libsane-teco1.so.1.0.19 +usr/lib/sane/libsane-teco1.so.1.0.22 #usr/lib/sane/libsane-teco2.la usr/lib/sane/libsane-teco2.so usr/lib/sane/libsane-teco2.so.1 -usr/lib/sane/libsane-teco2.so.1.0.19 +usr/lib/sane/libsane-teco2.so.1.0.22 #usr/lib/sane/libsane-teco3.la usr/lib/sane/libsane-teco3.so usr/lib/sane/libsane-teco3.so.1 -usr/lib/sane/libsane-teco3.so.1.0.19 +usr/lib/sane/libsane-teco3.so.1.0.22 #usr/lib/sane/libsane-test.la usr/lib/sane/libsane-test.so usr/lib/sane/libsane-test.so.1 -usr/lib/sane/libsane-test.so.1.0.19 +usr/lib/sane/libsane-test.so.1.0.22 #usr/lib/sane/libsane-u12.la usr/lib/sane/libsane-u12.so usr/lib/sane/libsane-u12.so.1 -usr/lib/sane/libsane-u12.so.1.0.19 +usr/lib/sane/libsane-u12.so.1.0.22 #usr/lib/sane/libsane-umax.la usr/lib/sane/libsane-umax.so usr/lib/sane/libsane-umax.so.1 -usr/lib/sane/libsane-umax.so.1.0.19 +usr/lib/sane/libsane-umax.so.1.0.22 #usr/lib/sane/libsane-umax1220u.la usr/lib/sane/libsane-umax1220u.so usr/lib/sane/libsane-umax1220u.so.1 -usr/lib/sane/libsane-umax1220u.so.1.0.19 +usr/lib/sane/libsane-umax1220u.so.1.0.22 #usr/lib/sane/libsane-umax_pp.la usr/lib/sane/libsane-umax_pp.so usr/lib/sane/libsane-umax_pp.so.1 -usr/lib/sane/libsane-umax_pp.so.1.0.19 -#usr/lib/sane/libsane-v4l.la -usr/lib/sane/libsane-v4l.so -usr/lib/sane/libsane-v4l.so.1 -usr/lib/sane/libsane-v4l.so.1.0.19 +usr/lib/sane/libsane-umax_pp.so.1.0.22 +#usr/lib/sane/libsane-xerox_mfp.la +usr/lib/sane/libsane-xerox_mfp.so +usr/lib/sane/libsane-xerox_mfp.so.1 +usr/lib/sane/libsane-xerox_mfp.so.1.0.22 usr/sbin/saned #usr/share/locale/bg/LC_MESSAGES/sane-backends.mo #usr/share/locale/cs/LC_MESSAGES/sane-backends.mo #usr/share/locale/da/LC_MESSAGES/sane-backends.mo usr/share/locale/de/LC_MESSAGES/sane-backends.mo +#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo #usr/share/locale/eo/LC_MESSAGES/sane-backends.mo #usr/share/locale/es/LC_MESSAGES/sane-backends.mo #usr/share/locale/fi/LC_MESSAGES/sane-backends.mo #usr/share/locale/fr/LC_MESSAGES/sane-backends.mo +#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo #usr/share/locale/it/LC_MESSAGES/sane-backends.mo +#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo #usr/share/locale/nb/LC_MESSAGES/sane-backends.mo #usr/share/locale/nl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pl/LC_MESSAGES/sane-backends.mo #usr/share/locale/pt/LC_MESSAGES/sane-backends.mo #usr/share/locale/ru/LC_MESSAGES/sane-backends.mo #usr/share/locale/sv/LC_MESSAGES/sane-backends.mo -usr/share/man/man1/gamma4scanimage.1 -usr/share/man/man1/sane-config.1 -usr/share/man/man1/sane-find-scanner.1 -usr/share/man/man1/scanimage.1 -usr/share/man/man5/sane-abaton.5 -usr/share/man/man5/sane-agfafocus.5 -usr/share/man/man5/sane-apple.5 -usr/share/man/man5/sane-artec.5 -usr/share/man/man5/sane-artec_eplus48u.5 -usr/share/man/man5/sane-as6e.5 -usr/share/man/man5/sane-avision.5 -usr/share/man/man5/sane-bh.5 -usr/share/man/man5/sane-canon.5 -usr/share/man/man5/sane-canon630u.5 -usr/share/man/man5/sane-canon_pp.5 -usr/share/man/man5/sane-cardscan.5 -usr/share/man/man5/sane-coolscan.5 -usr/share/man/man5/sane-coolscan2.5 -usr/share/man/man5/sane-dc210.5 -usr/share/man/man5/sane-dc240.5 -usr/share/man/man5/sane-dc25.5 -usr/share/man/man5/sane-dll.5 -usr/share/man/man5/sane-dmc.5 -usr/share/man/man5/sane-epjitsu.5 -usr/share/man/man5/sane-epson.5 -usr/share/man/man5/sane-fujitsu.5 -usr/share/man/man5/sane-genesys.5 -usr/share/man/man5/sane-gphoto2.5 -usr/share/man/man5/sane-gt68xx.5 -usr/share/man/man5/sane-hp.5 -usr/share/man/man5/sane-hp3500.5 -usr/share/man/man5/sane-hp3900.5 -usr/share/man/man5/sane-hp4200.5 -usr/share/man/man5/sane-hp5400.5 -usr/share/man/man5/sane-hp5590.5 -usr/share/man/man5/sane-hpljm1005.5 -usr/share/man/man5/sane-hpsj5s.5 -usr/share/man/man5/sane-hs2p.5 -usr/share/man/man5/sane-ibm.5 -usr/share/man/man5/sane-leo.5 -usr/share/man/man5/sane-lexmark.5 -usr/share/man/man5/sane-ma1509.5 -usr/share/man/man5/sane-matsushita.5 -usr/share/man/man5/sane-microtek.5 -usr/share/man/man5/sane-microtek2.5 -usr/share/man/man5/sane-mustek.5 -usr/share/man/man5/sane-mustek_pp.5 -usr/share/man/man5/sane-mustek_usb.5 -usr/share/man/man5/sane-mustek_usb2.5 -usr/share/man/man5/sane-nec.5 -usr/share/man/man5/sane-net.5 -usr/share/man/man5/sane-niash.5 -usr/share/man/man5/sane-pie.5 -usr/share/man/man5/sane-pint.5 -usr/share/man/man5/sane-pixma.5 -usr/share/man/man5/sane-plustek.5 -usr/share/man/man5/sane-plustek_pp.5 -usr/share/man/man5/sane-pnm.5 -usr/share/man/man5/sane-qcam.5 -usr/share/man/man5/sane-ricoh.5 -usr/share/man/man5/sane-s9036.5 -usr/share/man/man5/sane-sceptre.5 -usr/share/man/man5/sane-scsi.5 -usr/share/man/man5/sane-sharp.5 -usr/share/man/man5/sane-sm3600.5 -usr/share/man/man5/sane-sm3840.5 -usr/share/man/man5/sane-snapscan.5 -usr/share/man/man5/sane-sp15c.5 -usr/share/man/man5/sane-st400.5 -usr/share/man/man5/sane-stv680.5 -usr/share/man/man5/sane-tamarack.5 -usr/share/man/man5/sane-teco1.5 -usr/share/man/man5/sane-teco2.5 -usr/share/man/man5/sane-teco3.5 -usr/share/man/man5/sane-test.5 -usr/share/man/man5/sane-u12.5 -usr/share/man/man5/sane-umax.5 -usr/share/man/man5/sane-umax1220u.5 -usr/share/man/man5/sane-umax_pp.5 -usr/share/man/man5/sane-usb.5 -usr/share/man/man5/sane-v4l.5 -usr/share/man/man7/sane.7 -usr/share/man/man8/saned.8 +#usr/share/locale/uk/LC_MESSAGES/sane-backends.mo +#usr/share/man/man1/gamma4scanimage.1 +#usr/share/man/man1/sane-config.1 +#usr/share/man/man1/sane-find-scanner.1 +#usr/share/man/man1/scanimage.1 +#usr/share/man/man5/sane-abaton.5 +#usr/share/man/man5/sane-agfafocus.5 +#usr/share/man/man5/sane-apple.5 +#usr/share/man/man5/sane-artec.5 +#usr/share/man/man5/sane-artec_eplus48u.5 +#usr/share/man/man5/sane-as6e.5 +#usr/share/man/man5/sane-avision.5 +#usr/share/man/man5/sane-bh.5 +#usr/share/man/man5/sane-canon.5 +#usr/share/man/man5/sane-canon630u.5 +#usr/share/man/man5/sane-canon_dr.5 +#usr/share/man/man5/sane-cardscan.5 +#usr/share/man/man5/sane-coolscan.5 +#usr/share/man/man5/sane-coolscan2.5 +#usr/share/man/man5/sane-coolscan3.5 +#usr/share/man/man5/sane-dc210.5 +#usr/share/man/man5/sane-dc240.5 +#usr/share/man/man5/sane-dc25.5 +#usr/share/man/man5/sane-dll.5 +#usr/share/man/man5/sane-dmc.5 +#usr/share/man/man5/sane-epjitsu.5 +#usr/share/man/man5/sane-epson.5 +#usr/share/man/man5/sane-epson2.5 +#usr/share/man/man5/sane-fujitsu.5 +#usr/share/man/man5/sane-genesys.5 +#usr/share/man/man5/sane-gt68xx.5 +#usr/share/man/man5/sane-hp.5 +#usr/share/man/man5/sane-hp3500.5 +#usr/share/man/man5/sane-hp3900.5 +#usr/share/man/man5/sane-hp4200.5 +#usr/share/man/man5/sane-hp5400.5 +#usr/share/man/man5/sane-hp5590.5 +#usr/share/man/man5/sane-hpljm1005.5 +#usr/share/man/man5/sane-hs2p.5 +#usr/share/man/man5/sane-ibm.5 +#usr/share/man/man5/sane-kodak.5 +#usr/share/man/man5/sane-kvs1025.5 +#usr/share/man/man5/sane-kvs20xx.5 +#usr/share/man/man5/sane-leo.5 +#usr/share/man/man5/sane-lexmark.5 +#usr/share/man/man5/sane-ma1509.5 +#usr/share/man/man5/sane-magicolor.5 +#usr/share/man/man5/sane-matsushita.5 +#usr/share/man/man5/sane-microtek.5 +#usr/share/man/man5/sane-microtek2.5 +#usr/share/man/man5/sane-mustek.5 +#usr/share/man/man5/sane-mustek_pp.5 +#usr/share/man/man5/sane-mustek_usb.5 +#usr/share/man/man5/sane-nec.5 +#usr/share/man/man5/sane-net.5 +#usr/share/man/man5/sane-niash.5 +#usr/share/man/man5/sane-p5.5 +#usr/share/man/man5/sane-pie.5 +#usr/share/man/man5/sane-pixma.5 +#usr/share/man/man5/sane-plustek.5 +#usr/share/man/man5/sane-plustek_pp.5 +#usr/share/man/man5/sane-qcam.5 +#usr/share/man/man5/sane-ricoh.5 +#usr/share/man/man5/sane-rts8891.5 +#usr/share/man/man5/sane-s9036.5 +#usr/share/man/man5/sane-sceptre.5 +#usr/share/man/man5/sane-scsi.5 +#usr/share/man/man5/sane-sharp.5 +#usr/share/man/man5/sane-sm3600.5 +#usr/share/man/man5/sane-sm3840.5 +#usr/share/man/man5/sane-snapscan.5 +#usr/share/man/man5/sane-sp15c.5 +#usr/share/man/man5/sane-st400.5 +#usr/share/man/man5/sane-stv680.5 +#usr/share/man/man5/sane-tamarack.5 +#usr/share/man/man5/sane-teco1.5 +#usr/share/man/man5/sane-teco2.5 +#usr/share/man/man5/sane-teco3.5 +#usr/share/man/man5/sane-test.5 +#usr/share/man/man5/sane-u12.5 +#usr/share/man/man5/sane-umax.5 +#usr/share/man/man5/sane-umax1220u.5 +#usr/share/man/man5/sane-umax_pp.5 +#usr/share/man/man5/sane-usb.5 +#usr/share/man/man5/sane-xerox_mfp.5 +#usr/share/man/man7/sane.7 +#usr/share/man/man8/saned.8 #usr/share/sane usr/share/sane/artec_eplus48u usr/share/sane/epjitsu usr/share/sane/gt68xx usr/share/sane/snapscan +#usr/var +#usr/var/lock usr/var/lock/sane -etc/sane.d/mustek_pp.conf -#usr/lib/sane/libsane-mustek_pp.la -usr/lib/sane/libsane-mustek_pp.so -usr/lib/sane/libsane-mustek_pp.so.1 -usr/lib/sane/libsane-mustek_pp.so.1.0.19 +var/ipfire/backup/addons/includes/sane etc/rc.d/init.d/sane -etc/rc.d/rc3.d/S95sane -etc/rc.d/rc0.d/K10sane -etc/rc.d/rc6.d/K10sane usr/local/bin/sanedloop -var/ipfire/backup/addons/includes/sane -#usr/var -#usr/var/lock diff --git a/lfs/client175 b/lfs/client175 index 7f39508..ef2b487 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,7 +24,7 @@ include Config -VER = 0.5a +VER = 0.7 THISAPP = client175_$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = client175 -PAK_VER = 2 +PAK_VER = 3 DEPS = "mpfire" @@ -44,7 +44,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 578ad4ba1743f3b0801a806659f550c8 +$(DL_FILE)_MD5 = 975b69de79dc2649d8acba294cc0c5eb + install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,11 +77,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxvf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) @rm -rf /srv/client175 mkdir -pv /srv/client175 cd $(DIR_APP) && mv -vf * /srv/client175 + cp -vf $(DIR_SRC)/config/client175/site.conf /srv/client175/ install -v -m 644 $(DIR_SRC)/config/backup/includes/client175 \ diff --git a/lfs/sane b/lfs/sane index 742fc70..96341b6 100644 --- a/lfs/sane +++ b/lfs/sane @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,23 +24,16 @@ include Config -VER = 1.0.19 +VER = 1.0.22 THISAPP = sane-$(VER) DL_FILE = sane-backends-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/sane-backends-$(VER) -ifeq "$(KMOD)" "1" -ifeq "$(SMP)" "1" -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-smp -else -TARGET = $(DIR_INFO)/$(THISAPP)-kmod -endif -else TARGET = $(DIR_INFO)/$(THISAPP) -endif + PROG = sane -PAK_VER = 1 +PAK_VER = 2 DEPS = "libtiff" @@ -52,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8c0936272dcfd4e98c51512699f1c06f +$(DL_FILE)_MD5 = fadf56a60f4776bfb24491f66b617cf5 install : $(TARGET) @@ -85,21 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(KMOD)" "1" - cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \ - $(DIR_APP)/backend/Makefile -ifeq "$(SMP)" "1" - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/ -else - cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \ - SUBDIRS=$(DIR_APP)/backend modules - cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \ - /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/ -endif -else cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --disable-ipv6 \ --enable-parport-directio @@ -112,7 +90,5 @@ else ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane install -v -m 644 $(DIR_SRC)/config/backup/includes/sane \ /var/ipfire/backup/addons/includes/sane -endif @rm -rf $(DIR_APP) @$(POSTBUILD) - \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2011