Menu
▾
▴
ipcop-svn — IPCop Subversion mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(330) |
May
(46) |
Jun
(52) |
Jul
(39) |
Aug
(26) |
Sep
(12) |
Oct
(110) |
Nov
(178) |
Dec
(161) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(99) |
Feb
(106) |
Mar
(97) |
Apr
(93) |
May
(81) |
Jun
(112) |
Jul
(84) |
Aug
(142) |
Sep
(165) |
Oct
(89) |
Nov
(120) |
Dec
(117) |
| 2009 |
Jan
(141) |
Feb
(137) |
Mar
(121) |
Apr
(96) |
May
(207) |
Jun
(194) |
Jul
(210) |
Aug
(155) |
Sep
(91) |
Oct
(159) |
Nov
(123) |
Dec
(166) |
| 2010 |
Jan
(142) |
Feb
(79) |
Mar
(137) |
Apr
(126) |
May
(78) |
Jun
(69) |
Jul
(54) |
Aug
(161) |
Sep
(76) |
Oct
(98) |
Nov
(113) |
Dec
(95) |
| 2011 |
Jan
(101) |
Feb
(118) |
Mar
(74) |
Apr
(75) |
May
(32) |
Jun
(32) |
Jul
(39) |
Aug
(74) |
Sep
(48) |
Oct
(134) |
Nov
(133) |
Dec
(55) |
| 2012 |
Jan
(94) |
Feb
(143) |
Mar
(80) |
Apr
(75) |
May
(36) |
Jun
(46) |
Jul
(47) |
Aug
(51) |
Sep
(10) |
Oct
(36) |
Nov
(38) |
Dec
(19) |
| 2013 |
Jan
(26) |
Feb
(40) |
Mar
(48) |
Apr
(26) |
May
(34) |
Jun
(20) |
Jul
(18) |
Aug
(10) |
Sep
(8) |
Oct
(6) |
Nov
(64) |
Dec
(18) |
| 2014 |
Jan
(26) |
Feb
(42) |
Mar
(126) |
Apr
(122) |
May
(73) |
Jun
(33) |
Jul
(14) |
Aug
(20) |
Sep
(12) |
Oct
(33) |
Nov
(20) |
Dec
(49) |
| 2015 |
Jan
(79) |
Feb
(64) |
Mar
(49) |
Apr
(6) |
May
(9) |
Jun
(2) |
Jul
(27) |
Aug
|
Sep
|
Oct
(4) |
Nov
(1) |
Dec
(12) |
| 2016 |
Jan
(72) |
Feb
(9) |
Mar
(13) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
|
2
|
|
3
|
4
|
5
|
6
|
7
(1) |
8
|
9
|
|
10
|
11
|
12
|
13
|
14
|
15
|
16
|
|
17
|
18
|
19
|
20
|
21
|
22
|
23
|
|
24
(6) |
25
(2) |
26
(7) |
27
|
28
(4) |
29
|
30
|
|
31
|
|
|
|
|
|
|
|
From: <ow...@us...> - 2014-08-28 10:43:38
|
Revision: 7650
http://sourceforge.net/p/ipcop/svn/7650
Author: owes
Date: 2014-08-28 10:43:30 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Update util-linux to 2.25
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/util-linux
ipcop/trunk/lfs/util-linux
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
Modified: ipcop/trunk/config/rootfiles/common/util-linux
===================================================================
--- ipcop/trunk/config/rootfiles/common/util-linux 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/config/rootfiles/common/util-linux 2014-08-28 10:43:30 UTC (rev 7650)
@@ -11,6 +11,8 @@
lib/libblkid.so.1.1.0
lib/libmount.so.1
lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
lib/libuuid.so.1
lib/libuuid.so.1.3.0
sbin/agetty
@@ -46,7 +48,6 @@
#usr/bin/colcrt
#usr/bin/colrm
#usr/bin/column
-#usr/bin/cytune
#usr/bin/eject
#usr/bin/fallocate
#usr/bin/flock
@@ -65,6 +66,7 @@
#usr/bin/look
#usr/bin/lscpu
#usr/bin/lslocks
+#usr/bin/lslogins
#usr/bin/mcookie
usr/bin/mesg
#usr/bin/namei
@@ -81,6 +83,7 @@
#usr/bin/setterm
#usr/bin/tailf
#usr/bin/ul
+#usr/bin/uname26
usr/bin/utmpdump
#usr/bin/uuidgen
#usr/bin/wall
@@ -89,13 +92,18 @@
#usr/include/blkid/blkid.h
#usr/include/libmount
#usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
#usr/include/uuid
#usr/include/uuid/uuid.h
usr/lib/libblkid.so
usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+usr/lib/libsmartcols.so
usr/lib/libuuid.so
#usr/lib/pkgconfig/blkid.pc
#usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
#usr/lib/pkgconfig/uuid.pc
#usr/sbin/addpart
#usr/sbin/delpart
@@ -106,6 +114,8 @@
#usr/sbin/resizepart
#usr/sbin/rtcwake
#usr/sbin/uuidd
+#usr/share/bash-completion
+#usr/share/bash-completion/completions
#usr/share/doc/util-linux
#usr/share/doc/util-linux/getopt
#usr/share/doc/util-linux/getopt/getopt-parse.bash
@@ -130,6 +140,7 @@
#usr/share/man/man1/logger.1
#usr/share/man/man1/look.1
#usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lslogins.1
#usr/share/man/man1/mcookie.1
#usr/share/man/man1/mesg.1
#usr/share/man/man1/more.1
@@ -165,6 +176,7 @@
#usr/share/man/man3/uuid_time.3
#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
#usr/share/man/man8/addpart.8
#usr/share/man/man8/agetty.8
#usr/share/man/man8/blkdiscard.8
@@ -173,7 +185,6 @@
#usr/share/man/man8/cfdisk.8
#usr/share/man/man8/chcpu.8
#usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
#usr/share/man/man8/delpart.8
#usr/share/man/man8/fdformat.8
#usr/share/man/man8/fdisk.8
@@ -211,6 +222,7 @@
#usr/share/man/man8/swapon.8
#usr/share/man/man8/switch_root.8
#usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
#usr/share/man/man8/uuidd.8
#usr/share/man/man8/wdctl.8
#usr/share/man/man8/wipefs.8
Modified: ipcop/trunk/lfs/util-linux
===================================================================
--- ipcop/trunk/lfs/util-linux 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/lfs/util-linux 2014-08-28 10:43:30 UTC (rev 7650)
@@ -33,13 +33,13 @@
include Config
PKG_NAME = util-linux
-VER = 2.24.2
+VER = 2.25
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.xz
-DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.24
+DL_FROM = $(URL_KERNEL)/linux/utils/util-linux/v2.25
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3f191727a0d28f7204b755cf1b6ea0aa
+$(DL_FILE)_MD5 = 4c78fdef4cb882caafad61e33cafbc14
install : $(TARGET)
@@ -81,6 +81,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_lscpu-pic.patch
ifeq "$(STAGE)" "toolchain"
# Just try to build only what is required here : mount, setarch (for linux32), libblkid, libuuid
@@ -127,11 +128,12 @@
ifeq "$(STAGE)" "base"
# 2.25 should have this to be able to change adjtime: ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime
- cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' `grep -rl 'etc/adjtime' .`
+ #cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' `grep -rl 'etc/adjtime' .`
cd $(DIR_APP) && mkdir -p /var/lib/hwclock
cd $(DIR_APP) && ./configure --localstatedir=/var/run --disable-static --disable-nls \
--disable-bash-completion --disable-cramfs --disable-login --disable-nologin \
- --disable-schedutils --disable-su --disable-unshare
+ --disable-schedutils --disable-su --disable-unshare \
+ ADJTIME_PATH=/var/lib/hwclock/adjtime
# CCACHE_CPP2=1 replace the CFLAGS -fPIE hack and workaround a not well identified gcc-4.4 issue that trigger
# lscpu.c: In function 'read_hypervisor':
# lscpu.c:446: error can't find a register in class 'BREG' while reloading 'asm'
Added: ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch
===================================================================
--- ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch (rev 0)
+++ ipcop/trunk/src/patches/util-linux-2.25_lscpu-pic.patch 2014-08-28 10:43:30 UTC (rev 7650)
@@ -0,0 +1,81 @@
+From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <va...@ge...>
+Date: Tue, 5 Aug 2014 18:58:52 -0400
+Subject: [PATCH] lscpu: clean up vmware inline asm
+
+This code is not PIC clean which means it fails to build on hardened
+32bit x86 systems (i.e. building as PIE).
+
+While here, optimize the existing cpuid logic slightly.
+
+URL: https://bugs.gentoo.org/518936
+Signed-off-by: Mike Frysinger <va...@ge...>
+---
+ sys-utils/lscpu.c | 36 ++++++++++++++++++++++++++----------
+ 1 file changed, 26 insertions(+), 10 deletions(-)
+
+diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
+index 062dff5..9965eeb 100644
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -546,10 +546,9 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
+ __asm__(
+ #if defined(__PIC__) && defined(__i386__)
+ /* x86 PIC cannot clobber ebx -- gcc bitches */
+- "pushl %%ebx;"
++ "xchg %%ebx, %%esi;"
+ "cpuid;"
+- "movl %%ebx, %%esi;"
+- "popl %%ebx;"
++ "xchg %%esi, %%ebx;"
+ : "=S" (*ebx),
+ #else
+ "cpuid;"
+@@ -656,12 +655,29 @@ read_hypervisor_powerpc(struct lscpu_desc *desc)
+ #define VMWARE_BDOOR_PORT 0x5658
+ #define VMWARE_BDOOR_CMD_GETVERSION 10
+
+-#define VMWARE_BDOOR(eax, ebx, ecx, edx) \
+- __asm__("inl (%%dx), %%eax" : \
+- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \
+- "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \
+- "2"(VMWARE_BDOOR_PORT), "3"(0) : \
+- "memory");
++static inline
++void vmware_bdoor(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
++{
++ __asm__(
++#if defined(__PIC__) && defined(__i386__)
++ /* x86 PIC cannot clobber ebx -- gcc bitches */
++ "xchg %%ebx, %%esi;"
++ "inl (%%dx), %%eax;"
++ "xchg %%esi, %%ebx;"
++ : "=S" (*ebx),
++#else
++ "inl (%%dx), %%eax;"
++ : "=b" (*ebx),
++#endif
++ "=a" (*eax),
++ "=c" (*ecx),
++ "=d" (*edx)
++ : "0" (VMWARE_BDOOR_MAGIC),
++ "1" (VMWARE_BDOOR_CMD_GETVERSION),
++ "2" (VMWARE_BDOOR_PORT),
++ "3" (0)
++ : "memory");
++}
+
+ static jmp_buf segv_handler_env;
+
+@@ -697,7 +713,7 @@ is_vmware_platform(void)
+ if (sigaction(SIGSEGV, &act, &oact))
+ err(EXIT_FAILURE, _("error: can not set signal handler"));
+
+- VMWARE_BDOOR(eax, ebx, ecx, edx);
++ vmware_bdoor(&eax, &ebx, &ecx, &edx);
+
+ if (sigaction(SIGSEGV, &oact, NULL))
+ err(EXIT_FAILURE, _("error: can not restore signal handler"));
+--
+2.0.0
+
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:43:30 UTC (rev 7650)
@@ -466,7 +466,7 @@
/usr/share/zoneinfo/posix/US/Samoa
/usr/share/zoneinfo/posix/W-SU
##
-## util-linux-2.24.2
+## util-linux-2.25
/bin/dmesg
/bin/kill
/bin/more
@@ -475,6 +475,8 @@
/bin/umount
/lib/libblkid.so.1.1.0
/lib/libmount.so.1.1.0
+/lib/libsmartcols.so.1
+/lib/libsmartcols.so.1.1.0
/lib/libuuid.so.1.3.0
/sbin/agetty
/sbin/blkid
@@ -496,5 +498,6 @@
/usr/bin/rename
/usr/bin/renice
/usr/bin/utmpdump
+/usr/lib/libsmartcols.so
/usr/sbin/fdformat
/usr/sbin/mklost+found
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:28:51 UTC (rev 7649)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:43:30 UTC (rev 7650)
@@ -11,7 +11,7 @@
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, libnl to 3.2.25, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,
- tzdata to 2014f, util-linux to 2.24.2.
+ tzdata to 2014f, util-linux to 2.25.
Upgrade Perl modules IO-Socket-SSL to 1.997, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
Upgrade e1000e network driver to 3.1.0.2, igb network driver to 5.2.9.4.<br />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-28 10:28:55
|
Revision: 7649
http://sourceforge.net/p/ipcop/svn/7649
Author: owes
Date: 2014-08-28 10:28:51 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Update IO-Socket-SSL to 1.997
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/IO-Socket-SSL
ipcop/trunk/lfs/IO-Socket-SSL
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/config/rootfiles/common/IO-Socket-SSL
===================================================================
--- ipcop/trunk/config/rootfiles/common/IO-Socket-SSL 2014-08-28 10:16:15 UTC (rev 7648)
+++ ipcop/trunk/config/rootfiles/common/IO-Socket-SSL 2014-08-28 10:28:51 UTC (rev 7649)
@@ -2,6 +2,7 @@
#usr/lib/perl5/site_perl/PERLVER/IO/Socket
#usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL
usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL.pm
+#usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL.pod
usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL/Intercept.pm
usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL/PublicSuffix.pm
usr/lib/perl5/site_perl/PERLVER/IO/Socket/SSL/Utils.pm
Modified: ipcop/trunk/lfs/IO-Socket-SSL
===================================================================
--- ipcop/trunk/lfs/IO-Socket-SSL 2014-08-28 10:16:15 UTC (rev 7648)
+++ ipcop/trunk/lfs/IO-Socket-SSL 2014-08-28 10:28:51 UTC (rev 7649)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = IO-Socket-SSL
-VER = 1.988
+VER = 1.997
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1dd372023ba79550835932c1248a3f25
+$(DL_FILE)_MD5 = 2a6268bb42da81e69d1c1feb2fcb0eea
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:16:15 UTC (rev 7648)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:28:51 UTC (rev 7649)
@@ -171,7 +171,7 @@
/usr/lib/openvpn/plugins/openvpn-plugin-down-root.la
/usr/sbin/openvpn
##
-## perl IO-Socket-SSL-1.988
+## perl IO-Socket-SSL-1.997
/usr/lib/perl5/site_perl/5.14.2/IO/Socket/SSL.pm
/usr/lib/perl5/site_perl/5.14.2/IO/Socket/SSL/PublicSuffix.pm
/usr/lib/perl5/site_perl/5.14.2/IO/Socket/SSL/Utils.pm
@@ -475,6 +475,7 @@
/bin/umount
/lib/libblkid.so.1.1.0
/lib/libmount.so.1.1.0
+/lib/libuuid.so.1.3.0
/sbin/agetty
/sbin/blkid
/sbin/blockdev
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:16:15 UTC (rev 7648)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:28:51 UTC (rev 7649)
@@ -12,7 +12,7 @@
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
- Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
+ Upgrade Perl modules IO-Socket-SSL to 1.997, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
Upgrade e1000e network driver to 3.1.0.2, igb network driver to 5.2.9.4.<br />
<b>Mandatory reboot after upgrade.</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-28 10:16:20
|
Revision: 7648
http://sourceforge.net/p/ipcop/svn/7648
Author: owes
Date: 2014-08-28 10:16:15 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Update libnl to 3.2.25
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libnl
ipcop/trunk/lfs/libnl
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
ipcop/trunk/updates/2.1.6/setup
Modified: ipcop/trunk/config/rootfiles/common/libnl
===================================================================
--- ipcop/trunk/config/rootfiles/common/libnl 2014-08-28 10:10:56 UTC (rev 7647)
+++ ipcop/trunk/config/rootfiles/common/libnl 2014-08-28 10:16:15 UTC (rev 7648)
@@ -69,7 +69,12 @@
#usr/include/libnl3/netlink/route/link/can.h
#usr/include/libnl3/netlink/route/link/inet.h
#usr/include/libnl3/netlink/route/link/info-api.h
+#usr/include/libnl3/netlink/route/link/ip6tnl.h
+#usr/include/libnl3/netlink/route/link/ipgre.h
+#usr/include/libnl3/netlink/route/link/ipip.h
+#usr/include/libnl3/netlink/route/link/ipvti.h
#usr/include/libnl3/netlink/route/link/macvlan.h
+#usr/include/libnl3/netlink/route/link/sit.h
#usr/include/libnl3/netlink/route/link/veth.h
#usr/include/libnl3/netlink/route/link/vlan.h
#usr/include/libnl3/netlink/route/link/vxlan.h
@@ -101,19 +106,19 @@
#usr/include/libnl3/netlink/version.h
#usr/lib/libnl-3.so
usr/lib/libnl-3.so.200
-usr/lib/libnl-3.so.200.19.0
+usr/lib/libnl-3.so.200.20.0
#usr/lib/libnl-genl-3.so
usr/lib/libnl-genl-3.so.200
-usr/lib/libnl-genl-3.so.200.19.0
+usr/lib/libnl-genl-3.so.200.20.0
#usr/lib/libnl-idiag-3.so
#usr/lib/libnl-idiag-3.so.200
-#usr/lib/libnl-idiag-3.so.200.19.0
+#usr/lib/libnl-idiag-3.so.200.20.0
#usr/lib/libnl-nf-3.so
#usr/lib/libnl-nf-3.so.200
-#usr/lib/libnl-nf-3.so.200.19.0
+#usr/lib/libnl-nf-3.so.200.20.0
#usr/lib/libnl-route-3.so
#usr/lib/libnl-route-3.so.200
-#usr/lib/libnl-route-3.so.200.19.0
+#usr/lib/libnl-route-3.so.200.20.0
#usr/lib/pkgconfig/libnl-3.0.pc
#usr/lib/pkgconfig/libnl-genl-3.0.pc
#usr/lib/pkgconfig/libnl-nf-3.0.pc
Modified: ipcop/trunk/lfs/libnl
===================================================================
--- ipcop/trunk/lfs/libnl 2014-08-28 10:10:56 UTC (rev 7647)
+++ ipcop/trunk/lfs/libnl 2014-08-28 10:16:15 UTC (rev 7648)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libnl
-VER = 3.2.24
+VER = 3.2.25
HOST_ARCH = all
OTHER_SRC = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e0e7bad0674749d930dd9f285343d55
+$(DL_FILE)_MD5 = 03f74d0cd5037cadc8cdfa313bbd195c
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:10:56 UTC (rev 7647)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:16:15 UTC (rev 7648)
@@ -123,6 +123,12 @@
/usr/lib/libgpg-error.so.0
/usr/lib/libgpg-error.so.0.11.0
##
+## libnl-3.2.25
+/usr/lib/libnl-3.so.200
+/usr/lib/libnl-3.so.200.20.0
+/usr/lib/libnl-genl-3.so.200
+/usr/lib/libnl-genl-3.so.200.20.0
+##
## linux-3.4-3 (3.4.103)
/boot/vmlinuz
/boot/vmlinuz-3.4-3
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:10:56 UTC (rev 7647)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:16:15 UTC (rev 7648)
@@ -8,7 +8,7 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
- gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, mdadm to 3.3.2,
+ gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, libnl to 3.2.25, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-28 10:10:56 UTC (rev 7647)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-28 10:16:15 UTC (rev 7648)
@@ -83,6 +83,10 @@
/bin/rm -f /usr/lib/libgcrypt.so.20.0.1
/bin/rm -f /usr/lib/libgpg-error.so.0
/bin/rm -f /usr/lib/libgpg-error.so.0.10.0
+/bin/rm -f /usr/lib/libnl-3.so.200
+/bin/rm -f /usr/lib/libnl-3.so.200.19.0
+/bin/rm -f /usr/lib/libnl-genl-3.so.200
+/bin/rm -f /usr/lib/libnl-genl-3.so.200.19.0
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/EID.pm
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/NIMLOC.pm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-28 10:11:01
|
Revision: 7647
http://sourceforge.net/p/ipcop/svn/7647
Author: owes
Date: 2014-08-28 10:10:56 +0000 (Thu, 28 Aug 2014)
Log Message:
-----------
Updata squid to 3.4.7
Modified Paths:
--------------
ipcop/trunk/lfs/squid
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid 2014-08-26 08:15:59 UTC (rev 7646)
+++ ipcop/trunk/lfs/squid 2014-08-28 10:10:56 UTC (rev 7647)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = squid
-VER = 3.4.6
+VER = 3.4.7
HOST_ARCH = all
OTHER_SRC = yes
@@ -46,8 +46,8 @@
# Used to include same timestamp for all
# This is the release date
-DATESTAMP = "26 Jun 2014"
-TIMESTAMP = "06:09:00"
+DATESTAMP = "27 Aug 2014"
+TIMESTAMP = "17:33:00"
###############################################################################
# Top-level Rules
@@ -57,7 +57,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78dba1ef230761577bce53633ca05c9d
+$(DL_FILE)_MD5 = 74677634121649ccb87a5655fcd4298d
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:15:59 UTC (rev 7646)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-28 10:10:56 UTC (rev 7647)
@@ -340,7 +340,7 @@
/usr/lib/liblogging-stdlog.so.0
/usr/lib/liblogging-stdlog.so.0.0.0
##
-## squid-3.4.6
+## squid-3.4.7
/usr/lib/squid/basic_ldap_auth
/usr/lib/squid/basic_msnt_auth
/usr/lib/squid/basic_ncsa_auth
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:15:59 UTC (rev 7646)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-28 10:10:56 UTC (rev 7647)
@@ -1,7 +1,7 @@
<ipcop>
<update>
<version>2.1.6</version>
- <releasedate>2014-mm-dd</releasedate>
+ <releasedate>2014-09-dd</releasedate>
<size>0</size>
<isoimages>yes</isoimages>
<description>Language updates.<br />
@@ -10,7 +10,7 @@
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
- squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
+ squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 08:16:02
|
Revision: 7646
http://sourceforge.net/p/ipcop/svn/7646
Author: owes
Date: 2014-08-26 08:15:59 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Upgrade iproute2 to 3.16.0
Modified Paths:
--------------
ipcop/trunk/lfs/iproute2
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/iproute2
===================================================================
--- ipcop/trunk/lfs/iproute2 2014-08-26 08:13:57 UTC (rev 7645)
+++ ipcop/trunk/lfs/iproute2 2014-08-26 08:15:59 UTC (rev 7646)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = iproute2
-VER = 3.15.0
+VER = 3.16.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5b1711c9d16071959052e369a2682d77
+$(DL_FILE)_MD5 = 6c823b40fdcfa7b8120743349a52ac18
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:13:57 UTC (rev 7645)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:15:59 UTC (rev 7646)
@@ -105,7 +105,7 @@
/bin/egrep
/bin/grep
##
-## iproute2-3.15.0
+## iproute2-3.16.0
/sbin/ip
/sbin/rtmon
/sbin/ss
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:13:57 UTC (rev 7645)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:15:59 UTC (rev 7646)
@@ -8,7 +8,7 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
- gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.2,
+ gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 08:14:04
|
Revision: 7645
http://sourceforge.net/p/ipcop/svn/7645
Author: owes
Date: 2014-08-26 08:13:57 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Upgrade mdadm to 3.3.2
Modified Paths:
--------------
ipcop/trunk/lfs/mdadm
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/mdadm-3.3.1_udev-blkid.patch
Modified: ipcop/trunk/lfs/mdadm
===================================================================
--- ipcop/trunk/lfs/mdadm 2014-08-26 08:11:46 UTC (rev 7644)
+++ ipcop/trunk/lfs/mdadm 2014-08-26 08:13:57 UTC (rev 7645)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = mdadm
-VER = 3.3.1
+VER = 3.3.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4227d48de62dfb217c92fa0c54171bbe
+$(DL_FILE)_MD5 = 44698d351501cac6a89072dc877eb220
install : $(TARGET)
Deleted: ipcop/trunk/src/patches/mdadm-3.3.1_udev-blkid.patch
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.3.1_udev-blkid.patch 2014-08-26 08:11:46 UTC (rev 7644)
+++ ipcop/trunk/src/patches/mdadm-3.3.1_udev-blkid.patch 2014-08-26 08:13:57 UTC (rev 7645)
@@ -1,11 +0,0 @@
---- mdadm-3.3/udev-md-raid-arrays.rules.orig 2014-01-11 17:11:31.000000000 +0100
-+++ mdadm-3.3/udev-md-raid-arrays.rules 2014-01-11 17:12:38.000000000 +0100
-@@ -26,7 +26,7 @@
- ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
- ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
-
--IMPORT{builtin}="blkid"
-+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
- ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
Copied: ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch (from rev 7642, ipcop/trunk/src/patches/mdadm-3.3.1_udev-blkid.patch)
===================================================================
--- ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch (rev 0)
+++ ipcop/trunk/src/patches/mdadm-3.3.2_udev-blkid.patch 2014-08-26 08:13:57 UTC (rev 7645)
@@ -0,0 +1,11 @@
+--- mdadm-3.3/udev-md-raid-arrays.rules.orig 2014-01-11 17:11:31.000000000 +0100
++++ mdadm-3.3/udev-md-raid-arrays.rules 2014-01-11 17:12:38.000000000 +0100
+@@ -26,7 +26,7 @@
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+
+-IMPORT{builtin}="blkid"
++IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+ OPTIONS+="link_priority=100"
+ OPTIONS+="watch"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:11:46 UTC (rev 7644)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:13:57 UTC (rev 7645)
@@ -142,7 +142,7 @@
/lib/firmware/rtl_nic/rtl8168f-1.fw
/lib/firmware/rtl_nic/rtl8168f-2.fw
##
-## mdadm-3.3.1
+## mdadm-3.3.2
/lib/udev/rules.d/63-md-raid-arrays.rules
/lib/udev/rules.d/64-md-raid-assembly.rules
/sbin/mdadm
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:11:46 UTC (rev 7644)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:13:57 UTC (rev 7645)
@@ -8,7 +8,7 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
- gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.1,
+ gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.2,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 08:11:50
|
Revision: 7644
http://sourceforge.net/p/ipcop/svn/7644
Author: owes
Date: 2014-08-26 08:11:46 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Upgrade dhcpcd to 6.4.3
Modified Paths:
--------------
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:11:20 UTC (rev 7643)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-26 08:11:46 UTC (rev 7644)
@@ -7,7 +7,7 @@
<description>Language updates.<br />
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
- Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
+ Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.1,
openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 08:11:23
|
Revision: 7643
http://sourceforge.net/p/ipcop/svn/7643
Author: owes
Date: 2014-08-26 08:11:20 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Upgrade dhcpcd to 6.4.3
Modified Paths:
--------------
ipcop/trunk/lfs/dhcpcd
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
Modified: ipcop/trunk/lfs/dhcpcd
===================================================================
--- ipcop/trunk/lfs/dhcpcd 2014-08-26 05:45:55 UTC (rev 7642)
+++ ipcop/trunk/lfs/dhcpcd 2014-08-26 08:11:20 UTC (rev 7643)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dhcpcd
-VER = 6.4.2
+VER = 6.4.3
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3ba26bd6e0cd2f973bfbcd3c08ebc93b
+$(DL_FILE)_MD5 = b22005c131e7108ecf598b6a4ac091eb
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 05:45:55 UTC (rev 7642)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 08:11:20 UTC (rev 7643)
@@ -71,7 +71,7 @@
/usr/lib/pppd/2.4.7/capiplugin.so
/usr/lib/pppd/2.4.7/userpass.so
##
-## dhcpcd-6.4.2
+## dhcpcd-6.4.3
/usr/sbin/dhcpcd
##
## dnsmasq-2.71
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 05:45:58
|
Revision: 7642
http://sourceforge.net/p/ipcop/svn/7642
Author: owes
Date: 2014-08-26 05:45:55 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Drop vconfig. Very old, deprecated for ages and can no longer be downloaded.
Modified Paths:
--------------
ipcop/trunk/make.sh
ipcop/trunk/src/rc.d/rc.red
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/setup
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/vlan
ipcop/trunk/lfs/vlan
Deleted: ipcop/trunk/config/rootfiles/common/vlan
===================================================================
--- ipcop/trunk/config/rootfiles/common/vlan 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/config/rootfiles/common/vlan 2014-08-26 05:45:55 UTC (rev 7642)
@@ -1,3 +0,0 @@
-## vlan-1.9
-##
-sbin/vconfig
Deleted: ipcop/trunk/lfs/vlan
===================================================================
--- ipcop/trunk/lfs/vlan 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/lfs/vlan 2014-08-26 05:45:55 UTC (rev 7642)
@@ -1,89 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop 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 IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <ro...@su...> #
-# #
-# Modifications by: #
-# 2005-jul Gilles Espinasse #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = vlan
-VER = 1.9
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = vlan.$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://www.candelatech.com/~greear/vlan
-DIR_APP = $(DIR_SRC)/vlan
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 5f0c6060b33956fb16e11a15467dd394
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && make clean
- cd $(DIR_APP) && make
- cd $(DIR_APP) && install -p -m 0755 vconfig /sbin
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/make.sh 2014-08-26 05:45:55 UTC (rev 7642)
@@ -1954,7 +1954,6 @@
chroot_make ulogd
chroot_make usb-modeswitch
chroot_make usb-modeswitch-data
- chroot_make vlan
chroot_make vnstat
chroot_make wget
chroot_make wireless_tools
Modified: ipcop/trunk/src/rc.d/rc.red
===================================================================
--- ipcop/trunk/src/rc.d/rc.red 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/src/rc.d/rc.red 2014-08-26 05:45:55 UTC (rev 7642)
@@ -16,7 +16,7 @@
# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# (c) The SmoothWall Team
-# Copyright (c) 2001-2011 The IPCop Team
+# Copyright (c) 2001-2014 The IPCop Team
#
# $Id$
@@ -182,8 +182,8 @@
if (! -d '/sys/module/8021q') {
system('/sbin/modprobe 8021q');
}
-
- system("/sbin/vconfig add $netsettings{'RED_1_DEV'} $pppsettings{'VDSL_TAG'}");
+
+ system("/sbin/ip link add link $netsettings{'RED_1_DEV'} name $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} type vlan id $pppsettings{'VDSL_TAG'}");
system("/sbin/ip link set $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} up");
}
}
@@ -302,7 +302,7 @@
# VLAN tag can be set in profile even when not using PPPoE, so check for dev exists to avoid error messages
if ($pppsettings{'VDSL_TAG'} && -e "/sys/class/net/$netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}") {
system("/sbin/ip link set $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'} down");
- system("/sbin/vconfig rem $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}");
+ system("/sbin/ip link delete $netsettings{'RED_1_DEV'} name $netsettings{'RED_1_DEV'}.$pppsettings{'VDSL_TAG'}");
}
if (-e "/var/run/dhcpcd-$iface.pid") {
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-26 05:45:55 UTC (rev 7642)
@@ -2,6 +2,7 @@
/etc/logrotate.d/squid
/etc/logrotate.d/squidGuard
/etc/rc.d/rc.net
+/etc/rc.d/rc.red
/etc/rc.d/rc.sysinit
/etc/ssl/openssl.cnf
/etc/ssl/openvpn.cnf
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-26 05:32:21 UTC (rev 7641)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-26 05:45:55 UTC (rev 7642)
@@ -102,6 +102,9 @@
/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh88
/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh89
+# vlan
+/bin/rm -f /sbin/vconfig
+
# renamed
/bin/rm -f /usr/local/sbin/installflash.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 05:32:25
|
Revision: 7641
http://sourceforge.net/p/ipcop/svn/7641
Author: owes
Date: 2014-08-26 05:32:21 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Newer allpatches file.
Modified Paths:
--------------
ipcop/trunk/lfs/mpfr
Modified: ipcop/trunk/lfs/mpfr
===================================================================
--- ipcop/trunk/lfs/mpfr 2014-08-26 05:17:18 UTC (rev 7640)
+++ ipcop/trunk/lfs/mpfr 2014-08-26 05:32:21 UTC (rev 7641)
@@ -56,7 +56,7 @@
$(PATCH1) = http://www.mpfr.org/$(THISAPP)/allpatches
$(DL_FILE)_MD5 = e3d203d188b8fe60bb6578dd3152e05c
-$(PATCH1)_MD5 = 3280aba9c8ebb1be9dab32d28e97e9a6
+$(PATCH1)_MD5 = 43121795ef12f1b29ada4508d9186ea9
install : $(TARGET)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-26 05:17:22
|
Revision: 7640
http://sourceforge.net/p/ipcop/svn/7640
Author: owes
Date: 2014-08-26 05:17:18 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Better to commit the modified rootfile too...
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libgcrypt
Modified: ipcop/trunk/config/rootfiles/common/libgcrypt
===================================================================
--- ipcop/trunk/config/rootfiles/common/libgcrypt 2014-08-25 13:04:21 UTC (rev 7639)
+++ ipcop/trunk/config/rootfiles/common/libgcrypt 2014-08-26 05:17:18 UTC (rev 7640)
@@ -6,7 +6,7 @@
#usr/lib/libgcrypt.la
#usr/lib/libgcrypt.so
usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.0.1
+usr/lib/libgcrypt.so.20.0.2
#usr/share/aclocal/libgcrypt.m4
#usr/share/info/gcrypt.info
#usr/share/info/gcrypt.info-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-25 13:04:32
|
Revision: 7639
http://sourceforge.net/p/ipcop/svn/7639
Author: owes
Date: 2014-08-25 13:04:21 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Adjust capi4k-utils to build with ppp 2.4.7
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/capi4k-utils
ipcop/trunk/lfs/capi4k-utils
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
Added Paths:
-----------
ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.7.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.6.patch
Modified: ipcop/trunk/config/rootfiles/common/capi4k-utils
===================================================================
--- ipcop/trunk/config/rootfiles/common/capi4k-utils 2014-08-25 10:39:56 UTC (rev 7638)
+++ ipcop/trunk/config/rootfiles/common/capi4k-utils 2014-08-25 13:04:21 UTC (rev 7639)
@@ -21,8 +21,8 @@
usr/lib/libcapi20.so.3
usr/lib/libcapi20.so.3.0.4
#usr/lib/libcapi20dyn.a
-usr/lib/pppd/2.4.6/capiplugin.so
-usr/lib/pppd/2.4.6/userpass.so
+usr/lib/pppd/2.4.7/capiplugin.so
+usr/lib/pppd/2.4.7/userpass.so
usr/sbin/capiinit
#usr/share/man/man8/avmcapictrl.8
#usr/share/man/man8/capiinfo.8
Modified: ipcop/trunk/lfs/capi4k-utils
===================================================================
--- ipcop/trunk/lfs/capi4k-utils 2014-08-25 10:39:56 UTC (rev 7638)
+++ ipcop/trunk/lfs/capi4k-utils 2014-08-25 13:04:21 UTC (rev 7639)
@@ -86,7 +86,7 @@
cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/capi4k-utils-20050718-msg2str-safety.diff
cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/capi4k-utils-20050718-size_t.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ppp-2.4.6.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ppp-2.4.7.patch
# Fix a typo (?) in capiinit configure and set default prefix to /usr
cd $(DIR_APP)/capiinit && sed -i -e 's/^CONFIG_SBINDIR.*=/CONFIG_SBINDIR=/' \
-e 's/^ac_default_prefix=.*/ac_default_prefix=\/usr/' configure
Deleted: ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.6.patch
===================================================================
--- ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.6.patch 2014-08-25 10:39:56 UTC (rev 7638)
+++ ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.6.patch 2014-08-25 13:04:21 UTC (rev 7639)
@@ -1,934 +0,0 @@
---- capi4k-utils.original/pppdcapiplugin/ppp-2.4.6/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ capi4k-utils/pppdcapiplugin/ppp-2.4.6/Makefile 2008-04-21 02:26:46.460759309 +0000
-@@ -0,0 +1,14 @@
-+# Makefile for the capiplugin for pppd(8).
-+#
-+# Copyright 2000 Carsten Paeth (ca...@ca...)
-+# Copyright 2000 AVM GmbH Berlin (in...@av...)
-+#
-+# 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
-+# 2 of the License, or (at your option) any later version.
-+
-+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+
-+include $(TOPDIR)/Rules.make
-+
---- capi4k-utils.original/pppdcapiplugin/ppp-2.4.6/pppd/pppd.h 1970-01-01 00:00:00.000000000 +0000
-+++ capi4k-utils/pppdcapiplugin/ppp-2.4.6/pppd/pppd.h 2005-08-25 23:59:34.000000000 +0000
-@@ -0,0 +1,907 @@
-+/*
-+ * pppd.h - PPP daemon global declarations.
-+ *
-+ * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
-+ * endorse or promote products derived from this software without
-+ * prior written permission. For permission or any legal
-+ * details, please contact
-+ * Office of Technology Transfer
-+ * Carnegie Mellon University
-+ * 5000 Forbes Avenue
-+ * Pittsburgh, PA 15213-3890
-+ * (412) 268-4387, fax: (412) 268-7395
-+ * tec...@an...
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ * acknowledgment:
-+ * "This product includes software developed by Computing Services
-+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY 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.
-+ *
-+ * $Id: pppd.h,v 1.91 2005/08/25 23:59:34 paulus Exp $
-+ */
-+
-+/*
-+ * TODO:
-+ */
-+
-+#ifndef __PPPD_H__
-+#define __PPPD_H__
-+
-+#include <stdio.h> /* for FILE */
-+#include <limits.h> /* for NGROUPS_MAX */
-+#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */
-+#include <sys/types.h> /* for u_int32_t, if defined */
-+#include <sys/time.h> /* for struct timeval */
-+#include <net/ppp_defs.h>
-+#include "patchlevel.h"
-+
-+#if defined(__STDC__)
-+#include <stdarg.h>
-+#define __V(x) x
-+#else
-+#include <varargs.h>
-+#define __V(x) (va_alist) va_dcl
-+#define const
-+#define volatile
-+#endif
-+
-+#ifdef INET6
-+#include "eui64.h"
-+#endif
-+
-+/*
-+ * Limits.
-+ */
-+
-+#define NUM_PPP 1 /* One PPP interface supported (per process) */
-+#define MAXWORDLEN 1024 /* max length of word in file (incl null) */
-+#define MAXARGS 1 /* max # args to a command */
-+#define MAXNAMELEN 256 /* max length of hostname or name for auth */
-+#define MAXSECRETLEN 256 /* max length of password or secret */
-+
-+/*
-+ * Option descriptor structure.
-+ */
-+
-+typedef unsigned char bool;
-+
-+enum opt_type {
-+ o_special_noarg = 0,
-+ o_special = 1,
-+ o_bool,
-+ o_int,
-+ o_uint32,
-+ o_string,
-+ o_wild
-+};
-+
-+typedef struct {
-+ char *name; /* name of the option */
-+ enum opt_type type;
-+ void *addr;
-+ char *description;
-+ unsigned int flags;
-+ void *addr2;
-+ int upper_limit;
-+ int lower_limit;
-+ const char *source;
-+ short int priority;
-+ short int winner;
-+} option_t;
-+
-+/* Values for flags */
-+#define OPT_VALUE 0xff /* mask for presupplied value */
-+#define OPT_HEX 0x100 /* int option is in hex */
-+#define OPT_NOARG 0x200 /* option doesn't take argument */
-+#define OPT_OR 0x400 /* OR in argument to value */
-+#define OPT_INC 0x800 /* increment value */
-+#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */
-+#define OPT_PRIV 0x1000 /* privileged option */
-+#define OPT_STATIC 0x2000 /* string option goes into static array */
-+#define OPT_LLIMIT 0x4000 /* check value against lower limit */
-+#define OPT_ULIMIT 0x8000 /* check value against upper limit */
-+#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT)
-+#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */
-+#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */
-+#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */
-+#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
-+#define OPT_NOINCR 0x20000 /* value mustn't be increased */
-+#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */
-+#define OPT_PRIO 0x80000 /* process option priorities for this option */
-+#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */
-+#define OPT_ALIAS 0x200000 /* option is alias for previous option */
-+#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */
-+#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */
-+#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */
-+#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */
-+#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */
-+#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */
-+#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV)
-+#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */
-+#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */
-+#define OPT_NOPRINT 0x40000000 /* don't print this option at all */
-+
-+#define OPT_VAL(x) ((x) & OPT_VALUE)
-+
-+/* Values for priority */
-+#define OPRIO_DEFAULT 0 /* a default value */
-+#define OPRIO_CFGFILE 1 /* value from a configuration file */
-+#define OPRIO_CMDLINE 2 /* value from the command line */
-+#define OPRIO_SECFILE 3 /* value from options in a secrets file */
-+#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */
-+
-+#ifndef GIDSET_TYPE
-+#define GIDSET_TYPE gid_t
-+#endif
-+
-+/* Structure representing a list of permitted IP addresses. */
-+struct permitted_ip {
-+ int permit; /* 1 = permit, 0 = forbid */
-+ u_int32_t base; /* match if (addr & mask) == base */
-+ u_int32_t mask; /* base and mask are in network byte order */
-+};
-+
-+/*
-+ * Unfortunately, the linux kernel driver uses a different structure
-+ * for statistics from the rest of the ports.
-+ * This structure serves as a common representation for the bits
-+ * pppd needs.
-+ */
-+struct pppd_stats {
-+ unsigned int bytes_in;
-+ unsigned int bytes_out;
-+ unsigned int pkts_in;
-+ unsigned int pkts_out;
-+};
-+
-+/* Used for storing a sequence of words. Usually malloced. */
-+struct wordlist {
-+ struct wordlist *next;
-+ char *word;
-+};
-+
-+/* An endpoint discriminator, used with multilink. */
-+#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */
-+struct epdisc {
-+ unsigned char class;
-+ unsigned char length;
-+ unsigned char value[MAX_ENDP_LEN];
-+};
-+
-+/* values for epdisc.class */
-+#define EPD_NULL 0 /* null discriminator, no data */
-+#define EPD_LOCAL 1
-+#define EPD_IP 2
-+#define EPD_MAC 3
-+#define EPD_MAGIC 4
-+#define EPD_PHONENUM 5
-+
-+typedef void (*notify_func) __P((void *, int));
-+
-+struct notifier {
-+ struct notifier *next;
-+ notify_func func;
-+ void *arg;
-+};
-+
-+/*
-+ * Global variables.
-+ */
-+
-+extern int hungup; /* Physical layer has disconnected */
-+extern int ifunit; /* Interface unit number */
-+extern char ifname[]; /* Interface name */
-+extern char hostname[]; /* Our hostname */
-+extern u_char outpacket_buf[]; /* Buffer for outgoing packets */
-+extern int devfd; /* fd of underlying device */
-+extern int fd_ppp; /* fd for talking PPP */
-+extern int phase; /* Current state of link - see values below */
-+extern int baud_rate; /* Current link speed in bits/sec */
-+extern char *progname; /* Name of this program */
-+extern int redirect_stderr;/* Connector's stderr should go to file */
-+extern char peer_authname[];/* Authenticated name of peer */
-+extern int auth_done[NUM_PPP]; /* Methods actually used for auth */
-+extern int privileged; /* We were run by real-uid root */
-+extern int need_holdoff; /* Need holdoff period after link terminates */
-+extern char **script_env; /* Environment variables for scripts */
-+extern int detached; /* Have detached from controlling tty */
-+extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */
-+extern int ngroups; /* How many groups valid in groups */
-+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-+extern int link_stats_valid; /* set if link_stats is valid */
-+extern unsigned link_connect_time; /* time the link was up for */
-+extern int using_pty; /* using pty as device (notty or pty opt.) */
-+extern int log_to_fd; /* logging to this fd as well as syslog */
-+extern bool log_default; /* log_to_fd is default (stdout) */
-+extern char *no_ppp_msg; /* message to print if ppp not in kernel */
-+extern volatile int status; /* exit status for pppd */
-+extern bool devnam_fixed; /* can no longer change devnam */
-+extern int unsuccess; /* # unsuccessful connection attempts */
-+extern int do_callback; /* set if we want to do callback next */
-+extern int doing_callback; /* set if this is a callback */
-+extern int error_count; /* # of times error() has been called */
-+extern char ppp_devnam[MAXPATHLEN];
-+extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-+extern int ppp_session_number; /* Session number (eg PPPoE session) */
-+extern int fd_devnull; /* fd open to /dev/null */
-+
-+extern int listen_time; /* time to listen first (ms) */
-+extern bool doing_multilink;
-+extern bool multilink_master;
-+extern bool bundle_eof;
-+extern bool bundle_terminating;
-+
-+extern struct notifier *pidchange; /* for notifications of pid changing */
-+extern struct notifier *phasechange; /* for notifications of phase changes */
-+extern struct notifier *exitnotify; /* for notification that we're exiting */
-+extern struct notifier *sigreceived; /* notification of received signal */
-+extern struct notifier *ip_up_notifier; /* IPCP has come up */
-+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
-+extern struct notifier *auth_up_notifier; /* peer has authenticated */
-+extern struct notifier *link_down_notifier; /* link has gone down */
-+extern struct notifier *fork_notifier; /* we are a new child process */
-+
-+/* Values for do_callback and doing_callback */
-+#define CALLBACK_DIALIN 1 /* we are expecting the call back */
-+#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */
-+
-+/*
-+ * Variables set by command-line options.
-+ */
-+
-+extern int debug; /* Debug flag */
-+extern int kdebugflag; /* Tell kernel to print debug messages */
-+extern int default_device; /* Using /dev/tty or equivalent */
-+extern char devnam[MAXPATHLEN]; /* Device name */
-+extern int crtscts; /* Use hardware flow control */
-+extern bool modem; /* Use modem control lines */
-+extern int inspeed; /* Input/Output speed requested */
-+extern u_int32_t netmask; /* IP netmask to set on interface */
-+extern bool lockflag; /* Create lock file to lock the serial dev */
-+extern bool nodetach; /* Don't detach from controlling tty */
-+extern bool updetach; /* Detach from controlling tty when link up */
-+extern char *initializer; /* Script to initialize physical link */
-+extern char *connect_script; /* Script to establish physical link */
-+extern char *disconnect_script; /* Script to disestablish physical link */
-+extern char *welcomer; /* Script to welcome client after connection */
-+extern char *ptycommand; /* Command to run on other side of pty */
-+extern int maxconnect; /* Maximum connect time (seconds) */
-+extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */
-+extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */
-+extern bool auth_required; /* Peer is required to authenticate */
-+extern bool persist; /* Reopen link after it goes down */
-+extern bool uselogin; /* Use /etc/passwd for checking PAP */
-+extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */
-+extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-+extern bool explicit_remote;/* remote_name specified with remotename opt */
-+extern bool demand; /* Do dial-on-demand */
-+extern char *ipparam; /* Extra parameter for ip up/down scripts */
-+extern bool cryptpap; /* Others' PAP passwords are encrypted */
-+extern int idle_time_limit;/* Shut down link if idle for this long */
-+extern int holdoff; /* Dead time before restarting */
-+extern bool holdoff_specified; /* true if user gave a holdoff value */
-+extern bool notty; /* Stdin/out is not a tty */
-+extern char *pty_socket; /* Socket to connect to pty */
-+extern char *record_file; /* File to record chars sent/received */
-+extern bool sync_serial; /* Device is synchronous serial device */
-+extern int maxfail; /* Max # of unsuccessful connection attempts */
-+extern char linkname[MAXPATHLEN]; /* logical name for link */
-+extern bool tune_kernel; /* May alter kernel settings as necessary */
-+extern int connect_delay; /* Time to delay after connect script */
-+extern int max_data_rate; /* max bytes/sec through charshunt */
-+extern int req_unit; /* interface unit number to use */
-+extern bool multilink; /* enable multilink operation */
-+extern bool noendpoint; /* don't send or accept endpt. discrim. */
-+extern char *bundle_name; /* bundle name for multilink */
-+extern bool dump_options; /* print out option values */
-+extern bool dryrun; /* check everything, print options, exit */
-+extern int child_wait; /* # seconds to wait for children at end */
-+
-+#ifdef MAXOCTETS
-+extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */
-+extern int maxoctets_dir; /* Direction :
-+ 0 - in+out (default)
-+ 1 - in
-+ 2 - out
-+ 3 - max(in,out) */
-+extern int maxoctets_timeout; /* Timeout for check of octets limit */
-+#define PPP_OCTETS_DIRECTION_SUM 0
-+#define PPP_OCTETS_DIRECTION_IN 1
-+#define PPP_OCTETS_DIRECTION_OUT 2
-+#define PPP_OCTETS_DIRECTION_MAXOVERAL 3
-+/* same as previos, but little different on RADIUS side */
-+#define PPP_OCTETS_DIRECTION_MAXSESSION 4
-+#endif
-+
-+#ifdef PPP_FILTER
-+extern struct bpf_program pass_filter; /* Filter for pkts to pass */
-+extern struct bpf_program active_filter; /* Filter for link-active pkts */
-+#endif
-+
-+#ifdef MSLANMAN
-+extern bool ms_lanman; /* Use LanMan password instead of NT */
-+ /* Has meaning only with MS-CHAP challenges */
-+#endif
-+
-+/* Values for auth_pending, auth_done */
-+#define PAP_WITHPEER 0x1
-+#define PAP_PEER 0x2
-+#define CHAP_WITHPEER 0x4
-+#define CHAP_PEER 0x8
-+#define EAP_WITHPEER 0x10
-+#define EAP_PEER 0x20
-+
-+/* Values for auth_done only */
-+#define CHAP_MD5_WITHPEER 0x40
-+#define CHAP_MD5_PEER 0x80
-+#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */
-+#define CHAP_MS_WITHPEER 0x100
-+#define CHAP_MS_PEER 0x200
-+#define CHAP_MS2_WITHPEER 0x400
-+#define CHAP_MS2_PEER 0x800
-+
-+extern char *current_option; /* the name of the option being parsed */
-+extern int privileged_option; /* set iff the current option came from root */
-+extern char *option_source; /* string saying where the option came from */
-+extern int option_priority; /* priority of current options */
-+
-+/*
-+ * Values for phase.
-+ */
-+#define PHASE_DEAD 0
-+#define PHASE_INITIALIZE 1
-+#define PHASE_SERIALCONN 2
-+#define PHASE_DORMANT 3
-+#define PHASE_ESTABLISH 4
-+#define PHASE_AUTHENTICATE 5
-+#define PHASE_CALLBACK 6
-+#define PHASE_NETWORK 7
-+#define PHASE_RUNNING 8
-+#define PHASE_TERMINATE 9
-+#define PHASE_DISCONNECT 10
-+#define PHASE_HOLDOFF 11
-+#define PHASE_MASTER 12
-+
-+/*
-+ * The following struct gives the addresses of procedures to call
-+ * for a particular protocol.
-+ */
-+struct protent {
-+ u_short protocol; /* PPP protocol number */
-+ /* Initialization procedure */
-+ void (*init) __P((int unit));
-+ /* Process a received packet */
-+ void (*input) __P((int unit, u_char *pkt, int len));
-+ /* Process a received protocol-reject */
-+ void (*protrej) __P((int unit));
-+ /* Lower layer has come up */
-+ void (*lowerup) __P((int unit));
-+ /* Lower layer has gone down */
-+ void (*lowerdown) __P((int unit));
-+ /* Open the protocol */
-+ void (*open) __P((int unit));
-+ /* Close the protocol */
-+ void (*close) __P((int unit, char *reason));
-+ /* Print a packet in readable form */
-+ int (*printpkt) __P((u_char *pkt, int len,
-+ void (*printer) __P((void *, char *, ...)),
-+ void *arg));
-+ /* Process a received data packet */
-+ void (*datainput) __P((int unit, u_char *pkt, int len));
-+ bool enabled_flag; /* 0 iff protocol is disabled */
-+ char *name; /* Text name of protocol */
-+ char *data_name; /* Text name of corresponding data protocol */
-+ option_t *options; /* List of command-line options */
-+ /* Check requested options, assign defaults */
-+ void (*check_options) __P((void));
-+ /* Configure interface for demand-dial */
-+ int (*demand_conf) __P((int unit));
-+ /* Say whether to bring up link for this pkt */
-+ int (*active_pkt) __P((u_char *pkt, int len));
-+};
-+
-+/* Table of pointers to supported protocols */
-+extern struct protent *protocols[];
-+
-+/*
-+ * This struct contains pointers to a set of procedures for
-+ * doing operations on a "channel". A channel provides a way
-+ * to send and receive PPP packets - the canonical example is
-+ * a serial port device in PPP line discipline (or equivalently
-+ * with PPP STREAMS modules pushed onto it).
-+ */
-+struct channel {
-+ /* set of options for this channel */
-+ option_t *options;
-+ /* find and process a per-channel options file */
-+ void (*process_extra_options) __P((void));
-+ /* check all the options that have been given */
-+ void (*check_options) __P((void));
-+ /* get the channel ready to do PPP, return a file descriptor */
-+ int (*connect) __P((void));
-+ /* we're finished with the channel */
-+ void (*disconnect) __P((void));
-+ /* put the channel into PPP `mode' */
-+ int (*establish_ppp) __P((int));
-+ /* take the channel out of PPP `mode', restore loopback if demand */
-+ void (*disestablish_ppp) __P((int));
-+ /* set the transmit-side PPP parameters of the channel */
-+ void (*send_config) __P((int, u_int32_t, int, int));
-+ /* set the receive-side PPP parameters of the channel */
-+ void (*recv_config) __P((int, u_int32_t, int, int));
-+ /* cleanup on error or normal exit */
-+ void (*cleanup) __P((void));
-+ /* close the device, called in children after fork */
-+ void (*close) __P((void));
-+};
-+
-+extern struct channel *the_channel;
-+
-+/*
-+ * Prototypes.
-+ */
-+
-+/* Procedures exported from main.c. */
-+void set_ifunit __P((int)); /* set stuff that depends on ifunit */
-+void detach __P((void)); /* Detach from controlling tty */
-+void die __P((int)); /* Cleanup and exit */
-+void quit __P((void)); /* like die(1) */
-+void novm __P((char *)); /* Say we ran out of memory, and die */
-+void timeout __P((void (*func)(void *), void *arg, int s, int us));
-+ /* Call func(arg) after s.us seconds */
-+void untimeout __P((void (*func)(void *), void *arg));
-+ /* Cancel call to func(arg) */
-+void record_child __P((int, char *, void (*) (void *), void *));
-+pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */
-+int device_script __P((char *cmd, int in, int out, int dont_wait));
-+ /* Run `cmd' with given stdin and stdout */
-+pid_t run_program __P((char *prog, char **args, int must_exist,
-+ void (*done)(void *), void *arg, int wait));
-+ /* Run program prog with args in child */
-+void reopen_log __P((void)); /* (re)open the connection to syslog */
-+void print_link_stats __P((void)); /* Print stats, if available */
-+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
-+void update_link_stats __P((int)); /* Get stats at link termination */
-+void script_setenv __P((char *, char *, int)); /* set script env var */
-+void script_unsetenv __P((char *)); /* unset script env var */
-+void new_phase __P((int)); /* signal start of new phase */
-+void add_notifier __P((struct notifier **, notify_func, void *));
-+void remove_notifier __P((struct notifier **, notify_func, void *));
-+void notify __P((struct notifier *, int));
-+int ppp_send_config __P((int, int, u_int32_t, int, int));
-+int ppp_recv_config __P((int, int, u_int32_t, int, int));
-+const char *protocol_name __P((int));
-+void remove_pidfiles __P((void));
-+void lock_db __P((void));
-+void unlock_db __P((void));
-+
-+/* Procedures exported from tty.c. */
-+void tty_init __P((void));
-+
-+/* Procedures exported from utils.c. */
-+void log_packet __P((u_char *, int, char *, int));
-+ /* Format a packet and log it with syslog */
-+void print_string __P((char *, int, void (*) (void *, char *, ...),
-+ void *)); /* Format a string for output */
-+int slprintf __P((char *, int, char *, ...)); /* sprintf++ */
-+int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */
-+size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */
-+size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */
-+void dbglog __P((char *, ...)); /* log a debug message */
-+void info __P((char *, ...)); /* log an informational message */
-+void notice __P((char *, ...)); /* log a notice-level message */
-+void warn __P((char *, ...)); /* log a warning message */
-+void error __P((char *, ...)); /* log an error message */
-+void fatal __P((char *, ...)); /* log an error message and die(1) */
-+void init_pr_log __P((char *, int)); /* initialize for using pr_log */
-+void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */
-+void end_pr_log __P((void)); /* finish up after using pr_log */
-+void dump_packet __P((const char *, u_char *, int));
-+ /* dump packet to debug log if interesting */
-+ssize_t complete_read __P((int, void *, size_t));
-+ /* read a complete buffer */
-+
-+/* Procedures exported from auth.c */
-+void link_required __P((int)); /* we are starting to use the link */
-+void start_link __P((int)); /* bring the link up now */
-+void link_terminated __P((int)); /* we are finished with the link */
-+void link_down __P((int)); /* the LCP layer has left the Opened state */
-+void upper_layers_down __P((int));/* take all NCPs down */
-+void link_established __P((int)); /* the link is up; authenticate now */
-+void start_networks __P((int)); /* start all the network control protos */
-+void continue_networks __P((int)); /* start network [ip, etc] control protos */
-+void np_up __P((int, int)); /* a network protocol has come up */
-+void np_down __P((int, int)); /* a network protocol has gone down */
-+void np_finished __P((int, int)); /* a network protocol no longer needs link */
-+void auth_peer_fail __P((int, int));
-+ /* peer failed to authenticate itself */
-+void auth_peer_success __P((int, int, int, char *, int));
-+ /* peer successfully authenticated itself */
-+void auth_withpeer_fail __P((int, int));
-+ /* we failed to authenticate ourselves */
-+void auth_withpeer_success __P((int, int, int));
-+ /* we successfully authenticated ourselves */
-+void auth_check_options __P((void));
-+ /* check authentication options supplied */
-+void auth_reset __P((int)); /* check what secrets we have */
-+int check_passwd __P((int, char *, int, char *, int, char **));
-+ /* Check peer-supplied username/password */
-+int get_secret __P((int, char *, char *, char *, int *, int));
-+ /* get "secret" for chap */
-+int get_srp_secret __P((int unit, char *client, char *server, char *secret,
-+ int am_server));
-+int auth_ip_addr __P((int, u_int32_t));
-+ /* check if IP address is authorized */
-+int auth_number __P((void)); /* check if remote number is authorized */
-+int bad_ip_adrs __P((u_int32_t));
-+ /* check if IP address is unreasonable */
-+
-+/* Procedures exported from demand.c */
-+void demand_conf __P((void)); /* config interface(s) for demand-dial */
-+void demand_block __P((void)); /* set all NPs to queue up packets */
-+void demand_unblock __P((void)); /* set all NPs to pass packets */
-+void demand_discard __P((void)); /* set all NPs to discard packets */
-+void demand_rexmit __P((int)); /* retransmit saved frames for an NP */
-+int loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-+int loop_frame __P((unsigned char *, int)); /* should we bring link up? */
-+
-+/* Procedures exported from multilink.c */
-+#ifdef HAVE_MULTILINK
-+void mp_check_options __P((void)); /* Check multilink-related options */
-+int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */
-+void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */
-+void mp_bundle_terminated __P((void));
-+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
-+int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
-+#else
-+#define mp_bundle_terminated() /* nothing */
-+#define mp_exit_bundle() /* nothing */
-+#define doing_multilink 0
-+#define multilink_master 0
-+#endif
-+
-+/* Procedures exported from sys-*.c */
-+void sys_init __P((void)); /* Do system-dependent initialization */
-+void sys_cleanup __P((void)); /* Restore system state before exiting */
-+int sys_check_options __P((void)); /* Check options specified */
-+void sys_close __P((void)); /* Clean up in a child before execing */
-+int ppp_available __P((void)); /* Test whether ppp kernel support exists */
-+int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */
-+int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-+int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */
-+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
-+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
-+int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
-+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
-+int bundle_attach __P((int)); /* Attach link to existing bundle */
-+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
-+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
-+void clean_check __P((void)); /* Check if line was 8-bit clean */
-+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-+void restore_tty __P((int)); /* Restore port's original parameters */
-+void setdtr __P((int, int)); /* Raise or lower port's DTR line */
-+void output __P((int, u_char *, int)); /* Output a PPP packet */
-+void wait_input __P((struct timeval *));
-+ /* Wait for input, with timeout */
-+void add_fd __P((int)); /* Add fd to set to wait for */
-+void remove_fd __P((int)); /* Remove fd from set to wait for */
-+int read_packet __P((u_char *)); /* Read PPP packet */
-+int get_loop_output __P((void)); /* Read pkts from loopback */
-+void tty_send_config __P((int, u_int32_t, int, int));
-+ /* Configure i/f transmit parameters */
-+void tty_set_xaccm __P((ext_accm));
-+ /* Set extended transmit ACCM */
-+void tty_recv_config __P((int, u_int32_t, int, int));
-+ /* Configure i/f receive parameters */
-+int ccp_test __P((int, u_char *, int, int));
-+ /* Test support for compression scheme */
-+void ccp_flags_set __P((int, int, int));
-+ /* Set kernel CCP state */
-+int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-+int get_idle_time __P((int, struct ppp_idle *));
-+ /* Find out how long link has been idle */
-+int get_ppp_stats __P((int, struct pppd_stats *));
-+ /* Return link statistics */
-+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
-+int netif_get_mtu __P((int)); /* Get PPP interface MTU */
-+int sifvjcomp __P((int, int, int, int));
-+ /* Configure VJ TCP header compression */
-+int sifup __P((int)); /* Configure i/f up for one protocol */
-+int sifnpmode __P((int u, int proto, enum NPmode mode));
-+ /* Set mode for handling packets for proto */
-+int sifdown __P((int)); /* Configure i/f down for one protocol */
-+int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
-+ /* Configure IPv4 addresses for i/f */
-+int cifaddr __P((int, u_int32_t, u_int32_t));
-+ /* Reset i/f IP addresses */
-+#ifdef INET6
-+int sif6addr __P((int, eui64_t, eui64_t));
-+ /* Configure IPv6 addresses for i/f */
-+int cif6addr __P((int, eui64_t, eui64_t));
-+ /* Remove an IPv6 address from i/f */
-+#endif
-+int sifdefaultroute __P((int, u_int32_t, u_int32_t));
-+ /* Create default route through i/f */
-+int cifdefaultroute __P((int, u_int32_t, u_int32_t));
-+ /* Delete default route through i/f */
-+int sifproxyarp __P((int, u_int32_t));
-+ /* Add proxy ARP entry for peer */
-+int cifproxyarp __P((int, u_int32_t));
-+ /* Delete proxy ARP entry for peer */
-+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-+int lock __P((char *)); /* Create lock file for device */
-+int relock __P((int)); /* Rewrite lock file with new pid */
-+void unlock __P((void)); /* Delete previously-created lock file */
-+void logwtmp __P((const char *, const char *, const char *));
-+ /* Write entry to wtmp file */
-+int get_host_seed __P((void)); /* Get host-dependent random number seed */
-+int have_route_to __P((u_int32_t)); /* Check if route to addr exists */
-+#ifdef PPP_FILTER
-+int set_filters __P((struct bpf_program *pass, struct bpf_program *active));
-+ /* Set filter programs in kernel */
-+#endif
-+#ifdef IPX_CHANGE
-+int sipxfaddr __P((int, unsigned long, unsigned char *));
-+int cipxfaddr __P((int));
-+#endif
-+int get_if_hwaddr __P((u_char *addr, char *name));
-+char *get_first_ethernet __P((void));
-+
-+/* Procedures exported from options.c */
-+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-+int parse_args __P((int argc, char **argv));
-+ /* Parse options from arguments given */
-+int options_from_file __P((char *filename, int must_exist, int check_prot,
-+ int privileged));
-+ /* Parse options from an options file */
-+int options_from_user __P((void)); /* Parse options from user's .ppprc */
-+int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-+int options_from_list __P((struct wordlist *, int privileged));
-+ /* Parse options from a wordlist */
-+int getword __P((FILE *f, char *word, int *newlinep, char *filename));
-+ /* Read a word from a file */
-+void option_error __P((char *fmt, ...));
-+ /* Print an error message about an option */
-+int int_option __P((char *, int *));
-+ /* Simplified number_option for decimal ints */
-+void add_options __P((option_t *)); /* Add extra options */
-+void check_options __P((void)); /* check values after all options parsed */
-+int override_value __P((const char *, int, const char *));
-+ /* override value if permitted by priority */
-+void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+ /* print out values of all options */
-+
-+int parse_dotted_ip __P((char *, u_int32_t *));
-+
-+/*
-+ * Hooks to enable plugins to change various things.
-+ */
-+extern int (*new_phase_hook) __P((int));
-+extern int (*idle_time_hook) __P((struct ppp_idle *));
-+extern int (*holdoff_hook) __P((void));
-+extern int (*pap_check_hook) __P((void));
-+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
-+ struct wordlist **paddrs,
-+ struct wordlist **popts));
-+extern void (*pap_logout_hook) __P((void));
-+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
-+extern int (*allowed_address_hook) __P((u_int32_t addr));
-+extern void (*ip_up_hook) __P((void));
-+extern void (*ip_down_hook) __P((void));
-+extern void (*ip_choose_hook) __P((u_int32_t *));
-+
-+extern int (*chap_check_hook) __P((void));
-+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
-+
-+/* 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));
-+
-+/*
-+ * Inline versions of get/put char/short/long.
-+ * Pointer is advanced; we assume that both arguments
-+ * are lvalues and will already be in registers.
-+ * cp MUST be u_char *.
-+ */
-+#define GETCHAR(c, cp) { \
-+ (c) = *(cp)++; \
-+}
-+#define PUTCHAR(c, cp) { \
-+ *(cp)++ = (u_char) (c); \
-+}
-+
-+
-+#define GETSHORT(s, cp) { \
-+ (s) = *(cp)++ << 8; \
-+ (s) |= *(cp)++; \
-+}
-+#define PUTSHORT(s, cp) { \
-+ *(cp)++ = (u_char) ((s) >> 8); \
-+ *(cp)++ = (u_char) (s); \
-+}
-+
-+#define GETLONG(l, cp) { \
-+ (l) = *(cp)++ << 8; \
-+ (l) |= *(cp)++; (l) <<= 8; \
-+ (l) |= *(cp)++; (l) <<= 8; \
-+ (l) |= *(cp)++; \
-+}
-+#define PUTLONG(l, cp) { \
-+ *(cp)++ = (u_char) ((l) >> 24); \
-+ *(cp)++ = (u_char) ((l) >> 16); \
-+ *(cp)++ = (u_char) ((l) >> 8); \
-+ *(cp)++ = (u_char) (l); \
-+}
-+
-+#define INCPTR(n, cp) ((cp) += (n))
-+#define DECPTR(n, cp) ((cp) -= (n))
-+
-+/*
-+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
-+ */
-+
-+#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0)
-+#define UNTIMEOUT(r, f) untimeout((r), (f))
-+
-+#define BCOPY(s, d, l) memcpy(d, s, l)
-+#define BZERO(s, n) memset(s, 0, n)
-+#define BCMP(s1, s2, l) memcmp(s1, s2, l)
-+
-+#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); }
-+
-+/*
-+ * MAKEHEADER - Add Header fields to a packet.
-+ */
-+#define MAKEHEADER(p, t) { \
-+ PUTCHAR(PPP_ALLSTATIONS, p); \
-+ PUTCHAR(PPP_UI, p); \
-+ PUTSHORT(t, p); }
-+
-+/*
-+ * Exit status values.
-+ */
-+#define EXIT_OK 0
-+#define EXIT_FATAL_ERROR 1
-+#define EXIT_OPTION_ERROR 2
-+#define EXIT_NOT_ROOT 3
-+#define EXIT_NO_KERNEL_SUPPORT 4
-+#define EXIT_USER_REQUEST 5
-+#define EXIT_LOCK_FAILED 6
-+#define EXIT_OPEN_FAILED 7
-+#define EXIT_CONNECT_FAILED 8
-+#define EXIT_PTYCMD_FAILED 9
-+#define EXIT_NEGOTIATION_FAILED 10
-+#define EXIT_PEER_AUTH_FAILED 11
-+#define EXIT_IDLE_TIMEOUT 12
-+#define EXIT_CONNECT_TIME 13
-+#define EXIT_CALLBACK 14
-+#define EXIT_PEER_DEAD 15
-+#define EXIT_HANGUP 16
-+#define EXIT_LOOPBACK 17
-+#define EXIT_INIT_FAILED 18
-+#define EXIT_AUTH_TOPEER_FAILED 19
-+#ifdef MAXOCTETS
-+#define EXIT_TRAFFIC_LIMIT 20
-+#endif
-+#define EXIT_CNID_AUTH_FAILED 21
-+
-+/*
-+ * Debug macros. Slightly useful for finding bugs in pppd, not particularly
-+ * useful for finding out why your connection isn't being established.
-+ */
-+#ifdef DEBUGALL
-+#define DEBUGMAIN 1
-+#define DEBUGFSM 1
-+#define DEBUGLCP 1
-+#define DEBUGIPCP 1
-+#define DEBUGIPV6CP 1
-+#define DEBUGUPAP 1
-+#define DEBUGCHAP 1
-+#endif
-+
-+#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */
-+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-+ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-+ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-+#define LOG_PPP LOG_LOCAL2
-+#else
-+#define LOG_PPP LOG_DAEMON
-+#endif
-+#endif /* LOG_PPP */
-+
-+#ifdef DEBUGMAIN
-+#define MAINDEBUG(x) if (debug) dbglog x
-+#else
-+#define MAINDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGSYS
-+#define SYSDEBUG(x) if (debug) dbglog x
-+#else
-+#define SYSDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGFSM
-+#define FSMDEBUG(x) if (debug) dbglog x
-+#else
-+#define FSMDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGLCP
-+#define LCPDEBUG(x) if (debug) dbglog x
-+#else
-+#define LCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPCP
-+#define IPCPDEBUG(x) if (debug) dbglog x
-+#else
-+#define IPCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPV6CP
-+#define IPV6CPDEBUG(x) if (debug) dbglog x
-+#else
-+#define IPV6CPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGUPAP
-+#define UPAPDEBUG(x) if (debug) dbglog x
-+#else
-+#define UPAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGCHAP
-+#define CHAPDEBUG(x) if (debug) dbglog x
-+#else
-+#define CHAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPXCP
-+#define IPXCPDEBUG(x) if (debug) dbglog x
-+#else
-+#define IPXCPDEBUG(x)
-+#endif
-+
-+#ifndef SIGTYPE
-+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-+#define SIGTYPE void
-+#else
-+#define SIGTYPE int
-+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-+#endif /* SIGTYPE */
-+
-+#ifndef MIN
-+#define MIN(a, b) ((a) < (b)? (a): (b))
-+#endif
-+#ifndef MAX
-+#define MAX(a, b) ((a) > (b)? (a): (b))
-+#endif
-+
-+#ifndef offsetof
-+#define offsetof(type, member) ((size_t) &((type *)0)->member)
-+#endif
-+
-+#endif /* __PPP_H__ */
---- capi4k-utils.original/pppdcapiplugin/ppp-2.4.6/pppd/patchlevel.h 1970-01-01 00:00:00.000000000 +0000
-+++ capi4k-utils/pppdcapiplugin/ppp-2.4.6/pppd/patchlevel.h 2006-06-28 00:21:23.000000000 +0000
-@@ -0,0 +1,4 @@
-+/* $Id: patchlevel.h,v 1.66 2006/06/28 00:21:23 paulus Exp $ */
-+
-+#define VERSION "2.4.5b"
-+#define DATE "12 Mar 2014"
Copied: ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.7.patch (from rev 7638, ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.6.patch)
===================================================================
--- ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.7.patch (rev 0)
+++ ipcop/trunk/src/patches/capi4k-utils-2005-07-18_ppp-2.4.7.patch 2014-08-25 13:04:21 UTC (rev 7639)
@@ -0,0 +1,934 @@
+--- capi4k-utils.original/pppdcapiplugin/ppp-2.4.7/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ capi4k-utils/pppdcapiplugin/ppp-2.4.7/Makefile 2008-04-21 02:26:46.460759309 +0000
+@@ -0,0 +1,14 @@
++# Makefile for the capiplugin for pppd(8).
++#
++# Copyright 2000 Carsten Paeth (ca...@ca...)
++# Copyright 2000 AVM GmbH Berlin (in...@av...)
++#
++# 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
++# 2 of the License, or (at your option) any later version.
++
++PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++
++include $(TOPDIR)/Rules.make
++
+--- capi4k-utils.original/pppdcapiplugin/ppp-2.4.7/pppd/pppd.h 1970-01-01 00:00:00.000000000 +0000
++++ capi4k-utils/pppdcapiplugin/ppp-2.4.7/pppd/pppd.h 2005-08-25 23:59:34.000000000 +0000
+@@ -0,0 +1,907 @@
++/*
++ * pppd.h - PPP daemon global declarations.
++ *
++ * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
++ * endorse or promote products derived from this software without
++ * prior written permission. For permission or any legal
++ * details, please contact
++ * Office of Technology Transfer
++ * Carnegie Mellon University
++ * 5000 Forbes Avenue
++ * Pittsburgh, PA 15213-3890
++ * (412) 268-4387, fax: (412) 268-7395
++ * tec...@an...
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ * acknowledgment:
++ * "This product includes software developed by Computing Services
++ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY 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.
++ *
++ * $Id: pppd.h,v 1.91 2005/08/25 23:59:34 paulus Exp $
++ */
++
++/*
++ * TODO:
++ */
++
++#ifndef __PPPD_H__
++#define __PPPD_H__
++
++#include <stdio.h> /* for FILE */
++#include <limits.h> /* for NGROUPS_MAX */
++#include <sys/param.h> /* for MAXPATHLEN and BSD4_4, if defined */
++#include <sys/types.h> /* for u_int32_t, if defined */
++#include <sys/time.h> /* for struct timeval */
++#include <net/ppp_defs.h>
++#include "patchlevel.h"
++
++#if defined(__STDC__)
++#include <stdarg.h>
++#define __V(x) x
++#else
++#include <varargs.h>
++#define __V(x) (va_alist) va_dcl
++#define const
++#define volatile
++#endif
++
++#ifdef INET6
++#include "eui64.h"
++#endif
++
++/*
++ * Limits.
++ */
++
++#define NUM_PPP 1 /* One PPP interface supported (per process) */
++#define MAXWORDLEN 1024 /* max length of word in file (incl null) */
++#define MAXARGS 1 /* max # args to a command */
++#define MAXNAMELEN 256 /* max length of hostname or name for auth */
++#define MAXSECRETLEN 256 /* max length of password or secret */
++
++/*
++ * Option descriptor structure.
++ */
++
++typedef unsigned char bool;
++
++enum opt_type {
++ o_special_noarg = 0,
++ o_special = 1,
++ o_bool,
++ o_int,
++ o_uint32,
++ o_string,
++ o_wild
++};
++
++typedef struct {
++ char *name; /* name of the option */
++ enum opt_type type;
++ void *addr;
++ char *description;
++ unsigned int flags;
++ void *addr2;
++ int upper_limit;
++ int lower_limit;
++ const char *source;
++ short int priority;
++ short int winner;
++} option_t;
++
++/* Values for flags */
++#define OPT_VALUE 0xff /* mask for presupplied value */
++#define OPT_HEX 0x100 /* int option is in hex */
++#define OPT_NOARG 0x200 /* option doesn't take argument */
++#define OPT_OR 0x400 /* OR in argument to value */
++#define OPT_INC 0x800 /* increment value */
++#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */
++#define OPT_PRIV 0x1000 /* privileged option */
++#define OPT_STATIC 0x2000 /* string option goes into static array */
++#define OPT_LLIMIT 0x4000 /* check value against lower limit */
++#define OPT_ULIMIT 0x8000 /* check value against upper limit */
++#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT)
++#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */
++#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */
++#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */
++#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
++#define OPT_NOINCR 0x20000 /* value mustn't be increased */
++#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */
++#define OPT_PRIO 0x80000 /* process option priorities for this option */
++#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */
++#define OPT_ALIAS 0x200000 /* option is alias for previous option */
++#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */
++#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */
++#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */
++#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */
++#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */
++#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */
++#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV)
++#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */
++#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */
++#define OPT_NOPRINT 0x40000000 /* don't print this option at all */
++
++#define OPT_VAL(x) ((x) & OPT_VALUE)
++
++/* Values for priority */
++#define OPRIO_DEFAULT 0 /* a default value */
++#define OPRIO_CFGFILE 1 /* value from a configuration file */
++#define OPRIO_CMDLINE 2 /* value from the command line */
++#define OPRIO_SECFILE 3 /* value from options in a secrets file */
++#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */
++
++#ifndef GIDSET_TYPE
++#define GIDSET_TYPE gid_t
++#endif
++
++/* Structure representing a list of permitted IP addresses. */
++struct permitted_ip {
++ int permit; /* 1 = permit, 0 = forbid */
++ u_int32_t base; /* match if (addr & mask) == base */
++ u_int32_t mask; /* base and mask are in network byte order */
++};
++
++/*
++ * Unfortunately, the linux kernel driver uses a different structure
++ * for statistics from the rest of the ports.
++ * This structure serves as a common representation for the bits
++ * pppd needs.
++ */
++struct pppd_stats {
++ unsigned int bytes_in;
++ unsigned int bytes_out;
++ unsigned int pkts_in;
++ unsigned int pkts_out;
++};
++
++/* Used for storing a sequence of words. Usually malloced. */
++struct wordlist {
++ struct wordlist *next;
++ char *word;
++};
++
++/* An endpoint discriminator, used with multilink. */
++#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */
++struct epdisc {
++ unsigned char class;
++ unsigned char length;
++ unsigned char value[MAX_ENDP_LEN];
++};
++
++/* values for epdisc.class */
++#define EPD_NULL 0 /* null discriminator, no data */
++#define EPD_LOCAL 1
++#define EPD_IP 2
++#define EPD_MAC 3
++#define EPD_MAGIC 4
++#define EPD_PHONENUM 5
++
++typedef void (*notify_func) __P((void *, int));
++
++struct notifier {
++ struct notifier *next;
++ notify_func func;
++ void *arg;
++};
++
++/*
++ * Global variables.
++ */
++
++extern int hungup; /* Physical layer has disconnected */
++extern int ifunit; /* Interface unit number */
++extern char ifname[]; /* Interface name */
++extern char hostname[]; /* Our hostname */
++extern u_char outpacket_buf[]; /* Buffer for outgoing packets */
++extern int devfd; /* fd of underlying device */
++extern int fd_ppp; /* fd for talking PPP */
++extern int phase; /* Current state of link - see values below */
++extern int baud_rate; /* Current link speed in bits/sec */
++extern char *progname; /* Name of this program */
++extern int redirect_stderr;/* Connector's stderr should go to file */
++extern char peer_authname[];/* Authenticated name of peer */
++extern int auth_done[NUM_PPP]; /* Methods actually used for auth */
++extern int privileged; /* We were run by real-uid root */
++extern int need_holdoff; /* Need holdoff period after link terminates */
++extern char **script_env; /* Environment variables for scripts */
++extern int detached; /* Have detached from controlling tty */
++extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */
++extern int ngroups; /* How many groups valid in groups */
++extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
++extern int link_stats_valid; /* set if link_stats is valid */
++extern unsigned link_connect_time; /* time the link was up for */
++extern int using_pty; /* using pty as device (notty or pty opt.) */
++extern int log_to_fd; /* logging to this fd as well as syslog */
++extern bool log_default; /* log_to_fd is default (stdout) */
++extern char *no_ppp_msg; /* message to print if ppp not in kernel */
++extern volatile int status; /* exit status for pppd */
++extern bool devnam_fixed; /* can no longer change devnam */
++extern int unsuccess; /* # unsuccessful connection attempts */
++extern int do_callback; /* set if we want to do callback next */
++extern int doing_callback; /* set if this is a callback */
++extern int error_count; /* # of times error() has been called */
++extern char ppp_devnam[MAXPATHLEN];
++extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
++extern int ppp_session_number; /* Session number (eg PPPoE session) */
++extern int fd_devnull; /* fd open to /dev/null */
++
++extern int listen_time; /* time to listen first (ms) */
++extern bool doing_multilink;
++extern bool multilink_master;
++extern bool bundle_eof;
++extern bool bundle_terminating;
++
++extern struct notifier *pidchange; /* for notifications of pid changing */
++extern struct notifier *phasechange; /* for notifications of phase changes */
++extern struct notifier *exitnotify; /* for notification that we're exiting */
++extern struct notifier *sigreceived; /* notification of received signal */
++extern struct notifier *ip_up_notifier; /* IPCP has come up */
++extern struct notifier *ip_down_notifier; /* IPCP has gone down */
++extern struct notifier *auth_up_notifier; /* peer has authenticated */
++extern struct notifier *link_down_notifier; /* link has gone down */
++extern struct notifier *fork_notifier; /* we are a new child process */
++
++/* Values for do_callback and doing_callback */
++#define CALLBACK_DIALIN 1 /* we are expecting the call back */
++#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */
++
++/*
++ * Variables set by command-line options.
++ */
++
++extern int debug; /* Debug flag */
++extern int kdebugflag; /* Tell kernel to print debug messages */
++extern int default_device; /* Using /dev/tty or equivalent */
++extern char devnam[MAXPATHLEN]; /* Device name */
++extern int crtscts; /* Use hardware flow control */
++extern bool modem; /* Use modem control lines */
++extern int inspeed; /* Input/Output speed requested */
++extern u_int32_t netmask; /* IP netmask to set on interface */
++extern bool lockflag; /* Create lock file to lock the serial dev */
++extern bool nodetach; /* Don't detach from controlling tty */
++extern bool updetach; /* Detach from controlling tty when link up */
++extern char *initializer; /* Script to initialize physical link */
++extern char *connect_script; /* Script to establish physical link */
++extern char *disconnect_script; /* Script to disestablish physical link */
++extern char *welcomer; /* Script to welcome client after connection */
++extern char *ptycommand; /* Command to run on other side of pty */
++extern int maxconnect; /* Maximum connect time (seconds) */
++extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */
++extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */
++extern bool auth_required; /* Peer is required to authenticate */
++extern bool persist; /* Reopen link after it goes down */
++extern bool uselogin; /* Use /etc/passwd for checking PAP */
++extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */
++extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
++extern bool explicit_remote;/* remote_name specified with remotename opt */
++extern bool demand; /* Do dial-on-demand */
++extern char *ipparam; /* Extra parameter for ip up/down scripts */
++extern bool cryptpap; /* Others' PAP passwords are encrypted */
++extern int idle_time_limit;/* Shut down link if idle for this long */
++extern int holdoff; /* Dead time before restarting */
++extern bool holdoff_specified; /* true if user gave a holdoff value */
++extern bool notty; /* Stdin/out is not a tty */
++extern char *pty_socket; /* Socket to connect to pty */
++extern char *record_file; /* File to record chars sent/received */
++extern bool sync_serial; /* Device is synchronous serial device */
++extern int maxfail; /* Max # of unsuccessful connection attempts */
++extern char linkname[MAXPATHLEN]; /* logical name for link */
++extern bool tune_kernel; /* May alter kernel settings as necessary */
++extern int connect_delay; /* Time to delay after connect script */
++extern int max_data_rate; /* max bytes/sec through charshunt */
++extern int req_unit; /* interface unit number to use */
++extern bool multilink; /* enable multilink operation */
++extern bool noendpoint; /* don't send or accept endpt. discrim. */
++extern char *bundle_name; /* bundle name for multilink */
++extern bool dump_options; /* print out option values */
++extern bool dryrun; /* check everything, print options, exit */
++extern int child_wait; /* # seconds to wait for children at end */
++
++#ifdef MAXOCTETS
++extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */
++extern int maxoctets_dir; /* Direction :
++ 0 - in+out (default)
++ 1 - in
++ 2 - out
++ 3 - max(in,out) */
++extern int maxoctets_timeout; /* Timeout for check of octets limit */
++#define PPP_OCTETS_DIRECTION_SUM 0
++#define PPP_OCTETS_DIRECTION_IN 1
++#define PPP_OCTETS_DIRECTION_OUT 2
++#define PPP_OCTETS_DIRECTION_MAXOVERAL 3
++/* same as previos, but little different on RADIUS side */
++#define PPP_OCTETS_DIRECTION_MAXSESSION 4
++#endif
++
++#ifdef PPP_FILTER
++extern struct bpf_program pass_filter; /* Filter for pkts to pass */
++extern struct bpf_program active_filter; /* Filter for link-active pkts */
++#endif
++
++#ifdef MSLANMAN
++extern bool ms_lanman; /* Use LanMan password instead of NT */
++ /* Has meaning only with MS-CHAP challenges */
++#endif
++
++/* Values for auth_pending, auth_done */
++#define PAP_WITHPEER 0x1
++#define PAP_PEER 0x2
++#define CHAP_WITHPEER 0x4
++#define CHAP_PEER 0x8
++#define EAP_WITHPEER 0x10
++#define EAP_PEER 0x20
++
++/* Values for auth_done only */
++#define CHAP_MD5_WITHPEER 0x40
++#define CHAP_MD5_PEER 0x80
++#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */
++#define CHAP_MS_WITHPEER 0x100
++#define CHAP_MS_PEER 0x200
++#define CHAP_MS2_WITHPEER 0x400
++#define CHAP_MS2_PEER 0x800
++
++extern char *current_option; /* the name of the option being parsed */
++extern int privileged_option; /* set iff the current option came from root */
++extern char *option_source; /* string saying where the option came from */
++extern int option_priority; /* priority of current options */
++
++/*
++ * Values for phase.
++ */
++#define PHASE_DEAD 0
++#define PHASE_INITIALIZE 1
++#define PHASE_SERIALCONN 2
++#define PHASE_DORMANT 3
++#define PHASE_ESTABLISH 4
++#define PHASE_AUTHENTICATE 5
++#define PHASE_CALLBACK 6
++#define PHASE_NETWORK 7
++#define PHASE_RUNNING 8
++#define PHASE_TERMINATE 9
++#define PHASE_DISCONNECT 10
++#define PHASE_HOLDOFF 11
++#define PHASE_MASTER 12
++
++/*
++ * The following struct gives the addresses of procedures to call
++ * for a particular protocol.
++ */
++struct protent {
++ u_short protocol; /* PPP protocol number */
++ /* Initialization procedure */
++ void (*init) __P((int unit));
++ /* Process a received packet */
++ void (*input) __P((int unit, u_char *pkt, int len));
++ /* Process a received protocol-reject */
++ void (*protrej) __P((int unit));
++ /* Lower layer has come up */
++ void (*lowerup) __P((int unit));
++ /* Lower layer has gone down */
++ void (*lowerdown) __P((int unit));
++ /* Open the protocol */
++ void (*open) __P((int unit));
++ /* Close the protocol */
++ void (*close) __P((int unit, char *reason));
++ /* Print a packet in readable form */
++ int (*printpkt) __P((u_char *pkt, int len,
++ void (*printer) __P((void *, char *, ...)),
++ void *arg));
++ /* Process a received data packet */
++ void (*datainput) __P((int unit, u_char *pkt, int len));
++ bool enabled_flag; /* 0 iff protocol is disabled */
++ char *name; /* Text name of protocol */
++ char *data_name; /* Text name of corresponding data protocol */
++ option_t *options; /* List of command-line options */
++ /* Check requested options, assign defaults */
++ void (*check_options) __P((void));
++ /* Configure interface for demand-dial */
++ int (*demand_conf) __P((int unit));
++ /* Say whether to bring up link for this pkt */
++ int (*active_pkt) __P((u_char *pkt, int len));
++};
++
++/* Table of pointers to supported protocols */
++extern struct protent *protocols[];
++
++/*
++ * This struct contains pointers to a set of procedures for
++ * doing operations on a "channel". A channel provides a way
++ * to send and receive PPP packets - the canonical example is
++ * a serial port device in PPP line discipline (or equivalently
++ * with PPP STREAMS modules pushed onto it).
++ */
++struct channel {
++ /* set of options for this channel */
++ option_t *options;
++ /* find and process a per-channel options file */
++ void (*process_extra_options) __P((void));
++ /* check all the options that have been given */
++ void (*check_options) __P((void));
++ /* get the channel ready to do PPP, return a file descriptor */
++ int (*connect) __P((void));
++ /* we're finished with the channel */
++ void (*disconnect) __P((void));
++ /* put the channel into PPP `mode' */
++ int (*establish_ppp) __P((int));
++ /* take the channel out of PPP `mode', restore loopback if demand */
++ void (*disestablish_ppp) __P((int));
++ /* set the transmit-side PPP parameters of the channel */
++ void (*send_config) __P((int, u_int32_t, int, int));
++ /* set the receive-side PPP parameters of the channel */
++ void (*recv_config) __P((int, u_int32_t, int, int));
++ /* cleanup on error or normal exit */
++ void (*cleanup) __P((void));
++ /* close the device, called in children after fork */
++ void ...
[truncated message content] |
|
From: <ow...@us...> - 2014-08-25 10:40:05
|
Revision: 7638
http://sourceforge.net/p/ipcop/svn/7638
Author: owes
Date: 2014-08-25 10:39:56 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Update ppp to 2.4.7, without Debian patches for now. Needs testing.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ppp
ipcop/trunk/lfs/ppp
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
ipcop/trunk/updates/2.1.6/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
Modified: ipcop/trunk/config/rootfiles/common/ppp
===================================================================
--- ipcop/trunk/config/rootfiles/common/ppp 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/config/rootfiles/common/ppp 2014-08-25 10:39:56 UTC (rev 7638)
@@ -35,18 +35,18 @@
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
#usr/lib/pppd
-#usr/lib/pppd/2.4.6
-usr/lib/pppd/2.4.6/minconn.so
-usr/lib/pppd/2.4.6/openl2tp.so
-usr/lib/pppd/2.4.6/passprompt.so
-usr/lib/pppd/2.4.6/passwordfd.so
-usr/lib/pppd/2.4.6/pppoatm.so
-usr/lib/pppd/2.4.6/pppol2tp.so
-usr/lib/pppd/2.4.6/radattr.so
-usr/lib/pppd/2.4.6/radius.so
-usr/lib/pppd/2.4.6/radrealms.so
-usr/lib/pppd/2.4.6/rp-pppoe.so
-usr/lib/pppd/2.4.6/winbind.so
+#usr/lib/pppd/2.4.7
+usr/lib/pppd/2.4.7/minconn.so
+usr/lib/pppd/2.4.7/openl2tp.so
+usr/lib/pppd/2.4.7/passprompt.so
+usr/lib/pppd/2.4.7/passwordfd.so
+usr/lib/pppd/2.4.7/pppoatm.so
+usr/lib/pppd/2.4.7/pppol2tp.so
+usr/lib/pppd/2.4.7/radattr.so
+usr/lib/pppd/2.4.7/radius.so
+usr/lib/pppd/2.4.7/radrealms.so
+usr/lib/pppd/2.4.7/rp-pppoe.so
+usr/lib/pppd/2.4.7/winbind.so
usr/sbin/chat
usr/sbin/pppd
#usr/sbin/pppdump
Modified: ipcop/trunk/lfs/ppp
===================================================================
--- ipcop/trunk/lfs/ppp 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/lfs/ppp 2014-08-25 10:39:56 UTC (rev 7638)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = ppp
-VER = 2.4.6
+VER = 2.4.7
HOST_ARCH = all
OTHER_SRC = yes
@@ -45,7 +45,7 @@
CFLAGS += -Wall -fno-strict-aliasing
-PATCH1 := $(PKG_NAME)_2.4.5-5.1.diff.gz
+PATCH1 = $(PKG_NAME)_2.4.6-2.debian.tar.xz
$(PATCH1) := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
###############################################################################
@@ -54,11 +54,11 @@
objects = $(DL_FILE) $(PATCH1)
-$(DL_FILE):= $(DL_FROM)/$(DL_FILE)
-$(PATCH1) := $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(PATCH1) = $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5:= 3434d2cc9327167a0723aaaa8670083b
-$(PATCH1)_MD5 := 0c8767343ed46e79c74d7b1e45286b35
+$(DL_FILE)_MD5 = 78818f40e6d33a1d1de68a1551f6595a
+$(PATCH1)_MD5 = 033ad4705526812eb4f194c563ac0615
install : $(TARGET)
@@ -88,21 +88,20 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
# Apply patches on debian order
- cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -p1
+ #cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -p1
# Hack the list of patches, remove rejected and later patches (debian specific), blank lines and comments.
- cd $(DIR_APP) && sed -i -e '/rejected/,$$d' -e '/^$$/d' -e '/#.*/d' debian/patches/series
- cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch -p1 -i debian/patches/$$patch; done
+ #cd $(DIR_APP) && sed -i -e '/rejected/,$$d' -e '/^$$/d' -e '/#.*/d' debian/patches/series
+ #cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch -p1 -i debian/patches/$$patch; done
# logwtmp patch need this added as we skipped zzz_config patch in end of series
- cd $(DIR_APP) && sed -i 's/LIBS =$$/LIBS = -lutil/' pppd/Makefile.linux
+ #cd $(DIR_APP) && sed -i 's/LIBS =$$/LIBS = -lutil/' pppd/Makefile.linux
# needed now or pppdump fail to build
- cd $(DIR_APP) && sed -i -e '/DO_DEFLATE=y/d' pppdump/Makefile.linux
+ #cd $(DIR_APP) && sed -i -e '/DO_DEFLATE=y/d' pppdump/Makefile.linux
# Fix 'call to __builtin___strncat_chk might overflow destination buffer'
cd $(DIR_APP) && sed -i -e 's/strncat/strlcat/' pppd/plugins/radius/clientid.c
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_fix-sifvjcomp-undefined.patch
-
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' chat/Makefile
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' pppd/plugins/Makefile
Deleted: ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
===================================================================
--- ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch 2014-08-25 10:39:56 UTC (rev 7638)
@@ -1,18 +0,0 @@
---- a/pppd/sys-linux.c 2014-03-12 08:15:38.057972274 +0100
-+++ b/pppd/sys-linux.c 2014-03-12 08:16:12.000000000 +0100
-@@ -2281,6 +2281,7 @@
- }
- #endif
- }
-+#endif /* ifndef linux */
- #endif /* HAVE_LOGWTMP */
-
- /********************************************************************
-@@ -2304,7 +2305,6 @@
-
- return 1;
- }
--#endif
-
- /********************************************************************
- *
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-25 10:39:56 UTC (rev 7638)
@@ -306,6 +306,22 @@
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_read.al
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_write.al
##
+## ppp-2.4.7
+/usr/sbin/chat
+/usr/sbin/pppd
+/usr/sbin/pppstats
+/usr/lib/pppd/2.4.7/minconn.so
+/usr/lib/pppd/2.4.7/openl2tp.so
+/usr/lib/pppd/2.4.7/passprompt.so
+/usr/lib/pppd/2.4.7/passwordfd.so
+/usr/lib/pppd/2.4.7/pppoatm.so
+/usr/lib/pppd/2.4.7/pppol2tp.so
+/usr/lib/pppd/2.4.7/radattr.so
+/usr/lib/pppd/2.4.7/radius.so
+/usr/lib/pppd/2.4.7/radrealms.so
+/usr/lib/pppd/2.4.7/rp-pppoe.so
+/usr/lib/pppd/2.4.7/winbind.so
+##
## rsyslog-7.6.3
/usr/lib/rsyslog/imklog.so
/usr/lib/rsyslog/imuxsock.so
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-25 10:39:56 UTC (rev 7638)
@@ -9,7 +9,8 @@
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.1,
- openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
+ openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
+ squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-25 10:39:56 UTC (rev 7638)
@@ -88,6 +88,9 @@
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/NIMLOC.pm
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/NSAP.pm
+# ppp
+/bin/rm -rf /usr/lib/pppd/2.4.6
+
# squid helpers that have disappeared over time
/bin/rm -f /usr/lib/squid/digest_edirectory_auth
/bin/rm -f /usr/lib/squid/diskd-daemon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 21:21:28
|
Revision: 7637
http://sourceforge.net/p/ipcop/svn/7637
Author: owes
Date: 2014-08-24 21:21:20 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
Update libgcrypt to 1.6.2
Modified Paths:
--------------
ipcop/trunk/lfs/libgcrypt
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
ipcop/trunk/updates/2.1.6/setup
Modified: ipcop/trunk/lfs/libgcrypt
===================================================================
--- ipcop/trunk/lfs/libgcrypt 2014-08-24 21:17:29 UTC (rev 7636)
+++ ipcop/trunk/lfs/libgcrypt 2014-08-24 21:21:20 UTC (rev 7637)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libgcrypt
-VER = 1.6.1
+VER = 1.6.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,6 +43,9 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+# Use release date so recompile has same md5
+DATESTAMP=2014-08-21T15:29+0000
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -51,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a5a5060dc2f80bcac700ab0236ea47dc
+$(DL_FILE)_MD5 = b54395a93cb1e57619943c082da09d5f
install : $(TARGET)
@@ -81,6 +84,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && sed -i -e 's/BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=$(DATESTAMP)/g' configure
# elif defined (HAVE_GETTIMEOFDAY) is before elif defined (HAVE_CLOCK_GETTIME) in random/cs-prng.c
# So broken clock_gettime test is not an issue for us and could be skipped
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 21:17:29 UTC (rev 7636)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 21:21:20 UTC (rev 7637)
@@ -110,6 +110,10 @@
/usr/lib/libjson-c.so.2
/usr/lib/libjson-c.so.2.0.1
##
+## libgcrypt-1.6.2
+/usr/lib/libgcrypt.so.20
+/usr/lib/libgcrypt.so.20.0.2
+##
## libgpg-error-1.13
/usr/lib/libgpg-error.so.0
/usr/lib/libgpg-error.so.0.11.0
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 21:17:29 UTC (rev 7636)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 21:21:20 UTC (rev 7637)
@@ -8,7 +8,7 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
- gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, mdadm to 3.3.1,
+ gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2, mdadm to 3.3.1,
openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-24 21:17:29 UTC (rev 7636)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-24 21:21:20 UTC (rev 7637)
@@ -80,6 +80,7 @@
# Remove old libraries (version specific)
# /bin/rm -f .....
+/bin/rm -f /usr/lib/libgcrypt.so.20.0.1
/bin/rm -f /usr/lib/libgpg-error.so.0
/bin/rm -f /usr/lib/libgpg-error.so.0.10.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 21:17:38
|
Revision: 7636
http://sourceforge.net/p/ipcop/svn/7636
Author: owes
Date: 2014-08-24 21:17:29 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
Fix tzdata additions & removals
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/tzdata
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/setup
Modified: ipcop/trunk/config/rootfiles/common/tzdata
===================================================================
--- ipcop/trunk/config/rootfiles/common/tzdata 2014-08-24 12:06:29 UTC (rev 7635)
+++ ipcop/trunk/config/rootfiles/common/tzdata 2014-08-24 21:17:29 UTC (rev 7636)
@@ -306,9 +306,6 @@
#usr/share/zoneinfo/posix/Asia/Qyzylorda
#usr/share/zoneinfo/posix/Asia/Rangoon
#usr/share/zoneinfo/posix/Asia/Riyadh
-#usr/share/zoneinfo/posix/Asia/Riyadh87
-#usr/share/zoneinfo/posix/Asia/Riyadh88
-#usr/share/zoneinfo/posix/Asia/Riyadh89
#usr/share/zoneinfo/posix/Asia/Saigon
#usr/share/zoneinfo/posix/Asia/Sakhalin
#usr/share/zoneinfo/posix/Asia/Samarkand
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 12:06:29 UTC (rev 7635)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 21:17:29 UTC (rev 7636)
@@ -361,6 +361,7 @@
/usr/share/zoneinfo/posix/America/Metlakatla
/usr/share/zoneinfo/posix/Antarctica/Casey
/usr/share/zoneinfo/posix/Antarctica/Macquarie
+/usr/share/zoneinfo/posix/Asia/Chita
/usr/share/zoneinfo/posix/Asia/Chongqing
/usr/share/zoneinfo/posix/Asia/Chungking
/usr/share/zoneinfo/posix/Asia/Harbin
@@ -378,6 +379,7 @@
/usr/share/zoneinfo/posix/Asia/Sakhalin
/usr/share/zoneinfo/posix/Asia/Seoul
/usr/share/zoneinfo/posix/Asia/Shanghai
+/usr/share/zoneinfo/posix/Asia/Srednekolymsk
/usr/share/zoneinfo/posix/Asia/Taipei
/usr/share/zoneinfo/posix/Asia/Tashkent
/usr/share/zoneinfo/posix/Asia/Tbilisi
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-24 12:06:29 UTC (rev 7635)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-24 21:17:29 UTC (rev 7636)
@@ -93,6 +93,11 @@
/bin/rm -f /usr/lib/squid/logfile-daemon
/bin/rm -f /usr/lib/squid/ntlm_auth
+# tzdata changes
+/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh87
+/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh88
+/bin/rm -f /usr/share/zoneinfo/posix/Asia/Riyadh89
+
# renamed
/bin/rm -f /usr/local/sbin/installflash.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 12:06:33
|
Revision: 7635
http://sourceforge.net/p/ipcop/svn/7635
Author: owes
Date: 2014-08-24 12:06:29 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
Update linux kernel to 3.4.103
Modified Paths:
--------------
ipcop/trunk/lfs/linux
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux 2014-08-24 12:05:23 UTC (rev 7634)
+++ ipcop/trunk/lfs/linux 2014-08-24 12:06:29 UTC (rev 7635)
@@ -34,7 +34,7 @@
PKG_NAME = linux
VER = 3.4
-PATCHLEVEL = 3.4.99
+PATCHLEVEL = 3.4.103
IPCOPKRELEASE = -3
HOST_ARCH = all
OTHER_SRC = yes
@@ -72,7 +72,7 @@
$(GRSECURITYPATCH) = http://ipcop-addons.mooo.com/misc/IPCop/$(GRSECURITYPATCH)
$(DL_FILE)_MD5 = 967f72983655e2479f951195953e8480
-patch-$(PATCHLEVEL).xz_MD5 = c16194b938fa8f690a36ac29a8f94521
+patch-$(PATCHLEVEL).xz_MD5 = a835fb799c048e5fbac8f9b9dc652158
$(GRSECURITYPATCH)_MD5 = b15bb91a07aa2fb030e18c47c91940bb
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 12:05:23 UTC (rev 7634)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 12:06:29 UTC (rev 7635)
@@ -114,7 +114,7 @@
/usr/lib/libgpg-error.so.0
/usr/lib/libgpg-error.so.0.11.0
##
-## linux-3.4-3 (3.4.99)
+## linux-3.4-3 (3.4.103)
/boot/vmlinuz
/boot/vmlinuz-3.4-3
/boot/System.map-3.4-3
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:05:23 UTC (rev 7634)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:06:29 UTC (rev 7635)
@@ -6,7 +6,7 @@
<isoimages>yes</isoimages>
<description>Language updates.<br />
Patch openssl for CVE-2010-5298.<br />
- Upgrade linux kernel to 3.4-3 (3.4.99).<br />
+ Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, mdadm to 3.3.1,
openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 12:05:28
|
Revision: 7634
http://sourceforge.net/p/ipcop/svn/7634
Author: owes
Date: 2014-08-24 12:05:23 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
Update igb network driver to 5.2.9.4
Modified Paths:
--------------
ipcop/trunk/lfs/igb
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/igb
===================================================================
--- ipcop/trunk/lfs/igb 2014-08-24 12:02:15 UTC (rev 7633)
+++ ipcop/trunk/lfs/igb 2014-08-24 12:05:23 UTC (rev 7634)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = igb
-VER = 5.2.5
+VER = 5.2.9.4
HOST_ARCH = i486
OTHER_SRC = yes
KERNEL_MOD = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7d7430f5a7151d39db038f4a75baa3b9
+$(DL_FILE)_MD5 = b59b8d5ae7d8f53f3481004051fb7b87
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:02:15 UTC (rev 7633)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:05:23 UTC (rev 7634)
@@ -8,11 +8,12 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.99).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
- gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, e1000e network driver to 3.1.0.2, mdadm to 3.3.1,
+ gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, mdadm to 3.3.1,
openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
+ Upgrade e1000e network driver to 3.1.0.2, igb network driver to 5.2.9.4.<br />
<b>Mandatory reboot after upgrade.</b>
</description>
<previousversion>2.1.5</previousversion>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 12:02:22
|
Revision: 7633
http://sourceforge.net/p/ipcop/svn/7633
Author: owes
Date: 2014-08-24 12:02:15 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
Update openssl to 1.0.1i
Modified Paths:
--------------
ipcop/trunk/lfs/openssl
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/openssl
===================================================================
--- ipcop/trunk/lfs/openssl 2014-08-24 12:00:42 UTC (rev 7632)
+++ ipcop/trunk/lfs/openssl 2014-08-24 12:02:15 UTC (rev 7633)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openssl
-VER = 1.0.1h
+VER = 1.0.1i
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf
+$(DL_FILE)_MD5 = c8dc151a671b9b92ff3e4c118b174972
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 12:00:42 UTC (rev 7632)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 12:02:15 UTC (rev 7633)
@@ -139,7 +139,7 @@
/sbin/mdadm
/sbin/mdmon
##
-## openssl-1.0.1h
+## openssl-1.0.1i
/usr/bin/openssl
/usr/lib/libcrypto.so
/usr/lib/libcrypto.so.1.0.0
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:00:42 UTC (rev 7632)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 12:02:15 UTC (rev 7633)
@@ -9,7 +9,7 @@
Upgrade linux kernel to 3.4-3 (3.4.99).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, e1000e network driver to 3.1.0.2, mdadm to 3.3.1,
- openssl to 1.0.1h, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
+ openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ow...@us...> - 2014-08-24 12:00:56
|
Revision: 7632
http://sourceforge.net/p/ipcop/svn/7632
Author: owes
Date: 2014-08-24 12:00:42 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
strace 4.9, not in ISO
Modified Paths:
--------------
ipcop/trunk/lfs/strace
Modified: ipcop/trunk/lfs/strace
===================================================================
--- ipcop/trunk/lfs/strace 2014-08-07 12:53:20 UTC (rev 7631)
+++ ipcop/trunk/lfs/strace 2014-08-24 12:00:42 UTC (rev 7632)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = strace
-VER = 4.8
+VER = 4.9
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c575ef43829586801f514fd91bfe7575
+$(DL_FILE)_MD5 = 885eafadb10f6c60464a266d3929a2a4
install : $(TARGET)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eob...@us...> - 2014-08-07 12:53:25
|
Revision: 7631
http://sourceforge.net/p/ipcop/svn/7631
Author: eoberlander
Date: 2014-08-07 12:53:20 +0000 (Thu, 07 Aug 2014)
Log Message:
-----------
Update tzdata to 2014f
Modified Paths:
--------------
ipcop/trunk/lfs/tzdata
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Modified: ipcop/trunk/lfs/tzdata
===================================================================
--- ipcop/trunk/lfs/tzdata 2014-07-18 05:22:47 UTC (rev 7630)
+++ ipcop/trunk/lfs/tzdata 2014-08-07 12:53:20 UTC (rev 7631)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = tzdata
-VER = 2014e
+VER = 2014f
HOST_ARCH = all
OTHER_SRC = yes
@@ -54,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8a49fdedd4e832da8e85f7f9bcaedc33
+$(DL_FILE)_MD5 = f333b2e8f876221a97871cae0c188aa5
install : $(TARGET)
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-07-18 05:22:47 UTC (rev 7630)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-07 12:53:20 UTC (rev 7631)
@@ -343,13 +343,94 @@
/boot/vesamenu.c32
/sbin/extlinux
##
-## tzdata 2014e
+## tzdata 2014f
+/usr/share/zoneinfo/posix/Africa/Accra
+/usr/share/zoneinfo/posix/Africa/Bamako
+/usr/share/zoneinfo/posix/Africa/Banjul
/usr/share/zoneinfo/posix/Africa/Cairo
/usr/share/zoneinfo/posix/Africa/Casablanca
+/usr/share/zoneinfo/posix/Africa/Conakry
+/usr/share/zoneinfo/posix/Africa/Dakar
/usr/share/zoneinfo/posix/Africa/El_Aaiun
+/usr/share/zoneinfo/posix/Africa/Freetown
+/usr/share/zoneinfo/posix/Africa/Lome
+/usr/share/zoneinfo/posix/Africa/Nouakchott
+/usr/share/zoneinfo/posix/Africa/Ouagadougou
+/usr/share/zoneinfo/posix/Africa/Sao_Tome
+/usr/share/zoneinfo/posix/Africa/Timbuktu
+/usr/share/zoneinfo/posix/America/Metlakatla
+/usr/share/zoneinfo/posix/Antarctica/Casey
+/usr/share/zoneinfo/posix/Antarctica/Macquarie
+/usr/share/zoneinfo/posix/Asia/Chongqing
+/usr/share/zoneinfo/posix/Asia/Chungking
+/usr/share/zoneinfo/posix/Asia/Harbin
+/usr/share/zoneinfo/posix/Asia/Irkutsk
+/usr/share/zoneinfo/posix/Asia/Jayapura
+/usr/share/zoneinfo/posix/Asia/Kashgar
+/usr/share/zoneinfo/posix/Asia/Khandyga
+/usr/share/zoneinfo/posix/Asia/Krasnoyarsk
+/usr/share/zoneinfo/posix/Asia/Magadan
+/usr/share/zoneinfo/posix/Asia/Novokuznetsk
+/usr/share/zoneinfo/posix/Asia/Novosibirsk
+/usr/share/zoneinfo/posix/Asia/Omsk
+/usr/share/zoneinfo/posix/Asia/Pyongyang
+/usr/share/zoneinfo/posix/Asia/Riyadh
+/usr/share/zoneinfo/posix/Asia/Sakhalin
+/usr/share/zoneinfo/posix/Asia/Seoul
+/usr/share/zoneinfo/posix/Asia/Shanghai
+/usr/share/zoneinfo/posix/Asia/Taipei
+/usr/share/zoneinfo/posix/Asia/Tashkent
+/usr/share/zoneinfo/posix/Asia/Tbilisi
+/usr/share/zoneinfo/posix/Asia/Tokyo
+/usr/share/zoneinfo/posix/Asia/Urumqi
+/usr/share/zoneinfo/posix/Asia/Ust-Nera
/usr/share/zoneinfo/posix/Asia/Vladivostok
+/usr/share/zoneinfo/posix/Asia/Yakutsk
+/usr/share/zoneinfo/posix/Asia/Yekaterinburg
+/usr/share/zoneinfo/posix/Atlantic/St_Helena
+/usr/share/zoneinfo/posix/Australia/ACT
+/usr/share/zoneinfo/posix/Australia/Adelaide
+/usr/share/zoneinfo/posix/Australia/Brisbane
+/usr/share/zoneinfo/posix/Australia/Broken_Hill
+/usr/share/zoneinfo/posix/Australia/Canberra
+/usr/share/zoneinfo/posix/Australia/Currie
+/usr/share/zoneinfo/posix/Australia/Darwin
+/usr/share/zoneinfo/posix/Australia/Eucla
+/usr/share/zoneinfo/posix/Australia/Hobart
+/usr/share/zoneinfo/posix/Australia/LHI
+/usr/share/zoneinfo/posix/Australia/Lindeman
+/usr/share/zoneinfo/posix/Australia/Lord_Howe
+/usr/share/zoneinfo/posix/Australia/Melbourne
+/usr/share/zoneinfo/posix/Australia/North
+/usr/share/zoneinfo/posix/Australia/NSW
+/usr/share/zoneinfo/posix/Australia/Perth
+/usr/share/zoneinfo/posix/Australia/Queensland
+/usr/share/zoneinfo/posix/Australia/South
+/usr/share/zoneinfo/posix/Australia/Sydney
+/usr/share/zoneinfo/posix/Australia/Tasmania
+/usr/share/zoneinfo/posix/Australia/Victoria
+/usr/share/zoneinfo/posix/Australia/West
+/usr/share/zoneinfo/posix/Australia/Yancowinna
/usr/share/zoneinfo/posix/Egypt
+/usr/share/zoneinfo/posix/Europe/Budapest
+/usr/share/zoneinfo/posix/Europe/Helsinki
+/usr/share/zoneinfo/posix/Europe/Kaliningrad
+/usr/share/zoneinfo/posix/Europe/Mariehamn
/usr/share/zoneinfo/posix/Europe/Moscow
+/usr/share/zoneinfo/posix/Europe/Riga
+/usr/share/zoneinfo/posix/Europe/Samara
+/usr/share/zoneinfo/posix/Europe/Simferopol
+/usr/share/zoneinfo/posix/Europe/Volgograd
+/usr/share/zoneinfo/posix/Japan
+/usr/share/zoneinfo/posix/NZ-CHAT
+/usr/share/zoneinfo/posix/Pacific/Apia
+/usr/share/zoneinfo/posix/Pacific/Chatham
+/usr/share/zoneinfo/posix/Pacific/Pago_Pago
+/usr/share/zoneinfo/posix/Pacific/Samoa
+/usr/share/zoneinfo/posix/PRC
+/usr/share/zoneinfo/posix/ROC
+/usr/share/zoneinfo/posix/ROK
+/usr/share/zoneinfo/posix/US/Samoa
/usr/share/zoneinfo/posix/W-SU
##
## util-linux-2.24.2
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-07-18 05:22:47 UTC (rev 7630)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-07 12:53:20 UTC (rev 7631)
@@ -10,7 +10,7 @@
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, e1000e network driver to 3.1.0.2, mdadm to 3.3.1,
openssl to 1.0.1h, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
- tzdata to 2014e, util-linux to 2.24.2.
+ tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075, Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
<b>Mandatory reboot after upgrade.</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|