[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104 (commit) via 38183e52dd438dbe0bb204d4601e902fb6cf0af5 (commit) via 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 (commit) via 76fd8bcf7be92abeae859c9ab618b30d2ea32467 (commit) via 4bdbf22ee4609aed3cc378f80a1eb656ed68a634 (commit) via ed7a7f77db713e8977dec2c3c165e7bbd7f73fb5 (commit) via 5a2ebd32c0fdbda840271796c8d25a8e36b7c84b (commit) via 868d2a1fff7d6c217bd860567a956f27d0851e78 (commit) via 8b1eb795ac5a6fe1d0d2fda5c70a4b251b1188f9 (commit) via 3ec5ba501ebe5a9579cbf4c78a6f4ee157f839ed (commit) via c7b83f9bedd69f74586627d7e5705cd6e4548239 (commit) via 5d4f3a42cea5e4224aa4ba469dd7bc182ece4b67 (commit) via 7354d2947a9a57c34502ee8d689fe52f434e525d (commit) via b8a5c2fc7b844784abb17c030615d58e9f448a56 (commit) via 894fea37d4a1d6169d27611502f117feae6cf080 (commit) via 71a95ee3300c9db2ab3765f314973aec7c4c4862 (commit) via 1cd30812d6860300756d32cc637c322e5755eaf5 (commit) via d1778a773eb5870f7c95568533e260163b7e8db7 (commit) via 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4 (commit) from 86667d0c7a32054bea49dcbf1f90803b6170a581 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 31 21:31:09 2016 +0100
set pakfire version to 107
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/netpbm/{Makefile.config => config.mk} | 128 ++- config/rootfiles/common/libjpeg | 36 +- config/rootfiles/common/libjpeg-compat | 3 + config/rootfiles/common/texinfo | 12 +- config/rootfiles/core/{106 => 107}/exclude | 1 + .../107}/filelists/armv5tel/linux-kirkwood | 0 .../95 => core/107}/filelists/armv5tel/linux-multi | 0 .../95 => core/107}/filelists/armv5tel/linux-rpi | 0 config/rootfiles/core/107/filelists/files | 5 + .../{oldcore/94 => core/107}/filelists/hdparm | 0 .../{oldcore/95 => core/107}/filelists/i586/linux | 0 .../{oldcore/90 => core/107}/filelists/libjpeg | 0 config/rootfiles/core/107/filelists/libjpeg-compat | 1 + config/rootfiles/core/{106 => 107}/filelists/squid | 0 .../95 => core/107}/filelists/x86_64/linux | 0 config/rootfiles/core/{106 => 107}/meta | 0 .../rootfiles/{oldcore/104 => core/107}/update.sh | 7 +- config/rootfiles/{core => oldcore}/106/exclude | 0 .../rootfiles/{core => oldcore}/106/filelists/attr | 0 .../{core => oldcore}/106/filelists/diffutils | 0 .../rootfiles/{core => oldcore}/106/filelists/ed | 0 .../{core => oldcore}/106/filelists/expat | 0 .../rootfiles/{core => oldcore}/106/filelists/file | 0 .../{core => oldcore}/106/filelists/files | 0 .../rootfiles/{core => oldcore}/106/filelists/flex | 0 .../rootfiles/{core => oldcore}/106/filelists/gawk | 0 .../{core => oldcore}/106/filelists/gettext | 0 .../{core => oldcore}/106/filelists/gnupg | 0 .../106/filelists/i586/openssl-sse2 | 0 .../106/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/106/filelists/iproute2 | 0 .../{core => oldcore}/106/filelists/ipset | 0 .../{core => oldcore}/106/filelists/libgpg-error | 0 .../{core => oldcore}/106/filelists/libidn | 0 .../{core => oldcore}/106/filelists/libmnl | 0 .../106/filelists/libnetfilter_conntrack | 0 .../{core => oldcore}/106/filelists/misc-progs | 0 .../106/filelists/mt7601u-firmware | 0 .../{core => oldcore}/106/filelists/openssl | 0 .../{core => oldcore}/106/filelists/python-daemon | 0 .../106/filelists/python-docutils | 0 .../{core => oldcore}/106/filelists/python-inotify | 0 .../106/filelists/python-ipaddress | 0 .../{core => oldcore}/106/filelists/smartmontools | 0 .../rootfiles/oldcore/{94 => 106}/filelists/squid | 0 .../{core => oldcore}/106/filelists/strongswan | 0 .../{core => oldcore}/106/filelists/unbound | 0 .../{core => oldcore}/106/filelists/usb_modeswitch | 0 .../106/filelists/usb_modeswitch_data | 0 config/rootfiles/oldcore/{99 => 106}/meta | 0 config/rootfiles/{core => oldcore}/106/update.sh | 0 config/rootfiles/packages/netpbm | 993 ++++++++------------- html/cgi-bin/logs.cgi/log.dat | 70 +- lfs/hdparm | 4 +- lfs/libjpeg | 15 +- lfs/{libjpeg => libjpeg-compat} | 2 +- lfs/linux | 10 +- lfs/netpbm | 23 +- lfs/squid | 6 +- lfs/texinfo | 8 +- make.sh | 5 +- ...i-Add-support-for-192-256-bit-keys-to-AES.patch | 689 ++++++++++++++ ...up_flags-FOLL_WRITE-games-from-__get_user.patch | 96 ++ ...=> squid-3.5.22-fix-max-file-descriptors.patch} | 0 64 files changed, 1367 insertions(+), 747 deletions(-) copy config/netpbm/{Makefile.config => config.mk} (82%) create mode 100644 config/rootfiles/common/libjpeg-compat copy config/rootfiles/core/{106 => 107}/exclude (95%) copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-rpi (100%) create mode 100644 config/rootfiles/core/107/filelists/files copy config/rootfiles/{oldcore/94 => core/107}/filelists/hdparm (100%) copy config/rootfiles/{oldcore/95 => core/107}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/90 => core/107}/filelists/libjpeg (100%) create mode 120000 config/rootfiles/core/107/filelists/libjpeg-compat rename config/rootfiles/core/{106 => 107}/filelists/squid (100%) copy config/rootfiles/{oldcore/95 => core/107}/filelists/x86_64/linux (100%) rename config/rootfiles/core/{106 => 107}/meta (100%) copy config/rootfiles/{oldcore/104 => core/107}/update.sh (98%) rename config/rootfiles/{core => oldcore}/106/exclude (100%) rename config/rootfiles/{core => oldcore}/106/filelists/attr (100%) rename config/rootfiles/{core => oldcore}/106/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/106/filelists/ed (100%) rename config/rootfiles/{core => oldcore}/106/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/106/filelists/file (100%) rename config/rootfiles/{core => oldcore}/106/filelists/files (100%) rename config/rootfiles/{core => oldcore}/106/filelists/flex (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/106/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/106/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/106/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/106/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libidn (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libmnl (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libnetfilter_conntrack (100%) rename config/rootfiles/{core => oldcore}/106/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/106/filelists/mt7601u-firmware (100%) rename config/rootfiles/{core => oldcore}/106/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-daemon (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-docutils (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-inotify (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-ipaddress (100%) rename config/rootfiles/{core => oldcore}/106/filelists/smartmontools (100%) copy config/rootfiles/oldcore/{94 => 106}/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/106/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/106/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch_data (100%) copy config/rootfiles/oldcore/{99 => 106}/meta (100%) rename config/rootfiles/{core => oldcore}/106/update.sh (100%) copy lfs/{libjpeg => libjpeg-compat} (97%) create mode 100644 src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch create mode 100644 src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch rename src/patches/{squid-3.5.21-fix-max-file-descriptors.patch => squid-3.5.22-fix-max-file-descriptors.patch} (100%)
Difference in files: diff --git a/config/netpbm/config.mk b/config/netpbm/config.mk new file mode 100644 index 0000000..9c789b2 --- /dev/null +++ b/config/netpbm/config.mk @@ -0,0 +1,657 @@ +####This file was automatically created by 'configure.' +####Many variables are set twice -- a generic setting, then +####a system-specific override at the bottom of the file. +#### +# This is a make file inclusion, to be included in all the Netpbm make +# files. + +# This file is meant to contain variable settings that customize the +# build for a particular target system configuration. + +# The distribution contains the file config.mk.in. You edit +# config.mk.in in ways relevant to your particular environment +# to create config.mk. The "configure" program will do this +# for you in simple cases. + +# Some of the variables that the including make file must set for this +# file to work: +# +# SRCDIR: The directory at the top of the Netpbm source tree. Note that +# this is typically a relative directory, and it must be relative to the +# make file that includes this file. + +DEFAULT_TARGET = nonmerge +#DEFAULT_TARGET = merge + +# Fiasco has some special requirements that make it fail to compile on +# some systems, and since it isn't very important, just set this to "N" +# and skip it on those systems unless you want to debug it and fix it. +# OpenBSD: +#BUILD_FIASCO = N +BUILD_FIASCO = Y + +# The following are commands for the build process to use. These values +# do not get built into anything. + +# The C compiler (including macro preprocessor) +#CC = gcc +# Note that 'cc' is usually an alias for whatever is the main compiler +# on a system, e.g. the GNU Compiler on Linux. +CC = cc + +# The linker. +LD = $(CC) +#LD = ld +#Tru64: +#LD = cc +#LD = gcc + +#If the linker identified above is a compiler that invokes a linker +#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is +#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' +#syntax whereas the actual linker would take '-opt1 val1'. +LINKERISCOMPILER=Y +#If $(LD) is 'ld': +#LINKERISCOMPILER=N + +#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can +#take a library as just another link object argument, as in 'ld +#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a +#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. +#This variable controls how 'libopt' gets built. Note that with some +#linkers, you can specify a shared library explicitly, but then it has +#to live in that exact place at run time. That's not good enough for us. + +LINKER_CAN_DO_EXPLICIT_LIBRARY=N +#GNU: +#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y + +# This is the name of the header file that declares the types +# uint32_t, etc. This name is used as #include $(INTTYPES_H) . +# Set to null if the types come automatically without including anything. + +# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO +# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include +# sys/types for other things), so for that environment, <inttypes.h> +# won't work, but "inttypes_netpbm.h" might. + +INTTYPES_H = <inttypes.h> +# Linux libc5: +#INTTYPES_H = <types.h> +# Solaris: +# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc. +#INTTYPES_H = "inttypes_netpbm.h" +# Others: +#INTTYPES_H = <sys/stdint.h> +#INTTYPES_H = <sys/types.h> +# The automatically generated Netpbm version: +#INTTYPES_H = "inttypes_netpbm.h" + +# HAVE_INT64 tells whether, assuming you include the header indicated by +# INTTYPES_H, you have the int64_t type and related stuff. (If you don't +# the build will omit certain code that does 64 bit computations). +HAVE_INT64 = Y +#HAVE_INT64 = N + +# CC and LD are for building the Netpbm programs, which are not necessarily +# intended to run on the same system on which Make is running. But when we +# build a build tool such as Libopt, it is meant to run only on the same +# system on which the Make is running. The variables below define programs +# to use to compile and link build tools. +CC_FOR_BUILD = $(CC) +LD_FOR_BUILD = $(LD) +CFLAGS_FOR_BUILD = $(CFLAGS) +LDFLAGS_FOR_BUILD = $(LDFLAGS) + +# MAKE is set automatically by Make to what was used to invoke Make. + +INSTALL = $(SRCDIR)/buildtools/install.sh +#Solaris: +#INSTALL = /usr/ucb/install +#Tru64: +#INSTALL = installbsd +#OSF1: +#INSTALL = $(SRCDIR)/buildtools/installosf +#Red Hat Linux: +#INSTALL = install + +# STRIPFLAG is the option you pass to the above install program to make it +# strip unnecessary information out of binaries. +STRIPFLAG = -s +# If you don't want to strip the binaries, just leave it null: +#STRIPFLAG = + +SYMLINK = ln -s +# At least some Windows environments don't have any concept of symbolic +# links, but direct copies are usually a passable alternative. +#SYMLINK = cp + +#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the +#pointer man pages are installed (ready to nroff, or ready to cat). +#A pointer man pages is just a single-paragraph pages that tells you there is +#no man page for the program, to look at the HTML documentation instead. +MANPAGE_FORMAT = nroff +#MANPAGE_FORMAT = cat + +AR = ar +RANLIB = ranlib +# IRIX, SCO don't have Ranlib: +#RANLIB = true + +# LEX is the beginning of a shell command that runs a Lex-like +# pattern matcher generator. Null string means there isn't any such +# command. That means the build will skip parts that need one. + +LEX = flex +# Solaris: +# LEX = flex -e +# Windows Mingw: +# LEX = +# +# LEX = lex + +# C compiler options + +# gcc: +# -ansi and -Werror should work too, but are not included +# by default because there's no point in daring the build to fail. +# -pedantic isn't a problem because it causes at worst a warning. +#CFLAGS = -O3 -ffast-math -pedantic -fno-common \ +# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \ +# -Wwrite-strings -Wmissing-prototypes -Wundef +# The merged programs have a main_XXX subroutine instead of main(), +# which would cause a warning with -Wmissing-declarations or +# -Wmissing-prototypes. +#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes +# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg, +# but word size-sensitive code was removed from parallel.c in September 2004. +# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In +# theory, you need this if on your system, long is 32 bits and int is not. +# But it may be completely irrelevant today. +#Tru64: +#CFLAGS = -O2 -std1 -DLONG_32 +#CFLAGS = -O2 -std1 +#AIX: +#CFLAGS= -O3 +#HP-UX: +#CFLAGS= -O3 -fPIC +#IRIX: +#CFLAGS= -n32 -O3 +#Amiga with GNU compiler: +#CFLAGS= -m68020-60 -ffast-math -mstackextend +# You can add -noixemul for Amiga and successfully compile most of the +# programs. (Of the remaining ones, if you can supply your own strtod() +# function, most of them will build with -noixemul). So try building +# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build +# everything that failed for lack of the ixemul library in the first step. +# That way, the parts that don't required the ixemul library won't indicate +# a dependency on it. +#OpenBSD: +#CFLAGS = -I/usr/local/include + +# EXE is a suffix that the linker puts on any executable it generates. +# In cygwin, this is .exe and most programs deal with its existence without +# us having to know about it. Some don't though, so set this: + +EXE = +#Cygwin, DJGPP/Windows: +#EXE = .exe + +# linker options. + +# LDFLAGS is often set as an environment variable; A setting here overrides +# it. So either make sure you want to override it, or do a "LDFLAGS +=" here. + +# LDFLAGS is usually not the right place for a -L option, because we put +# LDFLAGS _before_ our own -L options, so it would cancel out our +# specific selection of libraries. For example, if you say +# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in +# /usr/local/lib, then you'd be linking against that old copy instead of +# the copy you just built, which is located by a -L option later on the +# link command. LIBS is the right variable for adding -L options. LIBS +# goes after any of our make files' own -L options. + +# Eunice users may want to use -noshare so that the executables can +# run standalone: +#LDFLAGS += -noshare +#Tru64: +# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary +# to keep from finding an ancient system libjpeg.so that isn't compatible with +# NetPBM. Michael Long found that /usr/local/lib is not in the default +# search path, or not soon enough, and he was getting an old libjpeg that +# caused all the jpeg symbol references to be unresolved. He had installed +# a new libjpeg in /usr/local/lib. +#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib +#AIX: +#LDFLAGS += -L /usr/pubsw/lib +#HP-UX: +#LDFLAGS += -Wl,+b,/usr/pubsw/lib +#IRIX: +#LDFLAGS += -n32 + +# Linker options for created Netpbm shared libraries. + +# Here, $(SONAME) resolves to the soname for the shared library being created. +# The following are gcc options. This works on GNU libc systems. +LDSHLIB = -shared -Wl,-soname,$(SONAME) +# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is +# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc +# documentation and doesn't exist in at least one non-BeOS installation. +# BeOS doesn't have sonames built in. +#LDSHLIB = -nostart +#LDSHLIB = -G +# Solaris, SunOS with GNU Ld, SCO: +# These systems have no soname option. +#LDSHLIB = -shared +# Solaris with Sun Ld: +#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) +#Tru64: +#LDSHLIB = -shared -expect_unresolved "*" +#IRIX: +#LDSHLIB = -shared -n32 +#AIX GNU compiler/linker: +#LDSHLIB = -shared +#AIX Visual Age C: +#LDSHLIB = -qmkshrobj +#Mac OSX: +# According to experiments done by Peter A Crowley in May 2007, if +# libnetpbm goes in a standard place such as /usr/local/lib, +# programs need not be built with libnetpbm's location included. +# But if it goes elsewhere, the link-editor must include the +# location in the executable. It finds the runtime location by +# looking inside the library. The information in the library +# comes from the install_name option with which the library was +# built. It's an alternative to the -rpath option on other systems. +#LDSHLIB=-dynamiclib +#LDSHLIB=-dynamiclib -install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib + +# LDRELOC is the command to combine two .o files (relocateable object files) +# into a single .o file that can later be linked into something else. NONE +# means no such command is available. + +LDRELOC = NONE +# GNU Ld: +# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld +# correctly spells it --relocatable. The abbreviation --reloc works on +# both. +#LDRELOC = ld --reloc +#LDRELOC = ld -r + + +# On older systems, you have to make shared libraries out of position +# independent code, so you need -fpic or fPIC here. (The rule is: if +# -fpic works, use it. If it bombs, go to fPIC). On newer systems, +# it isn't necessary, but can save real memory at the expense of +# execution speed. Without position independent code, the library +# loader may have to patch addresses into the executable text. On an +# older system, this would cause a program crash because the loader +# would be writing into read-only shared memory. But on newer +# systems, the system silently creates a private mapping of the page +# or segment being modified (the "copy on write" phenomenon). So it +# needs its own private real page frame. In one experiment, A second +# copy of Pbmtext used 16K less real memory when built with -fpic than +# when built without. 2001.06.02. + +# We have seen -fPIC required on IA64 and AMD64 machines (GNU +# compiler/linker). Build-time linking fails without it. I don't +# know why -- history seems to be repeating itself. 2005.02.23. + +CFLAGS_SHLIB = +# Gcc: +#CFLAGS_SHLIB = -fpic +#CFLAGS_SHLIB = -fPIC +# Sun compiler: +#CFLAGS_SHLIB = -Kpic +#CFLAGS_SHLIB = -KPIC + +# SHLIB_CLIB is the link option to include the C library in a shared library, +# normally "-lc". On typical systems, this serves no purpose. On some, +# though, it causes information about which C library to use to be recorded +# in the shared library and thus choose the correct library among several or +# avoid using an incompatible one. But on some systems, the link fails. +# On 2002.09.30, "John H. DuBois III" spcecdt@armory.com reports that on +# SCO OpenServer, he gets the following error message with -lc: +# +# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); +# fatal error: relocations remain against allocatable but non-writable +# section: ; .text + +SHLIB_CLIB = -lc +# SCO: +#SHLIB_CLIB = + +# On some systems you have to build into an executable the list of +# directories where its dynamically linked libraries can be found at +# run time. This is typically done with a -R or -rpath linker +# option. Even on systems that don't require it, you might prefer to do +# that rather than set up environment variables or configuration files +# to tell the system where the libraries are. A "Y" here means to put +# the directory information in the executable at link time. + +NEED_RUNTIME_PATH = N +# Solaris, SunOS, NetBSD, AIX: +#NEED_RUNTIME_PATH = Y + +# RPATHOPTNAME is the option you use on the link command to specify +# a runtime search path for a shared library. It is meaningless unless +# NEED_RUNTIME_PATH is Y. +RPATHOPTNAME = -rpath + +# The following variables tell where your various libraries on which +# Netpbm depends live. The LIBxxx variable is a full file +# specification of the link library (not necessarily the library used +# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually +# doesn't matter if the library prefix and suffix are right -- you can +# use "lib" and ".so" or ".a" regardless of what your system actually +# uses because these just turn into "-L" and "-l" linker options +# anyway. ".a" implies a static library for some purposes, though. +# If you don't have the library in question, use a value of NONE for +# LIBxxx and the build will simply skip the programs that require that +# library. If the library is in your linker's (or the Netpbm build's) +# default search path, leave off the directory part, e.g. "libjpeg.so". + +# The xxxHDR_DIR variable is the directory in which the interface +# headers for the library live (e.g. /usr/include). If they are in your +# compiler's default search path, set this variable to null. + +# This is where the Netpbm shared libraries will reside when Netpbm is +# fully installed. In some configurations, the Netpbm builder builds +# this information into the Netpbm executables. This does NOT affect +# where the Netpbm installer installs the libraries. A null value +# means the libraries are in a default search path used by the runtime +# library loader. +NETPBMLIB_RUNTIME_PATH = +#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm + +# The TIFF library. See above. If you want to build the tiff +# converters, you must have the tiff library already installed. + +TIFFLIB = NONE +TIFFHDR_DIR = + +#TIFFLIB = libtiff.so +#TIFFHDR_DIR = /usr/include/libtiff +#NetBSD: +#TIFFLIB = $(LOCALBASE)/lib/libtiff.so +#TIFFHDR_DIR = $(LOCALBASE)/include +# OSF, Tru64: +#TIFFLIB = /usr/local1/DEC/lib/libtiff.so +#TIFFHDR_DIR = /usr/local1/DEC/include + +# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any +# program linked with the TIFF library needs a Jpeg and/or Z library. +# Some TIFF libraries have such library statically linked in, but others +# need it to be dynamically linked at program load time. +# Make this 'N' if youf TIFF library doesn't need such dynamic linking. +# As of 2005.01, the most usual build of the TIFF library appears to require +# both. +TIFFLIB_NEEDS_JPEG = Y +TIFFLIB_NEEDS_Z = Y + +# The JPEG library. See above. If you want to build the jpeg +# converters you must have the jpeg library already installed. + +# Tiff files can use JPEG compression, so the Tiff library can reference +# the JPEG library. If your Tiff library references a dynamic JPEG +# library, you must specify at least JPEGLIB here, or the Tiff +# converters will not build. Note that your Tiff library may have the +# JPEG stuff statically linked in, in which case you won't need +# JPEGLIB in order to build the Tiff converters. + +JPEGLIB = NONE +JPEGHDR_DIR = +#JPEGLIB = libjpeg.so +#JPEGHDR_DIR = /usr/include/jpeg +# Netbsd: +#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so +#JPEGHDR_DIR = ${LOCALBASE}/include +# OSF, Tru64: +#JPEGLIB = /usr/local1/DEC/libjpeg.so +#JPEGHDR_DIR = /usr/local1/DEC/include +# Typical: +#JPEGLIB = /usr/local/lib/libjpeg.so +#JPEGHDR_DIR = /usr/local/include +# Don't build JPEG stuff: +#JPEGLIB = NONE + + +# The PNG library. See above. If you want to build the PNG +# converters you must have the PNG library already installed. + +# The PNG library, by convention starting around April 2002, gets installed +# with names that include a version number, such as libpng10.a and header +# files in /usr/include/libpng10. But there is conventionally an unnumbered +# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version. +# +# Recent versions of the library (since some time in the 2002-2006 period) +# have an associated 'libpng-config' that tells how to link it. The make +# files will use that program if it exists (must be in the PATH). In that +# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful, +# because the make file runs 'libpng$(PNGVER)-config'. + +PNGLIB = NONE +PNGHDR_DIR = +PNGVER = +#PNGLIB = libpng$(PNGVER).so +#PNGHDR_DIR = /usr/include/libpng$(PNGVER) +# NetBSD: +#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so +#PNGHDR_DIR = $(LOCALBASE)/include +# OSF/Tru64: +#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so +#PNGHDR_DIR = /usr/local1/DEC/include + +# The zlib compression library. See above. You need it to build +# anything that needs the PNG library (see above). If you selected +# NONE for the PNG library, it doesn't matter what you specify here -- +# it won't get used. +# +# If you have 'libpng-config' (see above), these are irrelevant. + +ZLIB = NONE +ZHDR_DIR = +#ZLIB = libz.so + +# The JBIG lossless image compression library (aka JBIG-KIT): + +JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a +JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig + +# The Jasper JPEG-2000 image compression library (aka JasPer): +JASPERLIB = $(INTERNAL_JASPERLIB) +JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +# JASPERDEPLIBS is the libraries (-l options or file names) on which +# The Jasper library depends -- i.e. what you have to link into any +# executable that links in the Jasper library. +JASPERDEPLIBS = +#JASPERDEPLIBS = -ljpeg + +# And the Utah Raster Toolkit (aka URT aka RLE) library: + +URTLIB = $(BUILDDIR)/urt/librle.a +URTHDR_DIR = $(SRCDIR)/urt + +# The X11 library has facilities for talking to an X Window System +# server. It is required by Pamx. + +X11LIB = NONE +X11HDR_DIR = + +#X11LIB = /usr/lib/libX11.so +#X11HDR_DIR = + +# The Linux SVGA library (Svgalib) is a facility for displaying graphics +# on the Linux console. It is required by Ppmsvgalib. + +LINUXSVGALIB = NONE +LINUXSVGAHDR_DIR = + +#LINUXSVGALIB = /usr/lib/libvga.so +#LINUXSVGAHDR_DIR = /usr/include/vgalib + +# If you don't want any network functions, set OMIT_NETWORK to "y". +# The only thing that requires network functions is the option in +# ppmtompeg to run it on multiple computers simultaneously. On some +# systems network functions don't work or we haven't figured out how to +# make them work, or they just aren't worth the effort. +OMIT_NETWORK = +#DJGPP/Windows, Tru64: +# (there's some minor header problem that prevents network functions from +# building on Tru64 2000.10.06) +#OMIT_NETWORK = y + +# These are -l options to link in the network libraries. Often, these are +# built into the standard C library, so this can be null. This is irrelevant +# if OMIT_NETWORK is "y". + +NETWORKLD = +# Solaris, SunOS: +#NETWORKLD = -lsocket -lnsl +# SCO: +#NETWORKLD = -lsocket, -lresolv + +VMS = +#VMS: +#VMS = yes + +# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual +# Unix process management stuff - fork, wait, etc. N for a regular Unix +# system. +DONT_HAVE_PROCESS_MGMT = N + +# The following variables are used only by 'make install' (and the +# variants of it). Paths here don't, for example, get built into any +# programs. + +# This is where everything goes when you do 'make package', unless you +# override it by setting 'pkgdir' on the Make command line. +PKGDIR_DEFAULT = /tmp/netpbm + +# Subdirectory of the package directory ($(pkgdir)) in which man pages +# go. +PKGMANDIR = share/man + +# File permissions for installed files. +# Note that on some systems (e.g. Solaris), 'install' can't use the +# mnemonic permissions - you have to use octal. + +# binaries (pbmmake, etc) +INSTALL_PERM_BIN = 755 # u=rwx,go=rx +# shared libraries (libpbm.so, etc) +INSTALL_PERM_LIBD = 755 # u=rwx,go=rx +# static libraries (libpbm.a, etc) +INSTALL_PERM_LIBS = 644 # u=rw,go=r +# header files (pbm.h, etc) +INSTALL_PERM_HDR = 644 # u=rw,go=r +# man pages (pbmmake.1, etc) +INSTALL_PERM_MAN = 644 # u=rw,go=r +# data files (pnmtopalm color maps, etc) +INSTALL_PERM_DATA = 644 # u=rw,go=r + +# Specify the suffix that want the man pages to have. + +SUFFIXMANUALS1 = 1 +SUFFIXMANUALS3 = 3 +SUFFIXMANUALS5 = 5 + +#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the +#Netpbm library functions. The value is used only in make file tests. +# "unixshared" means a unix-style shared library, typically named like +# libxyz.so.2.3 +NETPBMLIBTYPE = unixshared +# "unixstatic" means a unix-style static library, (like libxyz.a) +#NETPBMLIBTYPE = unixstatic +# "dll" means a Windows DLL shared library +#NETPBMLIBTYPE = dll +# "dylib" means a Darwin/Mac OS shared library +#NETPBMLIBTYPE = dylib + +#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is +#selected above. All this is used for is to construct library names. +#The make files never examine the actual value. +NETPBMLIBSUFFIX = so + +# "a" is the suffix for unix-style static libraries. It is also +# traditionally used for shared libraries on AIX. The Visual Age C +# manual says sometimes .so works on AIX, and GNU software for AIX +# 5.1.0 does indeed use it. In our experiments, it works fine if you +# name the library file explicitly on the link, but isn't in the -l +# search order. If you name the library explicitly on the link, the +# library must live in exactly the same position at run time, so we +# can't use that. Therefore, you cannot build both static and shared +# libraries with AIX. You have to choose. +#NETPBMLIBSUFFIX = a +# For HP-UX shared libraries: +#NETPBMLIBSUFFIX = sl +# Darwin/Mac OS shared library: +#NETPBMLIBSUFFIX = dylib +# Windows shared library: +#NETPBMLIBSUFFIX = dll + +#STATICLIB_TOO is "y" to signify that you want a static library built +#and installed in addition to whatever library type you specified by +#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, +#STATICLIB_TOO simply has no effect. +STATICLIB_TOO = y +#STATICLIB_TOO = n + +#STATICLIBSUFFIX is the suffix that static libraries have. It's +#meaningless if you aren't building static libraries. +STATICLIBSUFFIX = a + +#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename +#of a shared library may have on this system. Traditionally, it's +#just "lib", as in libc or libnetpbm. On Windows, though, varying +#prefixes are used when multiple alternative forms of a library are +#available. The first prefix in this list is what we use to name the +#Netpbm shared libraries. +# +# This variable controls how 'libopt' gets built. +# +SHLIBPREFIXLIST = lib +#Cygwin: +#SHLIBPREFIXLIST = cyg lib + +NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) + +#DLLVER is used to version the DLLs built on cygwin or other +#windowsish platforms. We can't add this to LIBROOT, or we'd +#version the static libs (which is bad). We can't add this +#at the end of the name (like unix does with so numbers) because +#windows will only load dlls whose name ends in "dll". So, +#we have this variable, which becomes the end of the library "root" name +#for DLLs only. +# +# This variable controls how 'libopt' gets built. +# +DLLVER = +#Cygwin +#DLLVER = $(NETPBM_MAJOR_RELEASE) + +#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. +#This is a directory which contains a file for each Netpbm program, +#library, and file type. E.g. The documentation for jpegtopnm might be in +#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets +#installed in the man pages (which say no more than to read the webpage) +#and in the Webman netpbm.url file. +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ +#For a system with no web access, but a local copy of the doc: +#NETPBM_DOCURL = file:/usr/doc/netpbm/ + + +####Lines above were copied from config.mk.in by 'configure'. +####Lines below were added by 'configure' based on the GNU platform. +DEFAULT_TARGET = nonmerge +NETPBMLIBTYPE=unixshared +NETPBMLIBSUFFIX=so +STATICLIB_TOO=n +CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef +CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes +LDRELOC = ld --reloc +LINKER_CAN_DO_EXPLICIT_LIBRARY=Y +LINKERISCOMPILER = Y +CFLAGS_SHLIB += -fPIC +TIFFLIB = libtiff.so +JPEGLIB = libjpeg.so +ZLIB = libz.so +NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 7ceb697..1c56023 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -9,25 +9,27 @@ #usr/include/jmorecfg.h #usr/include/jpeglib.h #usr/include/turbojpeg.h -#usr/lib/libjpeg.a #usr/lib/libjpeg.la #usr/lib/libjpeg.so -usr/lib/libjpeg.so.62 -usr/lib/libjpeg.so.62.1.0 -#usr/lib/libturbojpeg.a +usr/lib/libjpeg.so.8 +usr/lib/libjpeg.so.8.1.2 #usr/lib/libturbojpeg.la #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.0.0 -#usr/man/man1/cjpeg.1 -#usr/man/man1/djpeg.1 -#usr/man/man1/jpegtran.1 -#usr/man/man1/rdjpgcom.1 -#usr/man/man1/wrjpgcom.1 -#usr/share/doc/README -#usr/share/doc/README-turbo.txt -#usr/share/doc/example.c -#usr/share/doc/libjpeg.txt -#usr/share/doc/structure.txt -#usr/share/doc/usage.txt -#usr/share/doc/wizard.txt +usr/lib/libturbojpeg.so.0.1.0 +#usr/lib/pkgconfig/libjpeg.pc +#usr/lib/pkgconfig/libturbojpeg.pc +#usr/share/doc/libjpeg-turbo +#usr/share/doc/libjpeg-turbo/LICENSE.md +#usr/share/doc/libjpeg-turbo/README.ijg +#usr/share/doc/libjpeg-turbo/README.md +#usr/share/doc/libjpeg-turbo/example.c +#usr/share/doc/libjpeg-turbo/libjpeg.txt +#usr/share/doc/libjpeg-turbo/structure.txt +#usr/share/doc/libjpeg-turbo/usage.txt +#usr/share/doc/libjpeg-turbo/wizard.txt +#usr/share/man/man1/cjpeg.1 +#usr/share/man/man1/djpeg.1 +#usr/share/man/man1/jpegtran.1 +#usr/share/man/man1/rdjpgcom.1 +#usr/share/man/man1/wrjpgcom.1 diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat new file mode 100644 index 0000000..5e7b98d --- /dev/null +++ b/config/rootfiles/common/libjpeg-compat @@ -0,0 +1,3 @@ +usr/lib/libjpeg.so.62 +usr/lib/libjpeg.so.62.1.0 +usr/lib/libturbojpeg.so.0.0.0 diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo index 781bc81..c023d76 100644 --- a/config/rootfiles/common/texinfo +++ b/config/rootfiles/common/texinfo @@ -1,5 +1,4 @@ #usr/bin/info -#usr/bin/infokey #usr/bin/install-info #usr/bin/makeinfo #usr/bin/pdftexi2dvi @@ -8,14 +7,16 @@ #usr/bin/texi2dvi #usr/bin/texi2pdf #usr/bin/texindex +#usr/lib/texinfo +#usr/lib/texinfo/XSParagraph.a +#usr/lib/texinfo/XSParagraph.la +#usr/lib/texinfo/XSParagraph.so #usr/share/info/info-stnd.info -#usr/share/info/info.info #usr/share/info/texinfo.info #usr/share/info/texinfo.info-1 #usr/share/info/texinfo.info-2 #usr/share/info/texinfo.info-3 #usr/share/man/man1/info.1 -#usr/share/man/man1/infokey.1 #usr/share/man/man1/install-info.1 #usr/share/man/man1/makeinfo.1 #usr/share/man/man1/pdftexi2dvi.1 @@ -46,6 +47,7 @@ #usr/share/texinfo/Texinfo/Convert/Line.pm #usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm #usr/share/texinfo/Texinfo/Convert/Paragraph.pm +#usr/share/texinfo/Texinfo/Convert/ParagraphNonXS.pm #usr/share/texinfo/Texinfo/Convert/PlainTexinfo.pm #usr/share/texinfo/Texinfo/Convert/Plaintext.pm #usr/share/texinfo/Texinfo/Convert/Texinfo.pm @@ -55,8 +57,11 @@ #usr/share/texinfo/Texinfo/Convert/TextContent.pm #usr/share/texinfo/Texinfo/Convert/UnFilled.pm #usr/share/texinfo/Texinfo/Convert/Unicode.pm +#usr/share/texinfo/Texinfo/Convert/XSParagraph +#usr/share/texinfo/Texinfo/Convert/XSParagraph/TestXS.pm #usr/share/texinfo/Texinfo/Documentlanguages.pm #usr/share/texinfo/Texinfo/Encoding.pm +#usr/share/texinfo/Texinfo/ModulePath.pm #usr/share/texinfo/Texinfo/Parser.pm #usr/share/texinfo/Texinfo/Report.pm #usr/share/texinfo/Texinfo/Structuring.pm @@ -408,4 +413,5 @@ #usr/share/texinfo/lib/libintl-perl/lib/Locale/TextDomain.pm #usr/share/texinfo/lib/libintl-perl/lib/Locale/Util.pm #usr/share/texinfo/lib/libintl-perl/lib/Locale/gettext_pp.pm +#usr/share/texinfo/texindex.awk #usr/share/texinfo/texinfo.dtd diff --git a/config/rootfiles/core/106/exclude b/config/rootfiles/core/106/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/106/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/106/filelists/attr b/config/rootfiles/core/106/filelists/attr deleted file mode 120000 index c808017..0000000 --- a/config/rootfiles/core/106/filelists/attr +++ /dev/null @@ -1 +0,0 @@ -../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/core/106/filelists/diffutils deleted file mode 120000 index a5c02f3..0000000 --- a/config/rootfiles/core/106/filelists/diffutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/core/106/filelists/ed deleted file mode 120000 index 0ed331c..0000000 --- a/config/rootfiles/core/106/filelists/ed +++ /dev/null @@ -1 +0,0 @@ -../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/core/106/filelists/expat deleted file mode 120000 index e1923cf..0000000 --- a/config/rootfiles/core/106/filelists/expat +++ /dev/null @@ -1 +0,0 @@ -../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/core/106/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/106/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files deleted file mode 100644 index a67d30a..0000000 --- a/config/rootfiles/core/106/filelists/files +++ /dev/null @@ -1,25 +0,0 @@ -etc/system-release -etc/issue -etc/login.defs -etc/rc.d/init.d/dhcp -etc/rc.d/init.d/localnet -etc/rc.d/init.d/network -etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders -etc/rc.d/init.d/ntp -etc/rc.d/init.d/setclock -etc/rc.d/init.d/unbound -etc/rc.d/rc0.d/K79unbound -etc/rc.d/rc3.d/S11unbound -etc/rc.d/rc6.d/K79unbound -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/hosts.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/iptables.cgi -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -srv/web/ipfire/cgi-bin/pakfire.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/services.cgi -var/ipfire/backup/include diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/core/106/filelists/flex deleted file mode 120000 index feb0390..0000000 --- a/config/rootfiles/core/106/filelists/flex +++ /dev/null @@ -1 +0,0 @@ -../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/core/106/filelists/gawk deleted file mode 120000 index a3bbe32..0000000 --- a/config/rootfiles/core/106/filelists/gawk +++ /dev/null @@ -1 +0,0 @@ -../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/core/106/filelists/gettext deleted file mode 120000 index b6c6c6f..0000000 --- a/config/rootfiles/core/106/filelists/gettext +++ /dev/null @@ -1 +0,0 @@ -../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/core/106/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/106/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/core/106/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/106/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/core/106/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/106/filelists/i586/strongswan-padlock +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/core/106/filelists/iproute2 deleted file mode 120000 index 05f0f71..0000000 --- a/config/rootfiles/core/106/filelists/iproute2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/core/106/filelists/ipset deleted file mode 120000 index 2b43691..0000000 --- a/config/rootfiles/core/106/filelists/ipset +++ /dev/null @@ -1 +0,0 @@ -../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/core/106/filelists/libgpg-error deleted file mode 120000 index cad4313..0000000 --- a/config/rootfiles/core/106/filelists/libgpg-error +++ /dev/null @@ -1 +0,0 @@ -../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libidn b/config/rootfiles/core/106/filelists/libidn deleted file mode 120000 index 7e35489..0000000 --- a/config/rootfiles/core/106/filelists/libidn +++ /dev/null @@ -1 +0,0 @@ -../../../common/libidn \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/core/106/filelists/libmnl deleted file mode 120000 index f671c41..0000000 --- a/config/rootfiles/core/106/filelists/libmnl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/core/106/filelists/libnetfilter_conntrack deleted file mode 120000 index 6ef5cc4..0000000 --- a/config/rootfiles/core/106/filelists/libnetfilter_conntrack +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/core/106/filelists/misc-progs deleted file mode 120000 index 7223cad..0000000 --- a/config/rootfiles/core/106/filelists/misc-progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/mt7601u-firmware b/config/rootfiles/core/106/filelists/mt7601u-firmware deleted file mode 120000 index 300ac04..0000000 --- a/config/rootfiles/core/106/filelists/mt7601u-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/core/106/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/106/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/core/106/filelists/python-daemon deleted file mode 120000 index 8e510bb..0000000 --- a/config/rootfiles/core/106/filelists/python-daemon +++ /dev/null @@ -1 +0,0 @@ -../../../common/python-daemon \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/core/106/filelists/python-docutils deleted file mode 120000 index 5ae1ada..0000000 --- a/config/rootfiles/core/106/filelists/python-docutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/python-docutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/core/106/filelists/python-inotify deleted file mode 120000 index 6f572c3..0000000 --- a/config/rootfiles/core/106/filelists/python-inotify +++ /dev/null @@ -1 +0,0 @@ -../../../common/python-inotify \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/core/106/filelists/python-ipaddress deleted file mode 120000 index 0702482..0000000 --- a/config/rootfiles/core/106/filelists/python-ipaddress +++ /dev/null @@ -1 +0,0 @@ -../../../common/python-ipaddress \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/core/106/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/106/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/106/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/106/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/core/106/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/106/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/core/106/filelists/unbound deleted file mode 120000 index 66adf09..0000000 --- a/config/rootfiles/core/106/filelists/unbound +++ /dev/null @@ -1 +0,0 @@ -../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/core/106/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/106/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/core/106/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/106/filelists/usb_modeswitch_data +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/106/meta b/config/rootfiles/core/106/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/106/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh deleted file mode 100644 index c3609af..0000000 --- a/config/rootfiles/core/106/update.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -core=106 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )); do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - - -# Stop services -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/dnsmasq stop - -# Extract files -extract_files - -# Delete dnsmasq -rm -vf \ - /etc/rc.d/init.d/dnsmasq \ - /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \ - /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ - /usr/sbin/dnsmasq - -# delete unbound link after network start -rm -vf /etc/rc.d/rc3.d/S21unbound - -# Delete old net-traffic stuff -rm -vrf \ - /etc/rc.d/helper/writeipac.pl \ - /etc/rc.d/init.d/networking/red.up/40-ipac \ - /var/ipfire/net-traffic \ - /var/log/net-traffic.log* - -# update linker config -ldconfig - -grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update DNS trust anchor -%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem -EOF - -# Update Language cache -/usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/unbound start -/etc/init.d/squid start -if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then - /etc/init.d/ipsec start -fi - -# Restart DHCP server to import leases into unbound -/etc/init.d/dhcp restart - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/107/exclude b/config/rootfiles/core/107/exclude new file mode 100644 index 0000000..1d8d74e --- /dev/null +++ b/config/rootfiles/core/107/exclude @@ -0,0 +1,29 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/lib/unbound/root.key +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-multi b/config/rootfiles/core/107/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-rpi b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/files b/config/rootfiles/core/107/filelists/files new file mode 100644 index 0000000..b03a86e --- /dev/null +++ b/config/rootfiles/core/107/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/traffic.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/107/filelists/hdparm b/config/rootfiles/core/107/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/core/107/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/i586/linux b/config/rootfiles/core/107/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/107/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/libjpeg b/config/rootfiles/core/107/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/core/107/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/libjpeg-compat b/config/rootfiles/core/107/filelists/libjpeg-compat new file mode 120000 index 0000000..e6ff86d --- /dev/null +++ b/config/rootfiles/core/107/filelists/libjpeg-compat @@ -0,0 +1 @@ +../../../common/libjpeg-compat \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/squid b/config/rootfiles/core/107/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/107/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/x86_64/linux b/config/rootfiles/core/107/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/core/107/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/107/meta b/config/rootfiles/core/107/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/107/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/107/update.sh b/config/rootfiles/core/107/update.sh new file mode 100644 index 0000000..b8987b0 --- /dev/null +++ b/config/rootfiles/core/107/update.sh @@ -0,0 +1,249 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=107 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/collectd stop +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Remove some old files + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/collectd start +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/106/exclude b/config/rootfiles/oldcore/106/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/106/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/106/filelists/attr b/config/rootfiles/oldcore/106/filelists/attr new file mode 120000 index 0000000..c808017 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/diffutils b/config/rootfiles/oldcore/106/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/ed b/config/rootfiles/oldcore/106/filelists/ed new file mode 120000 index 0000000..0ed331c --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/ed @@ -0,0 +1 @@ +../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/expat b/config/rootfiles/oldcore/106/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/file b/config/rootfiles/oldcore/106/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/files b/config/rootfiles/oldcore/106/filelists/files new file mode 100644 index 0000000..a67d30a --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/files @@ -0,0 +1,25 @@ +etc/system-release +etc/issue +etc/login.defs +etc/rc.d/init.d/dhcp +etc/rc.d/init.d/localnet +etc/rc.d/init.d/network +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/ntp +etc/rc.d/init.d/setclock +etc/rc.d/init.d/unbound +etc/rc.d/rc0.d/K79unbound +etc/rc.d/rc3.d/S11unbound +etc/rc.d/rc6.d/K79unbound +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/services.cgi +var/ipfire/backup/include diff --git a/config/rootfiles/oldcore/106/filelists/flex b/config/rootfiles/oldcore/106/filelists/flex new file mode 120000 index 0000000..feb0390 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/flex @@ -0,0 +1 @@ +../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/gawk b/config/rootfiles/oldcore/106/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/gettext b/config/rootfiles/oldcore/106/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/gnupg b/config/rootfiles/oldcore/106/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/iproute2 b/config/rootfiles/oldcore/106/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/ipset b/config/rootfiles/oldcore/106/filelists/ipset new file mode 120000 index 0000000..2b43691 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/libgpg-error b/config/rootfiles/oldcore/106/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/libidn b/config/rootfiles/oldcore/106/filelists/libidn new file mode 120000 index 0000000..7e35489 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/libidn @@ -0,0 +1 @@ +../../../common/libidn \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/libmnl b/config/rootfiles/oldcore/106/filelists/libmnl new file mode 120000 index 0000000..f671c41 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack b/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack new file mode 120000 index 0000000..6ef5cc4 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/misc-progs b/config/rootfiles/oldcore/106/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/mt7601u-firmware b/config/rootfiles/oldcore/106/filelists/mt7601u-firmware new file mode 120000 index 0000000..300ac04 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/mt7601u-firmware @@ -0,0 +1 @@ +../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/openssl b/config/rootfiles/oldcore/106/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/python-daemon b/config/rootfiles/oldcore/106/filelists/python-daemon new file mode 120000 index 0000000..8e510bb --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/python-daemon @@ -0,0 +1 @@ +../../../common/python-daemon \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/python-docutils b/config/rootfiles/oldcore/106/filelists/python-docutils new file mode 120000 index 0000000..5ae1ada --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/python-docutils @@ -0,0 +1 @@ +../../../common/python-docutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/python-inotify b/config/rootfiles/oldcore/106/filelists/python-inotify new file mode 120000 index 0000000..6f572c3 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/python-inotify @@ -0,0 +1 @@ +../../../common/python-inotify \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/python-ipaddress b/config/rootfiles/oldcore/106/filelists/python-ipaddress new file mode 120000 index 0000000..0702482 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/python-ipaddress @@ -0,0 +1 @@ +../../../common/python-ipaddress \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/smartmontools b/config/rootfiles/oldcore/106/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/squid b/config/rootfiles/oldcore/106/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/strongswan b/config/rootfiles/oldcore/106/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/unbound b/config/rootfiles/oldcore/106/filelists/unbound new file mode 120000 index 0000000..66adf09 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/usb_modeswitch b/config/rootfiles/oldcore/106/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/oldcore/106/meta b/config/rootfiles/oldcore/106/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/106/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/106/update.sh b/config/rootfiles/oldcore/106/update.sh new file mode 100644 index 0000000..c3609af --- /dev/null +++ b/config/rootfiles/oldcore/106/update.sh @@ -0,0 +1,104 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=106 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/dnsmasq stop + +# Extract files +extract_files + +# Delete dnsmasq +rm -vf \ + /etc/rc.d/init.d/dnsmasq \ + /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \ + /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ + /usr/sbin/dnsmasq + +# delete unbound link after network start +rm -vf /etc/rc.d/rc3.d/S21unbound + +# Delete old net-traffic stuff +rm -vrf \ + /etc/rc.d/helper/writeipac.pl \ + /etc/rc.d/init.d/networking/red.up/40-ipac \ + /var/ipfire/net-traffic \ + /var/log/net-traffic.log* + +# update linker config +ldconfig + +grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update DNS trust anchor +%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem +EOF + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start +/etc/init.d/squid start +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# Restart DHCP server to import leases into unbound +/etc/init.d/dhcp restart + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/netpbm b/config/rootfiles/packages/netpbm index c0258be..b4d1693 100644 --- a/config/rootfiles/packages/netpbm +++ b/config/rootfiles/packages/netpbm @@ -1,632 +1,363 @@ -#usr/local/netpbm/VERSION -#usr/local/netpbm/README -#usr/local/netpbm/include/pgm.h -#usr/local/netpbm/include/mallocvar.h -#usr/local/netpbm/include/bitio.h -#usr/local/netpbm/include/pam.h -#usr/local/netpbm/include/pbmfont.h -#usr/local/netpbm/include/pnm.h -#usr/local/netpbm/include/ppmfloyd.h -#usr/local/netpbm/include/pbm.h -#usr/local/netpbm/include/pammap.h -#usr/local/netpbm/include/shhopt.h -#usr/local/netpbm/include/pm_gamma.h -#usr/local/netpbm/include/colorname.h -#usr/local/netpbm/include/pm_system.h -#usr/local/netpbm/include/nstring.h -#usr/local/netpbm/include/pm_config.h -#usr/local/netpbm/include/pm.h -#usr/local/netpbm/include/ppm.h -#usr/local/netpbm/include/ppmcmap.h -#usr/local/netpbm/bin/pgmabel -#usr/local/netpbm/bin/pbmtomgr -#usr/local/netpbm/bin/pgmnoise -#usr/local/netpbm/bin/ppmspread -#usr/local/netpbm/bin/pbmtomda -#usr/local/netpbm/bin/hdifftopam -#usr/local/netpbm/bin/pnmcut -#usr/local/netpbm/bin/ppmtouil -#usr/local/netpbm/bin/pbmtopk -#usr/local/netpbm/bin/pbmtocmuwm -#usr/local/netpbm/bin/pamstack -#usr/local/netpbm/bin/pnminterp -#usr/local/netpbm/bin/pstopnm -#usr/local/netpbm/bin/fitstopnm -#usr/local/netpbm/bin/pbmtowbmp -#usr/local/netpbm/bin/pamdeinterlace -#usr/local/netpbm/bin/pnmremap -#usr/local/netpbm/bin/rgb3toppm -#usr/local/netpbm/bin/pgmbentley -#usr/local/netpbm/bin/hipstopgm -#usr/local/netpbm/bin/pbmtopi3 -#usr/local/netpbm/bin/pgmenhance -#usr/local/netpbm/bin/pbmtoplot -#usr/local/netpbm/bin/ilbmtoppm -#usr/local/netpbm/bin/ppmshadow -#usr/local/netpbm/bin/palmtopnm -#usr/local/netpbm/bin/ppmchange -#usr/local/netpbm/bin/pamchannel -#usr/local/netpbm/bin/pnmsplit -#usr/local/netpbm/bin/pamedge -#usr/local/netpbm/bin/pnmrotate -#usr/local/netpbm/bin/ppmtosixel -#usr/local/netpbm/bin/fiascotopnm -#usr/local/netpbm/bin/fstopgm -#usr/local/netpbm/bin/pnmtosgi -#usr/local/netpbm/bin/pbmtextps -#usr/local/netpbm/bin/mtvtoppm -#usr/local/netpbm/bin/pbmtoibm23xx -#usr/local/netpbm/bin/sldtoppm -#usr/local/netpbm/bin/pnmtofits -#usr/local/netpbm/bin/gouldtoppm -#usr/local/netpbm/bin/pnmtopnm -#usr/local/netpbm/bin/ppmcie -#usr/local/netpbm/bin/ppmtoicr -#usr/local/netpbm/bin/pamtopnm -#usr/local/netpbm/bin/tifftopnm -#usr/local/netpbm/bin/g3topbm -#usr/local/netpbm/bin/ppmcolors -#usr/local/netpbm/bin/pbmtoascii -#usr/local/netpbm/bin/pbmto4425 -#usr/local/netpbm/bin/sirtopnm -#usr/local/netpbm/bin/pgmtexture -#usr/local/netpbm/bin/asciitopgm -#usr/local/netpbm/bin/pamcut -#usr/local/netpbm/bin/ppmlabel -#usr/local/netpbm/bin/ppmtogif -#usr/local/netpbm/bin/neotoppm -#usr/local/netpbm/bin/pnmgamma -#usr/local/netpbm/bin/pnmtojbig -#usr/local/netpbm/bin/ppmtv -#usr/local/netpbm/bin/ppmquantall -#usr/local/netpbm/bin/ppmmix -#usr/local/netpbm/bin/ppmglobe -#usr/local/netpbm/bin/pamscale -#usr/local/netpbm/bin/qrttoppm -#usr/local/netpbm/bin/xpmtoppm -#usr/local/netpbm/bin/pnmtops -#usr/local/netpbm/bin/zeisstopnm -#usr/local/netpbm/bin/ppmmake -#usr/local/netpbm/bin/pamperspective -#usr/local/netpbm/bin/pgmminkowski -#usr/local/netpbm/bin/rawtopgm -#usr/local/netpbm/bin/pamtohtmltbl -#usr/local/netpbm/bin/pnmmargin -#usr/local/netpbm/bin/pnmtorast -#usr/local/netpbm/bin/bmptoppm -#usr/local/netpbm/bin/pbmtoepson -#usr/local/netpbm/bin/pnmtoxwd -#usr/local/netpbm/bin/pbmtolj -#usr/local/netpbm/bin/pgmcrater -#usr/local/netpbm/bin/ppmhist -#usr/local/netpbm/bin/gemtopnm -#usr/local/netpbm/bin/pamfile -#usr/local/netpbm/bin/ppmtorgb3 -#usr/local/netpbm/bin/pnmquant -#usr/local/netpbm/bin/ppmtopuzz -#usr/local/netpbm/bin/ppmtobmp -#usr/local/netpbm/bin/mrftopbm -#usr/local/netpbm/bin/411toppm -#usr/local/netpbm/bin/ppmtopict -#usr/local/netpbm/bin/rletopnm -#usr/local/netpbm/bin/pgmtopbm -#usr/local/netpbm/bin/pampop9 -#usr/local/netpbm/bin/ppmdist -#usr/local/netpbm/bin/ppmtoxpm -#usr/local/netpbm/bin/mdatopbm -#usr/local/netpbm/bin/jpegtopnm -#usr/local/netpbm/bin/pnmtopng -#usr/local/netpbm/bin/ppmtopi1 -#usr/local/netpbm/bin/pamseq -#usr/local/netpbm/bin/sputoppm -#usr/local/netpbm/bin/pcdovtoppm -#usr/local/netpbm/bin/pbmtopgm -#usr/local/netpbm/bin/pnmalias -#usr/local/netpbm/bin/pbmtomacp -#usr/local/netpbm/bin/pamoil -#usr/local/netpbm/bin/ppmtoarbtxt -#usr/local/netpbm/bin/pbmpage -#usr/local/netpbm/bin/xbmtopbm -#usr/local/netpbm/bin/pnmcomp -#usr/local/netpbm/bin/pamtopfm -#usr/local/netpbm/bin/icontopbm -#usr/local/netpbm/bin/spctoppm -#usr/local/netpbm/bin/ppmrainbow -#usr/local/netpbm/bin/pgmtopgm -#usr/local/netpbm/bin/winicontoppm -#usr/local/netpbm/bin/pgmedge -#usr/local/netpbm/bin/pnmmontage -#usr/local/netpbm/bin/ppmtoyuv -#usr/local/netpbm/bin/pnmarith -#usr/local/netpbm/bin/pgmtolispm -#usr/local/netpbm/bin/pgmhist -#usr/local/netpbm/bin/pbmtox10bm -#usr/local/netpbm/bin/ppmnorm -#usr/local/netpbm/bin/infotopam -#usr/local/netpbm/bin/pgmtoppm -#usr/local/netpbm/bin/ppmrelief -#usr/local/netpbm/bin/pgmramp -#usr/local/netpbm/bin/pbmtodjvurle -#usr/local/netpbm/bin/pnmstitch -#usr/local/netpbm/bin/ximtoppm -#usr/local/netpbm/bin/pbmtomrf -#usr/local/netpbm/bin/pnmnoraw -#usr/local/netpbm/bin/pamstretch -#usr/local/netpbm/bin/ppmpat -#usr/local/netpbm/bin/giftopnm -#usr/local/netpbm/bin/pbmtozinc -#usr/local/netpbm/bin/pgmmorphconv -#usr/local/netpbm/bin/cmuwmtopbm -#usr/local/netpbm/bin/pamgauss -#usr/local/netpbm/bin/pamsumm -#usr/local/netpbm/bin/ppmtojpeg -#usr/local/netpbm/bin/pbmtopsg3 -#usr/local/netpbm/bin/pamslice -#usr/local/netpbm/bin/pbmtoescp2 -#usr/local/netpbm/bin/pnmtopalm -#usr/local/netpbm/bin/pi3topbm -#usr/local/netpbm/bin/jbigtopnm -#usr/local/netpbm/bin/sgitopnm -#usr/local/netpbm/bin/pbmtoln03 -#usr/local/netpbm/bin/ppmtomap -#usr/local/netpbm/bin/ybmtopbm -#usr/local/netpbm/bin/pjtoppm -#usr/local/netpbm/bin/pnmtopclxl -#usr/local/netpbm/bin/pamtouil -#usr/local/netpbm/bin/pbmtoepsi -#usr/local/netpbm/bin/pbmtogem -#usr/local/netpbm/bin/sbigtopgm -#usr/local/netpbm/bin/pnmtotiffcmyk -#usr/local/netpbm/bin/pgmslice -#usr/local/netpbm/bin/ppmtoyuvsplit -#usr/local/netpbm/bin/pc1toppm -#usr/local/netpbm/bin/ppmrough -#usr/local/netpbm/bin/bioradtopgm -#usr/local/netpbm/bin/wbmptopbm -#usr/local/netpbm/bin/pnmpad -#usr/local/netpbm/bin/ppmbrighten -#usr/local/netpbm/bin/pamtojpeg2k -#usr/local/netpbm/bin/pbmtoatk -#usr/local/netpbm/bin/pnmnlfilt -#usr/local/netpbm/bin/pnmtile -#usr/local/netpbm/bin/pbmtoppa -#usr/local/netpbm/bin/tgatoppm -#usr/local/netpbm/bin/pgmnorm -#usr/local/netpbm/bin/pamflip -#usr/local/netpbm/bin/pnmtosir -#usr/local/netpbm/bin/pbmtogo -#usr/local/netpbm/bin/lispmtopgm -#usr/local/netpbm/bin/atktopbm -#usr/local/netpbm/bin/pamdice -#usr/local/netpbm/bin/manweb -#usr/local/netpbm/bin/gemtopbm -#usr/local/netpbm/bin/pamtotga -#usr/local/netpbm/bin/pnmindex -#usr/local/netpbm/bin/imgtoppm -#usr/local/netpbm/bin/pamstretch-gen -#usr/local/netpbm/bin/pnmflip -#usr/local/netpbm/bin/pbmmake -#usr/local/netpbm/bin/leaftoppm -#usr/local/netpbm/bin/pamlookup -#usr/local/netpbm/bin/pfmtopam -#usr/local/netpbm/bin/pbmto10x -#usr/local/netpbm/bin/ppmfade -#usr/local/netpbm/bin/pktopbm -#usr/local/netpbm/bin/pbmclean -#usr/local/netpbm/bin/rawtoppm -#usr/local/netpbm/bin/pammasksharpen -#usr/local/netpbm/bin/eyuvtoppm -#usr/local/netpbm/bin/pnmdepth -#usr/local/netpbm/bin/escp2topbm -#usr/local/netpbm/bin/ppmquant -#usr/local/netpbm/bin/pbmupc -#usr/local/netpbm/bin/ppmshift -#usr/local/netpbm/bin/ppmtoleaf -#usr/local/netpbm/bin/pgmtofs -#usr/local/netpbm/bin/thinkjettopbm -#usr/local/netpbm/bin/pnmtotiff -#usr/local/netpbm/bin/pnmenlarge -#usr/local/netpbm/bin/ppmtoppm -#usr/local/netpbm/bin/pbmtonokia -#usr/local/netpbm/bin/doc.url -#usr/local/netpbm/bin/pbmtoicon -#usr/local/netpbm/bin/pnmcrop -#usr/local/netpbm/bin/ppmtopgm -#usr/local/netpbm/bin/ppmtoneo -#usr/local/netpbm/bin/rasttopnm -#usr/local/netpbm/bin/pamsharpmap -#usr/local/netpbm/bin/psidtopgm -#usr/local/netpbm/bin/pgmkernel -#usr/local/netpbm/bin/ppmtopjxl -#usr/local/netpbm/bin/pbmtoptx -#usr/local/netpbm/bin/ppmtopcx -#usr/local/netpbm/bin/pnmhistmap -#usr/local/netpbm/bin/pnmtoplainpnm -#usr/local/netpbm/bin/pamsummcol -#usr/local/netpbm/bin/pbmtoxbm -#usr/local/netpbm/bin/pnmscale -#usr/local/netpbm/bin/pnmfile -#usr/local/netpbm/bin/pnmnorm -#usr/local/netpbm/bin/pcxtoppm -#usr/local/netpbm/bin/pamenlarge -#usr/local/netpbm/bin/pnmpsnr -#usr/local/netpbm/bin/mgrtopbm -#usr/local/netpbm/bin/hpcdtoppm -#usr/local/netpbm/bin/pnmconvol -#usr/local/netpbm/bin/macptopbm -#usr/local/netpbm/bin/pbmtomatrixorbital -#usr/local/netpbm/bin/pbmtoybm -#usr/local/netpbm/bin/ppmtopj -#usr/local/netpbm/bin/pamditherbw -#usr/local/netpbm/bin/pnmtofiasco -#usr/local/netpbm/bin/pngtopnm -#usr/local/netpbm/bin/anytopnm -#usr/local/netpbm/bin/pbmpscale -#usr/local/netpbm/bin/ppmtowinicon -#usr/local/netpbm/bin/pnmtorle -#usr/local/netpbm/bin/pbmtext -#usr/local/netpbm/bin/pi1toppm -#usr/local/netpbm/bin/pamtodjvurle -#usr/local/netpbm/bin/pamsharpness -#usr/local/netpbm/bin/ppmdither -#usr/local/netpbm/bin/pamstereogram -#usr/local/netpbm/bin/pnminvert -#usr/local/netpbm/bin/pamcomp -#usr/local/netpbm/bin/jpeg2ktopam -#usr/local/netpbm/bin/pamtohdiff -#usr/local/netpbm/bin/ppmtoilbm -#usr/local/netpbm/bin/pnmpaste -#usr/local/netpbm/bin/pgmoil -#usr/local/netpbm/bin/pnmcat -#usr/local/netpbm/bin/yuvsplittoppm -#usr/local/netpbm/bin/brushtopbm -#usr/local/netpbm/bin/ppmwheel -#usr/local/netpbm/bin/bmptopnm -#usr/local/netpbm/bin/ppmtoterm -#usr/local/netpbm/bin/pbmtog3 -#usr/local/netpbm/bin/yuvtoppm -#usr/local/netpbm/bin/ppmntsc -#usr/local/netpbm/bin/pbmlife -#usr/local/netpbm/bin/ppmtomitsu -#usr/local/netpbm/bin/pbmtobbnbg -#usr/local/netpbm/bin/ppm3d -#usr/local/netpbm/bin/ppmcolormask -#usr/local/netpbm/bin/pnmshear -#usr/local/netpbm/bin/pnmscalefixed -usr/local/netpbm/bin/pnmtojpeg -#usr/local/netpbm/bin/ppmtoeyuv -#usr/local/netpbm/bin/picttoppm -#usr/local/netpbm/bin/pbmtolps -#usr/local/netpbm/bin/pbmreduce -#usr/local/netpbm/bin/pnmcolormap -#usr/local/netpbm/bin/pnmtoddif -#usr/local/netpbm/bin/ppmflash -#usr/local/netpbm/bin/ppmtoacad -#usr/local/netpbm/bin/ppmforge -#usr/local/netpbm/bin/spottopgm -#usr/local/netpbm/bin/pnmhisteq -#usr/local/netpbm/bin/xwdtopnm -#usr/local/netpbm/bin/pamendian -#usr/local/netpbm/bin/pbmmask -#usr/local/netpbm/bin/pamarith -#usr/local/netpbm/bin/xvminitoppm -#usr/local/netpbm/bin/ppmdim -#usr/local/netpbm/bin/ppmtolj -#usr/local/netpbm/bin/pamfunc -#usr/local/netpbm/bin/pnmsmooth -#usr/local/netpbm/bin/ddbugtopbm -#usr/local/netpbm/bin/ppmtompeg -#usr/local/netpbm/lib -usr/lib/libnetpbm.so.10.26 +#usr/bin/411toppm +#usr/bin/anytopnm +#usr/bin/asciitopgm +#usr/bin/atktopbm +#usr/bin/bioradtopgm +#usr/bin/bmptopnm +#usr/bin/bmptoppm +#usr/bin/brushtopbm +#usr/bin/cameratopam +#usr/bin/cmuwmtopbm +#usr/bin/ddbugtopbm +#usr/bin/doc.url +#usr/bin/escp2topbm +#usr/bin/eyuvtoppm +#usr/bin/fiascotopnm +#usr/bin/fitstopnm +#usr/bin/fstopgm +#usr/bin/g3topbm +#usr/bin/gemtopbm +#usr/bin/gemtopnm +#usr/bin/giftopnm +#usr/bin/gouldtoppm +#usr/bin/hdifftopam +#usr/bin/hipstopgm +#usr/bin/hpcdtoppm +#usr/bin/icontopbm +#usr/bin/ilbmtoppm +#usr/bin/imgtoppm +#usr/bin/infotopam +#usr/bin/jbigtopnm +#usr/bin/jpeg2ktopam +#usr/bin/jpegtopnm +#usr/bin/leaftoppm +#usr/bin/lispmtopgm +#usr/bin/macptopbm +#usr/bin/manweb +#usr/bin/mdatopbm +#usr/bin/mgrtopbm +#usr/bin/mrftopbm +#usr/bin/mtvtoppm +#usr/bin/neotoppm +#usr/bin/palmtopnm +#usr/bin/pamaddnoise +#usr/bin/pamarith +#usr/bin/pambackground +#usr/bin/pambayer +#usr/bin/pamchannel +#usr/bin/pamcomp +#usr/bin/pamcut +#usr/bin/pamdeinterlace +#usr/bin/pamdepth +#usr/bin/pamdice +#usr/bin/pamditherbw +#usr/bin/pamedge +#usr/bin/pamendian +#usr/bin/pamenlarge +#usr/bin/pamfile +#usr/bin/pamfixtrunc +#usr/bin/pamflip +#usr/bin/pamfunc +#usr/bin/pamgauss +#usr/bin/pamgradient +#usr/bin/pamlookup +#usr/bin/pammasksharpen +#usr/bin/pammixinterlace +#usr/bin/pamoil +#usr/bin/pamperspective +#usr/bin/pampick +#usr/bin/pampop9 +#usr/bin/pamrgbatopng +#usr/bin/pamscale +#usr/bin/pamseq +#usr/bin/pamsharpmap +#usr/bin/pamsharpness +#usr/bin/pamsistoaglyph +#usr/bin/pamslice +#usr/bin/pamsplit +#usr/bin/pamstack +#usr/bin/pamstereogram +#usr/bin/pamstretch +#usr/bin/pamstretch-gen +#usr/bin/pamsumm +#usr/bin/pamsummcol +#usr/bin/pamthreshold +#usr/bin/pamtilt +#usr/bin/pamtodjvurle +#usr/bin/pamtofits +#usr/bin/pamtogif +#usr/bin/pamtohdiff +#usr/bin/pamtohtmltbl +#usr/bin/pamtojpeg2k +#usr/bin/pamtompfont +#usr/bin/pamtooctaveimg +#usr/bin/pamtopam +#usr/bin/pamtopfm +#usr/bin/pamtopnm +#usr/bin/pamtosvg +#usr/bin/pamtotga +#usr/bin/pamtotiff +#usr/bin/pamtouil +#usr/bin/pamtoxvmini +#usr/bin/pamundice +#usr/bin/pbmclean +#usr/bin/pbmlife +#usr/bin/pbmmake +#usr/bin/pbmmask +#usr/bin/pbmminkowski +#usr/bin/pbmpage +#usr/bin/pbmpscale +#usr/bin/pbmreduce +#usr/bin/pbmtext +#usr/bin/pbmtextps +#usr/bin/pbmto10x +#usr/bin/pbmto4425 +#usr/bin/pbmtoascii +#usr/bin/pbmtoatk +#usr/bin/pbmtobbnbg +#usr/bin/pbmtocmuwm +#usr/bin/pbmtodjvurle +#usr/bin/pbmtoepsi +#usr/bin/pbmtoepson +#usr/bin/pbmtoescp2 +#usr/bin/pbmtog3 +#usr/bin/pbmtogem +#usr/bin/pbmtogo +#usr/bin/pbmtoibm23xx +#usr/bin/pbmtoicon +#usr/bin/pbmtolj +#usr/bin/pbmtoln03 +#usr/bin/pbmtolps +#usr/bin/pbmtomacp +#usr/bin/pbmtomatrixorbital +#usr/bin/pbmtomda +#usr/bin/pbmtomgr +#usr/bin/pbmtomrf +#usr/bin/pbmtonokia +#usr/bin/pbmtopgm +#usr/bin/pbmtopi3 +#usr/bin/pbmtopk +#usr/bin/pbmtoplot +#usr/bin/pbmtoppa +#usr/bin/pbmtopsg3 +#usr/bin/pbmtoptx +#usr/bin/pbmtowbmp +#usr/bin/pbmtox10bm +#usr/bin/pbmtoxbm +#usr/bin/pbmtoybm +#usr/bin/pbmtozinc +#usr/bin/pbmupc +#usr/bin/pc1toppm +#usr/bin/pcdovtoppm +#usr/bin/pcxtoppm +#usr/bin/pfmtopam +#usr/bin/pgmabel +#usr/bin/pgmbentley +#usr/bin/pgmcrater +#usr/bin/pgmdeshadow +#usr/bin/pgmedge +#usr/bin/pgmenhance +#usr/bin/pgmhist +#usr/bin/pgmkernel +#usr/bin/pgmmake +#usr/bin/pgmmedian +#usr/bin/pgmminkowski +#usr/bin/pgmmorphconv +#usr/bin/pgmnoise +#usr/bin/pgmnorm +#usr/bin/pgmoil +#usr/bin/pgmramp +#usr/bin/pgmslice +#usr/bin/pgmtexture +#usr/bin/pgmtofs +#usr/bin/pgmtolispm +#usr/bin/pgmtopbm +#usr/bin/pgmtopgm +#usr/bin/pgmtoppm +#usr/bin/pi1toppm +#usr/bin/pi3topbm +#usr/bin/picttoppm +#usr/bin/pjtoppm +#usr/bin/pktopbm +#usr/bin/pngtopam +#usr/bin/pngtopnm +#usr/bin/pnmalias +#usr/bin/pnmarith +#usr/bin/pnmcat +#usr/bin/pnmcolormap +#usr/bin/pnmcomp +#usr/bin/pnmconvol +#usr/bin/pnmcrop +#usr/bin/pnmcut +#usr/bin/pnmdepth +#usr/bin/pnmenlarge +#usr/bin/pnmfile +#usr/bin/pnmflip +#usr/bin/pnmgamma +#usr/bin/pnmhisteq +#usr/bin/pnmhistmap +#usr/bin/pnmindex +#usr/bin/pnminterp +#usr/bin/pnminvert +#usr/bin/pnmmargin +#usr/bin/pnmmontage +#usr/bin/pnmnlfilt +#usr/bin/pnmnoraw +#usr/bin/pnmnorm +#usr/bin/pnmpad +#usr/bin/pnmpaste +#usr/bin/pnmpsnr +#usr/bin/pnmquant +#usr/bin/pnmremap +#usr/bin/pnmrotate +#usr/bin/pnmscale +#usr/bin/pnmscalefixed +#usr/bin/pnmshear +#usr/bin/pnmsmooth +#usr/bin/pnmsplit +#usr/bin/pnmstitch +#usr/bin/pnmtile +#usr/bin/pnmtoddif +#usr/bin/pnmtofiasco +#usr/bin/pnmtofits +#usr/bin/pnmtojbig +usr/bin/pnmtojpeg +#usr/bin/pnmtopalm +#usr/bin/pnmtopclxl +#usr/bin/pnmtoplainpnm +usr/bin/pnmtopng +#usr/bin/pnmtopnm +#usr/bin/pnmtops +#usr/bin/pnmtorast +#usr/bin/pnmtorle +#usr/bin/pnmtosgi +#usr/bin/pnmtosir +usr/bin/pnmtotiff +#usr/bin/pnmtotiffcmyk +#usr/bin/pnmtoxwd +#usr/bin/ppm3d +#usr/bin/ppmbrighten +#usr/bin/ppmchange +#usr/bin/ppmcie +#usr/bin/ppmcolormask +#usr/bin/ppmcolors +#usr/bin/ppmdcfont +#usr/bin/ppmddumpfont +#usr/bin/ppmdim +#usr/bin/ppmdist +#usr/bin/ppmdither +#usr/bin/ppmdmkfont +#usr/bin/ppmdraw +#usr/bin/ppmfade +#usr/bin/ppmflash +#usr/bin/ppmforge +#usr/bin/ppmglobe +#usr/bin/ppmhist +#usr/bin/ppmlabel +#usr/bin/ppmmake +#usr/bin/ppmmix +#usr/bin/ppmnorm +#usr/bin/ppmntsc +#usr/bin/ppmpat +#usr/bin/ppmquant +#usr/bin/ppmquantall +#usr/bin/ppmrainbow +#usr/bin/ppmrelief +#usr/bin/ppmrough +#usr/bin/ppmshadow +#usr/bin/ppmshift +#usr/bin/ppmspread +#usr/bin/ppmtoacad +#usr/bin/ppmtoarbtxt +#usr/bin/ppmtobmp +#usr/bin/ppmtoeyuv +#usr/bin/ppmtogif +#usr/bin/ppmtoicr +#usr/bin/ppmtoilbm +#usr/bin/ppmtojpeg +#usr/bin/ppmtoleaf +#usr/bin/ppmtolj +#usr/bin/ppmtomap +#usr/bin/ppmtomitsu +#usr/bin/ppmtompeg +#usr/bin/ppmtoneo +#usr/bin/ppmtopcx +#usr/bin/ppmtopgm +#usr/bin/ppmtopi1 +#usr/bin/ppmtopict +#usr/bin/ppmtopj +#usr/bin/ppmtopjxl +#usr/bin/ppmtoppm +#usr/bin/ppmtopuzz +#usr/bin/ppmtorgb3 +#usr/bin/ppmtosixel +#usr/bin/ppmtoterm +#usr/bin/ppmtotga +#usr/bin/ppmtouil +#usr/bin/ppmtowinicon +#usr/bin/ppmtoxpm +#usr/bin/ppmtoyuv +#usr/bin/ppmtoyuvsplit +#usr/bin/ppmtv +#usr/bin/ppmwheel +#usr/bin/psidtopgm +#usr/bin/pstopnm +#usr/bin/qrttoppm +#usr/bin/rasttopnm +#usr/bin/rawtopgm +#usr/bin/rawtoppm +#usr/bin/rgb3toppm +#usr/bin/rlatopam +#usr/bin/rletopnm +#usr/bin/sbigtopgm +#usr/bin/sgitopnm +#usr/bin/sirtopnm +#usr/bin/sldtoppm +#usr/bin/spctoppm +#usr/bin/spottopgm +#usr/bin/sputoppm +#usr/bin/svgtopam +#usr/bin/tgatoppm +#usr/bin/thinkjettopbm +#usr/bin/tifftopnm +#usr/bin/wbmptopbm +#usr/bin/winicontoppm +#usr/bin/xbmtopbm +#usr/bin/ximtoppm +#usr/bin/xpmtoppm +#usr/bin/xvminitoppm +#usr/bin/xwdtopnm +#usr/bin/ybmtopbm +#usr/bin/yuvsplittoppm +#usr/bin/yuvtoppm +#usr/bin/zeisstopnm +#usr/include/netpbm +#usr/include/netpbm/bitio.h +#usr/include/netpbm/colorname.h +#usr/include/netpbm/mallocvar.h +#usr/include/netpbm/pam.h +#usr/include/netpbm/pammap.h +#usr/include/netpbm/pbm.h +#usr/include/netpbm/pbmfont.h +#usr/include/netpbm/pgm.h +#usr/include/netpbm/pm.h +#usr/include/netpbm/pm_config.h +#usr/include/netpbm/pm_gamma.h +#usr/include/netpbm/pm_system.h +#usr/include/netpbm/pnm.h +#usr/include/netpbm/ppm.h +#usr/include/netpbm/ppmcmap.h +#usr/include/netpbm/ppmdfont.h +#usr/include/netpbm/ppmdraw.h +#usr/include/netpbm/ppmfloyd.h +#usr/include/netpbm/shhopt.h +usr/lib/libnetpbm.so usr/lib/libnetpbm.so.10 -#usr/local/netpbm/link -#usr/local/netpbm/link/libnetpbm.so -#usr/local/netpbm/link/libnetpbm.a -#usr/local/netpbm/man -#usr/local/netpbm/man/man1 -#usr/local/netpbm/man/man1/pnmnorm.1 -#usr/local/netpbm/man/man1/pnmcut.1 -#usr/local/netpbm/man/man1/imgtoppm.1 -#usr/local/netpbm/man/man1/ppmtopcx.1 -#usr/local/netpbm/man/man1/pbmtoibm23xx.1 -#usr/local/netpbm/man/man1/gouldtoppm.1 -#usr/local/netpbm/man/man1/pnmalias.1 -#usr/local/netpbm/man/man1/xwdtopnm.1 -#usr/local/netpbm/man/man1/hipstopgm.1 -#usr/local/netpbm/man/man1/pnmtopalm.1 -#usr/local/netpbm/man/man1/pbmto4425.1 -#usr/local/netpbm/man/man1/pbmtoescp2.1 -#usr/local/netpbm/man/man1/ddbugtopbm.1 -#usr/local/netpbm/man/man1/macptopbm.1 -#usr/local/netpbm/man/man1/pbmtocmuwm.1 -#usr/local/netpbm/man/man1/pamstack.1 -#usr/local/netpbm/man/man1/pnmtotiffcmyk.1 -#usr/local/netpbm/man/man1/pgmtopbm.1 -#usr/local/netpbm/man/man1/bioradtopgm.1 -#usr/local/netpbm/man/man1/ppmtompeg.1 -#usr/local/netpbm/man/man1/411toppm.1 -#usr/local/netpbm/man/man1/pnmtojbig.1 -#usr/local/netpbm/man/man1/ppmdist.1 -#usr/local/netpbm/man/man1/ppmtopict.1 -#usr/local/netpbm/man/man1/pgmminkowski.1 -#usr/local/netpbm/man/man1/ppmflash.1 -#usr/local/netpbm/man/man1/pbmupc.1 -#usr/local/netpbm/man/man1/ppmforge.1 -#usr/local/netpbm/man/man1/ppmtorgb3.1 -#usr/local/netpbm/man/man1/sputoppm.1 -#usr/local/netpbm/man/man1/pbmpscale.1 -#usr/local/netpbm/man/man1/pbmtomacp.1 -#usr/local/netpbm/man/man1/pamdeinterlace.1 -#usr/local/netpbm/man/man1/pcdovtoppm.1 -#usr/local/netpbm/man/man1/pi1toppm.1 -#usr/local/netpbm/man/man1/infotopam.1 -#usr/local/netpbm/man/man1/ppmtolj.1 -#usr/local/netpbm/man/man1/ppmtoilbm.1 -#usr/local/netpbm/man/man1/ybmtopbm.1 -#usr/local/netpbm/man/man1/pbmtoptx.1 -#usr/local/netpbm/man/man1/ppmtomap.1 -#usr/local/netpbm/man/man1/pnmtopnm.1 -#usr/local/netpbm/man/man1/ppmtoacad.1 -#usr/local/netpbm/man/man1/pbmtomatrixorbital.1 -#usr/local/netpbm/man/man1/pnmconvol.1 -#usr/local/netpbm/man/man1/pktopbm.1 -#usr/local/netpbm/man/man1/pnmtorast.1 -#usr/local/netpbm/man/man1/pbmto10x.1 -#usr/local/netpbm/man/man1/palmtopnm.1 -#usr/local/netpbm/man/man1/ppmtoneo.1 -#usr/local/netpbm/man/man1/ppmdither.1 -#usr/local/netpbm/man/man1/pbmtoatk.1 -#usr/local/netpbm/man/man1/hpcdtoppm.1 -#usr/local/netpbm/man/man1/ppmtomitsu.1 -#usr/local/netpbm/man/man1/ppmcolors.1 -#usr/local/netpbm/man/man1/ppmmake.1 -#usr/local/netpbm/man/man1/pgmtofs.1 -#usr/local/netpbm/man/man1/pgmtopgm.1 -#usr/local/netpbm/man/man1/pgmhist.1 -#usr/local/netpbm/man/man1/pbmtopsg3.1 -#usr/local/netpbm/man/man1/ppmcie.1 -#usr/local/netpbm/man/man1/pbmtoplot.1 -#usr/local/netpbm/man/man1/pfmtopam.1 -#usr/local/netpbm/man/man1/asciitopgm.1 -#usr/local/netpbm/man/man1/ppmchange.1 -#usr/local/netpbm/man/man1/ppm3d.1 -#usr/local/netpbm/man/man1/pbmtoppa.1 -#usr/local/netpbm/man/man1/ppmfade.1 -#usr/local/netpbm/man/man1/pnmflip.1 -#usr/local/netpbm/man/man1/ppmcolormask.1 -#usr/local/netpbm/man/man1/ppmtopj.1 -#usr/local/netpbm/man/man1/pamtopnm.1 -#usr/local/netpbm/man/man1/pnmcat.1 -#usr/local/netpbm/man/man1/pc1toppm.1 -#usr/local/netpbm/man/man1/pstopnm.1 -#usr/local/netpbm/man/man1/pnmhisteq.1 -#usr/local/netpbm/man/man1/pnmtopclxl.1 -#usr/local/netpbm/man/man1/fitstopnm.1 -#usr/local/netpbm/man/man1/ppmtobmp.1 -#usr/local/netpbm/man/man1/pamcut.1 -#usr/local/netpbm/man/man1/ppmmix.1 -#usr/local/netpbm/man/man1/rgb3toppm.1 -#usr/local/netpbm/man/man1/ppmtowinicon.1 -#usr/local/netpbm/man/man1/pi3topbm.1 -#usr/local/netpbm/man/man1/psidtopgm.1 -#usr/local/netpbm/man/man1/pnmpaste.1 -#usr/local/netpbm/man/man1/ppmtogif.1 -#usr/local/netpbm/man/man1/ppmtoterm.1 -#usr/local/netpbm/man/man1/sgitopnm.1 -#usr/local/netpbm/man/man1/pbmtoepsi.1 -#usr/local/netpbm/man/man1/rawtoppm.1 -#usr/local/netpbm/man/man1/pnmpad.1 -#usr/local/netpbm/man/man1/pnmcomp.1 -#usr/local/netpbm/man/man1/pbmtonokia.1 -#usr/local/netpbm/man/man1/pnmtops.1 -#usr/local/netpbm/man/man1/pamarith.1 -#usr/local/netpbm/man/man1/pamstretch.1 -#usr/local/netpbm/man/man1/pgmbentley.1 -#usr/local/netpbm/man/man1/thinkjettopbm.1 -#usr/local/netpbm/man/man1/pbmtolps.1 -#usr/local/netpbm/man/man1/ximtoppm.1 -#usr/local/netpbm/man/man1/brushtopbm.1 -#usr/local/netpbm/man/man1/ilbmtoppm.1 -#usr/local/netpbm/man/man1/pamgauss.1 -#usr/local/netpbm/man/man1/ppmtoyuv.1 -#usr/local/netpbm/man/man1/pgmcrater.1 -#usr/local/netpbm/man/man1/pbmtomda.1 -#usr/local/netpbm/man/man1/ppmntsc.1 -#usr/local/netpbm/man/man1/pamtotga.1 -#usr/local/netpbm/man/man1/pamfile.1 -#usr/local/netpbm/man/man1/pnmcolormap.1 -#usr/local/netpbm/man/man1/pbmtopi3.1 -#usr/local/netpbm/man/man1/pamsumm.1 -#usr/local/netpbm/man/man1/pnmtofits.1 -#usr/local/netpbm/man/man1/pcxtoppm.1 -#usr/local/netpbm/man/man1/pnmpsnr.1 -#usr/local/netpbm/man/man1/pnmshear.1 -#usr/local/netpbm/man/man1/ppmtoicr.1 -#usr/local/netpbm/man/man1/ppmtv.1 -#usr/local/netpbm/man/man1/pgmramp.1 -#usr/local/netpbm/man/man1/pamditherbw.1 -#usr/local/netpbm/man/man1/ppmhist.1 -#usr/local/netpbm/man/man1/pamseq.1 -#usr/local/netpbm/man/man1/wbmptopbm.1 -#usr/local/netpbm/man/man1/pnmsplit.1 -#usr/local/netpbm/man/man1/pamtohtmltbl.1 -#usr/local/netpbm/man/man1/ppmtoyuvsplit.1 -#usr/local/netpbm/man/man1/pbmtextps.1 -#usr/local/netpbm/man/man1/winicontoppm.1 -#usr/local/netpbm/man/man1/pbmmask.1 -#usr/local/netpbm/man/man1/pnmtorle.1 -#usr/local/netpbm/man/man1/pgmtoppm.1 -#usr/local/netpbm/man/man1/pbmreduce.1 -#usr/local/netpbm/man/man1/giftopnm.1 -#usr/local/netpbm/man/man1/leaftoppm.1 -#usr/local/netpbm/man/man1/pbmtoln03.1 -#usr/local/netpbm/man/man1/pnmtotiff.1 -#usr/local/netpbm/man/man1/pamstereogram.1 -#usr/local/netpbm/man/man1/pamtojpeg2k.1 -#usr/local/netpbm/man/man1/pnmscalefixed.1 -#usr/local/netpbm/man/man1/sirtopnm.1 -#usr/local/netpbm/man/man1/pbmtoxbm.1 -#usr/local/netpbm/man/man1/pamtodjvurle.1 -#usr/local/netpbm/man/man1/spctoppm.1 -#usr/local/netpbm/man/man1/pnmtosgi.1 -#usr/local/netpbm/man/man1/pnmsmooth.1 -#usr/local/netpbm/man/man1/fstopgm.1 -#usr/local/netpbm/man/man1/pbmtoepson.1 -#usr/local/netpbm/man/man1/pbmtoascii.1 -#usr/local/netpbm/man/man1/pnmstitch.1 -#usr/local/netpbm/man/man1/pamtohdiff.1 -#usr/local/netpbm/man/man1/pnmtofiasco.1 -#usr/local/netpbm/man/man1/anytopnm.1 -#usr/local/netpbm/man/man1/pbmtobbnbg.1 -#usr/local/netpbm/man/man1/pnmhistmap.1 -#usr/local/netpbm/man/man1/ppmpat.1 -#usr/local/netpbm/man/man1/pbmpage.1 -#usr/local/netpbm/man/man1/ppmtoeyuv.1 -#usr/local/netpbm/man/man1/gemtopnm.1 -#usr/local/netpbm/man/man1/ppmtopgm.1 -#usr/local/netpbm/man/man1/pamcomp.1 -#usr/local/netpbm/man/man1/pbmtext.1 -#usr/local/netpbm/man/man1/rletopnm.1 -#usr/local/netpbm/man/man1/pnmmontage.1 -#usr/local/netpbm/man/man1/pbmtomgr.1 -#usr/local/netpbm/man/man1/zeisstopnm.1 -#usr/local/netpbm/man/man1/pjtoppm.1 -#usr/local/netpbm/man/man1/pbmtopk.1 -#usr/local/netpbm/man/man1/pamenlarge.1 -#usr/local/netpbm/man/man1/mrftopbm.1 -#usr/local/netpbm/man/man1/eyuvtoppm.1 -#usr/local/netpbm/man/man1/ppmglobe.1 -#usr/local/netpbm/man/man1/pamtopfm.1 -#usr/local/netpbm/man/man1/ppmtoxpm.1 -#usr/local/netpbm/man/man1/ppmtoleaf.1 -#usr/local/netpbm/man/man1/pnmtoddif.1 -#usr/local/netpbm/man/man1/ppmtosixel.1 -#usr/local/netpbm/man/man1/ppmshadow.1 -#usr/local/netpbm/man/man1/pbmtowbmp.1 -#usr/local/netpbm/man/man1/pgmabel.1 -#usr/local/netpbm/man/man1/sbigtopgm.1 -#usr/local/netpbm/man/man1/pbmtoicon.1 -#usr/local/netpbm/man/man1/pamtouil.1 -#usr/local/netpbm/man/man1/pbmtog3.1 -#usr/local/netpbm/man/man1/lispmtopgm.1 -#usr/local/netpbm/man/man1/pbmtomrf.1 -#usr/local/netpbm/man/man1/mdatopbm.1 -#usr/local/netpbm/man/man1/pgmtolispm.1 -#usr/local/netpbm/man/man1/ppmwheel.1 -#usr/local/netpbm/man/man1/pgmkernel.1 -#usr/local/netpbm/man/man1/ppmtopjxl.1 -#usr/local/netpbm/man/man1/g3topbm.1 -#usr/local/netpbm/man/man1/ppmrainbow.1 -#usr/local/netpbm/man/man1/pnminvert.1 -#usr/local/netpbm/man/man1/ppmspread.1 -#usr/local/netpbm/man/man1/pamfunc.1 -#usr/local/netpbm/man/man1/sldtoppm.1 -#usr/local/netpbm/man/man1/pnmremap.1 -#usr/local/netpbm/man/man1/pnmmargin.1 -#usr/local/netpbm/man/man1/pnmindex.1 -#usr/local/netpbm/man/man1/pnmtoxwd.1 -#usr/local/netpbm/man/man1/pnmtosir.1 -#usr/local/netpbm/man/man1/pgmmorphconv.1 -#usr/local/netpbm/man/man1/picttoppm.1 -#usr/local/netpbm/man/man1/pamlookup.1 -#usr/local/netpbm/man/man1/jpeg2ktopam.1 -#usr/local/netpbm/man/man1/mgrtopbm.1 -#usr/local/netpbm/man/man1/ppmquant.1 -#usr/local/netpbm/man/man1/pnmnlfilt.1 -#usr/local/netpbm/man/man1/ppmrough.1 -#usr/local/netpbm/man/man1/pbmtoybm.1 -#usr/local/netpbm/man/man1/spottopgm.1 -#usr/local/netpbm/man/man1/ppmtoppm.1 -#usr/local/netpbm/man/man1/neotoppm.1 -#usr/local/netpbm/man/man1/ppmbrighten.1 -#usr/local/netpbm/man/man1/pnmquant.1 -#usr/local/netpbm/man/man1/pamsummcol.1 -#usr/local/netpbm/man/man1/pamsharpness.1 -#usr/local/netpbm/man/man1/pbmclean.1 -#usr/local/netpbm/man/man1/fiascotopnm.1 -#usr/local/netpbm/man/man1/escp2topbm.1 -#usr/local/netpbm/man/man1/rasttopnm.1 -#usr/local/netpbm/man/man1/pnmscale.1 -#usr/local/netpbm/man/man1/pbmtogem.1 -#usr/local/netpbm/man/man1/pgmnoise.1 -#usr/local/netpbm/man/man1/pamedge.1 -#usr/local/netpbm/man/man1/pnmtile.1 -#usr/local/netpbm/man/man1/pampop9.1 -#usr/local/netpbm/man/man1/ppmlabel.1 -#usr/local/netpbm/man/man1/pamendian.1 -#usr/local/netpbm/man/man1/pamsharpmap.1 -#usr/local/netpbm/man/man1/pnmtopng.1 -#usr/local/netpbm/man/man1/pbmtogo.1 -#usr/local/netpbm/man/man1/ppmquantall.1 -#usr/local/netpbm/man/man1/pnmdepth.1 -#usr/local/netpbm/man/man1/pnmcrop.1 -#usr/local/netpbm/man/man1/atktopbm.1 -#usr/local/netpbm/man/man1/qrttoppm.1 -#usr/local/netpbm/man/man1/xpmtoppm.1 -#usr/local/netpbm/man/man1/xvminitoppm.1 -#usr/local/netpbm/man/man1/pamstretch-gen.1 -#usr/local/netpbm/man/man1/pamoil.1 -#usr/local/netpbm/man/man1/pbmlife.1 -#usr/local/netpbm/man/man1/ppmshift.1 -#usr/local/netpbm/man/man1/rawtopgm.1 -#usr/local/netpbm/man/man1/ppmrelief.1 -#usr/local/netpbm/man/man1/xbmtopbm.1 -#usr/local/netpbm/man/man1/pgmtexture.1 -#usr/local/netpbm/man/man1/pnmrotate.1 -#usr/local/netpbm/man/man1/tifftopnm.1 -#usr/local/netpbm/man/man1/pbmtodjvurle.1 -#usr/local/netpbm/man/man1/pbmtozinc.1 -#usr/local/netpbm/man/man1/tgatoppm.1 -#usr/local/netpbm/man/man1/pamperspective.1 -#usr/local/netpbm/man/man1/pamflip.1 -#usr/local/netpbm/man/man1/yuvtoppm.1 -#usr/local/netpbm/man/man1/pamscale.1 -#usr/local/netpbm/man/man1/ppmdim.1 -#usr/local/netpbm/man/man1/ppmtopi1.1 -#usr/local/netpbm/man/man1/cmuwmtopbm.1 -#usr/local/netpbm/man/man1/ppmtopuzz.1 -#usr/local/netpbm/man/man1/yuvsplittoppm.1 -#usr/local/netpbm/man/man1/pgmenhance.1 -#usr/local/netpbm/man/man1/hdifftopam.1 -#usr/local/netpbm/man/man1/jbigtopnm.1 -#usr/local/netpbm/man/man1/ppmtoarbtxt.1 -#usr/local/netpbm/man/man1/bmptopnm.1 -#usr/local/netpbm/man/man1/pamdice.1 -#usr/local/netpbm/man/man1/pbmtolj.1 -#usr/local/netpbm/man/man1/pbmmake.1 -#usr/local/netpbm/man/man1/pammasksharpen.1 -#usr/local/netpbm/man/man1/pngtopnm.1 -#usr/local/netpbm/man/man1/pnmtoplainpnm.1 -#usr/local/netpbm/man/man1/icontopbm.1 -#usr/local/netpbm/man/man1/pbmtopgm.1 -#usr/local/netpbm/man/man1/pamslice.1 -#usr/local/netpbm/man/man1/manweb.1 -#usr/local/netpbm/man/man1/jpegtopnm.1 -#usr/local/netpbm/man/man1/pnmgamma.1 -#usr/local/netpbm/man/man1/pnmtojpeg.1 -#usr/local/netpbm/man/man1/mtvtoppm.1 -#usr/local/netpbm/man/man1/pamchannel.1 -#usr/local/netpbm/man/man1/pbmtox10bm.1 -#usr/local/netpbm/man/web -#usr/local/netpbm/man/web/netpbm.url -#usr/local/netpbm/man/man5 -#usr/local/netpbm/man/man5/pgm.5 -#usr/local/netpbm/man/man5/pam.5 -#usr/local/netpbm/man/man5/ppm.5 -#usr/local/netpbm/man/man5/pbm.5 -#usr/local/netpbm/man/man5/pnm.5 -#usr/local/netpbm/man/man3 -#usr/local/netpbm/man/man3/libnetpbm.3 -#usr/local/netpbm/pkginfo -#usr/local/netpbm/misc -usr/local/netpbm/misc/pcxstd.ppm -usr/local/netpbm/misc/palmgray2.map -usr/local/netpbm/misc/rgb.txt -usr/local/netpbm/misc/palmcolor8.map -usr/local/netpbm/misc/palmgray1.map -usr/local/netpbm/misc/palmgray4.map -#usr/local/netpbm -#usr/local/netpbm/bin -#usr/local/netpbm/include -#usr/local/netpbm/lib/libnetpbm.so.10 -#usr/local/netpbm/lib/libnetpbm.so.10.26 +usr/lib/libnetpbm.so.10.47 +#usr/share/netpbm +usr/share/netpbm/palmcolor8.map +usr/share/netpbm/palmgray1.map +usr/share/netpbm/palmgray2.map +usr/share/netpbm/palmgray4.map +usr/share/netpbm/pcxstd.ppm +#usr/share/netpbm/rgb.txt diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 82b6aa0..138bf9b 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -49,50 +49,54 @@ $cgiparams{'ACTION'} = ''; $cgiparams{'SECTION'} = 'ipfire';
my %sections = ( - 'ipfire' => '(ipfire: )', - 'red' => '(red:|pppd[.*]: |chat[.*]|pppoe[.*]|pptp[.*]|pppoa[.*]|pppoa3[.*]|pppoeci[.*]|ipppd|ipppd[.*]|kernel: ippp\d|kernel: isdn.*|ibod[.*]|dhcpcd[.*]|modem_run[.*])', - 'ddns' => '(ddns[\d+]:)', - 'dns' => '(dnsmasq[.*]: |unbound[.*]: )', - 'dma' => '(dma[.*]: )', - 'dhcp' => '(dhcpd: )', + 'auth' => '(\w+(pam_unix)[.*]: )', 'clamav' => '(clamd[.*]: |freshclam[.*]: )', 'collectd' => '(collectd[.*]: )', 'cron' => '(fcron[.*]: )', - 'ntp' => '(ntpd(?:ate)?[.*]: )', - 'ssh' => '(sshd(?:(.*))?[.*]: )', - 'auth' => '(\w+(pam_unix)[.*]: )', - 'kernel' => '(kernel: (?!DROP_))', + 'ddns' => '(ddns[\d+]:)', + 'dhcp' => '(dhcpd: )', + 'dma' => '(dma[.*]: )', + 'dnsmasq' => '(dnsmasq[.*]: )', + 'unbound' => '(unbound: [.*:.*])(.*:.*$)', + 'guardian' => '(guardian[.*]: )', + 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto[.*]: |charon: |vpnwatch: )', + 'kernel' => '(kernel: (?!DROP_))', + 'ntp' => '(ntpd(?:ate)?[.*]: )', 'openvpn' => '(openvpnserver[.*]: |.*n2n[.*]: )', - 'pakfire' => '(pakfire:) ', - 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ', - 'squid' => '(squid[.*]: |squid: )', + 'pakfire' => '(pakfire:)', + 'red' => '(red:|pppd[.*]: |chat[.*]|pppoe[.*]|pptp[.*]|pppoa[.*]|pppoa3[.*]|pppoeci[.*]|ipppd|ipppd[.*]|kernel: ippp\d|kernel: isdn.*|ibod[.*]|dhcpcd[.*]|modem_run[.*])', 'snort' => '(snort[.*]: )', - 'guardian' => '(guardian[.*]: )' + 'squid' => '(squid[.*]: |squid: )', + 'ssh' => '(sshd(?:(.*))?[.*]: )', + 'urlfilter bl' => '(installpackage[urlfilter]: )', + 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)' );
# Translations for the %sections array. my %trsections = ( - 'ipfire' => 'IPFire', - 'red' => 'RED', + 'auth' => "$Lang::tr{'loginlogout'}", + 'clamav' => 'ClamAV', + 'collectd' => 'Collectd', + 'cron' => 'Cron', 'ddns' => "$Lang::tr{'dynamic dns'}", - 'dns' => 'DNS', - 'dma' => 'Mail', 'dhcp' => "$Lang::tr{'dhcp server'}", - 'cron' => 'Cron', - 'collectd' => 'Collectd', - 'clamav' => 'ClamAV', - 'ntp' => 'NTP', - 'ssh' => 'SSH', - 'auth' => "$Lang::tr{'loginlogout'}", - 'kernel' => "$Lang::tr{'kernel'}", + 'dma' => 'Mail', + 'dnsmasq' => 'DNS: Dnsmasq', + 'unbound' => 'DNS: Unbound', + 'guardian' => "$Lang::tr{'guardian'}", + 'ipfire' => 'IPFire', 'ipsec' => 'IPSec', + 'kernel' => "$Lang::tr{'kernel'}", + 'ntp' => 'NTP', 'openvpn' => 'OpenVPN', 'pakfire' => 'Pakfire', - 'wireless' => 'Wireless', - 'squid' => "$Lang::tr{'web proxy'}", + 'red' => 'RED', 'snort' => "$Lang::tr{'intrusion detection'}", - 'guardian' => "$Lang::tr{'guardian'}" + 'squid' => "$Lang::tr{'web proxy'}", + 'ssh' => 'SSH', + 'urlfilter bl' => 'URLFilter Blacklist', + 'wireless' => 'Wireless' );
@@ -212,7 +216,7 @@ while ($gzindex >=0 && $loop) { READ:while (<FILE>) { my $line = $_; if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w-]+ ${section}(.*)/) { - # when standart viewing, just keep in memory the correct slice + # when standard viewing, just keep in memory the correct slice # it starts a '$start' and size is $viewport # If export, then keep all lines... if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}){ @@ -223,7 +227,7 @@ while ($gzindex >=0 && $loop) { if (@log > $Header::viewsize) { shift (@log); } - #} else { dont do this optimisation, need to count lines ! + #} else { don't do this optimisation, need to count lines ! # $datetime = $maxtime; # we have read viewsize lines, stop main loop # last READ; # exit read file } @@ -288,7 +292,7 @@ print <<END <select name='SECTION'> END ; -foreach $section (keys %sections) { +foreach $section (sort {$trsections{$a} cmp $trsections{$b}} keys %sections) { print "\t<option "; if ($section eq $cgiparams{'SECTION'}) { print "selected='selected' "; } @@ -369,8 +373,8 @@ print <<END <table width='100%' class='tbl'> <tr> <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></th> - <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th> - <th width='80%'> </th> + <th width='15%' align='center' class='boldbase'><b>$Lang::tr{'section'}</b></th> + <th width='75%'> </th> </tr> END ; diff --git a/lfs/hdparm b/lfs/hdparm index e4e9ac1..6c7dc4d 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -24,7 +24,7 @@
include Config
-VER = 9.48 +VER = 9.50
THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 213efdbe7471fad3408198918e164354 +$(DL_FILE)_MD5 = d380062ad6c4b40076736efbb640f1f5
install : $(TARGET)
diff --git a/lfs/libjpeg b/lfs/libjpeg index 8b4c077..64b227a 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,13 @@
include Config
-VER = 1.3.1 +VER = 1.5.1
THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libjpeg -PAK_VER = ipfire-beta1
############################################################################### # Top-level Rules @@ -42,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 +$(DL_FILE)_MD5 = 55deb139b0cac3c8200b75d485fc13f3
install : $(TARGET)
@@ -72,9 +70,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared - cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-jpeg8 \ + --disable-static\ + --mandir=/usr/share/man cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) + diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat new file mode 100644 index 0000000..4166d52 --- /dev/null +++ b/lfs/libjpeg-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3.1 + +THISAPP = libjpeg-turbo-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libjpeg +PAK_VER = ipfire-beta1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 + +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) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index da13c17..19d2729 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =
-PAK_VER = 72 +PAK_VER = 73 DEPS = ""
KERNEL_ARCH = $(MACHINE) @@ -201,6 +201,14 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0025-Drivers-hv-vmbus-Support-per-channel-driver-state.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-hyperv_Mark_the_Hyoer-V_TSC_as_unstable.patch
+ifneq "$(KCFG)" "-headers" + # fix AES-NI 192 and 256 bits / grsec is needed for this patch version + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch +endif + + # fix CVE-2016-5195 (Dirty COW) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch + # fix empty symbol crc's cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-genksyms_fix_typeof_handling.patch
diff --git a/lfs/netpbm b/lfs/netpbm index ab5e4f8..d6065d4 100644 --- a/lfs/netpbm +++ b/lfs/netpbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 10.26.46 +VER = 10.47.61
THISAPP = netpbm-$(VER) DL_FILE = $(THISAPP).tgz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netpbm -PAK_VER = 1 +PAK_VER = 2
DEPS = ""
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 37a071debfce1dd9596267448f4b56c8 +$(DL_FILE)_MD5 = a5d2ec8acc99f60e5b92a720ed292c3e
install : $(TARGET)
@@ -79,10 +79,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/converter && patch -Np1 < $(DIR_SRC)/src/patches/netpbm-10.26.46-getline.patch - cp $(DIR_SRC)/config/netpbm/Makefile.config $(DIR_APP) + rm -rf /usr/netpbm + cp $(DIR_SRC)/config/netpbm/config.mk $(DIR_APP) cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" - cd $(DIR_APP) && make package PKGDIR=/usr/local/netpbm - cp /usr/local/netpbm/lib/lib* /usr/lib + cd $(DIR_APP) && make package PKGDIR=/usr/netpbm + mkdir -pv /usr/include/netpbm + mkdir -pv /usr/share/netpbm + mv -fv /usr/netpbm/include/netpbm/* /usr/include/netpbm + mv -fv /usr/netpbm/lib/* /usr/lib + mv -fv /usr/netpbm/bin/* /usr/bin + mv -fv /usr/netpbm/misc/* /usr/share/netpbm + rm -Rfv /usr/netpbm/ + cd /usr/lib && ln -sfv libnetpbm.so.10.47 libnetpbm.so @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/squid b/lfs/squid index ae8e1e9..269c663 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 3.5.21 +VER = 3.5.22
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e6745a6e4ac0b48b7283861f64a40ae5 +$(DL_FILE)_MD5 = afb82d2748c06c95815c171463b4aa14
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/texinfo b/lfs/texinfo index 40af8dc..95e244a 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team info@ipfire.org # +# Copyright (C) 2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,12 +24,12 @@
include Config
-VER = 5.2 +VER = 6.3
THISAPP = texinfo-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/texinfo-5.2 +DIR_APP = $(DIR_SRC)/texinfo-6.3
# Normal build or /tools build. # @@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cb489df8a7ee9d10a236197aefdb32c5 +$(DL_FILE)_MD5 = 32baefe5c7080dfb512a4eac5ce67b2a
install : $(TARGET)
diff --git a/make.sh b/make.sh index d4d164e..4b7beb8 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="106" # Core Level (Filename) -PAKFIRE_CORE="106" # Core Level (PAKFIRE) +CORE="107" # Core Level (Filename) +PAKFIRE_CORE="107" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -508,6 +508,7 @@ buildipfire() { ipfiremake libidn ipfiremake nasm ipfiremake libjpeg + ipfiremake libjpeg-compat ipfiremake libexif ipfiremake libpng ipfiremake libtiff diff --git a/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch b/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch new file mode 100644 index 0000000..51b4394 --- /dev/null +++ b/src/patches/linux/0100-crypto-aesni-Add-support-for-192-256-bit-keys-to-AES.patch @@ -0,0 +1,689 @@ +From bcdbd313c0e6fd630a8945fd58dc5383631dc6dd Mon Sep 17 00:00:00 2001 +From: Timothy McCaffrey timothy.mccaffrey@unisys.com +Date: Tue, 13 Jan 2015 13:16:43 -0500 +Subject: [PATCH] crypto: aesni - Add support for 192 & 256 bit keys to AESNI + RFC4106 + +These patches fix the RFC4106 implementation in the aesni-intel +module so it supports 192 & 256 bit keys. + +Since the AVX support that was added to this module also only +supports 128 bit keys, and this patch only affects the SSE +implementation, changes were also made to use the SSE version +if key sizes other than 128 are specified. + +RFC4106 specifies that 192 & 256 bit keys must be supported (section +8.4). + +Also, this should fix Strongswan issue 341 where the aesni module +needs to be unloaded if 256 bit keys are used: + +http://wiki.strongswan.org/issues/341 + +This patch has been tested with Sandy Bridge and Haswell processors. +With 128 bit keys and input buffers > 512 bytes a slight performance +degradation was noticed (~1%). For input buffers of less than 512 +bytes there was no performance impact. Compared to 128 bit keys, +256 bit key size performance is approx. .5 cycles per byte slower +on Sandy Bridge, and .37 cycles per byte slower on Haswell (vs. +SSE code). + +This patch has also been tested with StrongSwan IPSec connections +where it worked correctly. + +I created this diff from a git clone of crypto-2.6.git. + +Any questions, please feel free to contact me. + +Signed-off-by: Timothy McCaffrey timothy.mccaffrey@unisys.com +Signed-off-by: Jarod Wilson jarod@redhat.com +Signed-off-by: Herbert Xu herbert@gondor.apana.org.au +--- + arch/x86/crypto/aesni-intel_asm.S | 342 +++++++++++++++++++------------------ + arch/x86/crypto/aesni-intel_glue.c | 31 +++- + 2 files changed, 202 insertions(+), 171 deletions(-) + +diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S +index c92c7d8..f5cdfbf 100644 +--- a/arch/x86/crypto/aesni-intel_asm.S ++++ b/arch/x86/crypto/aesni-intel_asm.S +@@ -33,12 +33,23 @@ + #include <asm/inst.h> + #include <asm/alternative-asm.h> + ++/* ++ * The following macros are used to move an (un)aligned 16 byte value to/from ++ * an XMM register. This can done for either FP or integer values, for FP use ++ * movaps (move aligned packed single) or integer use movdqa (move double quad ++ * aligned). It doesn't make a performance difference which instruction is used ++ * since Nehalem (original Core i7) was released. However, the movaps is a byte ++ * shorter, so that is the one we'll use for now. (same for unaligned). ++ */ ++#define MOVADQ movaps ++#define MOVUDQ movups ++ + #ifdef __x86_64__ ++ + .data + .align 16 + .Lgf128mul_x_ble_mask: + .octa 0x00000000000000010000000000000087 +- + POLY: .octa 0xC2000000000000000000000000000001 + TWOONE: .octa 0x00000001000000000000000000000001 + +@@ -90,6 +101,7 @@ enc: .octa 0x2 + #define arg8 STACK_OFFSET+16(%r14) + #define arg9 STACK_OFFSET+24(%r14) + #define arg10 STACK_OFFSET+32(%r14) ++#define keysize 2*15*16(%arg1) + #endif + + +@@ -214,10 +226,12 @@ enc: .octa 0x2 + + .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \ + XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation ++ MOVADQ SHUF_MASK(%rip), %xmm14 + mov arg7, %r10 # %r10 = AAD + mov arg8, %r15 # %r15 = aadLen + mov %r15, %r11 + pxor %xmm\i, %xmm\i ++ + _get_AAD_loop\num_initial_blocks\operation: + movd (%r10), \TMP1 + pslldq $12, \TMP1 +@@ -226,6 +240,7 @@ _get_AAD_loop\num_initial_blocks\operation: + add $4, %r10 + sub $4, %r15 + jne _get_AAD_loop\num_initial_blocks\operation ++ + cmp $16, %r11 + je _get_AAD_loop2_done\num_initial_blocks\operation + mov $16, %r15 +@@ -234,8 +249,8 @@ _get_AAD_loop2\num_initial_blocks\operation: + sub $4, %r15 + cmp %r11, %r15 + jne _get_AAD_loop2\num_initial_blocks\operation ++ + _get_AAD_loop2_done\num_initial_blocks\operation: +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data + + xor %r11, %r11 # initialise the data pointer offset as zero +@@ -244,59 +259,34 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + + mov %arg5, %rax # %rax = *Y0 + movdqu (%rax), \XMM0 # XMM0 = Y0 +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM0 + + .if (\i == 5) || (\i == 6) || (\i == 7) ++ MOVADQ ONE(%RIP),\TMP1 ++ MOVADQ (%arg1),\TMP2 + .irpc index, \i_seq +- paddd ONE(%rip), \XMM0 # INCR Y0 ++ paddd \TMP1, \XMM0 # INCR Y0 + movdqa \XMM0, %xmm\index +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, %xmm\index # perform a 16 byte swap +- +-.endr +-.irpc index, \i_seq +- pxor 16*0(%arg1), %xmm\index +-.endr +-.irpc index, \i_seq +- movaps 0x10(%rdi), \TMP1 +- AESENC \TMP1, %xmm\index # Round 1 +-.endr +-.irpc index, \i_seq +- movaps 0x20(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 ++ pxor \TMP2, %xmm\index + .endr +-.irpc index, \i_seq +- movaps 0x30(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x40(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x50(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x60(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x70(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x80(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x90(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 ++ lea 0x10(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ add $5,%eax # 128->9, 192->11, 256->13 ++ ++aes_loop_initial_dec\num_initial_blocks: ++ MOVADQ (%r10),\TMP1 ++.irpc index, \i_seq ++ AESENC \TMP1, %xmm\index + .endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_initial_dec\num_initial_blocks ++ ++ MOVADQ (%r10), \TMP1 + .irpc index, \i_seq +- movaps 0xa0(%arg1), \TMP1 +- AESENCLAST \TMP1, %xmm\index # Round 10 ++ AESENCLAST \TMP1, %xmm\index # Last Round + .endr + .irpc index, \i_seq + movdqu (%arg3 , %r11, 1), \TMP1 +@@ -306,10 +296,8 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + add $16, %r11 + + movdqa \TMP1, %xmm\index +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, %xmm\index +- +- # prepare plaintext/ciphertext for GHASH computation ++ # prepare plaintext/ciphertext for GHASH computation + .endr + .endif + GHASH_MUL %xmm\i, \TMP3, \TMP1, \TMP2, \TMP4, \TMP5, \XMM1 +@@ -339,30 +327,28 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + * Precomputations for HashKey parallel with encryption of first 4 blocks. + * Haskey_i_k holds XORed values of the low and high parts of the Haskey_i + */ +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM1 +- movdqa SHUF_MASK(%rip), %xmm14 ++ MOVADQ ONE(%rip), \TMP1 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM1 + PSHUFB_XMM %xmm14, \XMM1 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM2 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM2 + PSHUFB_XMM %xmm14, \XMM2 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM3 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM3 + PSHUFB_XMM %xmm14, \XMM3 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM4 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM4 + PSHUFB_XMM %xmm14, \XMM4 # perform a 16 byte swap + +- pxor 16*0(%arg1), \XMM1 +- pxor 16*0(%arg1), \XMM2 +- pxor 16*0(%arg1), \XMM3 +- pxor 16*0(%arg1), \XMM4 ++ MOVADQ 0(%arg1),\TMP1 ++ pxor \TMP1, \XMM1 ++ pxor \TMP1, \XMM2 ++ pxor \TMP1, \XMM3 ++ pxor \TMP1, \XMM4 + movdqa \TMP3, \TMP5 + pshufd $78, \TMP3, \TMP1 + pxor \TMP3, \TMP1 +@@ -400,7 +386,23 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + pshufd $78, \TMP5, \TMP1 + pxor \TMP5, \TMP1 + movdqa \TMP1, HashKey_4_k(%rsp) +- movaps 0xa0(%arg1), \TMP2 ++ lea 0xa0(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ sub $4,%eax # 128->0, 192->2, 256->4 ++ jz aes_loop_pre_dec_done\num_initial_blocks ++ ++aes_loop_pre_dec\num_initial_blocks: ++ MOVADQ (%r10),\TMP2 ++.irpc index, 1234 ++ AESENC \TMP2, %xmm\index ++.endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_pre_dec\num_initial_blocks ++ ++aes_loop_pre_dec_done\num_initial_blocks: ++ MOVADQ (%r10), \TMP2 + AESENCLAST \TMP2, \XMM1 + AESENCLAST \TMP2, \XMM2 + AESENCLAST \TMP2, \XMM3 +@@ -422,15 +424,11 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + movdqu \XMM4, 16*3(%arg2 , %r11 , 1) + movdqa \TMP1, \XMM4 + add $64, %r11 +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM1 # perform a 16 byte swap + pxor \XMMDst, \XMM1 + # combine GHASHed value with the corresponding ciphertext +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM2 # perform a 16 byte swap +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM3 # perform a 16 byte swap +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM4 # perform a 16 byte swap + + _initial_blocks_done\num_initial_blocks\operation: +@@ -452,6 +450,7 @@ _initial_blocks_done\num_initial_blocks\operation: + + .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \ + XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation ++ MOVADQ SHUF_MASK(%rip), %xmm14 + mov arg7, %r10 # %r10 = AAD + mov arg8, %r15 # %r15 = aadLen + mov %r15, %r11 +@@ -473,7 +472,6 @@ _get_AAD_loop2\num_initial_blocks\operation: + cmp %r11, %r15 + jne _get_AAD_loop2\num_initial_blocks\operation + _get_AAD_loop2_done\num_initial_blocks\operation: +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data + + xor %r11, %r11 # initialise the data pointer offset as zero +@@ -482,59 +480,35 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + + mov %arg5, %rax # %rax = *Y0 + movdqu (%rax), \XMM0 # XMM0 = Y0 +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM0 + + .if (\i == 5) || (\i == 6) || (\i == 7) +-.irpc index, \i_seq +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, %xmm\index +- movdqa SHUF_MASK(%rip), %xmm14 +- PSHUFB_XMM %xmm14, %xmm\index # perform a 16 byte swap + +-.endr +-.irpc index, \i_seq +- pxor 16*0(%arg1), %xmm\index +-.endr +-.irpc index, \i_seq +- movaps 0x10(%rdi), \TMP1 +- AESENC \TMP1, %xmm\index # Round 1 +-.endr +-.irpc index, \i_seq +- movaps 0x20(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr ++ MOVADQ ONE(%RIP),\TMP1 ++ MOVADQ 0(%arg1),\TMP2 + .irpc index, \i_seq +- movaps 0x30(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, %xmm\index ++ PSHUFB_XMM %xmm14, %xmm\index # perform a 16 byte swap ++ pxor \TMP2, %xmm\index + .endr +-.irpc index, \i_seq +- movaps 0x40(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x50(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x60(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x70(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x80(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 +-.endr +-.irpc index, \i_seq +- movaps 0x90(%arg1), \TMP1 +- AESENC \TMP1, %xmm\index # Round 2 ++ lea 0x10(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ add $5,%eax # 128->9, 192->11, 256->13 ++ ++aes_loop_initial_enc\num_initial_blocks: ++ MOVADQ (%r10),\TMP1 ++.irpc index, \i_seq ++ AESENC \TMP1, %xmm\index + .endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_initial_enc\num_initial_blocks ++ ++ MOVADQ (%r10), \TMP1 + .irpc index, \i_seq +- movaps 0xa0(%arg1), \TMP1 +- AESENCLAST \TMP1, %xmm\index # Round 10 ++ AESENCLAST \TMP1, %xmm\index # Last Round + .endr + .irpc index, \i_seq + movdqu (%arg3 , %r11, 1), \TMP1 +@@ -542,8 +516,6 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + movdqu %xmm\index, (%arg2 , %r11, 1) + # write back plaintext/ciphertext for num_initial_blocks + add $16, %r11 +- +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, %xmm\index + + # prepare plaintext/ciphertext for GHASH computation +@@ -576,30 +548,28 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + * Precomputations for HashKey parallel with encryption of first 4 blocks. + * Haskey_i_k holds XORed values of the low and high parts of the Haskey_i + */ +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM1 +- movdqa SHUF_MASK(%rip), %xmm14 ++ MOVADQ ONE(%RIP),\TMP1 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM1 + PSHUFB_XMM %xmm14, \XMM1 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM2 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM2 + PSHUFB_XMM %xmm14, \XMM2 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM3 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM3 + PSHUFB_XMM %xmm14, \XMM3 # perform a 16 byte swap + +- paddd ONE(%rip), \XMM0 # INCR Y0 +- movdqa \XMM0, \XMM4 +- movdqa SHUF_MASK(%rip), %xmm14 ++ paddd \TMP1, \XMM0 # INCR Y0 ++ MOVADQ \XMM0, \XMM4 + PSHUFB_XMM %xmm14, \XMM4 # perform a 16 byte swap + +- pxor 16*0(%arg1), \XMM1 +- pxor 16*0(%arg1), \XMM2 +- pxor 16*0(%arg1), \XMM3 +- pxor 16*0(%arg1), \XMM4 ++ MOVADQ 0(%arg1),\TMP1 ++ pxor \TMP1, \XMM1 ++ pxor \TMP1, \XMM2 ++ pxor \TMP1, \XMM3 ++ pxor \TMP1, \XMM4 + movdqa \TMP3, \TMP5 + pshufd $78, \TMP3, \TMP1 + pxor \TMP3, \TMP1 +@@ -637,7 +607,23 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + pshufd $78, \TMP5, \TMP1 + pxor \TMP5, \TMP1 + movdqa \TMP1, HashKey_4_k(%rsp) +- movaps 0xa0(%arg1), \TMP2 ++ lea 0xa0(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ sub $4,%eax # 128->0, 192->2, 256->4 ++ jz aes_loop_pre_enc_done\num_initial_blocks ++ ++aes_loop_pre_enc\num_initial_blocks: ++ MOVADQ (%r10),\TMP2 ++.irpc index, 1234 ++ AESENC \TMP2, %xmm\index ++.endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_pre_enc\num_initial_blocks ++ ++aes_loop_pre_enc_done\num_initial_blocks: ++ MOVADQ (%r10), \TMP2 + AESENCLAST \TMP2, \XMM1 + AESENCLAST \TMP2, \XMM2 + AESENCLAST \TMP2, \XMM3 +@@ -656,15 +642,11 @@ _get_AAD_loop2_done\num_initial_blocks\operation: + movdqu \XMM4, 16*3(%arg2 , %r11 , 1) + + add $64, %r11 +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM1 # perform a 16 byte swap + pxor \XMMDst, \XMM1 + # combine GHASHed value with the corresponding ciphertext +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM2 # perform a 16 byte swap +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM3 # perform a 16 byte swap +- movdqa SHUF_MASK(%rip), %xmm14 + PSHUFB_XMM %xmm14, \XMM4 # perform a 16 byte swap + + _initial_blocks_done\num_initial_blocks\operation: +@@ -795,7 +777,23 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation + AESENC \TMP3, \XMM3 + AESENC \TMP3, \XMM4 + PCLMULQDQ 0x00, \TMP5, \XMM8 # XMM8 = a0*b0 +- movaps 0xa0(%arg1), \TMP3 ++ lea 0xa0(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ sub $4,%eax # 128->0, 192->2, 256->4 ++ jz aes_loop_par_enc_done ++ ++aes_loop_par_enc: ++ MOVADQ (%r10),\TMP3 ++.irpc index, 1234 ++ AESENC \TMP3, %xmm\index ++.endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_par_enc ++ ++aes_loop_par_enc_done: ++ MOVADQ (%r10), \TMP3 + AESENCLAST \TMP3, \XMM1 # Round 10 + AESENCLAST \TMP3, \XMM2 + AESENCLAST \TMP3, \XMM3 +@@ -987,8 +985,24 @@ TMP6 XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 XMM8 operation + AESENC \TMP3, \XMM3 + AESENC \TMP3, \XMM4 + PCLMULQDQ 0x00, \TMP5, \XMM8 # XMM8 = a0*b0 +- movaps 0xa0(%arg1), \TMP3 +- AESENCLAST \TMP3, \XMM1 # Round 10 ++ lea 0xa0(%arg1),%r10 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ sub $4,%eax # 128->0, 192->2, 256->4 ++ jz aes_loop_par_dec_done ++ ++aes_loop_par_dec: ++ MOVADQ (%r10),\TMP3 ++.irpc index, 1234 ++ AESENC \TMP3, %xmm\index ++.endr ++ add $16,%r10 ++ sub $1,%eax ++ jnz aes_loop_par_dec ++ ++aes_loop_par_dec_done: ++ MOVADQ (%r10), \TMP3 ++ AESENCLAST \TMP3, \XMM1 # last round + AESENCLAST \TMP3, \XMM2 + AESENCLAST \TMP3, \XMM3 + AESENCLAST \TMP3, \XMM4 +@@ -1156,33 +1170,29 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst + pxor \TMP6, \XMMDst # reduced result is in XMMDst + .endm + +-/* Encryption of a single block done*/ +-.macro ENCRYPT_SINGLE_BLOCK XMM0 TMP1 + +- pxor (%arg1), \XMM0 +- movaps 16(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 32(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 48(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 64(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 80(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 96(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 112(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 128(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 144(%arg1), \TMP1 +- AESENC \TMP1, \XMM0 +- movaps 160(%arg1), \TMP1 +- AESENCLAST \TMP1, \XMM0 +-.endm ++/* Encryption of a single block ++* uses eax & r10 ++*/ + ++.macro ENCRYPT_SINGLE_BLOCK XMM0 TMP1 + ++ pxor (%arg1), \XMM0 ++ mov keysize,%eax ++ shr $2,%eax # 128->4, 192->6, 256->8 ++ add $5,%eax # 128->9, 192->11, 256->13 ++ lea 16(%arg1), %r10 # get first expanded key address ++ ++_esb_loop_@: ++ MOVADQ (%r10),\TMP1 ++ AESENC \TMP1,\XMM0 ++ add $16,%r10 ++ sub $1,%eax ++ jnz _esb_loop_@ ++ ++ MOVADQ (%r10),\TMP1 ++ AESENCLAST \TMP1,\XMM0 ++.endm + /***************************************************************************** + * void aesni_gcm_dec(void *aes_ctx, // AES Key schedule. Starts on a 16 byte boundary. + * u8 *out, // Plaintext output. Encrypt in-place is allowed. +diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c +index 6d4faba..bfaf817 100644 +--- a/arch/x86/crypto/aesni-intel_glue.c ++++ b/arch/x86/crypto/aesni-intel_glue.c +@@ -177,7 +177,8 @@ static void aesni_gcm_enc_avx(void *ctx, u8 *out, + u8 *hash_subkey, const u8 *aad, unsigned long aad_len, + u8 *auth_tag, unsigned long auth_tag_len) + { +- if (plaintext_len < AVX_GEN2_OPTSIZE) { ++ struct crypto_aes_ctx *aes_ctx = (struct crypto_aes_ctx*)ctx; ++ if ((plaintext_len < AVX_GEN2_OPTSIZE) || (aes_ctx-> key_length != AES_KEYSIZE_128)){ + aesni_gcm_enc(ctx, out, in, plaintext_len, iv, hash_subkey, aad, + aad_len, auth_tag, auth_tag_len); + } else { +@@ -192,7 +193,8 @@ static void aesni_gcm_dec_avx(void *ctx, u8 *out, + u8 *hash_subkey, const u8 *aad, unsigned long aad_len, + u8 *auth_tag, unsigned long auth_tag_len) + { +- if (ciphertext_len < AVX_GEN2_OPTSIZE) { ++ struct crypto_aes_ctx *aes_ctx = (struct crypto_aes_ctx*)ctx; ++ if ((ciphertext_len < AVX_GEN2_OPTSIZE) || (aes_ctx-> key_length != AES_KEYSIZE_128)) { + aesni_gcm_dec(ctx, out, in, ciphertext_len, iv, hash_subkey, aad, + aad_len, auth_tag, auth_tag_len); + } else { +@@ -226,7 +228,8 @@ static void aesni_gcm_enc_avx2(void *ctx, u8 *out, + u8 *hash_subkey, const u8 *aad, unsigned long aad_len, + u8 *auth_tag, unsigned long auth_tag_len) + { +- if (plaintext_len < AVX_GEN2_OPTSIZE) { ++ struct crypto_aes_ctx *aes_ctx = (struct crypto_aes_ctx*)ctx; ++ if ((plaintext_len < AVX_GEN2_OPTSIZE) || (aes_ctx-> key_length != AES_KEYSIZE_128)) { + aesni_gcm_enc(ctx, out, in, plaintext_len, iv, hash_subkey, aad, + aad_len, auth_tag, auth_tag_len); + } else if (plaintext_len < AVX_GEN4_OPTSIZE) { +@@ -245,7 +248,8 @@ static void aesni_gcm_dec_avx2(void *ctx, u8 *out, + u8 *hash_subkey, const u8 *aad, unsigned long aad_len, + u8 *auth_tag, unsigned long auth_tag_len) + { +- if (ciphertext_len < AVX_GEN2_OPTSIZE) { ++ struct crypto_aes_ctx *aes_ctx = (struct crypto_aes_ctx*)ctx; ++ if ((ciphertext_len < AVX_GEN2_OPTSIZE) || (aes_ctx-> key_length != AES_KEYSIZE_128)) { + aesni_gcm_dec(ctx, out, in, ciphertext_len, iv, hash_subkey, + aad, aad_len, auth_tag, auth_tag_len); + } else if (ciphertext_len < AVX_GEN4_OPTSIZE) { +@@ -878,7 +882,8 @@ static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key, + } + /*Account for 4 byte nonce at the end.*/ + key_len -= 4; +- if (key_len != AES_KEYSIZE_128) { ++ if (key_len != AES_KEYSIZE_128 && key_len != AES_KEYSIZE_192 && ++ key_len != AES_KEYSIZE_256) { + crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); + return -EINVAL; + } +@@ -989,6 +994,7 @@ static int __driver_rfc4106_encrypt(struct aead_request *req) + __be32 counter = cpu_to_be32(1); + struct crypto_aead *tfm = crypto_aead_reqtfm(req); + struct aesni_rfc4106_gcm_ctx *ctx = aesni_rfc4106_gcm_ctx_get(tfm); ++ u32 key_len = ctx->aes_key_expanded.key_length; + void *aes_ctx = &(ctx->aes_key_expanded); + unsigned long auth_tag_len = crypto_aead_authsize(tfm); + u8 iv_tab[16+AESNI_ALIGN]; +@@ -1003,6 +1009,13 @@ static int __driver_rfc4106_encrypt(struct aead_request *req) + /* to 8 or 12 bytes */ + if (unlikely(req->assoclen != 8 && req->assoclen != 12)) + return -EINVAL; ++ if (unlikely(auth_tag_len != 8 && auth_tag_len != 12 && auth_tag_len != 16)) ++ return -EINVAL; ++ if (unlikely(key_len != AES_KEYSIZE_128 && ++ key_len != AES_KEYSIZE_192 && ++ key_len != AES_KEYSIZE_256)) ++ return -EINVAL; ++ + /* IV below built */ + for (i = 0; i < 4; i++) + *(iv+i) = ctx->nonce[i]; +@@ -1067,6 +1080,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) + int retval = 0; + struct crypto_aead *tfm = crypto_aead_reqtfm(req); + struct aesni_rfc4106_gcm_ctx *ctx = aesni_rfc4106_gcm_ctx_get(tfm); ++ u32 key_len = ctx->aes_key_expanded.key_length; + void *aes_ctx = &(ctx->aes_key_expanded); + unsigned long auth_tag_len = crypto_aead_authsize(tfm); + u8 iv_and_authTag[32+AESNI_ALIGN]; +@@ -1080,6 +1094,13 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) + if (unlikely((req->cryptlen < auth_tag_len) || + (req->assoclen != 8 && req->assoclen != 12))) + return -EINVAL; ++ if (unlikely(auth_tag_len != 8 && auth_tag_len != 12 && auth_tag_len != 16)) ++ return -EINVAL; ++ if (unlikely(key_len != AES_KEYSIZE_128 && ++ key_len != AES_KEYSIZE_192 && ++ key_len != AES_KEYSIZE_256)) ++ return -EINVAL; ++ + /* Assuming we are supporting rfc4106 64-bit extended */ + /* sequence numbers We need to have the AAD length */ + /* equal to 8 or 12 bytes */ +-- +2.7.4 + diff --git a/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch b/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch new file mode 100644 index 0000000..a47f080 --- /dev/null +++ b/src/patches/linux/0110-mm-remove-gup_flags-FOLL_WRITE-games-from-__get_user.patch @@ -0,0 +1,96 @@ +From a289eb38cfb481de48e36b481c72fb2492c6d242 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds torvalds@linux-foundation.org +Date: Thu, 13 Oct 2016 13:07:36 -0700 +Subject: [PATCH] mm: remove gup_flags FOLL_WRITE games from __get_user_pages() + +commit 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619 upstream. + +This is an ancient bug that was actually attempted to be fixed once +(badly) by me eleven years ago in commit 4ceb5db9757a ("Fix +get_user_pages() race for write access") but that was then undone due to +problems on s390 by commit f33ea7f404e5 ("fix get_user_pages bug"). + +In the meantime, the s390 situation has long been fixed, and we can now +fix it by checking the pte_dirty() bit properly (and do it better). The +s390 dirty bit was implemented in abf09bed3cce ("s390/mm: implement +software dirty bits") which made it into v3.9. Earlier kernels will +have to look at the page state itself. + +Also, the VM has become more scalable, and what used a purely +theoretical race back then has become easier to trigger. + +To fix it, we introduce a new internal FOLL_COW flag to mark the "yes, +we already did a COW" rather than play racy games with FOLL_WRITE that +is very fundamental, and then use the pte dirty flag to validate that +the FOLL_COW flag is still valid. + +Reported-and-tested-by: Phil "not Paul" Oester kernel@linuxace.com +Acked-by: Hugh Dickins hughd@google.com +Reviewed-by: Michal Hocko mhocko@suse.com +Cc: Andy Lutomirski luto@kernel.org +Cc: Kees Cook keescook@chromium.org +Cc: Oleg Nesterov oleg@redhat.com +Cc: Willy Tarreau w@1wt.eu +Cc: Nick Piggin npiggin@gmail.com +Cc: Greg Thelen gthelen@google.com +Signed-off-by: Linus Torvalds torvalds@linux-foundation.org +Signed-off-by: Jiri Slaby jslaby@suse.cz +--- + include/linux/mm.h | 1 + + mm/memory.c | 14 ++++++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/include/linux/mm.h b/include/linux/mm.h +index 5aef73c..6f56355 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -1964,6 +1964,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma, + #define FOLL_HWPOISON 0x100 /* check page is hwpoisoned */ + #define FOLL_NUMA 0x200 /* force NUMA hinting page fault */ + #define FOLL_MIGRATION 0x400 /* wait for page to replace migration entry */ ++#define FOLL_COW 0x4000 /* internal GUP flag */ + + typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, + void *data); +diff --git a/mm/memory.c b/mm/memory.c +index e9f4d40..5c1df12 100644 +--- a/mm/memory.c ++++ b/mm/memory.c +@@ -1449,6 +1449,16 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, + } + EXPORT_SYMBOL_GPL(zap_vma_ptes); + ++/* ++ * FOLL_FORCE can write to even unwritable pte's, but only ++ * after we've gone through a COW cycle and they are dirty. ++ */ ++static inline bool can_follow_write_pte(pte_t pte, unsigned int flags) ++{ ++ return pte_write(pte) || ++ ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte)); ++} ++ + /** + * follow_page_mask - look up a page descriptor from a user-virtual address + * @vma: vm_area_struct mapping @address +@@ -1569,7 +1579,7 @@ split_fallthrough: + } + if ((flags & FOLL_NUMA) && pte_numa(pte)) + goto no_page; +- if ((flags & FOLL_WRITE) && !pte_write(pte)) ++ if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) + goto unlock; + + page = vm_normal_page(vma, address, pte); +@@ -1866,7 +1876,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, + */ + if ((ret & VM_FAULT_WRITE) && + !(vma->vm_flags & VM_WRITE)) +- foll_flags &= ~FOLL_WRITE; ++ foll_flags |= FOLL_COW; + + cond_resched(); + } +-- +2.7.4 + diff --git a/src/patches/squid-3.5.21-fix-max-file-descriptors.patch b/src/patches/squid-3.5.21-fix-max-file-descriptors.patch deleted file mode 100644 index b740b61..0000000 --- a/src/patches/squid-3.5.21-fix-max-file-descriptors.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- configure.ac.~ Wed Apr 20 14:26:07 2016 -+++ configure.ac Fri Apr 22 17:20:46 2016 -@@ -3135,6 +3135,9 @@ - ;; - esac - -+SQUID_CHECK_DEFAULT_FD_SETSIZE -+SQUID_CHECK_MAXFD -+ - dnl --with-maxfd present for compatibility with Squid-2. - dnl undocumented in ./configure --help to encourage using the Squid-3 directive - AC_ARG_WITH(maxfd,, -@@ -3165,8 +3168,6 @@ - esac - ]) - --SQUID_CHECK_DEFAULT_FD_SETSIZE --SQUID_CHECK_MAXFD - if test "x$squid_filedescriptors_num" != "x"; then - AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) - fi diff --git a/src/patches/squid-3.5.22-fix-max-file-descriptors.patch b/src/patches/squid-3.5.22-fix-max-file-descriptors.patch new file mode 100644 index 0000000..b740b61 --- /dev/null +++ b/src/patches/squid-3.5.22-fix-max-file-descriptors.patch @@ -0,0 +1,21 @@ +--- configure.ac.~ Wed Apr 20 14:26:07 2016 ++++ configure.ac Fri Apr 22 17:20:46 2016 +@@ -3135,6 +3135,9 @@ + ;; + esac + ++SQUID_CHECK_DEFAULT_FD_SETSIZE ++SQUID_CHECK_MAXFD ++ + dnl --with-maxfd present for compatibility with Squid-2. + dnl undocumented in ./configure --help to encourage using the Squid-3 directive + AC_ARG_WITH(maxfd,, +@@ -3165,8 +3168,6 @@ + esac + ]) + +-SQUID_CHECK_DEFAULT_FD_SETSIZE +-SQUID_CHECK_MAXFD + if test "x$squid_filedescriptors_num" != "x"; then + AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) + fi
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org