IPFire-SCM October 2016

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core107, created. f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104
by git＠ipfire.org 31 Oct '16

31 Oct '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104
by git＠ipfire.org 31 Oct '16

31 Oct '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f95b8b9f7b094b1f3e7f37b000dc26a9ac7a6104
by git＠ipfire.org 31 Oct '16

31 Oct '16

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(a)ipfire.org> Date: Mon Oct 31 21:31:09 2016 +0100 set pakfire version to 107 Signed-off-by: Arne Fitzenreiter <arne_f(a)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(a)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(a)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(a)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(a)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(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,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(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,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(a)ipfire.org> # +# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,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(a)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(a)unisys.com> +Signed-off-by: Jarod Wilson <jarod(a)redhat.com> +Signed-off-by: Herbert Xu <herbert(a)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(a)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(a)linuxace.com> +Acked-by: Hugh Dickins <hughd(a)google.com> +Reviewed-by: Michal Hocko <mhocko(a)suse.com> +Cc: Andy Lutomirski <luto(a)kernel.org> +Cc: Kees Cook <keescook(a)chromium.org> +Cc: Oleg Nesterov <oleg(a)redhat.com> +Cc: Willy Tarreau <w(a)1wt.eu> +Cc: Nick Piggin <npiggin(a)gmail.com> +Cc: Greg Thelen <gthelen(a)google.com> +Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> +Signed-off-by: Jiri Slaby <jslaby(a)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

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.19-core106, created. 2dfb5ee7869774a1541fca19bda135ea63eae0b4
by git＠ipfire.org 31 Oct '16

31 Oct '16

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 tag, v2.19-core106 has been created at 2dfb5ee7869774a1541fca19bda135ea63eae0b4 (commit) - Log ----------------------------------------------------------------- commit 2dfb5ee7869774a1541fca19bda135ea63eae0b4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 26 19:18:40 2016 +0200 core106: add language files to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a620945275c8be281f4e4b014328290c2a558160
by git＠ipfire.org 28 Oct '16

28 Oct '16

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. eebef710c18f323aeb16df70c664007211c6f9e2
by git＠ipfire.org 28 Oct '16

28 Oct '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 38183e52dd438dbe0bb204d4601e902fb6cf0af5
by git＠ipfire.org 27 Oct '16

27 Oct '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 38183e52dd438dbe0bb204d4601e902fb6cf0af5 (commit) from 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 (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 38183e52dd438dbe0bb204d4601e902fb6cf0af5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 27 21:06:16 2016 +0200 start core107 updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{106 => 107}/exclude | 1 + .../{oldcore/95 => core/107}/filelists/armv5tel/linux-kirkwood | 0 .../{oldcore/95 => core/107}/filelists/armv5tel/linux-multi | 0 .../{oldcore/95 => core/107}/filelists/armv5tel/linux-rpi | 0 config/rootfiles/core/107/filelists/files | 5 +++++ config/rootfiles/{oldcore/94 => core/107}/filelists/hdparm | 0 config/rootfiles/{oldcore/95 => core/107}/filelists/i586/linux | 0 config/rootfiles/{oldcore/90 => core/107}/filelists/libjpeg | 0 config/rootfiles/core/107/filelists/libjpeg-compat | 1 + config/rootfiles/core/{106 => 107}/filelists/squid | 0 config/rootfiles/{oldcore/95 => core/107}/filelists/x86_64/linux | 0 config/rootfiles/core/{106 => 107}/meta | 0 config/rootfiles/{oldcore/104 => core/107}/update.sh | 7 +------ config/rootfiles/{core => oldcore}/106/exclude | 0 config/rootfiles/{core => oldcore}/106/filelists/attr | 0 config/rootfiles/{core => oldcore}/106/filelists/diffutils | 0 config/rootfiles/{core => oldcore}/106/filelists/ed | 0 config/rootfiles/{core => oldcore}/106/filelists/expat | 0 config/rootfiles/{core => oldcore}/106/filelists/file | 0 config/rootfiles/{core => oldcore}/106/filelists/files | 0 config/rootfiles/{core => oldcore}/106/filelists/flex | 0 config/rootfiles/{core => oldcore}/106/filelists/gawk | 0 config/rootfiles/{core => oldcore}/106/filelists/gettext | 0 config/rootfiles/{core => oldcore}/106/filelists/gnupg | 0 config/rootfiles/{core => oldcore}/106/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/106/filelists/i586/strongswan-padlock | 0 config/rootfiles/{core => oldcore}/106/filelists/iproute2 | 0 config/rootfiles/{core => oldcore}/106/filelists/ipset | 0 config/rootfiles/{core => oldcore}/106/filelists/libgpg-error | 0 config/rootfiles/{core => oldcore}/106/filelists/libidn | 0 config/rootfiles/{core => oldcore}/106/filelists/libmnl | 0 .../{core => oldcore}/106/filelists/libnetfilter_conntrack | 0 config/rootfiles/{core => oldcore}/106/filelists/misc-progs | 0 config/rootfiles/{core => oldcore}/106/filelists/mt7601u-firmware | 0 config/rootfiles/{core => oldcore}/106/filelists/openssl | 0 config/rootfiles/{core => oldcore}/106/filelists/python-daemon | 0 config/rootfiles/{core => oldcore}/106/filelists/python-docutils | 0 config/rootfiles/{core => oldcore}/106/filelists/python-inotify | 0 config/rootfiles/{core => oldcore}/106/filelists/python-ipaddress | 0 config/rootfiles/{core => oldcore}/106/filelists/smartmontools | 0 config/rootfiles/oldcore/{94 => 106}/filelists/squid | 0 config/rootfiles/{core => oldcore}/106/filelists/strongswan | 0 config/rootfiles/{core => oldcore}/106/filelists/unbound | 0 config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch | 0 .../rootfiles/{core => oldcore}/106/filelists/usb_modeswitch_data | 0 config/rootfiles/oldcore/{99 => 106}/meta | 0 config/rootfiles/{core => oldcore}/106/update.sh | 0 make.sh | 2 +- 48 files changed, 9 insertions(+), 7 deletions(-) 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%) Difference in files: 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(a)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(a)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(a)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/make.sh b/make.sh index e30c075..d2e32ab 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="106" # Core Level (Filename) +CORE="107" # Core Level (Filename) PAKFIRE_CORE="106" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a3b04653dc27b4d24b59a65c2ef5a94d9f5eb854
by git＠ipfire.org 27 Oct '16

27 Oct '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via a3b04653dc27b4d24b59a65c2ef5a94d9f5eb854 (commit) via 501028b5582d04979522170329f5185beffc4303 (commit) via b8b4576449f20282f2fdb9a43fc18a19a038bdc0 (commit) from 8db6df934338535beafaca34cc7a268f421c4397 (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 a3b04653dc27b4d24b59a65c2ef5a94d9f5eb854 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 27 09:57:46 2016 +0100 gcc: Default to DWARF4 for debugging info GCC already defaults to DWARF4, so this block that changes defaults is not required any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 501028b5582d04979522170329f5185beffc4303 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 26 23:58:56 2016 +0100 pakfire: Remove debugedit debugedit was shipped with pakfire before and is now a standalone package. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8b4576449f20282f2fdb9a43fc18a19a038bdc0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 26 23:58:19 2016 +0100 debugedit: New package Stripped from RPM5 and built as a standalone version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: makedepend/makedepend.nm => debugedit/debugedit.nm | 25 +- debugedit/patches/debugedit-5.3.5-DWARF-4.patch | 129 + debugedit/update/Makefile | 11 + debugedit/update/README | 1 + debugedit/update/update.sh | 58 + gcc/gcc.nm | 9 +- pakfire/pakfire.nm | 10 +- .../0001-Remove-shipped-version-of-debugedit.patch | 4576 ++++++++++++++++++++ 8 files changed, 4792 insertions(+), 27 deletions(-) copy makedepend/makedepend.nm => debugedit/debugedit.nm (57%) create mode 100644 debugedit/patches/debugedit-5.3.5-DWARF-4.patch create mode 100644 debugedit/update/Makefile create mode 100644 debugedit/update/README create mode 100644 debugedit/update/update.sh create mode 100644 pakfire/patches/0001-Remove-shipped-version-of-debugedit.patch Difference in files: diff --git a/debugedit/debugedit.nm b/debugedit/debugedit.nm new file mode 100644 index 0000000..83f67a8 --- /dev/null +++ b/debugedit/debugedit.nm @@ -0,0 +1,38 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = debugedit +version = 5.3.5 +release = 1 + +groups = Development/Tools +url = http://www.rpm5.org/ +license = GPLv2 +summary = Standalone version of debugedit + +description + This package contains a standalone version of debugedit from RPM5. +end + +build + requires + beecrypt-devel + elfutils-devel + popt-devel + end + + install + mkdir -pv %{BUILDROOT}%{bindir} + install -v -m 755 debugedit %{BUILDROOT}%{bindir}/debugedit + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/debugedit/patches/debugedit-5.3.5-DWARF-4.patch b/debugedit/patches/debugedit-5.3.5-DWARF-4.patch new file mode 100644 index 0000000..3e14061 --- /dev/null +++ b/debugedit/patches/debugedit-5.3.5-DWARF-4.patch @@ -0,0 +1,129 @@ +add DWARF 4 support + +https://bugs.gentoo.org/400663 +https://bugzilla.redhat.com/show_bug.cgi?id=707677 + +--- debugedit-5.3.5/debugedit.c 2011-10-11 05:37:49.000000000 +0200 ++++ debugedit-5.3.5/debugedit.c 2012-01-25 01:27:23.487999039 +0100 +@@ -70,6 +70,10 @@ + #include <rpmtag.h> + + #define DW_TAG_partial_unit 0x3c ++#define DW_FORM_sec_offset 0x17 ++#define DW_FORM_exprloc 0x18 ++#define DW_FORM_flag_present 0x19 ++#define DW_FORM_ref_sig8 0x20 + + char *base_dir = NULL; + char *dest_dir = NULL; +@@ -246,6 +250,7 @@ + #define DEBUG_STR 8 + #define DEBUG_FRAME 9 + #define DEBUG_RANGES 10 ++#define DEBUG_TYPES 11 + { ".debug_info", NULL, NULL, 0, 0, 0 }, + { ".debug_abbrev", NULL, NULL, 0, 0, 0 }, + { ".debug_line", NULL, NULL, 0, 0, 0 }, +@@ -257,6 +262,7 @@ + { ".debug_str", NULL, NULL, 0, 0, 0 }, + { ".debug_frame", NULL, NULL, 0, 0, 0 }, + { ".debug_ranges", NULL, NULL, 0, 0, 0 }, ++ { ".debug_types", NULL, NULL, 0, 0, 0 }, + { NULL, NULL, NULL, 0, 0, 0 } + }; + +@@ -349,7 +355,8 @@ + goto no_memory; + } + form = read_uleb128 (ptr); +- if (form == 2 || form > DW_FORM_indirect) ++ if (form == 2 ++ || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8)) + { + error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form); + htab_delete (h); +@@ -378,7 +385,6 @@ + canonicalize_path (const char *s, char *d) + { + char *rv = d; +- const char *sroot; + char *droot; + + if (IS_DIR_SEPARATOR (*s)) +@@ -394,7 +400,6 @@ + s++; + } + droot = d; +- sroot = s; + + while (*s) + { +@@ -513,7 +518,7 @@ + } + + value = read_16 (ptr); +- if (value != 2 && value != 3) ++ if (value != 2 && value != 3 && value != 4) + { + error (0, 0, "%s: DWARF version %d unhandled", dso->filename, + value); +@@ -529,8 +534,8 @@ + return 1; + } + +- opcode_base = ptr[4]; +- ptr = dir = ptr + 4 + opcode_base; ++ opcode_base = ptr[4 + (value >= 4)]; ++ ptr = dir = ptr + 4 + (value >= 4) + opcode_base; + + /* dir table: */ + value = 1; +@@ -758,7 +763,8 @@ + { + if (t->attr[i].attr == DW_AT_stmt_list) + { +- if (form == DW_FORM_data4) ++ if (form == DW_FORM_data4 ++ || form == DW_FORM_sec_offset) + { + list_offs = do_read_32_relocated (ptr); + found_list_offs = 1; +@@ -864,6 +870,8 @@ + else + ptr += 4; + break; ++ case DW_FORM_flag_present: ++ break; + case DW_FORM_addr: + ptr += ptr_size; + break; +@@ -878,10 +886,12 @@ + break; + case DW_FORM_ref4: + case DW_FORM_data4: ++ case DW_FORM_sec_offset: + ptr += 4; + break; + case DW_FORM_ref8: + case DW_FORM_data8: ++ case DW_FORM_ref_sig8: + ptr += 8; + break; + case DW_FORM_sdata: +@@ -910,6 +920,7 @@ + form = DW_FORM_block1; + break; + case DW_FORM_block: ++ case DW_FORM_exprloc: + len = read_uleb128 (ptr); + form = DW_FORM_block1; + assert (len < UINT_MAX); +@@ -1213,7 +1224,7 @@ + } + + cu_version = read_16 (ptr); +- if (cu_version != 2 && cu_version != 3) ++ if (cu_version != 2 && cu_version != 3 && cu_version != 4) + { + error (0, 0, "%s: DWARF version %d unhandled", dso->filename, + cu_version); diff --git a/debugedit/update/Makefile b/debugedit/update/Makefile new file mode 100644 index 0000000..946a128 --- /dev/null +++ b/debugedit/update/Makefile @@ -0,0 +1,11 @@ +CPPFLAGS += -I. +LDLIBS = -lelf -lpopt -lbeecrypt + +all: debugedit + +debugedit: debugedit.o hashtab.o + +clean: + rm -f *.o debugedit + +.PHONY: clean diff --git a/debugedit/update/README b/debugedit/update/README new file mode 100644 index 0000000..2a676ae --- /dev/null +++ b/debugedit/update/README @@ -0,0 +1 @@ +From https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/debugedit diff --git a/debugedit/update/update.sh b/debugedit/update/update.sh new file mode 100644 index 0000000..448624b --- /dev/null +++ b/debugedit/update/update.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +DISTDIR=/usr/portage/distfiles +PN=debugedit + +set -e + +echo "Getting updated index" +rm -f index.html +wget -q http://rpm5.org/ + +PV=$(sed -n '/Production:/{n;s:.*RPM ::;s:<.*::;p;q}' index.html) +PV=5.3.5 +echo "Latest upstream version: ${PV}" +rm -f index.html + +P="${PN}-${PV}" +A=${P}.tar.gz + +echo "Fetching latest rpm tarball" +r=rpm-${PV} +wget -nv http://rpm5.org/files/rpm/rpm-${PV%.*}/${r}.tar.gz + +echo "Unpacking ${r}" +rm -rf ${r} +tar xf ${r}.tar.gz + +echo "Creating ${P}" +rm -rf ${P} +mkdir ${P} +cp Makefile ${r}/tools/{hashtab.?,debugedit.c} ${P}/ +pushd ${P} >/dev/null +more=true +while ${more} ; do + more=false + for h in $(grep '#include' *.[ch] | awk '{print $NF}' | sed 's:[<>"]::g') ; do + [[ ${h} == */* ]] && continue + rh=$(find ../${r} -name ${h##*/}) + if [[ -n ${rh} ]] && [[ ! -e ${rh##*/} ]] ; then + # don't copy glibc includes + if ! grep -qs 'This file is part of the GNU C Library' ${rh} ; then + cp ${rh} ./ + more=true + fi + fi + done +done +popd >/dev/null +tar zcf ${A} ${P} + +echo "Testing build" +pushd ${P} >/dev/null +make -s +popd >/dev/null + +echo "Cleaning up" +rm -rf ${P} ${r} +du -b ${A} diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 1965352..8ec13d9 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_graphite = 1 name = gcc version = 6.2.0 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -151,13 +151,6 @@ build sed -i gcc/Makefile.in \ -e "s/-fno-exceptions/& -fno-asynchronous-unwind-tables/" - # Default to -gdwarf-4 -fno-debug-types-section rather than -gdwarf-2 - sed -i gcc/common.opt \ - -e '/UInteger Var(dwarf_version)/s/Init(2)/Init(4)/' \ - -e '/flag_debug_types_section/s/Init(1)/Init(0)/' \ - -e '/dwarf_record_gcc_switches/s/Init(0)/Init(1)/' \ - -e 's/$may be either 2, 3 or 4; the default version is $2\./\14./' - #./contrib/gcc_update --touch end diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index ffd9cbc..b16f079 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.27 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging @@ -24,23 +24,16 @@ build requires autoconf automake - beecrypt-devel - elfutils-devel gettext-devel intltool libcap-devel libsolv-devel >= 0.0.0-4 - popt-devel python-devel systemd-devel systemd-units xz-devel end - # libgomp was broken in earlier releases. - requires += gcc >= 4.6.2-4 - requires += beecrypt >= 4.2.1-2 - prepare_cmds # Generate the build system, if this was not a release # tarball. @@ -95,6 +88,7 @@ packages requires # For --rpm-requires. bash >= 4.2-7 + debugedit %{name} = %{thisver} quality-agent = %{thisver} diff --git a/pakfire/patches/0001-Remove-shipped-version-of-debugedit.patch b/pakfire/patches/0001-Remove-shipped-version-of-debugedit.patch new file mode 100644 index 0000000..676f210 --- /dev/null +++ b/pakfire/patches/0001-Remove-shipped-version-of-debugedit.patch @@ -0,0 +1,4576 @@ +From 559d80aa112c785fd2068ca09c5516d47ceabfe1 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 26 Oct 2016 23:42:57 +0100 +Subject: [PATCH] Remove shipped version of debugedit + +We are now shipping this as a seperate package so that +we can update it easier. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + .gitignore | 2 - + Makefile.am | 19 - + configure.ac | 22 - + src/debugedit/debugedit.c | 1688 -------------------------------------- + src/debugedit/hashtab.c | 523 ------------ + src/debugedit/hashtab.h | 143 ---- + src/debugedit/rpmiotypes.h | 653 --------------- + src/debugedit/rpmsw.h | 157 ---- + src/debugedit/rpmtag.h | 1243 ---------------------------- + src/scripts/extract-debuginfo.in | 2 +- + 10 files changed, 1 insertion(+), 4451 deletions(-) + delete mode 100644 src/debugedit/debugedit.c + delete mode 100644 src/debugedit/hashtab.c + delete mode 100644 src/debugedit/hashtab.h + delete mode 100644 src/debugedit/rpmiotypes.h + delete mode 100644 src/debugedit/rpmsw.h + delete mode 100644 src/debugedit/rpmtag.h + +diff --git a/.gitignore b/.gitignore +index 8fce8f6..293e999 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,6 +1,5 @@ + /Makefile + /build-aux +-/debugedit + /libtool + /missing + /contrib/pakfire.nm +@@ -9,7 +8,6 @@ + /src/scripts/extract-debuginfo + /src/systemd/*.service + /tmp +-/tools/debugedit + *.py[co] + /*.tar.bz2 + /*.tar.gz +diff --git a/Makefile.am b/Makefile.am +index 28dd954..bf7e42f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -244,25 +244,6 @@ libpakfire_preload_la_LIBADD = \ + + # ------------------------------------------------------------------------------ + +-libexec_PROGRAMS += \ +- debugedit +- +-debugedit_SOURCES = \ +- src/debugedit/debugedit.c \ +- src/debugedit/hashtab.c \ +- src/debugedit/hashtab.h \ +- src/debugedit/rpmiotypes.h \ +- src/debugedit/rpmsw.h \ +- src/debugedit/rpmtag.h +- +-debugedit_LDADD = \ +- $(AM_CFLAGS) \ +- $(BEECRYPT_LIBS) \ +- $(ELF_LIBS) \ +- $(POPT_LIBS) +- +-# ------------------------------------------------------------------------------ +- + scripts_SCRIPTS = \ + src/scripts/extract-debuginfo \ + src/scripts/quality-agent +diff --git a/configure.ac b/configure.ac +index 4030541..1e188e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,12 +103,6 @@ AM_PATH_PYTHON([2.7]) + + save_LIBS="$LIBS" + +-# beecrypt +-LIBS= +-AC_SEARCH_LIBS([hashFunctionContextInit], [beecrypt], [], [AC_MSG_ERROR([*** beecrypt library not found])]) +-BEECRYPT_LIBS="$LIBS" +-AC_SUBST(BEECRYPT_LIBS) +- + # libdl + LIBS= + AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])]) +@@ -123,22 +117,6 @@ AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not + CAP_LIBS="$LIBS" + AC_SUBST(CAP_LIBS) + +-# libelf +-AC_CHECK_HEADERS([libelf.h gelf.h], [], [AC_MSG_ERROR([*** libelf headers not found])]) +- +-LIBS= +-AC_SEARCH_LIBS([gelf_getvernaux], [elf], [], [AC_MSG_ERROR([*** libelf library not found])]) +-ELF_LIBS="$LIBS" +-AC_SUBST(ELF_LIBS) +- +-# libpopt +-AC_CHECK_HEADERS([popt.h], [], [AC_MSG_ERROR([*** libpopt headers not found])]) +- +-LIBS= +-AC_SEARCH_LIBS([poptGetContext], [popt], [], [AC_MSG_ERROR([*** libpopt library not found])]) +-POPT_LIBS="$LIBS" +-AC_SUBST(POPT_LIBS) +- + # libsolv + AC_CHECK_HEADERS([solv/solvversion.h], [], [AC_MSG_ERROR([*** libsolv headers not found])]) + +diff --git a/src/debugedit/debugedit.c b/src/debugedit/debugedit.c +deleted file mode 100644 +index 75b48f0..0000000 +--- a/src/debugedit/debugedit.c ++++ /dev/null +@@ -1,1688 +0,0 @@ +-/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009 Red Hat, Inc. +- Written by Alexander Larsson <alexl(a)redhat.com>, 2002 +- Based on code by Jakub Jelinek <jakub(a)redhat.com>, 2001. +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2, 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, write to the Free Software Foundation, +- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +- +-/* Needed for libelf */ +-#define _FILE_OFFSET_BITS 64 +- +-#include <assert.h> +-#include <byteswap.h> +-#include <endian.h> +-#include <errno.h> +-#include <error.h> +-#include <limits.h> +-#include <string.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <popt.h> +- +-#include <gelf.h> +- +-/* some defines taken from the dwarf standard */ +- +-#define DW_TAG_compile_unit 0x11 +- +-#define DW_AT_name 0x03 +-#define DW_AT_stmt_list 0x10 +-#define DW_AT_comp_dir 0x1b +- +-#define DW_FORM_addr 0x01 +-#define DW_FORM_block2 0x03 +-#define DW_FORM_block4 0x04 +-#define DW_FORM_data2 0x05 +-#define DW_FORM_data4 0x06 +-#define DW_FORM_data8 0x07 +-#define DW_FORM_string 0x08 +-#define DW_FORM_block 0x09 +-#define DW_FORM_block1 0x0a +-#define DW_FORM_data1 0x0b +-#define DW_FORM_flag 0x0c +-#define DW_FORM_sdata 0x0d +-#define DW_FORM_strp 0x0e +-#define DW_FORM_udata 0x0f +-#define DW_FORM_ref_addr 0x10 +-#define DW_FORM_ref1 0x11 +-#define DW_FORM_ref2 0x12 +-#define DW_FORM_ref4 0x13 +-#define DW_FORM_ref8 0x14 +-#define DW_FORM_ref_udata 0x15 +-#define DW_FORM_indirect 0x16 +- +-#include <beecrypt/beecrypt.h> +-#include "hashtab.h" +-#include "rpmtag.h" +- +-#define DW_TAG_partial_unit 0x3c +-#define DW_FORM_sec_offset 0x17 +-#define DW_FORM_exprloc 0x18 +-#define DW_FORM_flag_present 0x19 +-#define DW_FORM_ref_sig8 0x20 +- +-char *base_dir = NULL; +-char *dest_dir = NULL; +-char *list_file = NULL; +-int list_file_fd = -1; +-int do_build_id = 0; +- +-typedef struct +-{ +- Elf *elf; +- GElf_Ehdr ehdr; +- Elf_Scn **scn; +- const char *filename; +- int lastscn; +- GElf_Shdr shdr[0]; +-} DSO; +- +-typedef struct +-{ +- unsigned char *ptr; +- rpmuint32_t addend; +-} REL; +- +-#define read_uleb128(ptr) ({ \ +- unsigned int ret = 0; \ +- unsigned int c; \ +- int shift = 0; \ +- do \ +- { \ +- c = *ptr++; \ +- ret |= (c & 0x7f) << shift; \ +- shift += 7; \ +- } while (c & 0x80); \ +- \ +- if (shift >= 35) \ +- ret = UINT_MAX; \ +- ret; \ +-}) +- +-static rpmuint16_t (*do_read_16) (unsigned char *ptr); +-static rpmuint32_t (*do_read_32) (unsigned char *ptr); +-static void (*write_32) (unsigned char *ptr, GElf_Addr val); +- +-static int ptr_size; +-static int cu_version; +- +-static inline rpmuint16_t +-buf_read_ule16 (unsigned char *data) +-{ +- return data[0] | (data[1] << 8); +-} +- +-static inline rpmuint16_t +-buf_read_ube16 (unsigned char *data) +-{ +- return data[1] | (data[0] << 8); +-} +- +-static inline rpmuint32_t +-buf_read_ule32 (unsigned char *data) +-{ +- return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); +-} +- +-static inline rpmuint32_t +-buf_read_ube32 (unsigned char *data) +-{ +- return data[3] | (data[2] << 8) | (data[1] << 16) | (data[0] << 24); +-} +- +-static const char * +-strptr (DSO *dso, int sec, off_t offset) +-{ +- Elf_Scn *scn; +- Elf_Data *data; +- +- scn = dso->scn[sec]; +- if (offset >= 0 && (GElf_Addr) offset < dso->shdr[sec].sh_size) +- { +- data = NULL; +- while ((data = elf_rawdata (scn, data)) != NULL) +- { +- if (data->d_buf +- && offset >= data->d_off +- && offset < data->d_off + (off_t)data->d_size) +- return (const char *) data->d_buf + (offset - data->d_off); +- } +- } +- +- return NULL; +-} +- +- +-#define read_1(ptr) *ptr++ +- +-#define read_16(ptr) ({ \ +- rpmuint16_t ret = do_read_16 (ptr); \ +- ptr += 2; \ +- ret; \ +-}) +- +-#define read_32(ptr) ({ \ +- rpmuint32_t ret = do_read_32 (ptr); \ +- ptr += 4; \ +- ret; \ +-}) +- +-REL *relptr, *relend; +-int reltype; +- +-#define do_read_32_relocated(ptr) ({ \ +- rpmuint32_t dret = do_read_32 (ptr); \ +- if (relptr) \ +- { \ +- while (relptr < relend && relptr->ptr < ptr) \ +- ++relptr; \ +- if (relptr < relend && relptr->ptr == ptr) \ +- { \ +- if (reltype == SHT_REL) \ +- dret += relptr->addend; \ +- else \ +- dret = relptr->addend; \ +- } \ +- } \ +- dret; \ +-}) +- +-#define read_32_relocated(ptr) ({ \ +- rpmuint32_t ret = do_read_32_relocated (ptr); \ +- ptr += 4; \ +- ret; \ +-}) +- +-static void +-dwarf2_write_le32 (unsigned char *p, GElf_Addr val) +-{ +- rpmuint32_t v = (rpmuint32_t) val; +- +- p[0] = v; +- p[1] = v >> 8; +- p[2] = v >> 16; +- p[3] = v >> 24; +-} +- +- +-static void +-dwarf2_write_be32 (unsigned char *p, GElf_Addr val) +-{ +- rpmuint32_t v = (rpmuint32_t) val; +- +- p[3] = v; +- p[2] = v >> 8; +- p[1] = v >> 16; +- p[0] = v >> 24; +-} +- +-static struct +- { +- const char *name; +- unsigned char *data; +- Elf_Data *elf_data; +- size_t size; +- int sec, relsec; +- } debug_sections[] = +- { +-#define DEBUG_INFO 0 +-#define DEBUG_ABBREV 1 +-#define DEBUG_LINE 2 +-#define DEBUG_ARANGES 3 +-#define DEBUG_PUBNAMES 4 +-#define DEBUG_PUBTYPES 5 +-#define DEBUG_MACINFO 6 +-#define DEBUG_LOC 7 +-#define DEBUG_STR 8 +-#define DEBUG_FRAME 9 +-#define DEBUG_RANGES 10 +-#define DEBUG_TYPES 11 +-#define DEBUG_MACRO 12 +- { ".debug_info", NULL, NULL, 0, 0, 0 }, +- { ".debug_abbrev", NULL, NULL, 0, 0, 0 }, +- { ".debug_line", NULL, NULL, 0, 0, 0 }, +- { ".debug_aranges", NULL, NULL, 0, 0, 0 }, +- { ".debug_pubnames", NULL, NULL, 0, 0, 0 }, +- { ".debug_pubtypes", NULL, NULL, 0, 0, 0 }, +- { ".debug_macinfo", NULL, NULL, 0, 0, 0 }, +- { ".debug_loc", NULL, NULL, 0, 0, 0 }, +- { ".debug_str", NULL, NULL, 0, 0, 0 }, +- { ".debug_frame", NULL, NULL, 0, 0, 0 }, +- { ".debug_ranges", NULL, NULL, 0, 0, 0 }, +- { ".debug_types", NULL, NULL, 0, 0, 0 }, +- { ".debug_macro", NULL, NULL, 0, 0, 0 }, +- { NULL, NULL, NULL, 0, 0, 0 } +- }; +- +-struct abbrev_attr +- { +- unsigned int attr; +- unsigned int form; +- }; +- +-struct abbrev_tag +- { +- unsigned int entry; +- unsigned int tag; +- int nattr; +- struct abbrev_attr attr[0]; +- }; +- +-static hashval_t +-abbrev_hash (const void *p) +-{ +- struct abbrev_tag *t = (struct abbrev_tag *)p; +- +- return t->entry; +-} +- +-static int +-abbrev_eq (const void *p, const void *q) +-{ +- struct abbrev_tag *t1 = (struct abbrev_tag *)p; +- struct abbrev_tag *t2 = (struct abbrev_tag *)q; +- +- return t1->entry == t2->entry; +-} +- +-static void +-abbrev_del (void *p) +-{ +- free (p); +-} +- +-static htab_t +-read_abbrev (DSO *dso, unsigned char *ptr) +-{ +- htab_t h = htab_try_create (50, abbrev_hash, abbrev_eq, abbrev_del); +- unsigned int attr, form; +- struct abbrev_tag *t; +- int size; +- void **slot; +- +- if (h == NULL) +- { +-no_memory: +- error (0, ENOMEM, "%s: Could not read .debug_abbrev", dso->filename); +- if (h) +- htab_delete (h); +- return NULL; +- } +- +- while ((attr = read_uleb128 (ptr)) != 0) +- { +- size = 10; +- t = malloc (sizeof (*t) + size * sizeof (struct abbrev_attr)); +- if (t == NULL) +- goto no_memory; +- t->entry = attr; +- t->nattr = 0; +- slot = htab_find_slot (h, t, INSERT); +- if (slot == NULL) +- { +- free (t); +- goto no_memory; +- } +- if (*slot != NULL) +- { +- error (0, 0, "%s: Duplicate DWARF abbreviation %d", dso->filename, +- t->entry); +- free (t); +- htab_delete (h); +- return NULL; +- } +- t->tag = read_uleb128 (ptr); +- ++ptr; /* skip children flag. */ +- while ((attr = read_uleb128 (ptr)) != 0) +- { +- if (t->nattr == size) +- { +- size += 10; +- t = realloc (t, sizeof (*t) + size * sizeof (struct abbrev_attr)); +- if (t == NULL) +- goto no_memory; +- } +- form = read_uleb128 (ptr); +- if (form == 2 +- || (form > DW_FORM_flag_present && form != DW_FORM_ref_sig8)) +- { +- error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form); +- htab_delete (h); +- return NULL; +- } +- +- t->attr[t->nattr].attr = attr; +- t->attr[t->nattr++].form = form; +- } +- if (read_uleb128 (ptr) != 0) +- { +- error (0, 0, "%s: DWARF abbreviation does not end with 2 zeros", +- dso->filename); +- htab_delete (h); +- return NULL; +- } +- *slot = t; +- } +- +- return h; +-} +- +-#define IS_DIR_SEPARATOR(c) ((c)=='/') +- +-static char * +-canonicalize_path (const char *s, char *d) +-{ +- char *rv = d; +- const char *sroot; +- char *droot; +- +- if (IS_DIR_SEPARATOR (*s)) +- { +- *d++ = *s++; +- if (IS_DIR_SEPARATOR (*s) && !IS_DIR_SEPARATOR (s[1])) +- { +- /* Special case for "//foo" meaning a Posix namespace +- escape. */ +- *d++ = *s++; +- } +- while (IS_DIR_SEPARATOR (*s)) +- s++; +- } +- droot = d; +- sroot = s; +- +- while (*s) +- { +- /* At this point, we're always at the beginning of a path +- segment. */ +- +- if (s[0] == '.' && (s[1] == 0 || IS_DIR_SEPARATOR (s[1]))) +- { +- s++; +- if (*s) +- while (IS_DIR_SEPARATOR (*s)) +- ++s; +- } +- +- else if (s[0] == '.' && s[1] == '.' +- && (s[2] == 0 || IS_DIR_SEPARATOR (s[2]))) +- { +- char *pre = d - 1; /* includes slash */ +- while (droot < pre && IS_DIR_SEPARATOR (*pre)) +- pre--; +- if (droot <= pre && ! IS_DIR_SEPARATOR (*pre)) +- { +- while (droot < pre && ! IS_DIR_SEPARATOR (*pre)) +- pre--; +- /* pre now points to the slash */ +- if (droot < pre) +- pre++; +- if (pre + 3 == d && pre[0] == '.' && pre[1] == '.') +- { +- *d++ = *s++; +- *d++ = *s++; +- } +- else +- { +- d = pre; +- s += 2; +- if (*s) +- while (IS_DIR_SEPARATOR (*s)) +- s++; +- } +- } +- else +- { +- *d++ = *s++; +- *d++ = *s++; +- } +- } +- else +- { +- while (*s && ! IS_DIR_SEPARATOR (*s)) +- *d++ = *s++; +- } +- +- if (IS_DIR_SEPARATOR (*s)) +- { +- *d++ = *s++; +- while (IS_DIR_SEPARATOR (*s)) +- s++; +- } +- } +- while (droot < d && IS_DIR_SEPARATOR (d[-1])) +- --d; +- if (d == rv) +- *d++ = '.'; +- *d = 0; +- +- return rv; +-} +- +-static int +-has_prefix (const char *str, +- const char *prefix) +-{ +- size_t str_len; +- size_t prefix_len; +- +- str_len = strlen (str); +- prefix_len = strlen (prefix); +- +- if (str_len < prefix_len) +- return 0; +- +- return strncmp (str, prefix, prefix_len) == 0; +-} +- +-static int +-edit_dwarf2_line (DSO *dso, rpmuint32_t off, char *comp_dir, int phase) +-{ +- unsigned char *ptr = debug_sections[DEBUG_LINE].data, *dir; +- unsigned char **dirt; +- unsigned char *endsec = ptr + debug_sections[DEBUG_LINE].size; +- unsigned char *endcu, *endprol; +- unsigned char opcode_base; +- rpmuint32_t value, dirt_cnt; +- size_t comp_dir_len = strlen (comp_dir); +- size_t abs_file_cnt = 0, abs_dir_cnt = 0; +- +- if (phase != 0) +- return 0; +- +- ptr += off; +- +- endcu = ptr + 4; +- endcu += read_32 (ptr); +- if (endcu == ptr + 0xffffffff) +- { +- error (0, 0, "%s: 64-bit DWARF not supported", dso->filename); +- return 1; +- } +- +- if (endcu > endsec) +- { +- error (0, 0, "%s: .debug_line CU does not fit into section", +- dso->filename); +- return 1; +- } +- +- value = read_16 (ptr); +- if (value != 2 && value != 3 && value != 4) +- { +- error (0, 0, "%s: DWARF version %d unhandled", dso->filename, +- value); +- return 1; +- } +- +- endprol = ptr + 4; +- endprol += read_32 (ptr); +- if (endprol > endcu) +- { +- error (0, 0, "%s: .debug_line CU prologue does not fit into CU", +- dso->filename); +- return 1; +- } +- +- opcode_base = ptr[4 + (value >= 4)]; +- ptr = dir = ptr + 4 + (value >= 4) + opcode_base; +- +- /* dir table: */ +- value = 1; +- while (*ptr != 0) +- { +- ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1; +- ++value; +- } +- +- dirt = (unsigned char **) alloca (value * sizeof (unsigned char *)); +- dirt[0] = (unsigned char *) "."; +- dirt_cnt = 1; +- ptr = dir; +- while (*ptr != 0) +- { +- dirt[dirt_cnt++] = ptr; +- ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1; +- } +- ptr++; +- +- /* file table: */ +- while (*ptr != 0) +- { +- char *s, *file; +- size_t file_len, dir_len; +- +- file = (char *) ptr; +- ptr = (unsigned char *) strchr ((char *)ptr, 0) + 1; +- value = read_uleb128 (ptr); +- +- if (value >= dirt_cnt) +- { +- error (0, 0, "%s: Wrong directory table index %u", +- dso->filename, value); +- return 1; +- } +- file_len = strlen (file); +- dir_len = strlen ((char *)dirt[value]); +- s = malloc (comp_dir_len + 1 + file_len + 1 + dir_len + 1); +- if (s == NULL) +- { +- error (0, ENOMEM, "%s: Reading file table", dso->filename); +- return 1; +- } +- if (*file == '/') +- { +- memcpy (s, file, file_len + 1); +- if (dest_dir && has_prefix (file, base_dir)) +- ++abs_file_cnt; +- } +- else if (*dirt[value] == '/') +- { +- memcpy (s, dirt[value], dir_len); +- s[dir_len] = '/'; +- memcpy (s + dir_len + 1, file, file_len + 1); +- } +- else +- { +- char *p = s; +- if (comp_dir_len != 0) +- { +- memcpy (s, comp_dir, comp_dir_len); +- s[comp_dir_len] = '/'; +- p += comp_dir_len + 1; +- } +- memcpy (p, dirt[value], dir_len); +- p[dir_len] = '/'; +- memcpy (p + dir_len + 1, file, file_len + 1); +- } +- canonicalize_path (s, s); +- if (list_file_fd != -1) +- { +- char *p = NULL; +- if (base_dir == NULL) +- p = s; +- else if (has_prefix (s, base_dir)) +- p = s + strlen (base_dir); +- else if (has_prefix (s, dest_dir)) +- p = s + strlen (dest_dir); +- +- if (p) +- { +- size_t size = strlen (p) + 1; +- while (size > 0) +- { +- ssize_t ret = write (list_file_fd, p, size); +- if (ret == -1) +- break; +- size -= ret; +- p += ret; +- } +- } +- } +- +- free (s); +- +- read_uleb128 (ptr); +- read_uleb128 (ptr); +- } +- ++ptr; +- +- if (dest_dir) +- { +- unsigned char *srcptr, *buf = NULL; +- size_t base_len = strlen (base_dir); +- size_t dest_len = strlen (dest_dir); +- size_t shrank = 0; +- +- if (dest_len == base_len) +- abs_file_cnt = 0; +- if (abs_file_cnt) +- { +- srcptr = buf = malloc (ptr - dir); +- memcpy (srcptr, dir, ptr - dir); +- ptr = dir; +- } +- else +- ptr = srcptr = dir; +- while (*srcptr != 0) +- { +- size_t len = strlen ((char *)srcptr) + 1; +- const unsigned char *readptr = srcptr; +- +- if (*srcptr == '/' && has_prefix ((char *)srcptr, base_dir)) +- { +- if (dest_len < base_len) +- ++abs_dir_cnt; +- memcpy (ptr, dest_dir, dest_len); +- ptr += dest_len; +- readptr += base_len; +- } +- srcptr += len; +- +- shrank += srcptr - readptr; +- canonicalize_path ((char *)readptr, (char *)ptr); +- len = strlen ((char *)ptr) + 1; +- shrank -= len; +- ptr += len; +- +- elf_flagdata (debug_sections[DEBUG_STR].elf_data, +- ELF_C_SET, ELF_F_DIRTY); +- } +- +- if (shrank > 0) +- { +- if (--shrank == 0) +- error (EXIT_FAILURE, 0, +- "canonicalization unexpectedly shrank by one character"); +- else +- { +- memset (ptr, 'X', shrank); +- ptr += shrank; +- *ptr++ = '\0'; +- } +- } +- +- if (abs_dir_cnt + abs_file_cnt != 0) +- { +- size_t len = (abs_dir_cnt + abs_file_cnt) * (base_len - dest_len); +- +- if (len == 1) +- error (EXIT_FAILURE, 0, "-b arg has to be either the same length as -d arg, or more than 1 char shorter"); +- memset (ptr, 'X', len - 1); +- ptr += len - 1; +- *ptr++ = '\0'; +- } +- *ptr++ = '\0'; +- ++srcptr; +- +- while (*srcptr != 0) +- { +- size_t len = strlen ((char *)srcptr) + 1; +- +- if (*srcptr == '/' && has_prefix ((char *)srcptr, base_dir)) +- { +- memcpy (ptr, dest_dir, dest_len); +- if (dest_len < base_len) +- { +- memmove (ptr + dest_len, srcptr + base_len, +- len - base_len); +- ptr += dest_len - base_len; +- } +- elf_flagdata (debug_sections[DEBUG_STR].elf_data, +- ELF_C_SET, ELF_F_DIRTY); +- } +- else if (ptr != srcptr) +- memmove (ptr, srcptr, len); +- srcptr += len; +- ptr += len; +- dir = srcptr; +- read_uleb128 (srcptr); +- read_uleb128 (srcptr); +- read_uleb128 (srcptr); +- if (ptr != dir) +- memmove (ptr, dir, srcptr - dir); +- ptr += srcptr - dir; +- } +- *ptr = '\0'; +- free (buf); +- } +- return 0; +-} +- +- +- +-static unsigned char * +-edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase) +-{ +- int i; +- rpmuint32_t list_offs; +- int found_list_offs; +- char *comp_dir; +- +- comp_dir = NULL; +- list_offs = 0; +- found_list_offs = 0; +- for (i = 0; i < t->nattr; ++i) +- { +- rpmuint32_t form = t->attr[i].form; +- size_t len = 0; +- size_t base_len, dest_len; +- +- +- while (1) +- { +- if (t->attr[i].attr == DW_AT_stmt_list) +- { +- if (form == DW_FORM_data4 +- || form == DW_FORM_sec_offset) +- { +- list_offs = do_read_32_relocated (ptr); +- found_list_offs = 1; +- } +- } +- +- if (t->attr[i].attr == DW_AT_comp_dir) +- { +- if ( form == DW_FORM_string ) +- { +- free (comp_dir); +- comp_dir = strdup ((char *)ptr); +- +- if (phase == 1 && dest_dir && has_prefix ((char *)ptr, base_dir)) +- { +- base_len = strlen (base_dir); +- dest_len = strlen (dest_dir); +- +- memcpy (ptr, dest_dir, dest_len); +- if (dest_len < base_len) +- { +- memset(ptr + dest_len, '/', +- base_len - dest_len); +- +- } +- elf_flagdata (debug_sections[DEBUG_INFO].elf_data, +- ELF_C_SET, ELF_F_DIRTY); +- } +- } +- +- else if (form == DW_FORM_strp && +- debug_sections[DEBUG_STR].data) +- { +- char *dir; +- +- dir = (char *) debug_sections[DEBUG_STR].data +- + do_read_32_relocated (ptr); +- +- free (comp_dir); +- comp_dir = strdup (dir); +- +- if (phase == 1 && dest_dir && has_prefix (dir, base_dir)) +- { +- base_len = strlen (base_dir); +- dest_len = strlen (dest_dir); +- +- memcpy (dir, dest_dir, dest_len); +- if (dest_len < base_len) +- { +- memmove (dir + dest_len, dir + base_len, +- strlen (dir + base_len) + 1); +- } +- elf_flagdata (debug_sections[DEBUG_STR].elf_data, +- ELF_C_SET, ELF_F_DIRTY); +- } +- } +- } +- else if ((t->tag == DW_TAG_compile_unit +- || t->tag == DW_TAG_partial_unit) +- && t->attr[i].attr == DW_AT_name +- && form == DW_FORM_strp +- && debug_sections[DEBUG_STR].data) +- { +- char *name; +- +- name = (char *) debug_sections[DEBUG_STR].data +- + do_read_32_relocated (ptr); +- if (*name == '/' && comp_dir == NULL) +- { +- char *enddir = strrchr (name, '/'); +- +- if (enddir != name) +- { +- comp_dir = malloc (enddir - name + 1); +- memcpy (comp_dir, name, enddir - name); +- comp_dir [enddir - name] = '\0'; +- } +- else +- comp_dir = strdup ("/"); +- } +- +- if (phase == 1 && dest_dir && has_prefix (name, base_dir)) +- { +- base_len = strlen (base_dir); +- dest_len = strlen (dest_dir); +- +- memcpy (name, dest_dir, dest_len); +- if (dest_len < base_len) +- { +- memmove (name + dest_len, name + base_len, +- strlen (name + base_len) + 1); +- } +- elf_flagdata (debug_sections[DEBUG_STR].elf_data, +- ELF_C_SET, ELF_F_DIRTY); +- } +- } +- +- switch (form) +- { +- case DW_FORM_ref_addr: +- if (cu_version == 2) +- ptr += ptr_size; +- else +- ptr += 4; +- break; +- case DW_FORM_flag_present: +- break; +- case DW_FORM_addr: +- ptr += ptr_size; +- break; +- case DW_FORM_ref1: +- case DW_FORM_flag: +- case DW_FORM_data1: +- ++ptr; +- break; +- case DW_FORM_ref2: +- case DW_FORM_data2: +- ptr += 2; +- break; +- case DW_FORM_ref4: +- case DW_FORM_data4: +- case DW_FORM_sec_offset: +- ptr += 4; +- break; +- case DW_FORM_ref8: +- case DW_FORM_data8: +- case DW_FORM_ref_sig8: +- ptr += 8; +- break; +- case DW_FORM_sdata: +- case DW_FORM_ref_udata: +- case DW_FORM_udata: +- read_uleb128 (ptr); +- break; +- case DW_FORM_strp: +- ptr += 4; +- break; +- case DW_FORM_string: +- ptr = (unsigned char *) strchr ((char *)ptr, '\0') + 1; +- break; +- case DW_FORM_indirect: +- form = read_uleb128 (ptr); +- continue; +- case DW_FORM_block1: +- len = *ptr++; +- break; +- case DW_FORM_block2: +- len = read_16 (ptr); +- form = DW_FORM_block1; +- break; +- case DW_FORM_block4: +- len = read_32 (ptr); +- form = DW_FORM_block1; +- break; +- case DW_FORM_block: +- case DW_FORM_exprloc: +- len = read_uleb128 (ptr); +- form = DW_FORM_block1; +- assert (len < UINT_MAX); +- break; +- default: +- error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, +- form); +- return NULL; +- } +- +- if (form == DW_FORM_block1) +- ptr += len; +- +- break; +- } +- } +- +- /* Ensure the CU current directory will exist even if only empty. Source +- filenames possibly located in its parent directories refer relatively to +- it and the debugger (GDB) cannot safely optimize out the missing +- CU current dir subdirectories. */ +- if (comp_dir && list_file_fd != -1) +- { +- char *p; +- size_t size; +- +- if (base_dir && has_prefix (comp_dir, base_dir)) +- p = comp_dir + strlen (base_dir); +- else if (dest_dir && has_prefix (comp_dir, dest_dir)) +- p = comp_dir + strlen (dest_dir); +- else +- p = comp_dir; +- +- size = strlen (p) + 1; +- while (size > 0) +- { +- ssize_t ret = write (list_file_fd, p, size); +- if (ret == -1) +- break; +- size -= ret; +- p += ret; +- } +- } +- +- if (found_list_offs && comp_dir) +- edit_dwarf2_line (dso, list_offs, comp_dir, phase); +- +- free (comp_dir); +- +- return ptr; +-} +- +-static int +-rel_cmp (const void *a, const void *b) +-{ +- REL *rela = (REL *) a, *relb = (REL *) b; +- +- if (rela->ptr < relb->ptr) +- return -1; +- +- if (rela->ptr > relb->ptr) +- return 1; +- +- return 0; +-} +- +-static int +-edit_dwarf2 (DSO *dso) +-{ +- Elf_Data *data; +- Elf_Scn *scn; +- int i, j; +- +- for (i = 0; debug_sections[i].name; ++i) +- { +- debug_sections[i].data = NULL; +- debug_sections[i].size = 0; +- debug_sections[i].sec = 0; +- debug_sections[i].relsec = 0; +- } +- ptr_size = 0; +- +- for (i = 1; i < dso->ehdr.e_shnum; ++i) +- if (! (dso->shdr[i].sh_flags & (SHF_ALLOC | SHF_WRITE | SHF_EXECINSTR)) +- && dso->shdr[i].sh_size) +- { +- const char *name = strptr (dso, dso->ehdr.e_shstrndx, +- dso->shdr[i].sh_name); +- +- if (strncmp (name, ".debug_", sizeof (".debug_") - 1) == 0) +- { +- for (j = 0; debug_sections[j].name; ++j) +- if (strcmp (name, debug_sections[j].name) == 0) +- { +- if (debug_sections[j].data) +- { +- error (0, 0, "%s: Found two copies of %s section", +- dso->filename, name); +- return 1; +- } +- +- scn = dso->scn[i]; +- data = elf_rawdata (scn, NULL); +- assert (data != NULL && data->d_buf != NULL); +- assert (elf_rawdata (scn, data) == NULL); +- assert (data->d_off == 0); +- assert (data->d_size == dso->shdr[i].sh_size); +- debug_sections[j].data = data->d_buf; +- debug_sections[j].elf_data = data; +- debug_sections[j].size = data->d_size; +- debug_sections[j].sec = i; +- break; +- } +- +- if (debug_sections[j].name == NULL) +- { +- error (0, 0, "%s: Unknown debugging section %s", +- dso->filename, name); +- } +- } +- else if (dso->ehdr.e_type == ET_REL +- && ((dso->shdr[i].sh_type == SHT_REL +- && strncmp (name, ".rel.debug_", +- sizeof (".rel.debug_") - 1) == 0) +- || (dso->shdr[i].sh_type == SHT_RELA +- && strncmp (name, ".rela.debug_", +- sizeof (".rela.debug_") - 1) == 0))) +- { +- for (j = 0; debug_sections[j].name; ++j) +- if (strcmp (name + sizeof (".rel") - 1 +- + (dso->shdr[i].sh_type == SHT_RELA), +- debug_sections[j].name) == 0) +- { +- debug_sections[j].relsec = i; +- break; +- } +- } +- } +- +- if (dso->ehdr.e_ident[EI_DATA] == ELFDATA2LSB) +- { +- do_read_16 = buf_read_ule16; +- do_read_32 = buf_read_ule32; +- write_32 = dwarf2_write_le32; +- } +- else if (dso->ehdr.e_ident[EI_DATA] == ELFDATA2MSB) +- { +- do_read_16 = buf_read_ube16; +- do_read_32 = buf_read_ube32; +- write_32 = dwarf2_write_be32; +- } +- else +- { +- error (0, 0, "%s: Wrong ELF data enconding", dso->filename); +- return 1; +- } +- +- if (debug_sections[DEBUG_INFO].data != NULL) +- { +- unsigned char *ptr, *endcu, *endsec; +- rpmuint32_t value; +- htab_t abbrev; +- struct abbrev_tag tag, *t; +- int phase; +- REL *relbuf = NULL; +- +- if (debug_sections[DEBUG_INFO].relsec) +- { +- int ndx, maxndx; +- GElf_Rel rel; +- GElf_Rela rela; +- GElf_Sym sym; +- GElf_Addr base = dso->shdr[debug_sections[DEBUG_INFO].sec].sh_addr; +- Elf_Data *symdata = NULL; +- int rtype; +- +- i = debug_sections[DEBUG_INFO].relsec; +- scn = dso->scn[i]; +- data = elf_getdata (scn, NULL); +- assert (data != NULL && data->d_buf != NULL); +- assert (elf_getdata (scn, data) == NULL); +- assert (data->d_off == 0); +- assert (data->d_size == dso->shdr[i].sh_size); +- maxndx = dso->shdr[i].sh_size / dso->shdr[i].sh_entsize; +- relbuf = malloc (maxndx * sizeof (REL)); +- reltype = dso->shdr[i].sh_type; +- if (relbuf == NULL) +- error (1, errno, "%s: Could not allocate memory", dso->filename); +- +- symdata = elf_getdata (dso->scn[dso->shdr[i].sh_link], NULL); +- assert (symdata != NULL && symdata->d_buf != NULL); +- assert (elf_getdata (dso->scn[dso->shdr[i].sh_link], symdata) +- == NULL); +- assert (symdata->d_off == 0); +- assert (symdata->d_size +- == dso->shdr[dso->shdr[i].sh_link].sh_size); +- +- for (ndx = 0, relend = relbuf; ndx < maxndx; ++ndx) +- { +- if (dso->shdr[i].sh_type == SHT_REL) +- { +- gelf_getrel (data, ndx, &rel); +- rela.r_offset = rel.r_offset; +- rela.r_info = rel.r_info; +- rela.r_addend = 0; +- } +- else +- gelf_getrela (data, ndx, &rela); +- gelf_getsym (symdata, ELF64_R_SYM (rela.r_info), &sym); +- /* Relocations against section symbols are uninteresting +- in REL. */ +- if (dso->shdr[i].sh_type == SHT_REL && sym.st_value == 0) +- continue; +- /* Only consider relocations against .debug_str, .debug_line +- and .debug_abbrev. */ +- if (sym.st_shndx != debug_sections[DEBUG_STR].sec +- && sym.st_shndx != debug_sections[DEBUG_LINE].sec +- && sym.st_shndx != debug_sections[DEBUG_ABBREV].sec) +- continue; +- rela.r_addend += sym.st_value; +- rtype = ELF64_R_TYPE (rela.r_info); +- switch (dso->ehdr.e_machine) +- { +- case EM_SPARC: +- case EM_SPARC32PLUS: +- case EM_SPARCV9: +- if (rtype != R_SPARC_32 && rtype != R_SPARC_UA32) +- goto fail; +- break; +- case EM_386: +- if (rtype != R_386_32) +- goto fail; +- break; +- case EM_PPC: +- case EM_PPC64: +- if (rtype != R_PPC_ADDR32 && rtype != R_PPC_UADDR32) +- goto fail; +- break; +- case EM_S390: +- if (rtype != R_390_32) +- goto fail; +- break; +- case EM_IA_64: +- if (rtype != R_IA64_SECREL32LSB) +- goto fail; +- break; +- case EM_X86_64: +- if (rtype != R_X86_64_32) +- goto fail; +- break; +- case EM_ALPHA: +- if (rtype != R_ALPHA_REFLONG) +- goto fail; +- break; +- default: +- fail: +- error (1, 0, "%s: Unhandled relocation %d in .debug_info section", +- dso->filename, rtype); +- } +- relend->ptr = debug_sections[DEBUG_INFO].data +- + (rela.r_offset - base); +- relend->addend = rela.r_addend; +- ++relend; +- } +- if (relbuf == relend) +- { +- free (relbuf); +- relbuf = NULL; +- relend = NULL; +- } +- else +- qsort (relbuf, relend - relbuf, sizeof (REL), rel_cmp); +- } +- +- for (phase = 0; phase < 2; phase++) +- { +- ptr = debug_sections[DEBUG_INFO].data; +- relptr = relbuf; +- endsec = ptr + debug_sections[DEBUG_INFO].size; +- while (ptr < endsec) +- { +- if (ptr + 11 > endsec) +- { +- error (0, 0, "%s: .debug_info CU header too small", +- dso->filename); +- return 1; +- } +- +- endcu = ptr + 4; +- endcu += read_32 (ptr); +- if (endcu == ptr + 0xffffffff) +- { +- error (0, 0, "%s: 64-bit DWARF not supported", dso->filename); +- return 1; +- } +- +- if (endcu > endsec) +- { +- error (0, 0, "%s: .debug_info too small", dso->filename); +- return 1; +- } +- +- cu_version = read_16 (ptr); +- if (cu_version != 2 && cu_version != 3 && cu_version != 4) +- { +- error (0, 0, "%s: DWARF version %d unhandled", dso->filename, +- cu_version); +- return 1; +- } +- +- value = read_32_relocated (ptr); +- if (value >= debug_sections[DEBUG_ABBREV].size) +- { +- if (debug_sections[DEBUG_ABBREV].data == NULL) +- error (0, 0, "%s: .debug_abbrev not present", dso->filename); +- else +- error (0, 0, "%s: DWARF CU abbrev offset too large", +- dso->filename); +- return 1; +- } +- +- if (ptr_size == 0) +- { +- ptr_size = read_1 (ptr); +- if (ptr_size != 4 && ptr_size != 8) +- { +- error (0, 0, "%s: Invalid DWARF pointer size %d", +- dso->filename, ptr_size); +- return 1; +- } +- } +- else if (read_1 (ptr) != ptr_size) +- { +- error (0, 0, "%s: DWARF pointer size differs between CUs", +- dso->filename); +- return 1; +- } +- +- abbrev = read_abbrev (dso, +- debug_sections[DEBUG_ABBREV].data + value); +- if (abbrev == NULL) +- return 1; +- +- while (ptr < endcu) +- { +- tag.entry = read_uleb128 (ptr); +- if (tag.entry == 0) +- continue; +- t = htab_find_with_hash (abbrev, &tag, tag.entry); +- if (t == NULL) +- { +- error (0, 0, "%s: Could not find DWARF abbreviation %d", +- dso->filename, tag.entry); +- htab_delete (abbrev); +- return 1; +- } +- +- ptr = edit_attributes (dso, ptr, t, phase); +- if (ptr == NULL) +- break; +- } +- +- htab_delete (abbrev); +- } +- } +- free (relbuf); +- } +- +- return 0; +-} +- +-static struct poptOption optionsTable[] = { +- { "base-dir", 'b', POPT_ARG_STRING, &base_dir, 0, +- "base build directory of objects", NULL }, +- { "dest-dir", 'd', POPT_ARG_STRING, &dest_dir, 0, +- "directory to rewrite base-dir into", NULL }, +- { "list-file", 'l', POPT_ARG_STRING, &list_file, 0, +- "file where to put list of source and header file names", NULL }, +- { "build-id", 'i', POPT_ARG_NONE, &do_build_id, 0, +- "recompute build ID note and print ID on stdout", NULL }, +- POPT_AUTOHELP +- { NULL, 0, 0, NULL, 0, NULL, NULL } +-}; +- +-static DSO * +-fdopen_dso (int fd, const char *name) +-{ +- Elf *elf = NULL; +- GElf_Ehdr ehdr; +- int i; +- DSO *dso = NULL; +- +- elf = elf_begin (fd, ELF_C_RDWR_MMAP, NULL); +- if (elf == NULL) +- { +- error (0, 0, "cannot open ELF file: %s", elf_errmsg (-1)); +- goto error_out; +- } +- +- if (elf_kind (elf) != ELF_K_ELF) +- { +- error (0, 0, "\"%s\" is not an ELF file", name); +- goto error_out; +- } +- +- if (gelf_getehdr (elf, &ehdr) == NULL) +- { +- error (0, 0, "cannot get the ELF header: %s", +- elf_errmsg (-1)); +- goto error_out; +- } +- +- if (ehdr.e_type != ET_DYN && ehdr.e_type != ET_EXEC && ehdr.e_type != ET_REL) +- { +- error (0, 0, "\"%s\" is not a shared library", name); +- goto error_out; +- } +- +- /* Allocate DSO structure. Leave place for additional 20 new section +- headers. */ +- dso = (DSO *) +- malloc (sizeof(DSO) + (ehdr.e_shnum + 20) * sizeof(GElf_Shdr) +- + (ehdr.e_shnum + 20) * sizeof(Elf_Scn *)); +- if (!dso) +- { +- error (0, ENOMEM, "Could not open DSO"); +- goto error_out; +- } +- +- elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT); +- +- memset (dso, 0, sizeof(DSO)); +- dso->elf = elf; +- dso->ehdr = ehdr; +- dso->scn = (Elf_Scn **) &dso->shdr[ehdr.e_shnum + 20]; +- +- for (i = 0; i < ehdr.e_shnum; ++i) +- { +- dso->scn[i] = elf_getscn (elf, i); +- gelf_getshdr (dso->scn[i], dso->shdr + i); +- } +- +- dso->filename = (const char *) strdup (name); +- return dso; +- +-error_out: +- if (dso) +- { +- free ((char *) dso->filename); +- free (dso); +- } +- if (elf) +- elf_end (elf); +- if (fd != -1) +- close (fd); +- return NULL; +-} +- +-/* Compute a fresh build ID bit-string from the editted file contents. */ +-static void +-handle_build_id (DSO *dso, Elf_Data *build_id, +- size_t build_id_offset, size_t build_id_size) +-{ +- hashFunctionContext ctx; +- const hashFunction *hf = NULL; +- int i = hashFunctionCount (); +- +- while (i-- > 0) +- { +- hf = hashFunctionGet (i); +- if (hf != NULL && hf->digestsize == build_id_size) +- break; +- } +- if (hf == NULL) +- { +- fprintf (stderr, "Cannot handle %Zu-byte build ID\n", build_id_size); +- exit (1); +- } +- +- if (elf_update (dso->elf, ELF_C_NULL) < 0) +- { +- fprintf (stderr, "Failed to update file: %s\n", +- elf_errmsg (elf_errno ())); +- exit (1); +- } +- +- /* Clear the old bits so they do not affect the new hash. */ +- memset ((char *) build_id->d_buf + build_id_offset, 0, build_id_size); +- +- hashFunctionContextInit (&ctx, hf); +- +- /* Slurp the relevant header bits and section contents and feed them +- into the hash function. The only bits we ignore are the offset +- fields in ehdr and shdrs, since the semantically identical ELF file +- could be written differently if it doesn't change the phdr layout. +- We always use the GElf (i.e. Elf64) formats for the bits to hash +- since it is convenient. It doesn't matter whether this is an Elf32 +- or Elf64 object, only that we are consistent in what bits feed the +- hash so it comes out the same for the same file contents. */ +- { +- auto inline void process (const void *data, size_t size); +- auto inline void process (const void *data, size_t size) +- { +- memchunk chunk = { .data = (void *) data, .size = size }; +- hashFunctionContextUpdateMC (&ctx, &chunk); +- } +- union +- { +- GElf_Ehdr ehdr; +- GElf_Phdr phdr; +- GElf_Shdr shdr; +- } u; +- Elf_Data x = { .d_version = EV_CURRENT, .d_buf = &u }; +- +- x.d_type = ELF_T_EHDR; +- x.d_size = sizeof u.ehdr; +- u.ehdr = dso->ehdr; +- u.ehdr.e_phoff = u.ehdr.e_shoff = 0; +- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL) +- { +- bad: +- fprintf (stderr, "Failed to compute header checksum: %s\n", +- elf_errmsg (elf_errno ())); +- exit (1); +- } +- +- x.d_type = ELF_T_PHDR; +- x.d_size = sizeof u.phdr; +- for (i = 0; i < dso->ehdr.e_phnum; ++i) +- { +- if (gelf_getphdr (dso->elf, i, &u.phdr) == NULL) +- goto bad; +- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL) +- goto bad; +- process (x.d_buf, x.d_size); +- } +- +- x.d_type = ELF_T_SHDR; +- x.d_size = sizeof u.shdr; +- for (i = 0; i < dso->ehdr.e_shnum; ++i) +- if (dso->scn[i] != NULL) +- { +- u.shdr = dso->shdr[i]; +- u.shdr.sh_offset = 0; +- if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL) +- goto bad; +- process (x.d_buf, x.d_size); +- +- if (u.shdr.sh_type != SHT_NOBITS) +- { +- Elf_Data *d = elf_rawdata (dso->scn[i], NULL); +- if (d == NULL) +- goto bad; +- process (d->d_buf, d->d_size); +- } +- } +- } +- +- hashFunctionContextDigest (&ctx, (byte *) build_id->d_buf + build_id_offset); +- hashFunctionContextFree (&ctx); +- +- elf_flagdata (build_id, ELF_C_SET, ELF_F_DIRTY); +- +- /* Now format the build ID bits in hex to print out. */ +- { +- const rpmuint8_t * id = (rpmuint8_t *)build_id->d_buf + build_id_offset; +- char hex[build_id_size * 2 + 1]; +- int n = snprintf (hex, 3, "%02" PRIx8, id[0]); +- assert (n == 2); +- for (i = 1; i < (int)build_id_size; ++i) +- { +- n = snprintf (&hex[i * 2], 3, "%02" PRIx8, id[i]); +- assert (n == 2); +- } +- puts (hex); +- } +-} +- +-int +-main (int argc, char *argv[]) +-{ +- DSO *dso; +- int fd, i; +- const char *file; +- poptContext optCon; /* context for parsing command-line options */ +- int nextopt; +- const char **args; +- struct stat stat_buf; +- char *p; +- Elf_Data *build_id = NULL; +- size_t build_id_offset = 0, build_id_size = 0; +- +- optCon = poptGetContext("debugedit", argc, (const char **)argv, optionsTable, 0); +- +- while ((nextopt = poptGetNextOpt (optCon)) > 0 || nextopt == POPT_ERROR_BADOPT) +- /* do nothing */ ; +- +- if (nextopt != -1) +- { +- fprintf (stderr, "Error on option %s: %s.\nRun '%s --help' to see a full list of available command line options.\n", +- poptBadOption (optCon, 0), +- poptStrerror (nextopt), +- argv[0]); +- exit (1); +- } +- +- args = poptGetArgs (optCon); +- if (args == NULL || args[0] == NULL || args[1] != NULL) +- { +- poptPrintHelp(optCon, stdout, 0); +- exit (1); +- } +- +- if (dest_dir != NULL) +- { +- if (base_dir == NULL) +- { +- fprintf (stderr, "You must specify a base dir if you specify a dest dir\n"); +- exit (1); +- } +- if (strlen (dest_dir) > strlen (base_dir)) +- { +- fprintf (stderr, "Only dest dir longer than base dir not supported\n"); +- exit (1); +- } +- } +- +- /* Make sure there are trailing slashes in dirs */ +- if (base_dir != NULL && base_dir[strlen (base_dir)-1] != '/') +- { +- p = malloc (strlen (base_dir) + 2); +- strcpy (p, base_dir); +- strcat (p, "/"); +- free (base_dir); +- base_dir = p; +- } +- if (dest_dir != NULL && dest_dir[strlen (dest_dir)-1] != '/') +- { +- p = malloc (strlen (dest_dir) + 2); +- strcpy (p, dest_dir); +- strcat (p, "/"); +- free (dest_dir); +- dest_dir = p; +- } +- +- if (list_file != NULL) +- { +- list_file_fd = open (list_file, O_WRONLY|O_CREAT|O_APPEND, 0644); +- } +- +- file = args[0]; +- +- if (elf_version(EV_CURRENT) == EV_NONE) +- { +- fprintf (stderr, "library out of date\n"); +- exit (1); +- } +- +- if (stat(file, &stat_buf) < 0) +- { +- fprintf (stderr, "Failed to open input file '%s': %s\n", file, strerror(errno)); +- exit (1); +- } +- +- /* Make sure we can read and write */ +- chmod (file, stat_buf.st_mode | S_IRUSR | S_IWUSR); +- +- fd = open (file, O_RDWR); +- if (fd < 0) +- { +- fprintf (stderr, "Failed to open input file '%s': %s\n", file, strerror(errno)); +- exit (1); +- } +- +- dso = fdopen_dso (fd, file); +- if (dso == NULL) +- exit (1); +- +- for (i = 1; i < dso->ehdr.e_shnum; i++) +- { +- const char *name; +- +- switch (dso->shdr[i].sh_type) +- { +- case SHT_PROGBITS: +- case SHT_MIPS_DWARF: +- name = strptr (dso, dso->ehdr.e_shstrndx, dso->shdr[i].sh_name); +- /* TODO: Handle stabs */ +-#if 0 +- if (strcmp (name, ".stab") == 0) +- edit_stabs (dso, i); +-#endif +- if (strcmp (name, ".debug_info") == 0) +- edit_dwarf2 (dso); +- +- break; +- case SHT_NOTE: +- if (do_build_id +- && build_id == NULL && (dso->shdr[i].sh_flags & SHF_ALLOC)) +- { +- /* Look for a build-ID note here. */ +- Elf_Data *data = elf_rawdata (elf_getscn (dso->elf, i), NULL); +- Elf32_Nhdr nh; +- Elf_Data dst = +- { +- .d_version = EV_CURRENT, .d_type = ELF_T_NHDR, +- .d_buf = &nh, .d_size = sizeof nh +- }; +- Elf_Data src = dst; +- src.d_buf = data->d_buf; +- assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr)); +- while ((char *) data->d_buf + data->d_size - +- (char *) src.d_buf > (int) sizeof nh +- && elf32_xlatetom (&dst, &src, dso->ehdr.e_ident[EI_DATA])) +- { +- Elf32_Word len = sizeof nh + nh.n_namesz; +- len = (len + 3) & ~3; +- +- if (nh.n_namesz == sizeof "GNU" && nh.n_type == 3 +- && !memcmp ((char *) src.d_buf + sizeof nh, "GNU", sizeof "GNU")) +- { +- build_id = data; +- build_id_offset = (char *) src.d_buf + len - +- (char *) data->d_buf; +- build_id_size = nh.n_descsz; +- break; +- } +- +- len += nh.n_descsz; +- len = (len + 3) & ~3; +- src.d_buf = (char *) src.d_buf + len; +- } +- } +- break; +- default: +- break; +- } +- } +- +- if (do_build_id && build_id != NULL) +- handle_build_id (dso, build_id, build_id_offset, build_id_size); +- +- if (elf_update (dso->elf, ELF_C_WRITE) < 0) +- { +- fprintf (stderr, "Failed to write file: %s\n", elf_errmsg (elf_errno())); +- exit (1); +- } +- if (elf_end (dso->elf) < 0) +- { +- fprintf (stderr, "elf_end failed: %s\n", elf_errmsg (elf_errno())); +- exit (1); +- } +- close (fd); +- +- /* Restore old access rights */ +- chmod (file, stat_buf.st_mode); +- +- poptFreeContext (optCon); +- +- return 0; +-} +diff --git a/src/debugedit/hashtab.c b/src/debugedit/hashtab.c +deleted file mode 100644 +index e498545..0000000 +--- a/src/debugedit/hashtab.c ++++ /dev/null +@@ -1,523 +0,0 @@ +-/* An expandable hash tables datatype. +- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +- Contributed by Vladimir Makarov (vmakarov(a)cygnus.com). +- +-This file is part of the libiberty library. +-Libiberty is free software; you can redistribute it and/or +-modify it under the terms of the GNU Library General Public +-License as published by the Free Software Foundation; either +-version 2 of the License, or (at your option) any later version. +- +-Libiberty 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 +-Library General Public License for more details. +- +-You should have received a copy of the GNU Library General Public +-License along with libiberty; see the file COPYING.LIB. If +-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-Boston, MA 02111-1307, USA. */ +- +-/* This package implements basic hash table functionality. It is possible +- to search for an entry, create an entry and destroy an entry. +- +- Elements in the table are generic pointers. +- +- The size of the table is not fixed; if the occupancy of the table +- grows too high the hash table will be expanded. +- +- The abstract data implementation is based on generalized Algorithm D +- from Knuth's book "The art of computer programming". Hash table is +- expanded by creation of new hash table and transferring elements from +- the old table to the new table. */ +- +-#include <sys/types.h> +-#include <stdlib.h> +-#include <string.h> +-#include <stdio.h> +-#include "hashtab.h" +- +-/* This macro defines reserved value for empty table entry. */ +- +-#define EMPTY_ENTRY ((void *) 0) +- +-/* This macro defines reserved value for table entry which contained +- a deleted element. */ +- +-#define DELETED_ENTRY ((void *) 1) +- +-static unsigned long higher_prime_number (unsigned long); +-static hashval_t hash_pointer (const void *); +-static int eq_pointer (const void *, const void *); +-static int htab_expand (htab_t); +-static void **find_empty_slot_for_expand (htab_t, hashval_t); +- +-/* At some point, we could make these be NULL, and modify the +- hash-table routines to handle NULL specially; that would avoid +- function-call overhead for the common case of hashing pointers. */ +-htab_hash htab_hash_pointer = hash_pointer; +-htab_eq htab_eq_pointer = eq_pointer; +- +-/* The following function returns a nearest prime number which is +- greater than N, and near a power of two. */ +- +-static unsigned long +-higher_prime_number (n) +- unsigned long n; +-{ +- /* These are primes that are near, but slightly smaller than, a +- power of two. */ +- static unsigned long primes[] = { +- (unsigned long) 2, +- (unsigned long) 7, +- (unsigned long) 13, +- (unsigned long) 31, +- (unsigned long) 61, +- (unsigned long) 127, +- (unsigned long) 251, +- (unsigned long) 509, +- (unsigned long) 1021, +- (unsigned long) 2039, +- (unsigned long) 4093, +- (unsigned long) 8191, +- (unsigned long) 16381, +- (unsigned long) 32749, +- (unsigned long) 65521, +- (unsigned long) 131071, +- (unsigned long) 262139, +- (unsigned long) 524287, +- (unsigned long) 1048573, +- (unsigned long) 2097143, +- (unsigned long) 4194301, +- (unsigned long) 8388593, +- (unsigned long) 16777213, +- (unsigned long) 33554393, +- (unsigned long) 67108859, +- (unsigned long) 134217689, +- (unsigned long) 268435399, +- (unsigned long) 536870909, +- (unsigned long) 1073741789, +- (unsigned long) 2147483647, +- /* 4294967291L */ +- ((unsigned long) 2147483647) + ((unsigned long) 2147483644), +- }; +- +- unsigned long* low = &primes[0]; +- unsigned long* high = &primes[sizeof(primes) / sizeof(primes[0])]; +- +- while (low != high) +- { +- unsigned long* mid = low + (high - low) / 2; +- if (n > *mid) +- low = mid + 1; +- else +- high = mid; +- } +- +- /* If we've run out of primes, abort. */ +- if (n > *low) +- { +- fprintf (stderr, "Cannot find prime bigger than %lu\n", n); +- abort (); +- } +- +- return *low; +-} +- +-/* Returns a hash code for P. */ +- +-static hashval_t +-hash_pointer (p) +- const void * p; +-{ +- return (hashval_t) ((long)p >> 3); +-} +- +-/* Returns non-zero if P1 and P2 are equal. */ +- +-static int +-eq_pointer (p1, p2) +- const void * p1; +- const void * p2; +-{ +- return p1 == p2; +-} +- +-/* This function creates table with length slightly longer than given +- source length. The created hash table is initiated as empty (all the +- hash table entries are EMPTY_ENTRY). The function returns the created +- hash table. Memory allocation may fail; it may return NULL. */ +- +-htab_t +-htab_try_create (size, hash_f, eq_f, del_f) +- size_t size; +- htab_hash hash_f; +- htab_eq eq_f; +- htab_del del_f; +-{ +- htab_t result; +- +- size = higher_prime_number (size); +- result = (htab_t) calloc (1, sizeof (struct htab)); +- if (result == NULL) +- return NULL; +- +- result->entries = (void **) calloc (size, sizeof (void *)); +- if (result->entries == NULL) +- { +- free (result); +- return NULL; +- } +- +- result->size = size; +- result->hash_f = hash_f; +- result->eq_f = eq_f; +- result->del_f = del_f; +- result->return_allocation_failure = 1; +- return result; +-} +- +-/* This function frees all memory allocated for given hash table. +- Naturally the hash table must already exist. */ +- +-void +-htab_delete (htab) +- htab_t htab; +-{ +- int i; +- +- if (htab->del_f) +- for (i = htab->size - 1; i >= 0; i--) +- if (htab->entries[i] != EMPTY_ENTRY +- && htab->entries[i] != DELETED_ENTRY) +- (*htab->del_f) (htab->entries[i]); +- +- free (htab->entries); +- free (htab); +-} +- +-/* This function clears all entries in the given hash table. */ +- +-void +-htab_empty (htab) +- htab_t htab; +-{ +- int i; +- +- if (htab->del_f) +- for (i = htab->size - 1; i >= 0; i--) +- if (htab->entries[i] != EMPTY_ENTRY +- && htab->entries[i] != DELETED_ENTRY) +- (*htab->del_f) (htab->entries[i]); +- +- memset (htab->entries, 0, htab->size * sizeof (void *)); +-} +- +-/* Similar to htab_find_slot, but without several unwanted side effects: +- - Does not call htab->eq_f when it finds an existing entry. +- - Does not change the count of elements/searches/collisions in the +- hash table. +- This function also assumes there are no deleted entries in the table. +- HASH is the hash value for the element to be inserted. */ +- +-static void ** +-find_empty_slot_for_expand (htab, hash) +- htab_t htab; +- hashval_t hash; +-{ +- size_t size = htab->size; +- hashval_t hash2 = 1 + hash % (size - 2); +- unsigned int index = hash % size; +- +- for (;;) +- { +- void **slot = htab->entries + index; +- +- if (*slot == EMPTY_ENTRY) +- return slot; +- else if (*slot == DELETED_ENTRY) +- abort (); +- +- index += hash2; +- if (index >= size) +- index -= size; +- } +-} +- +-/* The following function changes size of memory allocated for the +- entries and repeatedly inserts the table elements. The occupancy +- of the table after the call will be about 50%. Naturally the hash +- table must already exist. Remember also that the place of the +- table entries is changed. If memory allocation failures are allowed, +- this function will return zero, indicating that the table could not be +- expanded. If all goes well, it will return a non-zero value. */ +- +-static int +-htab_expand (htab) +- htab_t htab; +-{ +- void **oentries; +- void **olimit; +- void **p; +- +- oentries = htab->entries; +- olimit = oentries + htab->size; +- +- htab->size = higher_prime_number (htab->size * 2); +- +- if (htab->return_allocation_failure) +- { +- void **nentries = (void **) calloc (htab->size, sizeof (void **)); +- if (nentries == NULL) +- return 0; +- htab->entries = nentries; +- } +- +- htab->n_elements -= htab->n_deleted; +- htab->n_deleted = 0; +- +- p = oentries; +- do +- { +- void * x = *p; +- +- if (x != EMPTY_ENTRY && x != DELETED_ENTRY) +- { +- void **q = find_empty_slot_for_expand (htab, (*htab->hash_f) (x)); +- +- *q = x; +- } +- +- p++; +- } +- while (p < olimit); +- +- free (oentries); +- return 1; +-} +- +-/* This function searches for a hash table entry equal to the given +- element. It cannot be used to insert or delete an element. */ +- +-void * +-htab_find_with_hash (htab, element, hash) +- htab_t htab; +- const void * element; +- hashval_t hash; +-{ +- unsigned int index; +- hashval_t hash2; +- size_t size; +- void * entry; +- +- htab->searches++; +- size = htab->size; +- index = hash % size; +- +- entry = htab->entries[index]; +- if (entry == EMPTY_ENTRY +- || (entry != DELETED_ENTRY && (*htab->eq_f) (entry, element))) +- return entry; +- +- hash2 = 1 + hash % (size - 2); +- +- for (;;) +- { +- htab->collisions++; +- index += hash2; +- if (index >= size) +- index -= size; +- +- entry = htab->entries[index]; +- if (entry == EMPTY_ENTRY +- || (entry != DELETED_ENTRY && (*htab->eq_f) (entry, element))) +- return entry; +- } +-} +- +-/* Like htab_find_slot_with_hash, but compute the hash value from the +- element. */ +- +-void * +-htab_find (htab, element) +- htab_t htab; +- const void * element; +-{ +- return htab_find_with_hash (htab, element, (*htab->hash_f) (element)); +-} +- +-/* This function searches for a hash table slot containing an entry +- equal to the given element. To delete an entry, call this with +- INSERT = 0, then call htab_clear_slot on the slot returned (possibly +- after doing some checks). To insert an entry, call this with +- INSERT = 1, then write the value you want into the returned slot. +- When inserting an entry, NULL may be returned if memory allocation +- fails. */ +- +-void ** +-htab_find_slot_with_hash (htab, element, hash, insert) +- htab_t htab; +- const void * element; +- hashval_t hash; +- enum insert_option insert; +-{ +- void **first_deleted_slot; +- unsigned int index; +- hashval_t hash2; +- size_t size; +- +- if (insert == INSERT && htab->size * 3 <= htab->n_elements * 4 +- && htab_expand (htab) == 0) +- return NULL; +- +- size = htab->size; +- hash2 = 1 + hash % (size - 2); +- index = hash % size; +- +- htab->searches++; +- first_deleted_slot = NULL; +- +- for (;;) +- { +- void * entry = htab->entries[index]; +- if (entry == EMPTY_ENTRY) +- { +- if (insert == NO_INSERT) +- return NULL; +- +- htab->n_elements++; +- +- if (first_deleted_slot) +- { +- *first_deleted_slot = EMPTY_ENTRY; +- return first_deleted_slot; +- } +- +- return &htab->entries[index]; +- } +- +- if (entry == DELETED_ENTRY) +- { +- if (!first_deleted_slot) +- first_deleted_slot = &htab->entries[index]; +- } +- else if ((*htab->eq_f) (entry, element)) +- return &htab->entries[index]; +- +- htab->collisions++; +- index += hash2; +- if (index >= size) +- index -= size; +- } +-} +- +-/* Like htab_find_slot_with_hash, but compute the hash value from the +- element. */ +- +-void ** +-htab_find_slot (htab, element, insert) +- htab_t htab; +- const void * element; +- enum insert_option insert; +-{ +- return htab_find_slot_with_hash (htab, element, (*htab->hash_f) (element), +- insert); +-} +- +-/* This function deletes an element with the given value from hash +- table. If there is no matching element in the hash table, this +- function does nothing. */ +- +-void +-htab_remove_elt (htab, element) +- htab_t htab; +- void * element; +-{ +- void **slot; +- +- slot = htab_find_slot (htab, element, NO_INSERT); +- if (*slot == EMPTY_ENTRY) +- return; +- +- if (htab->del_f) +- (*htab->del_f) (*slot); +- +- *slot = DELETED_ENTRY; +- htab->n_deleted++; +-} +- +-/* This function clears a specified slot in a hash table. It is +- useful when you've already done the lookup and don't want to do it +- again. */ +- +-void +-htab_clear_slot (htab, slot) +- htab_t htab; +- void **slot; +-{ +- if (slot < htab->entries || slot >= htab->entries + htab->size +- || *slot == EMPTY_ENTRY || *slot == DELETED_ENTRY) +- abort (); +- +- if (htab->del_f) +- (*htab->del_f) (*slot); +- +- *slot = DELETED_ENTRY; +- htab->n_deleted++; +-} +- +-/* This function scans over the entire hash table calling +- CALLBACK for each live entry. If CALLBACK returns false, +- the iteration stops. INFO is passed as CALLBACK's second +- argument. */ +- +-void +-htab_traverse (htab, callback, info) +- htab_t htab; +- htab_trav callback; +- void * info; +-{ +- void **slot = htab->entries; +- void **limit = slot + htab->size; +- +- do +- { +- void * x = *slot; +- +- if (x != EMPTY_ENTRY && x != DELETED_ENTRY) +- if (!(*callback) (slot, info)) +- break; +- } +- while (++slot < limit); +-} +- +-/* Return the current size of given hash table. */ +- +-size_t +-htab_size (htab) +- htab_t htab; +-{ +- return htab->size; +-} +- +-/* Return the current number of elements in given hash table. */ +- +-size_t +-htab_elements (htab) +- htab_t htab; +-{ +- return htab->n_elements - htab->n_deleted; +-} +- +-/* Return the fraction of fixed collisions during all work with given +- hash table. */ +- +-double +-htab_collisions (htab) +- htab_t htab; +-{ +- if (htab->searches == 0) +- return 0.0; +- +- return (double) htab->collisions / (double) htab->searches; +-} +diff --git a/src/debugedit/hashtab.h b/src/debugedit/hashtab.h +deleted file mode 100644 +index 9ed18ae..0000000 +--- a/src/debugedit/hashtab.h ++++ /dev/null +@@ -1,143 +0,0 @@ +-/* An expandable hash tables datatype. +- Copyright (C) 1999, 2000 Free Software Foundation, Inc. +- Contributed by Vladimir Makarov (vmakarov(a)cygnus.com). +- +-This program is free software; you can redistribute it and/or modify +-it under the terms of the GNU General Public License as published by +-the Free Software Foundation; either version 2 of the License, or +-(at your option) any later version. +- +-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, write to the Free Software +-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +- +-/* This package implements basic hash table functionality. It is possible +- to search for an entry, create an entry and destroy an entry. +- +- Elements in the table are generic pointers. +- +- The size of the table is not fixed; if the occupancy of the table +- grows too high the hash table will be expanded. +- +- The abstract data implementation is based on generalized Algorithm D +- from Knuth's book "The art of computer programming". Hash table is +- expanded by creation of new hash table and transferring elements from +- the old table to the new table. */ +- +-#ifndef __HASHTAB_H__ +-#define __HASHTAB_H__ +- +-#ifdef __cplusplus +-extern "C" { +-#endif /* __cplusplus */ +- +-/* The type for a hash code. */ +-typedef unsigned int hashval_t; +- +-/* Callback function pointer types. */ +- +-/* Calculate hash of a table entry. */ +-typedef hashval_t (*htab_hash) (const void *); +- +-/* Compare a table entry with a possible entry. The entry already in +- the table always comes first, so the second element can be of a +- different type (but in this case htab_find and htab_find_slot +- cannot be used; instead the variants that accept a hash value +- must be used). */ +-typedef int (*htab_eq) (const void *, const void *); +- +-/* Cleanup function called whenever a live element is removed from +- the hash table. */ +-typedef void (*htab_del) (void *); +- +-/* Function called by htab_traverse for each live element. The first +- arg is the slot of the element (which can be passed to htab_clear_slot +- if desired), the second arg is the auxiliary pointer handed to +- htab_traverse. Return 1 to continue scan, 0 to stop. */ +-typedef int (*htab_trav) (void **, void *); +- +-/* Hash tables are of the following type. The structure +- (implementation) of this type is not needed for using the hash +- tables. All work with hash table should be executed only through +- functions mentioned below. */ +- +-struct htab +-{ +- /* Pointer to hash function. */ +- htab_hash hash_f; +- +- /* Pointer to comparison function. */ +- htab_eq eq_f; +- +- /* Pointer to cleanup function. */ +- htab_del del_f; +- +- /* Table itself. */ +- void **entries; +- +- /* Current size (in entries) of the hash table */ +- size_t size; +- +- /* Current number of elements including also deleted elements */ +- size_t n_elements; +- +- /* Current number of deleted elements in the table */ +- size_t n_deleted; +- +- /* The following member is used for debugging. Its value is number +- of all calls of `htab_find_slot' for the hash table. */ +- unsigned int searches; +- +- /* The following member is used for debugging. Its value is number +- of collisions fixed for time of work with the hash table. */ +- unsigned int collisions; +- +- /* This is non-zero if we are allowed to return NULL for function calls +- that allocate memory. */ +- int return_allocation_failure; +-}; +- +-typedef struct htab *htab_t; +- +-/* An enum saying whether we insert into the hash table or not. */ +-enum insert_option {NO_INSERT, INSERT}; +- +-/* The prototypes of the package functions. */ +- +-/* This function is like htab_create, but may return NULL if memory +- allocation fails, and also signals that htab_find_slot_with_hash and +- htab_find_slot are allowed to return NULL when inserting. */ +-extern htab_t htab_try_create (size_t, htab_hash, htab_eq, htab_del); +-extern void htab_delete (htab_t); +-extern void htab_empty (htab_t); +- +-extern void *htab_find (htab_t, const void *); +-extern void **htab_find_slot (htab_t, const void *, enum insert_option); +-extern void *htab_find_with_hash (htab_t, const void *, hashval_t); +-extern void **htab_find_slot_with_hash (htab_t, const void *, hashval_t, +- enum insert_option); +-extern void htab_clear_slot (htab_t, void **); +-extern void htab_remove_elt (htab_t, void *); +- +-extern void htab_traverse (htab_t, htab_trav, void *); +- +-extern size_t htab_size (htab_t); +-extern size_t htab_elements (htab_t); +-extern double htab_collisions (htab_t); +- +-/* A hash function for pointers. */ +-extern htab_hash htab_hash_pointer; +- +-/* An equality function for pointers. */ +-extern htab_eq htab_eq_pointer; +- +-#ifdef __cplusplus +-} +-#endif /* __cplusplus */ +- +-#endif /* __HASHTAB_H */ +diff --git a/src/debugedit/rpmiotypes.h b/src/debugedit/rpmiotypes.h +deleted file mode 100644 +index 04891a1..0000000 +--- a/src/debugedit/rpmiotypes.h ++++ /dev/null +@@ -1,653 +0,0 @@ +-#ifndef _H_RPMIOTYPES_ +-#define _H_RPMIOTYPES_ +- +-/** \ingroup rpmio +- * \file rpmio/rpmiotypes.h +- */ +- +-/** \ingroup rpmio +- * RPM return codes. +- */ +-typedef enum rpmRC_e { +- RPMRC_OK = 0, /*!< Generic success code */ +- RPMRC_NOTFOUND = 1, /*!< Generic not found code. */ +- RPMRC_FAIL = 2, /*!< Generic failure code. */ +- RPMRC_NOTTRUSTED = 3, /*!< Signature is OK, but key is not trusted. */ +- RPMRC_NOKEY = 4 /*!< Public key is unavailable. */ +-} rpmRC; +- +-/** \ingroup rpmio +- * Private int typedefs to avoid C99 portability issues. +- */ +-typedef /*@unsignedintegraltype@*/ unsigned char rpmuint8_t; +-typedef /*@unsignedintegraltype@*/ unsigned short rpmuint16_t; +-typedef /*@unsignedintegraltype@*/ unsigned int rpmuint32_t; +-typedef /*@unsignedintegraltype@*/ unsigned long long rpmuint64_t; +- +-/** \ingroup rpmio +- */ +-typedef /*@signedintegraltype@*/ int rpmint32_t; +- +-/** +- */ +-typedef /*@refcounted@*/ struct rpmioItem_s * rpmioItem; +-struct rpmioItem_s { +-/*@null@*/ +- void *use; /*!< use count -- return to pool when zero */ +-/*@kept@*/ /*@null@*/ +- void *pool; /*!< pool (or NULL if malloc'd) */ +-#if defined(__LCLINT__) +-/*@refs@*/ +- int nrefs; /*!< (unused) keep splint happy */ +-#endif +-}; +- +-/** +- */ +-typedef struct rpmioPool_s * rpmioPool; +- +-/** \ingroup rpmio +- */ +-typedef /*@abstract@*/ /*@refcounted@*/ struct rpmiob_s * rpmiob; +- +-/** \ingroup rpmio +- */ +-/*@unchecked@*/ +-extern size_t _rpmiob_chunk; +- +-/** \ingroup rpmio +- */ +-typedef struct rpmioP_s { +- char * str; +- char * next; +- const char ** av; +- int ac; +-} * rpmioP; +- +-/** \ingroup rpmpgp +- */ +-typedef /*@abstract@*/ struct DIGEST_CTX_s * DIGEST_CTX; +- +-/** \ingroup rpmpgp +- */ +-typedef /*@abstract@*/ struct pgpPkt_s * pgpPkt; +- +-/** \ingroup rpmpgp +- */ +-typedef /*@abstract@*/ /*@refcounted@*/ struct pgpDig_s * pgpDig; +- +-/** \ingroup rpmpgp +- */ +-typedef /*@abstract@*/ struct pgpDigParams_s * pgpDigParams; +- +-/** \ingroup rpmpgp +- */ +-typedef rpmuint8_t pgpKeyID_t[8]; +- +-/** \ingroup rpmpgp +- */ +-typedef rpmuint8_t pgpTime_t[4]; +- +-/** \ingroup rpmpgp +- * Bit(s) to control digest and signature verification. +- */ +-typedef enum pgpVSFlags_e { +- RPMVSF_DEFAULT = 0, +- RPMVSF_NOHDRCHK = (1 << 0), +- RPMVSF_NEEDPAYLOAD = (1 << 1), +- /* bit(s) 2-7 unused */ +- RPMVSF_NOSHA1HEADER = (1 << 8), +- RPMVSF_NOMD5HEADER = (1 << 9), /* unimplemented */ +- RPMVSF_NODSAHEADER = (1 << 10), +- RPMVSF_NORSAHEADER = (1 << 11), +- /* bit(s) 12-15 unused */ +- RPMVSF_NOSHA1 = (1 << 16), /* unimplemented */ +- RPMVSF_NOMD5 = (1 << 17), +- RPMVSF_NODSA = (1 << 18), +- RPMVSF_NORSA = (1 << 19) +- /* bit(s) 20-31 unused */ +-} pgpVSFlags; +- +-#define _RPMVSF_NODIGESTS \ +- ( RPMVSF_NOSHA1HEADER | \ +- RPMVSF_NOMD5HEADER | \ +- RPMVSF_NOSHA1 | \ +- RPMVSF_NOMD5 ) +- +-#define _RPMVSF_NOSIGNATURES \ +- ( RPMVSF_NODSAHEADER | \ +- RPMVSF_NORSAHEADER | \ +- RPMVSF_NODSA | \ +- RPMVSF_NORSA ) +- +-#define _RPMVSF_NOHEADER \ +- ( RPMVSF_NOSHA1HEADER | \ +- RPMVSF_NOMD5HEADER | \ +- RPMVSF_NODSAHEADER | \ +- RPMVSF_NORSAHEADER ) +- +-#define _RPMVSF_NOPAYLOAD \ +- ( RPMVSF_NOSHA1 | \ +- RPMVSF_NOMD5 | \ +- RPMVSF_NODSA | \ +- RPMVSF_NORSA ) +- +-/*@-redef@*/ /* LCL: ??? */ +-typedef /*@abstract@*/ const void * fnpyKey; +-/*@=redef@*/ +- +-/** +- * Bit(s) to identify progress callbacks. +- */ +-typedef enum rpmCallbackType_e { +- RPMCALLBACK_UNKNOWN = 0, +- RPMCALLBACK_INST_PROGRESS = (1 << 0), +- RPMCALLBACK_INST_START = (1 << 1), +- RPMCALLBACK_INST_OPEN_FILE = (1 << 2), +- RPMCALLBACK_INST_CLOSE_FILE = (1 << 3), +- RPMCALLBACK_TRANS_PROGRESS = (1 << 4), +- RPMCALLBACK_TRANS_START = (1 << 5), +- RPMCALLBACK_TRANS_STOP = (1 << 6), +- RPMCALLBACK_UNINST_PROGRESS = (1 << 7), +- RPMCALLBACK_UNINST_START = (1 << 8), +- RPMCALLBACK_UNINST_STOP = (1 << 9), +- RPMCALLBACK_REPACKAGE_PROGRESS = (1 << 10), +- RPMCALLBACK_REPACKAGE_START = (1 << 11), +- RPMCALLBACK_REPACKAGE_STOP = (1 << 12), +- RPMCALLBACK_UNPACK_ERROR = (1 << 13), +- RPMCALLBACK_CPIO_ERROR = (1 << 14), +- RPMCALLBACK_SCRIPT_ERROR = (1 << 15) +-} rpmCallbackType; +- +-/** +- */ +-typedef void * rpmCallbackData; +- +-/** \ingroup rpmpgp +- * 9.4. Hash Algorithms +- * +-\verbatim +- ID Algorithm Text Name +- -- --------- ---- ---- +- 1 - MD5 "MD5" +- 2 - SHA-1 "SHA1" +- 3 - RIPE-MD/160 "RIPEMD160" +- 4 - Reserved for double-width SHA (experimental) +- 5 - MD2 "MD2" +- 6 - Reserved for TIGER/192 "TIGER192" +- 7 - Reserved for HAVAL (5 pass, 160-bit) "HAVAL-5-160" +- 100 to 110 - Private/Experimental algorithm. +-\endverbatim +- * +- * Implementations MUST implement SHA-1. Implementations SHOULD +- * implement MD5. +- * @todo Add SHA256. +- */ +-typedef enum pgpHashAlgo_e { +- PGPHASHALGO_ERROR = -1, +- PGPHASHALGO_NONE = 0, +- PGPHASHALGO_MD5 = 1, /*!< MD5 */ +- PGPHASHALGO_SHA1 = 2, /*!< SHA-1 */ +- PGPHASHALGO_RIPEMD160 = 3, /*!< RIPEMD-160 */ +- PGPHASHALGO_MD2 = 5, /*!< MD2 */ +- PGPHASHALGO_TIGER192 = 6, /*!< TIGER-192 */ +- PGPHASHALGO_HAVAL_5_160 = 7, /*!< HAVAL-5-160 */ +- PGPHASHALGO_SHA256 = 8, /*!< SHA-256 */ +- PGPHASHALGO_SHA384 = 9, /*!< SHA-384 */ +- PGPHASHALGO_SHA512 = 10, /*!< SHA-512 */ +- PGPHASHALGO_SHA224 = 11, /*!< SHA-224 */ +- +- PGPHASHALGO_MD4 = 104, /*!< (private) MD4 */ +- PGPHASHALGO_RIPEMD128 = 105, /*!< (private) RIPEMD-128 */ +- PGPHASHALGO_CRC32 = 106, /*!< (private) CRC-32 */ +- PGPHASHALGO_ADLER32 = 107, /*!< (private) ADLER-32 */ +- PGPHASHALGO_CRC64 = 108, /*!< (private) CRC-64 */ +- PGPHASHALGO_JLU32 = 109, /*!< (private) Jenkins lookup3.c */ +- +- PGPHASHALGO_RIPEMD256 = 111, /*!< (private) RIPEMD-256 */ +- PGPHASHALGO_RIPEMD320 = 112, /*!< (private) RIPEMD-320 */ +- PGPHASHALGO_SALSA10 = 113, /*!< (private) SALSA-10 */ +- PGPHASHALGO_SALSA20 = 114, /*!< (private) SALSA-20 */ +- +- PGPHASHALGO_MD6_224 = 128+0,/*!< (private) MD6-224 */ +- PGPHASHALGO_MD6_256 = 128+1,/*!< (private) MD6-256 */ +- PGPHASHALGO_MD6_384 = 128+2,/*!< (private) MD6-384 */ +- PGPHASHALGO_MD6_512 = 128+3,/*!< (private) MD6-512 */ +- +- PGPHASHALGO_CUBEHASH_224 = 136+0,/*!< (private) CUBEHASH-224 */ +- PGPHASHALGO_CUBEHASH_256 = 136+1,/*!< (private) CUBEHASH-256 */ +- PGPHASHALGO_CUBEHASH_384 = 136+2,/*!< (private) CUBEHASH-384 */ +- PGPHASHALGO_CUBEHASH_512 = 136+3,/*!< (private) CUBEHASH-512 */ +- +- PGPHASHALGO_KECCAK_224 = 144+0,/*!< (private) KECCAK-224 */ +- PGPHASHALGO_KECCAK_256 = 144+1,/*!< (private) KECCAK-256 */ +- PGPHASHALGO_KECCAK_384 = 144+2,/*!< (private) KECCAK-384 */ +- PGPHASHALGO_KECCAK_512 = 144+3,/*!< (private) KECCAK-384 */ +- +- PGPHASHALGO_ECHO_224 = 148+0,/*!< (private) ECHO-224 */ +- PGPHASHALGO_ECHO_256 = 148+1,/*!< (private) ECHO-256 */ +- PGPHASHALGO_ECHO_384 = 148+2,/*!< (private) ECHO-384 */ +- PGPHASHALGO_ECHO_512 = 148+3,/*!< (private) ECHO-384 */ +- +- PGPHASHALGO_EDONR_224 = 152+0,/*!< (private) EDON-R-224 */ +- PGPHASHALGO_EDONR_256 = 152+1,/*!< (private) EDON-R-256 */ +- PGPHASHALGO_EDONR_384 = 152+2,/*!< (private) EDON-R-384 */ +- PGPHASHALGO_EDONR_512 = 152+3,/*!< (private) EDON-R-512 */ +- +- PGPHASHALGO_FUGUE_224 = 156+0,/*!< (private) FUGUE-224 */ +- PGPHASHALGO_FUGUE_256 = 156+1,/*!< (private) FUGUE-256 */ +- PGPHASHALGO_FUGUE_384 = 156+2,/*!< (private) FUGUE-384 */ +- PGPHASHALGO_FUGUE_512 = 156+3,/*!< (private) FUGUE-512 */ +- +- PGPHASHALGO_SKEIN_224 = 160+0,/*!< (private) SKEIN-224 */ +- PGPHASHALGO_SKEIN_256 = 160+1,/*!< (private) SKEIN-256 */ +- PGPHASHALGO_SKEIN_384 = 160+2,/*!< (private) SKEIN-384 */ +- PGPHASHALGO_SKEIN_512 = 160+3,/*!< (private) SKEIN-512 */ +- PGPHASHALGO_SKEIN_1024 = 160+4,/*!< (private) SKEIN-1024 */ +- +- PGPHASHALGO_BMW_224 = 168+0,/*!< (private) BMW-224 */ +- PGPHASHALGO_BMW_256 = 168+1,/*!< (private) BMW-256 */ +- PGPHASHALGO_BMW_384 = 168+2,/*!< (private) BMW-384 */ +- PGPHASHALGO_BMW_512 = 168+3,/*!< (private) BMW-512 */ +- +- PGPHASHALGO_SHABAL_224 = 176+0,/*!< (private) SHABAL-224 */ +- PGPHASHALGO_SHABAL_256 = 176+1,/*!< (private) SHABAL-256 */ +- PGPHASHALGO_SHABAL_384 = 176+2,/*!< (private) SHABAL-384 */ +- PGPHASHALGO_SHABAL_512 = 176+3,/*!< (private) SHABAL-512 */ +- +- PGPHASHALGO_SHAVITE3_224 = 180+0,/*!< (private) SHAVITE3-224 */ +- PGPHASHALGO_SHAVITE3_256 = 180+1,/*!< (private) SHAVITE3-256 */ +- PGPHASHALGO_SHAVITE3_384 = 180+2,/*!< (private) SHAVITE3-384 */ +- PGPHASHALGO_SHAVITE3_512 = 180+3,/*!< (private) SHAVITE3-512 */ +- +- PGPHASHALGO_BLAKE_224 = 184+0,/*!< (private) BLAKE-224 */ +- PGPHASHALGO_BLAKE_256 = 184+1,/*!< (private) BLAKE-256 */ +- PGPHASHALGO_BLAKE_384 = 184+2,/*!< (private) BLAKE-384 */ +- PGPHASHALGO_BLAKE_512 = 184+3,/*!< (private) BLAKE-512 */ +- +- PGPHASHALGO_TIB3_224 = 192+0,/*!< (private) TIB3-224 */ +- PGPHASHALGO_TIB3_256 = 192+1,/*!< (private) TIB3-256 */ +- PGPHASHALGO_TIB3_384 = 192+2,/*!< (private) TIB3-384 */ +- PGPHASHALGO_TIB3_512 = 192+3,/*!< (private) TIB3-512 */ +- +- PGPHASHALGO_SIMD_224 = 200+0,/*!< (private) SIMD-224 */ +- PGPHASHALGO_SIMD_256 = 200+1,/*!< (private) SIMD-256 */ +- PGPHASHALGO_SIMD_384 = 200+2,/*!< (private) SIMD-384 */ +- PGPHASHALGO_SIMD_512 = 200+3,/*!< (private) SIMD-512 */ +- +- PGPHASHALGO_ARIRANG_224 = 208+0,/*!< (private) ARIRANG-224 */ +- PGPHASHALGO_ARIRANG_256 = 208+1,/*!< (private) ARIRANG-256 */ +- PGPHASHALGO_ARIRANG_384 = 208+2,/*!< (private) ARIRANG-384 */ +- PGPHASHALGO_ARIRANG_512 = 208+3,/*!< (private) ARIRANG-512 */ +- +- PGPHASHALGO_LANE_224 = 212+0,/*!< (private) LANE-224 */ +- PGPHASHALGO_LANE_256 = 212+1,/*!< (private) LANE-256 */ +- PGPHASHALGO_LANE_384 = 212+2,/*!< (private) LANE-384 */ +- PGPHASHALGO_LANE_512 = 212+3,/*!< (private) LANE-512 */ +- +- PGPHASHALGO_LUFFA_224 = 216+0,/*!< (private) LUFFA-224 */ +- PGPHASHALGO_LUFFA_256 = 216+1,/*!< (private) LUFFA-256 */ +- PGPHASHALGO_LUFFA_384 = 216+2,/*!< (private) LUFFA-384 */ +- PGPHASHALGO_LUFFA_512 = 216+3,/*!< (private) LUFFA-512 */ +- +- PGPHASHALGO_CHI_224 = 224+0,/*!< (private) CHI-224 */ +- PGPHASHALGO_CHI_256 = 224+1,/*!< (private) CHI-256 */ +- PGPHASHALGO_CHI_384 = 224+2,/*!< (private) CHI-384 */ +- PGPHASHALGO_CHI_512 = 224+3,/*!< (private) CHI-512 */ +- +- PGPHASHALGO_JH_224 = 232+0,/*!< (private) JH-224 */ +- PGPHASHALGO_JH_256 = 232+1,/*!< (private) JH-256 */ +- PGPHASHALGO_JH_384 = 232+2,/*!< (private) JH-384 */ +- PGPHASHALGO_JH_512 = 232+3,/*!< (private) JH-512 */ +- +- PGPHASHALGO_GROESTL_224 = 240+0,/*!< (private) GROESTL-224 */ +- PGPHASHALGO_GROESTL_256 = 240+1,/*!< (private) GROESTL-256 */ +- PGPHASHALGO_GROESTL_384 = 240+2,/*!< (private) GROESTL-384 */ +- PGPHASHALGO_GROESTL_512 = 240+3,/*!< (private) GROESTL-512 */ +- +- PGPHASHALGO_HAMSI_224 = 248+0,/*!< (private) HAMSI-224 */ +- PGPHASHALGO_HAMSI_256 = 248+1,/*!< (private) HAMSI-256 */ +- PGPHASHALGO_HAMSI_384 = 248+2,/*!< (private) HAMSI-384 */ +- PGPHASHALGO_HAMSI_512 = 248+3,/*!< (private) HAMSI-512 */ +- +-} pgpHashAlgo; +- +-/** \ingroup rpmpgp +- * Bit(s) to control digest operation. +- */ +-typedef enum rpmDigestFlags_e { +- RPMDIGEST_NONE = 0, +-} rpmDigestFlags; +- +-#if defined(_RPMIOB_INTERNAL) +-/** \ingroup rpmio +- */ +-struct rpmiob_s{ +- struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */ +- rpmuint8_t * b; /*!< data octects. */ +- size_t blen; /*!< no. of octets used. */ +- size_t allocated; /*!< no. of octets allocated. */ +-#if defined(__LCLINT__) +-/*@refs@*/ +- int nrefs; /*!< (unused) keep splint happy */ +-#endif +-}; +-#endif +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-/** \ingroup rpmpgp +- * Return digest algorithm identifier. +- * @param ctx digest context +- * @return digest hash algorithm identifier +- */ +-pgpHashAlgo rpmDigestAlgo(DIGEST_CTX ctx) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Return digest flags. +- * @param ctx digest context +- * @return digest flags +- */ +-rpmDigestFlags rpmDigestF(DIGEST_CTX ctx) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Return digest name. +- * @param ctx digest context +- * @return digest name +- */ +-/*@observer@*/ +-const char * rpmDigestName(DIGEST_CTX ctx) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Return digest ASN1 oid string. +- * Values from PKCS#1 v2.1 (aka RFC-3447). +- * @param ctx digest context +- * @return digest ASN1 oid string +- */ +-/*@observer@*/ /*@null@*/ +-const char * rpmDigestASN1(DIGEST_CTX ctx) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Duplicate a digest context. +- * @param octx existing digest context +- * @return duplicated digest context +- */ +-/*@only@*/ +-DIGEST_CTX rpmDigestDup(DIGEST_CTX octx) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Initialize digest. +- * Set bit count to 0 and buffer to mysterious initialization constants. +- * @param hashalgo type of digest +- * @param flags bit(s) to control digest operation +- * @return digest context +- */ +-/*@only@*/ /*@null@*/ +-DIGEST_CTX rpmDigestInit(pgpHashAlgo hashalgo, rpmDigestFlags flags) +- /*@*/; +- +-/** \ingroup rpmpgp +- * Update context with next plain text buffer. +- * @param ctx digest context +- * @param data next data buffer +- * @param len no. bytes of data +- * @return 0 on success +- */ +-int rpmDigestUpdate(/*@null@*/ DIGEST_CTX ctx, const void * data, size_t len) +- /*@modifies ctx @*/; +- +-/** \ingroup rpmpgp +- * Return digest and destroy context. +- * +- * @param ctx digest context +- * @retval *datap digest +- * @retval *lenp no. bytes of digest +- * @param asAscii return digest as ascii string? +- * @return 0 on success +- */ +-int rpmDigestFinal(/*@only@*/ /*@null@*/ DIGEST_CTX ctx, +- /*@null@*/ /*@out@*/ void * datap, +- /*@null@*/ /*@out@*/ size_t * lenp, int asAscii) +- /*@modifies *datap, *lenp @*/; +- +-/** \ingroup rpmpgp +- * +- * Compute key material and add to digest context. +- * @param ctx digest context +- * @param key HMAC key (NULL does digest instead) +- * @param keylen HMAC key length(bytes) (0 uses strlen(key)) +- * @return 0 on success +- */ +-int rpmHmacInit(DIGEST_CTX ctx, const void * key, size_t keylen) +- /*@*/; +- +-/** \ingroup rpmio +- */ +-typedef void * (*rpmCallbackFunction) +- (/*@null@*/ const void * h, +- const rpmCallbackType what, +- const rpmuint64_t amount, +- const rpmuint64_t total, +- /*@null@*/ fnpyKey key, +- /*@null@*/ rpmCallbackData data) +- /*@globals internalState@*/ +- /*@modifies internalState@*/; +- +-#if !defined(SWIG) +-/** \ingroup rpmio +- * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL. +- * @param p memory to free +- * @return NULL always +- */ +-#if defined(WITH_DMALLOC) +-#define _free(p) ((p) != NULL ? free((void *)(p)) : (void)0, NULL) +-#else +-/*@unused@*/ static inline /*@null@*/ +-void * _free(/*@only@*/ /*@null@*/ /*@out@*/ const void * p) +- /*@modifies p @*/ +-{ +- if (p != NULL) free((void *)p); +- return NULL; +-} +-#endif +-#endif +- +-/*@unused@*/ static inline int xislower(int c) /*@*/ { +- return (c >= (int)'a' && c <= (int)'z'); +-} +-/*@unused@*/ static inline int xisupper(int c) /*@*/ { +- return (c >= (int)'A' && c <= (int)'Z'); +-} +-/*@unused@*/ static inline int xisalpha(int c) /*@*/ { +- return (xislower(c) || xisupper(c)); +-} +-/*@unused@*/ static inline int xisdigit(int c) /*@*/ { +- return (c >= (int)'0' && c <= (int)'9'); +-} +-/*@unused@*/ static inline int xisalnum(int c) /*@*/ { +- return (xisalpha(c) || xisdigit(c)); +-} +-/*@unused@*/ static inline int xisblank(int c) /*@*/ { +- return (c == (int)' ' || c == (int)'\t'); +-} +-/*@unused@*/ static inline int xisspace(int c) /*@*/ { +- return (xisblank(c) || c == (int)'\n' || c == (int)'\r' || c == (int)'\f' || c == (int)'\v'); +-} +-/*@unused@*/ static inline int xiscntrl(int c) /*@*/ { +- return (c < (int)' '); +-} +-/*@unused@*/ static inline int xisascii(int c) /*@*/ { +- return ((c & 0x80) != 0x80); +-} +-/*@unused@*/ static inline int xisprint(int c) /*@*/ { +- return (c >= (int)' ' && xisascii(c)); +-} +-/*@unused@*/ static inline int xisgraph(int c) /*@*/ { +- return (c > (int)' ' && xisascii(c)); +-} +-/*@unused@*/ static inline int xispunct(int c) /*@*/ { +- return (xisgraph(c) && !xisalnum(c)); +-} +- +-/*@unused@*/ static inline int xtolower(int c) /*@*/ { +- return ((xisupper(c)) ? (c | ('a' - 'A')) : c); +-} +-/*@unused@*/ static inline int xtoupper(int c) /*@*/ { +- return ((xislower(c)) ? (c & ~('a' - 'A')) : c); +-} +- +-/** \ingroup rpmio +- * Locale insensitive strcasecmp(3). +- */ +-int xstrcasecmp(const char * s1, const char * s2) /*@*/; +- +-/** \ingroup rpmio +- * Locale insensitive strncasecmp(3). +- */ +-int xstrncasecmp(const char *s1, const char * s2, size_t n) /*@*/; +- +-/** \ingroup rpmio +- * Force encoding of string. +- */ +-/*@only@*/ /*@null@*/ +-const char * xstrtolocale(/*@only@*/ const char *str) +- /*@modifies *str @*/; +- +-/** +- * Unreference a I/O buffer instance. +- * @param iob hash table +- * @return NULL if free'd +- */ +-/*@unused@*/ /*@null@*/ +-rpmiob rpmiobUnlink (/*@killref@*/ /*@null@*/ rpmiob iob) +- /*@globals fileSystem @*/ +- /*@modifies iob, fileSystem @*/; +-#define rpmiobUnlink(_iob) \ +- ((rpmiob)rpmioUnlinkPoolItem((rpmioItem)(_iob), __FUNCTION__, __FILE__, __LINE__)) +- +-/** +- * Reference a I/O buffer instance. +- * @param iob I/O buffer +- * @return new I/O buffer reference +- */ +-/*@unused@*/ /*@newref@*/ /*@null@*/ +-rpmiob rpmiobLink (/*@null@*/ rpmiob iob) +- /*@globals fileSystem @*/ +- /*@modifies iob, fileSystem @*/; +-#define rpmiobLink(_iob) \ +- ((rpmiob)rpmioLinkPoolItem((rpmioItem)(_iob), __FUNCTION__, __FILE__, __LINE__)) +- +-/** +- * Destroy a I/O buffer instance. +- * @param iob I/O buffer +- * @return NULL on last dereference +- */ +-/*@null@*/ +-rpmiob rpmiobFree( /*@killref@*/ rpmiob iob) +- /*@globals fileSystem @*/ +- /*@modifies iob, fileSystem @*/; +-#define rpmiobFree(_iob) \ +- ((rpmiob)rpmioFreePoolItem((rpmioItem)(_iob), __FUNCTION__, __FILE__, __LINE__)) +- +-/** +- * Create an I/O buffer. +- * @param len no. of octets to allocate +- * @return new I/O buffer +- */ +-/*@newref@*/ /*@null@*/ +-rpmiob rpmiobNew(size_t len) +- /*@globals fileSystem @*/ +- /*@modifies fileSystem @*/; +- +-/** +- * Empty an I/O buffer. +- * @param iob I/O buffer +- * @return I/O buffer +- */ +-rpmiob rpmiobEmpty(/*@returned@*/ rpmiob iob) +- /*@modifies iob @*/; +- +-/** +- * Trim trailing white space. +- * @param iob I/O buffer +- * @return I/O buffer +- */ +-rpmiob rpmiobRTrim(/*@returned@*/ rpmiob iob) +- /*@modifies iob @*/; +- +-/** +- * Append string to I/O buffer. +- * @param iob I/O buffer +- * @param s string +- * @param nl append NL? +- * @return I/O buffer +- */ +-rpmiob rpmiobAppend(/*@returned@*/ rpmiob iob, const char * s, size_t nl) +- /*@modifies iob @*/; +- +-/** +- * Return I/O buffer. +- * @param iob I/O buffer +- * @return I/O buffer (as octets) +- */ +-rpmuint8_t * rpmiobBuf(rpmiob iob) +- /*@*/; +- +-/** +- * Return I/O buffer (as string). +- * @param iob I/O buffer +- * @return I/O buffer (as string) +- */ +-char * rpmiobStr(rpmiob iob) +- /*@*/; +- +-/** +- * Return I/O buffer len. +- * @param iob I/O buffer +- * @return I/O buffer length +- */ +-size_t rpmiobLen(rpmiob iob) +- /*@*/; +- +-#if defined(_RPMIOB_INTERNAL) +-/** +- * Read an entire file into a buffer. +- * @param fn file name to read +- * @retval *iobp I/O buffer +- * @return 0 on success +- */ +-int rpmiobSlurp(const char * fn, rpmiob * iobp) +- /*@globals h_errno, fileSystem, internalState @*/ +- /*@modifies *iobp, fileSystem, internalState @*/; +-#endif +- +-/** +- * Destroy a rpmioP object. +- * @param P parser state +- * @return NULL +- */ +-/*@null@*/ +-rpmioP rpmioPFree(/*@only@*/ /*@null@*/ rpmioP P) +- /*@modifies P @*/; +- +-/** +- * Parse next command out of a string incrementally. +- * @param *Pptr parser state +- * @param str string to parse +- * @return RPMRC_OK on success +- */ +-rpmRC rpmioParse(rpmioP *Pptr, const char * str) +- /*@modifies *Pptr @*/; +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* _H_RPMIOTYPES_ */ +diff --git a/src/debugedit/rpmsw.h b/src/debugedit/rpmsw.h +deleted file mode 100644 +index 9023d0b..0000000 +--- a/src/debugedit/rpmsw.h ++++ /dev/null +@@ -1,157 +0,0 @@ +-#ifndef H_RPMSW +-#define H_RPMSW +- +-/** \ingroup rpmio +- * \file rpmio/rpmsw.h +- */ +- +-/** \ingroup rpmio +- */ +-typedef unsigned long int rpmtime_t; +- +-/** \ingroup rpmio +- */ +-typedef struct rpmsw_s * rpmsw; +- +-/** \ingroup rpmio +- */ +-typedef struct rpmop_s * rpmop; +- +-/** \ingroup rpmio +- */ +-struct rpmsw_s { +- union { +- struct timeval tv; +- unsigned long long int ticks; +- unsigned long int tocks[2]; +- } u; +-}; +- +-/** \ingroup rpmio +- * Cumulative statistics for an operation. +- */ +-struct rpmop_s { +- struct rpmsw_s begin; /*!< Starting time stamp. */ +- int count; /*!< Number of operations. */ +- unsigned long long bytes; /*!< Number of bytes transferred. */ +- rpmtime_t usecs; /*!< Number of ticks. */ +-}; +- +-/*@unchecked@*/ +-extern int _rpmsw_stats; +- +-/** \ingroup rpmio +- * Indices for timestamps. +- */ +-typedef enum rpmswOpX_e { +- RPMSW_OP_TOTAL = 0, +- RPMSW_OP_CHECK = 1, +- RPMSW_OP_ORDER = 2, +- RPMSW_OP_FINGERPRINT = 3, +- RPMSW_OP_REPACKAGE = 4, +- RPMSW_OP_INSTALL = 5, +- RPMSW_OP_ERASE = 6, +- RPMSW_OP_SCRIPTLETS = 7, +- RPMSW_OP_COMPRESS = 8, +- RPMSW_OP_UNCOMPRESS = 9, +- RPMSW_OP_DIGEST = 10, +- RPMSW_OP_SIGNATURE = 11, +- RPMSW_OP_DBADD = 12, +- RPMSW_OP_DBREMOVE = 13, +- RPMSW_OP_DBGET = 14, +- RPMSW_OP_DBPUT = 15, +- RPMSW_OP_DBDEL = 16, +- RPMSW_OP_READHDR = 17, +- RPMSW_OP_HDRLOAD = 18, +- RPMSW_OP_HDRGET = 19, +- RPMSW_OP_DEBUG = 20, +- RPMSW_OP_MAX = 20 +-} rpmswOpX; +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-/** Return benchmark time stamp. +- * @param *sw time stamp +- * @return 0 on success +- */ +-/*@-exportlocal@*/ +-/*@null@*/ +-rpmsw rpmswNow(/*@returned@*/ rpmsw sw) +- /*@globals internalState @*/ +- /*@modifies sw, internalState @*/; +-/*@=exportlocal@*/ +- +-/** Return benchmark time stamp difference. +- * @param *end end time stamp +- * @param *begin begin time stamp +- * @return difference in micro-seconds +- */ +-/*@-exportlocal@*/ +-rpmtime_t rpmswDiff(/*@null@*/ rpmsw end, /*@null@*/ rpmsw begin) +- /*@*/; +-/*@=exportlocal@*/ +- +-/** Return benchmark time stamp overhead. +- * @return overhead in micro-seconds +- */ +-/*@-exportlocal@*/ +-rpmtime_t rpmswInit(void) +- /*@globals internalState @*/ +- /*@modifies internalState @*/; +-/*@=exportlocal@*/ +- +-/** \ingroup rpmio +- * Enter timed operation. +- * @param op operation statistics +- * @param rc -1 clears usec counter +- * @return 0 always +- */ +-int rpmswEnter(/*@null@*/ rpmop op, ssize_t rc) +- /*@globals internalState @*/ +- /*@modifies *op, internalState @*/; +- +-/** \ingroup rpmio +- * Exit timed operation. +- * @param op operation statistics +- * @param rc per-operation data (e.g. bytes transferred) +- * @return cumulative usecs for operation +- */ +-rpmtime_t rpmswExit(/*@null@*/ rpmop op, ssize_t rc) +- /*@globals internalState @*/ +- /*@modifies op, internalState @*/; +- +-/** \ingroup rpmio +- * Sum statistic counters. +- * @param to result statistics +- * @param from operation statistics +- * @return cumulative usecs for operation +- */ +-rpmtime_t rpmswAdd(/*@null@*/ rpmop to, /*@null@*/ rpmop from) +- /*@modifies to @*/; +- +-/** \ingroup rpmio +- * Subtract statistic counters. +- * @param to result statistics +- * @param from operation statistics +- * @return cumulative usecs for operation +- */ +-rpmtime_t rpmswSub(rpmop to, rpmop from) +- /*@modifies to @*/; +- +-/** \ingroup rpmio +- * Print operation statistics. +- * @param name operation name +- * @param op operation statistics +- * @param fp file handle (NULL uses stderr) +- */ +-void rpmswPrint(const char * name, /*@null@*/ rpmop op, /*@null@*/ FILE * fp) +- /*@globals fileSystem @*/ +- /*@modifies fp, fileSystem @*/; +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* H_RPMSW */ +diff --git a/src/debugedit/rpmtag.h b/src/debugedit/rpmtag.h +deleted file mode 100644 +index 36e24c8..0000000 +--- a/src/debugedit/rpmtag.h ++++ /dev/null +@@ -1,1243 +0,0 @@ +-#ifndef H_RPMTAG +-#define H_RPMTAG +- +-/** \ingroup header +- * \file rpmdb/rpmtag.h +- */ +- +-#include "rpmiotypes.h" +-#include "rpmsw.h" +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-/** \ingroup header +- */ +-typedef const char * errmsg_t; +- +-/** \ingroup header +- */ +-typedef /*@abstract@*/ /*@refcounted@*/ struct headerToken_s * Header; +- +-/** \ingroup header +- * The basic types of data in tags from headers. +- */ +-enum rpmTagType_e { +- /* RPM_NULL_TYPE = 0 - never been used. */ +- /* RPM_CHAR_TYPE = 1 - never been used, same as RPM_UINT8_TYPE. */ +- RPM_UINT8_TYPE = 2, +- RPM_UINT16_TYPE = 3, +- RPM_UINT32_TYPE = 4, +- RPM_UINT64_TYPE = 5, +- RPM_STRING_TYPE = 6, +- RPM_BIN_TYPE = 7, +- RPM_STRING_ARRAY_TYPE = 8, +- RPM_I18NSTRING_TYPE = 9 +- /* RPM_ASN1_TYPE = 10 - never been used. */ +- /* RPM_OPENPGP_TYPE= 11 - never been used. */ +-}; +-#define RPM_MIN_TYPE 2 +-#define RPM_MAX_TYPE 9 +-#define RPM_MASK_TYPE 0x0000ffff +- +-/** \ingroup header +- */ +-typedef enum rpmTagType_e rpmTagType; /*!< tag data type. */ +- +-/** \ingroup header +- */ +-typedef union rpmDataType_u rpmTagData; /*!< tag data. */ +- +-/** \ingroup header +- */ +-typedef rpmuint32_t rpmTagCount; /*!< tag data element count. */ +- +-/** \ingroup header +- */ +-typedef struct _HE_s * HE_t; /*!< tag container. */ +- +-/** \ingroup header +- */ +-/*@-typeuse -fielduse@*/ +-#if !defined(SWIG) +-union rpmDataType_u { +-/*@null@*/ +- void * ptr; +- rpmuint8_t * ui8p; /*!< RPM_UINT8_TYPE | RPM_CHAR_TYPE */ +- rpmuint16_t * ui16p; /*!< RPM_UINT16_TYPE */ +- rpmuint32_t * ui32p; /*!< RPM_UINT32_TYPE */ +- rpmuint64_t * ui64p; /*!< RPM_UINT64_TYPE */ +-/*@relnull@*/ +- const char * str; /*!< RPM_STRING_TYPE */ +- unsigned char * blob; /*!< RPM_BIN_TYPE */ +- const char ** argv; /*!< RPM_STRING_ARRAY_TYPE */ +- HE_t he; +-}; +-#endif +-/*@=typeuse =fielduse@*/ +- +-/*@=typeuse =fielduse@*/ +-/** \ingroup header +- */ +-/*@-enummemuse -typeuse @*/ +-typedef enum rpmSubTagType_e { +- RPM_REGION_TYPE = -10, +- RPM_BIN_ARRAY_TYPE = -11, +- RPM_XREF_TYPE = -12 +-} rpmSubTagType; +-/*@=enummemuse =typeuse @*/ +- +-/** \ingroup header +- * Identify how to return the header data type. +- */ +-/*@-enummemuse -typeuse @*/ +-typedef enum rpmTagReturnType_e { +- RPM_ANY_RETURN_TYPE = 0, +- RPM_SCALAR_RETURN_TYPE = 0x00010000, +- RPM_ARRAY_RETURN_TYPE = 0x00020000, +- RPM_MAPPING_RETURN_TYPE = 0x00040000, +- /* 0x00080000 */ +- RPM_PROBE_RETURN_TYPE = 0x00100000, +- RPM_TREE_RETURN_TYPE = 0x00200000, +- RPM_OPENPGP_RETURN_TYPE = 0x00400000, +- RPM_X509_RETURN_TYPE = 0x00800000, +- RPM_ASN1_RETURN_TYPE = 0x01000000, +- RPM_OPAQUE_RETURN_TYPE = 0x10000000, +- RPM_MASK_RETURN_TYPE = 0xffff0000 +-} rpmTagReturnType; +-/*@=enummemuse =typeuse @*/ +- +-/** +- * Header private tags. +- * @note General use tags should start at 1000 (RPM's tag space starts there). +- */ +-#define HEADER_IMAGE 61 +-#define HEADER_SIGNATURES 62 +-#define HEADER_IMMUTABLE 63 +-#define HEADER_REGIONS 64 +-#define HEADER_I18NTABLE 100 +-#define HEADER_SIGBASE 256 +-#define HEADER_TAGBASE 1000 +- +-/** \ingroup header +- */ +-typedef /*@abstract@*/ struct headerIterator_s * HeaderIterator; +- +-/** \ingroup header +- */ +-typedef /*@abstract@*/ struct headerTagIndices_s * headerTagIndices; +- +-/** \ingroup header +- */ +-typedef /*@abstract@*/ const struct headerSprintfExtension_s * headerSprintfExtension; +- +-/** +- * Pseudo-tags used by the rpmdb and rpmgi iterator API's. +- */ +-#define RPMDBI_PACKAGES 0 /* Installed package headers. */ +-#define RPMDBI_DEPENDS 1 /* Dependency resolution cache. */ +- /* (obsolete) RPMDBI_LABEL was 2 */ +-#define RPMDBI_ADDED 3 /* Added package headers. */ +-#define RPMDBI_REMOVED 4 /* Removed package headers. */ +-#define RPMDBI_AVAILABLE 5 /* Available package headers. */ +-#define RPMDBI_HDLIST 6 /* (rpmgi) Header list. */ +-#define RPMDBI_ARGLIST 7 /* (rpmgi) Argument list. */ +-#define RPMDBI_FTSWALK 8 /* (rpmgi) File tree walk. */ +-#define RPMDBI_SEQNO 9 /* Sequence numbers. */ +-#define RPMDBI_BTREE 10 /* (development) Generic DB_BTREE. */ +-#define RPMDBI_HASH 11 /* (development) Generic DB_HASH. */ +-#define RPMDBI_QUEUE 12 /* (development) Generic DB_QUEUE. */ +-#define RPMDBI_RECNO 13 /* (development) Generic DB_RECNO. */ +-#define RPMDBI_REPACKAGES 14 /* Re-packaged package paths. */ +-#define RPMDBI_REPOSITORY 15 /* Repository URI's. */ +- +-/** \ingroup header +- * Tags identify data in package headers. +- * @note tags should not have value 0! +- */ +-enum rpmTag_e { +- +- RPMTAG_HEADERIMAGE = HEADER_IMAGE, /*!< internal Current image. */ +- RPMTAG_HEADERSIGNATURES = HEADER_SIGNATURES, /*!< internal Signatures. */ +- RPMTAG_HEADERIMMUTABLE = HEADER_IMMUTABLE, /*!< x Original image. */ +-/*@-enummemuse@*/ +- RPMTAG_HEADERREGIONS = HEADER_REGIONS, /*!< internal Regions. */ +- +- RPMTAG_HEADERI18NTABLE = HEADER_I18NTABLE, /*!< s[] I18N string locales. */ +-/*@=enummemuse@*/ +- +-/* Retrofit (and uniqify) signature tags for use by tagName() and rpmQuery. */ +-/* the md5 sum was broken *twice* on big endian machines */ +-/* XXX 2nd underscore prevents tagTable generation */ +- RPMTAG_SIG_BASE = HEADER_SIGBASE, +- RPMTAG_SIGSIZE = RPMTAG_SIG_BASE+1, /* i */ +- RPMTAG_SIGLEMD5_1 = RPMTAG_SIG_BASE+2, /* internal - obsolete */ +- RPMTAG_SIGPGP = RPMTAG_SIG_BASE+3, /* x */ +- RPMTAG_SIGLEMD5_2 = RPMTAG_SIG_BASE+4, /* x internal - obsolete */ +- RPMTAG_SIGMD5 = RPMTAG_SIG_BASE+5, /* x */ +-#define RPMTAG_PKGID RPMTAG_SIGMD5 /* x */ +- RPMTAG_SIGGPG = RPMTAG_SIG_BASE+6, /* x */ +- RPMTAG_SIGPGP5 = RPMTAG_SIG_BASE+7, /* internal - obsolete */ +- +- RPMTAG_BADSHA1_1 = RPMTAG_SIG_BASE+8, /* internal - obsolete */ +- RPMTAG_BADSHA1_2 = RPMTAG_SIG_BASE+9, /* internal - obsolete */ +- RPMTAG_PUBKEYS = RPMTAG_SIG_BASE+10, /* s[] */ +- RPMTAG_DSAHEADER = RPMTAG_SIG_BASE+11, /* x */ +- RPMTAG_RSAHEADER = RPMTAG_SIG_BASE+12, /* x */ +- RPMTAG_SHA1HEADER = RPMTAG_SIG_BASE+13, /* s */ +-#define RPMTAG_HDRID RPMTAG_SHA1HEADER /* s */ +- +- RPMTAG_NAME = 1000, /* s */ +-#define RPMTAG_N RPMTAG_NAME /* s */ +- RPMTAG_VERSION = 1001, /* s */ +-#define RPMTAG_V RPMTAG_VERSION /* s */ +- RPMTAG_RELEASE = 1002, /* s */ +-#define RPMTAG_R RPMTAG_RELEASE /* s */ +- RPMTAG_EPOCH = 1003, /* i */ +-#define RPMTAG_E RPMTAG_EPOCH /* i */ +- RPMTAG_SUMMARY = 1004, /* s{} */ +- RPMTAG_DESCRIPTION = 1005, /* s{} */ +- RPMTAG_BUILDTIME = 1006, /* i */ +- RPMTAG_BUILDHOST = 1007, /* s */ +- RPMTAG_INSTALLTIME = 1008, /* i[] */ +- RPMTAG_SIZE = 1009, /* i */ +- RPMTAG_DISTRIBUTION = 1010, /* s */ +- RPMTAG_VENDOR = 1011, /* s */ +- RPMTAG_GIF = 1012, /* x */ +- RPMTAG_XPM = 1013, /* x */ +- RPMTAG_LICENSE = 1014, /* s */ +- RPMTAG_PACKAGER = 1015, /* s */ +- RPMTAG_GROUP = 1016, /* s{} */ +-/*@-enummemuse@*/ +- RPMTAG_CHANGELOG = 1017, /* s[] internal */ +-/*@=enummemuse@*/ +- RPMTAG_SOURCE = 1018, /* s[] */ +- RPMTAG_PATCH = 1019, /* s[] */ +- RPMTAG_URL = 1020, /* s */ +- RPMTAG_OS = 1021, /* s legacy used int */ +- RPMTAG_ARCH = 1022, /* s legacy used int */ +- RPMTAG_PREIN = 1023, /* s */ +- RPMTAG_POSTIN = 1024, /* s */ +- RPMTAG_PREUN = 1025, /* s */ +- RPMTAG_POSTUN = 1026, /* s */ +- RPMTAG_OLDFILENAMES = 1027, /* s[] obsolete */ +- RPMTAG_FILESIZES = 1028, /* i[] */ +- RPMTAG_FILESTATES = 1029, /* c[] */ +- RPMTAG_FILEMODES = 1030, /* h[] */ +- RPMTAG_FILEUIDS = 1031, /* i[] internal */ +- RPMTAG_FILEGIDS = 1032, /* i[] internal */ +- RPMTAG_FILERDEVS = 1033, /* h[] */ +- RPMTAG_FILEMTIMES = 1034, /* i[] */ +- RPMTAG_FILEDIGESTS = 1035, /* s[] */ +-#define RPMTAG_FILEMD5S RPMTAG_FILEDIGESTS /* s[] */ +- RPMTAG_FILELINKTOS = 1036, /* s[] */ +- RPMTAG_FILEFLAGS = 1037, /* i[] */ +-/*@-enummemuse@*/ +- RPMTAG_ROOT = 1038, /* internal - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_FILEUSERNAME = 1039, /* s[] */ +- RPMTAG_FILEGROUPNAME = 1040, /* s[] */ +-/*@-enummemuse@*/ +- RPMTAG_EXCLUDE = 1041, /* internal - obsolete */ +- RPMTAG_EXCLUSIVE = 1042, /* internal - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_ICON = 1043, /* x */ +- RPMTAG_SOURCERPM = 1044, /* s */ +- RPMTAG_FILEVERIFYFLAGS = 1045, /* i[] */ +- RPMTAG_ARCHIVESIZE = 1046, /* i */ +- RPMTAG_PROVIDENAME = 1047, /* s[] */ +-#define RPMTAG_PROVIDES RPMTAG_PROVIDENAME /* s[] */ +-#define RPMTAG_P RPMTAG_PROVIDENAME /* s[] */ +- RPMTAG_REQUIREFLAGS = 1048, /* i[] */ +- RPMTAG_REQUIRENAME = 1049, /* s[] */ +-#define RPMTAG_REQUIRES RPMTAG_REQUIRENAME /* s[] */ +- RPMTAG_REQUIREVERSION = 1050, /* s[] */ +- RPMTAG_NOSOURCE = 1051, /* i internal */ +- RPMTAG_NOPATCH = 1052, /* i internal */ +- RPMTAG_CONFLICTFLAGS = 1053, /* i[] */ +- RPMTAG_CONFLICTNAME = 1054, /* s[] */ +-#define RPMTAG_CONFLICTS RPMTAG_CONFLICTNAME /* s[] */ +-#define RPMTAG_C RPMTAG_CONFLICTNAME /* s[] */ +- RPMTAG_CONFLICTVERSION = 1055, /* s[] */ +- RPMTAG_DEFAULTPREFIX = 1056, /* s internal - deprecated */ +- RPMTAG_BUILDROOT = 1057, /* s internal */ +- RPMTAG_INSTALLPREFIX = 1058, /* s internal - deprecated */ +- RPMTAG_EXCLUDEARCH = 1059, /* s[] */ +- RPMTAG_EXCLUDEOS = 1060, /* s[] */ +- RPMTAG_EXCLUSIVEARCH = 1061, /* s[] */ +- RPMTAG_EXCLUSIVEOS = 1062, /* s[] */ +- RPMTAG_AUTOREQPROV = 1063, /* s internal */ +- RPMTAG_RPMVERSION = 1064, /* s */ +- RPMTAG_TRIGGERSCRIPTS = 1065, /* s[] */ +- RPMTAG_TRIGGERNAME = 1066, /* s[] */ +- RPMTAG_TRIGGERVERSION = 1067, /* s[] */ +- RPMTAG_TRIGGERFLAGS = 1068, /* i[] */ +- RPMTAG_TRIGGERINDEX = 1069, /* i[] */ +- RPMTAG_VERIFYSCRIPT = 1079, /* s */ +- RPMTAG_CHANGELOGTIME = 1080, /* i[] */ +- RPMTAG_CHANGELOGNAME = 1081, /* s[] */ +- RPMTAG_CHANGELOGTEXT = 1082, /* s[] */ +-/*@-enummemuse@*/ +- RPMTAG_BROKENMD5 = 1083, /* internal - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_PREREQ = 1084, /* internal */ +- RPMTAG_PREINPROG = 1085, /* s */ +- RPMTAG_POSTINPROG = 1086, /* s */ +- RPMTAG_PREUNPROG = 1087, /* s */ +- RPMTAG_POSTUNPROG = 1088, /* s */ +- RPMTAG_BUILDARCHS = 1089, /* s[] */ +- RPMTAG_OBSOLETENAME = 1090, /* s[] */ +-#define RPMTAG_OBSOLETES RPMTAG_OBSOLETENAME /* s[] */ +-#define RPMTAG_O RPMTAG_OBSOLETENAME /* s[] */ +- RPMTAG_VERIFYSCRIPTPROG = 1091, /* s */ +- RPMTAG_TRIGGERSCRIPTPROG = 1092, /* s[] */ +- RPMTAG_DOCDIR = 1093, /* internal */ +- RPMTAG_COOKIE = 1094, /* s */ +- RPMTAG_FILEDEVICES = 1095, /* i[] */ +- RPMTAG_FILEINODES = 1096, /* i[] */ +- RPMTAG_FILELANGS = 1097, /* s[] */ +- RPMTAG_PREFIXES = 1098, /* s[] */ +- RPMTAG_INSTPREFIXES = 1099, /* s[] */ +- RPMTAG_TRIGGERIN = 1100, /* internal */ +- RPMTAG_TRIGGERUN = 1101, /* internal */ +- RPMTAG_TRIGGERPOSTUN = 1102, /* internal */ +- RPMTAG_AUTOREQ = 1103, /* internal */ +- RPMTAG_AUTOPROV = 1104, /* internal */ +-/*@-enummemuse@*/ +- RPMTAG_CAPABILITY = 1105, /* i legacy - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_SOURCEPACKAGE = 1106, /* i legacy - obsolete */ +-/*@-enummemuse@*/ +- RPMTAG_OLDORIGFILENAMES = 1107, /* internal - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_BUILDPREREQ = 1108, /* internal */ +- RPMTAG_BUILDREQUIRES = 1109, /* internal */ +- RPMTAG_BUILDCONFLICTS = 1110, /* internal */ +-/*@-enummemuse@*/ +- RPMTAG_BUILDMACROS = 1111, /* s[] srpms only */ +-/*@=enummemuse@*/ +- RPMTAG_PROVIDEFLAGS = 1112, /* i[] */ +- RPMTAG_PROVIDEVERSION = 1113, /* s[] */ +- RPMTAG_OBSOLETEFLAGS = 1114, /* i[] */ +- RPMTAG_OBSOLETEVERSION = 1115, /* s[] */ +- RPMTAG_DIRINDEXES = 1116, /* i[] */ +- RPMTAG_BASENAMES = 1117, /* s[] */ +- RPMTAG_DIRNAMES = 1118, /* s[] */ +- RPMTAG_ORIGDIRINDEXES = 1119, /* i[] relocation */ +- RPMTAG_ORIGBASENAMES = 1120, /* s[] relocation */ +- RPMTAG_ORIGDIRNAMES = 1121, /* s[] relocation */ +- RPMTAG_OPTFLAGS = 1122, /* s */ +- RPMTAG_DISTURL = 1123, /* s */ +- RPMTAG_PAYLOADFORMAT = 1124, /* s */ +- RPMTAG_PAYLOADCOMPRESSOR = 1125, /* s */ +- RPMTAG_PAYLOADFLAGS = 1126, /* s */ +- RPMTAG_INSTALLCOLOR = 1127, /* i transaction color when installed */ +- RPMTAG_INSTALLTID = 1128, /* i[] */ +- RPMTAG_REMOVETID = 1129, /* i[] */ +-/*@-enummemuse@*/ +- RPMTAG_SHA1RHN = 1130, /* internal - obsolete */ +-/*@=enummemuse@*/ +- RPMTAG_RHNPLATFORM = 1131, /* s deprecated */ +- RPMTAG_PLATFORM = 1132, /* s */ +- RPMTAG_PATCHESNAME = 1133, /* s[] deprecated placeholder (SuSE) */ +- RPMTAG_PATCHESFLAGS = 1134, /* i[] deprecated placeholder (SuSE) */ +- RPMTAG_PATCHESVERSION = 1135, /* s[] deprecated placeholder (SuSE) */ +- RPMTAG_CACHECTIME = 1136, /* i rpmcache(8) only */ +- RPMTAG_CACHEPKGPATH = 1137, /* s rpmcache(8) only */ +- RPMTAG_CACHEPKGSIZE = 1138, /* i rpmcache(8) only */ +- RPMTAG_CACHEPKGMTIME = 1139, /* i rpmcache(8) only */ +- RPMTAG_FILECOLORS = 1140, /* i[] */ +- RPMTAG_FILECLASS = 1141, /* i[] */ +- RPMTAG_CLASSDICT = 1142, /* s[] */ +- RPMTAG_FILEDEPENDSX = 1143, /* i[] */ +- RPMTAG_FILEDEPENDSN = 1144, /* i[] */ +- RPMTAG_DEPENDSDICT = 1145, /* i[] */ +- RPMTAG_SOURCEPKGID = 1146, /* x */ +- RPMTAG_FILECONTEXTS = 1147, /* s[] */ +- RPMTAG_FSCONTEXTS = 1148, /* s[] extension */ +- RPMTAG_RECONTEXTS = 1149, /* s[] extension */ +- RPMTAG_POLICIES = 1150, /* s[] selinux *.te policy file. */ +- RPMTAG_PRETRANS = 1151, /* s */ +- RPMTAG_POSTTRANS = 1152, /* s */ +- RPMTAG_PRETRANSPROG = 1153, /* s */ +- RPMTAG_POSTTRANSPROG = 1154, /* s */ +- RPMTAG_DISTTAG = 1155, /* s */ +- RPMTAG_SUGGESTSNAME = 1156, /* s[] extension */ +-#define RPMTAG_SUGGESTS RPMTAG_SUGGESTSNAME /* s[] */ +- RPMTAG_SUGGESTSVERSION = 1157, /* s[] extension */ +- RPMTAG_SUGGESTSFLAGS = 1158, /* i[] extension */ +- RPMTAG_ENHANCESNAME = 1159, /* s[] extension placeholder */ +-#define RPMTAG_ENHANCES RPMTAG_ENHANCESNAME /* s[] */ +- RPMTAG_ENHANCESVERSION = 1160, /* s[] extension placeholder */ +- RPMTAG_ENHANCESFLAGS = 1161, /* i[] extension placeholder */ +- RPMTAG_PRIORITY = 1162, /* i[] extension placeholder */ +- RPMTAG_CVSID = 1163, /* s */ +-#define RPMTAG_SVNID RPMTAG_CVSID /* s */ +- RPMTAG_BLINKPKGID = 1164, /* s[] */ +- RPMTAG_BLINKHDRID = 1165, /* s[] */ +- RPMTAG_BLINKNEVRA = 1166, /* s[] */ +- RPMTAG_FLINKPKGID = 1167, /* s[] */ +- RPMTAG_FLINKHDRID = 1168, /* s[] */ +- RPMTAG_FLINKNEVRA = 1169, /* s[] */ +- RPMTAG_PACKAGEORIGIN = 1170, /* s */ +- RPMTAG_TRIGGERPREIN = 1171, /* internal */ +- RPMTAG_BUILDSUGGESTS = 1172, /* internal */ +- RPMTAG_BUILDENHANCES = 1173, /* internal */ +- RPMTAG_SCRIPTSTATES = 1174, /* i[] scriptlet exit codes */ +- RPMTAG_SCRIPTMETRICS = 1175, /* i[] scriptlet execution times */ +- RPMTAG_BUILDCPUCLOCK = 1176, /* i */ +- RPMTAG_FILEDIGESTALGOS = 1177, /* i[] */ +- RPMTAG_VARIANTS = 1178, /* s[] */ +- RPMTAG_XMAJOR = 1179, /* i */ +- RPMTAG_XMINOR = 1180, /* i */ +- RPMTAG_REPOTAG = 1181, /* s */ +- RPMTAG_KEYWORDS = 1182, /* s[] */ +- RPMTAG_BUILDPLATFORMS = 1183, /* s[] */ +- RPMTAG_PACKAGECOLOR = 1184, /* i */ +- RPMTAG_PACKAGEPREFCOLOR = 1185, /* i (unimplemented) */ +- RPMTAG_XATTRSDICT = 1186, /* s[] (unimplemented) */ +- RPMTAG_FILEXATTRSX = 1187, /* i[] (unimplemented) */ +- RPMTAG_DEPATTRSDICT = 1188, /* s[] (unimplemented) */ +- RPMTAG_CONFLICTATTRSX = 1189, /* i[] (unimplemented) */ +- RPMTAG_OBSOLETEATTRSX = 1190, /* i[] (unimplemented) */ +- RPMTAG_PROVIDEATTRSX = 1191, /* i[] (unimplemented) */ +- RPMTAG_REQUIREATTRSX = 1192, /* i[] (unimplemented) */ +- RPMTAG_BUILDPROVIDES = 1193, /* internal */ +- RPMTAG_BUILDOBSOLETES = 1194, /* internal */ +- RPMTAG_DBINSTANCE = 1195, /* i */ +- RPMTAG_NVRA = 1196, /* s */ +- RPMTAG_FILEPATHS = 1197, /* s[] */ +- RPMTAG_ORIGPATHS = 1198, /* s[] */ +- RPMTAG_RPMLIBVERSION = 1199, /* i */ +- RPMTAG_RPMLIBTIMESTAMP = 1200, /* i */ +- RPMTAG_RPMLIBVENDOR = 1201, /* i */ +- RPMTAG_CLASS = 1202, /* s arbitrary */ +- RPMTAG_TRACK = 1203, /* s internal arbitrary */ +- RPMTAG_TRACKPROG = 1204, /* s internal arbitrary */ +- RPMTAG_SANITYCHECK = 1205, /* s */ +- RPMTAG_SANITYCHECKPROG = 1206, /* s */ +- RPMTAG_FILESTAT = 1207, /* s[] stat(2) from metadata extension*/ +- RPMTAG_STAT = 1208, /* s[] stat(2) from disk extension */ +- RPMTAG_ORIGINTID = 1209, /* i[] */ +- RPMTAG_ORIGINTIME = 1210, /* i[] */ +- RPMTAG_HEADERSTARTOFF = 1211, /* l */ +- RPMTAG_HEADERENDOFF = 1212, /* l */ +- RPMTAG_PACKAGETIME = 1213, /* l */ +- RPMTAG_PACKAGESIZE = 1214, /* l */ +- RPMTAG_PACKAGEDIGEST = 1215, /* s */ +- RPMTAG_PACKAGESTAT = 1216, /* x */ +- RPMTAG_PACKAGEBASEURL = 1217, /* s */ +- RPMTAG_DISTEPOCH = 1218, /* s */ +-#define RPMTAG_D RPMTAG_DISTEPOCH /* s */ +- +- RPMTAG_CONFLICTYAMLENTRY = 1219, /* s[] */ +- RPMTAG_OBSOLETEYAMLENTRY = 1220, /* s[] */ +- RPMTAG_PROVIDEYAMLENTRY = 1221, /* s[] */ +- RPMTAG_REQUIREYAMLENTRY = 1222, /* s[] */ +- +- RPMTAG_FILEDIGESTALGO = 5011, /* i file checksum algorithm */ +- RPMTAG_BUGURL = 5012, /* s */ +- +-/*@-enummemuse@*/ +- RPMTAG_FIRSTFREE_TAG, /*!< internal */ +-/*@=enummemuse@*/ +- +- RPMTAG_PACKAGETRANSFLAGS = 0x4efaafd9, /* s[] arbitrary */ +- RPMTAG_PACKAGEDEPFLAGS = 0x748a8314, /* s[] arbitrary */ +- +- RPMTAG_BUILDPREPPROG = 0x4ba37c9e, /* s[] arbitrary */ +- RPMTAG_BUILDPREP = 0x799c0b4d, /* s[] arbitrary */ +- RPMTAG_BUILDBUILDPROG = 0x6fb46014, /* s[] arbitrary */ +- RPMTAG_BUILDBUILD = 0x5bae1a5a, /* s[] arbitrary */ +- RPMTAG_BUILDINSTALLPROG = 0x70d4ab6f, /* s[] arbitrary */ +- RPMTAG_BUILDINSTALL = 0x567f5983, /* s[] arbitrary */ +- RPMTAG_BUILDCHECKPROG = 0x488a60ce, /* s[] arbitrary */ +- RPMTAG_BUILDCHECK = 0x7f3b97b5, /* s[] arbitrary */ +- RPMTAG_BUILDCLEANPROG = 0x42c93d41, /* s[] arbitrary */ +- RPMTAG_BUILDCLEAN = 0x566042bf, /* s[] arbitrary */ +- +- RPMTAG_LASTARBITRARY_TAG = 0x80000000 /*!< internal */ +-}; +- +-#define RPMTAG_EXTERNAL_TAG 1000000 +- +-/** \ingroup signature +- * Tags found in signature header from package. +- */ +-enum rpmSigTag_e { +- RPMSIGTAG_SIZE = 1000, /*!< internal Header+Payload size in bytes. */ +- RPMSIGTAG_LEMD5_1 = 1001, /*!< internal Broken MD5, take 1 @deprecated legacy. */ +- RPMSIGTAG_PGP = 1002, /*!< internal PGP 2.6.3 signature. */ +- RPMSIGTAG_LEMD5_2 = 1003, /*!< internal Broken MD5, take 2 @deprecated legacy. */ +- RPMSIGTAG_MD5 = 1004, /*!< internal MD5 signature. */ +- RPMSIGTAG_GPG = 1005, /*!< internal GnuPG signature. */ +- RPMSIGTAG_PGP5 = 1006, /*!< internal PGP5 signature @deprecated legacy. */ +- RPMSIGTAG_PAYLOADSIZE = 1007,/*!< internal uncompressed payload size in bytes. */ +- RPMSIGTAG_BADSHA1_1 = RPMTAG_BADSHA1_1, /*!< internal Broken SHA1, take 1. */ +- RPMSIGTAG_BADSHA1_2 = RPMTAG_BADSHA1_2, /*!< internal Broken SHA1, take 2. */ +- RPMSIGTAG_SHA1 = RPMTAG_SHA1HEADER, /*!< internal sha1 header digest. */ +- RPMSIGTAG_DSA = RPMTAG_DSAHEADER, /*!< internal DSA header signature. */ +- RPMSIGTAG_RSA = RPMTAG_RSAHEADER, /*!< internal RSA header signature. */ +- RPMSIGTAG_PADDING = 0x3fffffff /*!< signature header padding */ +-}; +- +-/** \ingroup header +- */ +-typedef enum rpmTag_e rpmTag; +- +-/** \ingroup header +- */ +-typedef enum rpmSigTag_e rpmSigTag; +- +-/** \ingroup header +- */ +-/*@-typeuse -fielduse@*/ +-#if !defined(SWIG) +-struct _HE_s { +- rpmTag tag; +- rpmTagType t; +-/*@owned@*/ /*@null@*/ +- rpmTagData p; +- rpmTagCount c; +- int ix; +- unsigned int freeData : 1; +- unsigned int avail : 1; +- unsigned int append : 1; +-}; +-#endif +- +-/** +- */ +-typedef struct _HE_s HE_s; +- +-/** \ingroup rpmdb +- */ +-typedef struct tagStore_s * tagStore_t; +- +-/** +- */ +-typedef /*@abstract@*/ const struct headerTagTableEntry_s * headerTagTableEntry; +- +-#if defined(_RPMTAG_INTERNAL) +-/** +- */ +-/** \ingroup header +- * Associate tag names with numeric values. +- */ +-#if !defined(SWIG) +-struct headerTagTableEntry_s { +-/*@observer@*/ /*@relnull@*/ +- const char * name; /*!< Tag name. */ +- rpmTag val; /*!< Tag numeric value. */ +- rpmTagType type; /*!< Tag type. */ +-}; +-#endif +- +-/** +- */ +-struct tagStore_s { +-/*@only@*/ +- const char * str; /*!< Tag string (might be arbitrary). */ +- rpmTag tag; /*!< Tag number. */ +- rpmiob iob; /*!< Tag contents. */ +-}; +-#endif /* _RPMTAG_INTERNAL */ +- +-/** +- * Automatically generated table of tag name/value pairs. +- */ +-/*@-redecl@*/ +-/*@observer@*/ /*@unchecked@*/ +-extern headerTagTableEntry rpmTagTable; +-/*@=redecl@*/ +- +-/** +- * Number of entries in rpmTagTable. +- */ +-/*@-redecl@*/ +-/*@unchecked@*/ +-extern int rpmTagTableSize; +- +-/*@unchecked@*/ +-extern headerTagIndices rpmTags; +-/*@=redecl@*/ +- +-#if defined(_RPMTAG_INTERNAL) +-/** +- */ +-#if !defined(SWIG) +-struct headerTagIndices_s { +-/*@relnull@*/ +- int (*loadIndex) (headerTagTableEntry ** ipp, size_t * np, +- int (*cmp) (const void * avp, const void * bvp)) +- /*@ modifies *ipp, *np */; /*!< Load sorted tag index. */ +-/*@relnull@*/ +- headerTagTableEntry * byName; /*!< rpmTag's sorted by name. */ +- size_t byNameSize; /*!< No. of entries. */ +- int (*byNameCmp) (const void * avp, const void * bvp) +- /*@*/; /*!< Compare entries by name. */ +- rpmTag (*tagValue) (const char * name) +- /*@*/; /*!< Return value from name. */ +-/*@relnull@*/ +- headerTagTableEntry * byValue; /*!< rpmTag's sorted by value. */ +- size_t byValueSize; /*!< No. of entries. */ +- int (*byValueCmp) (const void * avp, const void * bvp) +- /*@*/; /*!< Compare entries by value. */ +- const char * (*tagName) (rpmTag value) +- /*@*/; /*!< Return name from value. */ +- rpmTag (*tagType) (rpmTag value) +- /*@*/; /*!< Return type from value. */ +- size_t nameBufLen; /*!< No. bytes allocated for nameBuf. */ +-/*@relnull@*/ +- const char ** aTags; /*!< Arbitrary tags array (ARGV_t) */ +-/*@owned@*/ /*@null@*/ +- char * nameBuf; /* Name buffer. */ +-/*@only@*/ +- char * (*tagCanonicalize) (const char * s) +- /*@*/; /*!< Canonicalize arbitrary string. */ +- rpmTag (*tagGenerate) (const char * s) +- /*@*/; /*!< Generate tag from string. */ +-}; +-#endif +-#endif /* _RPMTAG_INTERNAL */ +- +-/** +- * Return tag name from value. +- * @param tag tag value +- * @return tag name, "(unknown)" on not found +- */ +-/*@observer@*/ +-const char * tagName(rpmTag tag) +- /*@*/; +- +-/** +- * Return tag data type from value. +- * @todo Return rpmTagType-like, not unsigned int. There's no clear typedef yet. +- * @param tag tag value +- * @return tag data type, 0 on not found. +- */ +-unsigned int tagType(rpmTag tag) +- /*@*/; +- +-/** +- * Return tag value from name. +- * @param tagstr name of tag +- * @return tag value, 0xffffffff on not found +- */ +-rpmTag tagValue(const char * tagstr) +- /*@*/; +- +-/** +- * Canonicalize a rpmTag string. +- * @param s string +- * @return canonicalized string +- */ +-/*@only@*/ +-char * tagCanonicalize(const char * s) +- /*@*/; +- +-/** +- * Generate a tag from arbitrary string. +- * @param s string +- * @return generated tag value +- */ +-rpmTag tagGenerate(const char * s) +- /*@*/; +- +-/** +- * Free memory in header tag indices. +- * @param _rpmTags header tag indices (NULL uses rpmTags) +- */ +-void tagClean(/*@null@*/ headerTagIndices _rpmTags) +- /*@globals rpmTags @*/ +- /*@modifies _rpmTags, rpmTags @*/; +- +-/** +- * Destroy tagStore array. +- * @param dbiTags dbi tag storage +- * @param dbiNTags no. of dbi tags +- * @return NULL always +- */ +-/*@null@*/ +-tagStore_t tagStoreFree(/*@only@*//*@null@*/tagStore_t dbiTags, size_t dbiNTags) +- /*@modifies dbiTags @*/; +- +-#if defined(_RPMTAG_INTERNAL) +-/** \ingroup header +- */ +-typedef enum headerSprintfExtensionType_e { +- HEADER_EXT_LAST = 0, /*!< End of extension chain. */ +- HEADER_EXT_FORMAT, /*!< headerTagFormatFunction() extension */ +- HEADER_EXT_MORE, /*!< Chain to next table. */ +- HEADER_EXT_TAG /*!< headerTagTagFunction() extension */ +-} headerSprintfExtensionType; +- +-/** \ingroup header +- * HEADER_EXT_TAG format function prototype. +- * +- * @param he tag container +- * @param av parameter array (or NULL) +- * @return formatted string +- */ +-typedef /*only@*/ char * (*headerTagFormatFunction) (HE_t he, /*@null@*/ const char ** av) +- /*@modifies he @*/; +- +-/** \ingroup header +- * HEADER_EXT_FORMAT format function prototype. +- * This is allowed to fail, which indicates the tag doesn't exist. +- * +- * @param h header +- * @retval he tag container +- * @return 0 on success +- */ +-typedef int (*headerTagTagFunction) (Header h, HE_t he) +- /*@modifies he @*/; +- +-/** \ingroup header +- * Define header tag output formats. +- */ +-#if !defined(SWIG) +-struct headerSprintfExtension_s { +- headerSprintfExtensionType type; /*!< Type of extension. */ +-/*@observer@*/ /*@null@*/ +- const char * name; /*!< Name of extension. */ +- union { +-/*@observer@*/ /*@null@*/ +- void * generic; /*!< Private extension. */ +- headerTagFormatFunction fmtFunction; /*!< HEADER_EXT_TAG extension. */ +- headerTagTagFunction tagFunction; /*!< HEADER_EXT_FORMAT extension. */ +- headerSprintfExtension * more; /*!< Chained table extension. */ +- } u; +-}; +-#endif +-#endif /* _RPMTAG_INTERNAL */ +- +-/** \ingroup header +- * Supported default header tag output formats. +- */ +-/*@unchecked@*/ /*@observer@*/ +-extern headerSprintfExtension headerDefaultFormats; +- +-/** \ingroup header +- * Supported default header extension/tag output formats. +- */ +-/*@unchecked@*/ /*@observer@*/ +-extern headerSprintfExtension headerCompoundFormats; +- +-/** +- * Display list of tags that can be used in --queryformat. +- * @param fp file handle to use for display (NULL uses stdout) +- * @param _rpmTagTable rpm tag table (NULL uses rpmTagTable) +- * @param _rpmHeaderFormats rpm tag extensions & formats (NULL uses headerCompoundFormats) +- */ +-void rpmDisplayQueryTags(/*@null@*/ FILE * fp, +- /*@null@*/ headerTagTableEntry _rpmTagTable, +- /*@null@*/ headerSprintfExtension _rpmHeaderFormats) +- /*@globals fileSystem, internalState @*/ +- /*@modifies *fp, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Return formatted output string from header tags. +- * The returned string must be free()d. +- * +- * @param h header +- * @param fmt format to use +- * @param tags array of tag name/value/type triples (NULL uses default) +- * @param exts formatting extensions chained table (NULL uses default) +- * @retval errmsg error message (if any) +- * @return formatted output string (malloc'ed) +- */ +-/*@only@*/ /*@null@*/ +-char * headerSprintf(Header h, const char * fmt, +- /*@null@*/ headerTagTableEntry tags, +- /*@null@*/ headerSprintfExtension exts, +- /*@null@*/ /*@out@*/ errmsg_t * errmsg) +- /*@globals headerCompoundFormats, fileSystem, internalState @*/ +- /*@modifies h, *errmsg, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Retrieve extension or tag value from a header. +- * +- * @param h header +- * @param he tag container +- * @param flags tag retrieval flags +- * @return 1 on success, 0 on failure +- */ +-int headerGet(Header h, HE_t he, unsigned int flags) +- /*@globals internalState @*/ +- /*@modifies he, internalState @*/; +-#define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ +-#define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ +- +-/** \ingroup header +- * Add or append tag container to header. +- * +- * @param h header +- * @param he tag container +- * @param flags (unused) +- * @return 1 on success, 0 on failure +- */ +-/*@mayexit@*/ +-int headerPut(Header h, HE_t he, /*@unused@*/ unsigned int flags) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Remove tag container from header. +- * +- * @param h header +- * @param he tag container +- * @param flags (unused) +- * @return 1 on success, 0 on failure +- */ +-/*@mayexit@*/ +-int headerDel(Header h, HE_t he, /*@unused@*/ unsigned int flags) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Modify tag container in header. +- * If there are multiple entries with this tag, the first one gets replaced. +- * @param h header +- * @param he tag container +- * @param flags (unused) +- * @return 1 on success, 0 on failure +- */ +-int headerMod(Header h, HE_t he, /*@unused@*/ unsigned int flags) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Destroy header tag container iterator. +- * @param hi header tag container iterator +- * @return NULL always +- */ +-/*@null@*/ +-HeaderIterator headerFini(/*@only@*/ HeaderIterator hi) +- /*@globals fileSystem @*/ +- /*@modifies hi, fileSystem */; +- +-/** \ingroup header +- * Create header tag iterator. +- * @param h header +- * @return header tag iterator +- */ +-HeaderIterator headerInit(Header h) +- /*@globals fileSystem @*/ +- /*@modifies h, fileSystem */; +- +-/** \ingroup header +- * Return next tag from header. +- * @param hi header tag iterator +- * @param he tag container +- * @param flags (unused) +- * @return 1 on success, 0 on failure +- */ +-int headerNext(HeaderIterator hi, HE_t he, /*@unused@*/ unsigned int flags) +- /*@globals internalState @*/ +- /*@modifies hi, he, internalState @*/; +- +-/** \ingroup header +- * Reference a header instance. +- * @param h header +- * @return referenced header instance +- */ +-Header headerLink(Header h) +- /*@modifies h @*/; +-#define headerLink(_h) \ +- ((Header)rpmioLinkPoolItem((rpmioItem)(_h), __FUNCTION__, __FILE__, __LINE__)) +- +-/** \ingroup header +- * Dereference a header instance. +- * @param h header +- * @return NULL on last dereference +- */ +-/*@null@*/ +-Header headerUnlink(/*@killref@*/ /*@null@*/ Header h) +- /*@modifies h @*/; +-#define headerUnlink(_h) \ +- ((Header)rpmioUnlinkPoolItem((rpmioItem)(_h), __FUNCTION__, __FILE__, __LINE__)) +- +-/** \ingroup header +- * Dereference a header instance. +- * @param h header +- * @return NULL on last dereference +- */ +-/*@null@*/ +-Header headerFree(/*@killref@*/ /*@null@*/ Header h) +- /*@modifies h @*/; +-#define headerFree(_h) \ +- ((Header)rpmioFreePoolItem((rpmioItem)(_h), __FUNCTION__, __FILE__, __LINE__)) +- +-/** \ingroup header +- * Create new (empty) header instance. +- * @return header +- */ +-Header headerNew(void) +- /*@globals fileSystem @*/ +- /*@modifies fileSystem @*/; +- +-/** \ingroup header +- * Return size of on-disk header representation in bytes. +- * @param h header +- * @return size of on-disk header +- */ +-size_t headerSizeof(/*@null@*/ Header h) +- /*@modifies h @*/; +- +-/** \ingroup header +- * headerUnload. +- * @param h header +- * @retval *lenp no. bytes in unloaded header blob +- * @return unloaded header blob (NULL on error) +- */ +-/*@only@*/ /*@null@*/ +-void * headerUnload(Header h, /*@out@*/ /*@null@*/ size_t * lenp) +- /*@globals internalState @*/ +- /*@modifies h, *lenp, internalState @*/; +- +-/** \ingroup header +- * Convert header to on-disk representation, and then reload. +- * This is used to insure that all header data is in a single +- * contiguous memory allocation. +- * @param h header (with pointers) +- * @param tag region tag +- * @return on-disk header (with offsets) +- */ +-/*@null@*/ +-Header headerReload(/*@only@*/ Header h, int tag) +- /*@globals fileSystem, internalState @*/ +- /*@modifies h, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Duplicate a header. +- * @param h header +- * @return new header instance +- */ +-/*@null@*/ +-Header headerCopy(Header h) +- /*@globals fileSystem, internalState @*/ +- /*@modifies h, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Convert header to in-memory representation. +- * @param uh on-disk header blob (i.e. with offsets) +- * @return header +- */ +-/*@null@*/ +-Header headerLoad(/*@kept@*/ void * uh) +- /*@globals fileSystem, internalState @*/ +- /*@modifies uh, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Make a copy and convert header to in-memory representation. +- * @param uh on-disk header blob (i.e. with offsets) +- * @return header +- */ +-/*@null@*/ +-Header headerCopyLoad(const void * uh) +- /*@globals fileSystem, internalState @*/ +- /*@modifies fileSystem, internalState @*/; +- +-/** \ingroup header +- * Check if tag is in header. +- * @param h header +- * @param tag tag +- * @return 1 on success, 0 on failure +- */ +-int headerIsEntry(/*@null@*/ Header h, rpmTag tag) +- /*@*/; +- +-/** \ingroup header +- * Add locale specific tag to header. +- * A NULL lang is interpreted as the C locale. Here are the rules: +- * \verbatim +- * - If the tag isn't in the header, it's added with the passed string +- * as new value. +- * - If the tag occurs multiple times in entry, which tag is affected +- * by the operation is undefined. +- * - If the tag is in the header w/ this language, the entry is +- * *replaced* (like headerModifyEntry()). +- * \endverbatim +- * This function is intended to just "do the right thing". If you need +- * more fine grained control use headerAddEntry() and headerModifyEntry(). +- * +- * @param h header +- * @param tag tag +- * @param string tag value +- * @param lang locale +- * @return 1 on success, 0 on failure +- */ +-int headerAddI18NString(Header h, rpmTag tag, const char * string, +- const char * lang) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Duplicate tag values from one header into another. +- * @param headerFrom source header +- * @param headerTo destination header +- * @param tagstocopy array of tags that are copied +- */ +-void headerCopyTags(Header headerFrom, Header headerTo, rpmTag * tagstocopy) +- /*@globals internalState @*/ +- /*@modifies headerTo, internalState @*/; +- +-/** \ingroup header +- * Return header magic. +- * @param h header +- * @param *magicp magic array +- * @param *nmagicp no. bytes of magic +- * @return 0 always +- */ +-int headerGetMagic(/*@null@*/ Header h, unsigned char **magicp, size_t *nmagicp) +- /*@modifies *magicp, *nmagicp @*/; +- +-/** \ingroup header +- * Store header magic. +- * @param h header +- * @param magic magic array +- * @param nmagic no. bytes of magic +- * @return 0 always +- */ +-int headerSetMagic(/*@null@*/ Header h, unsigned char * magic, size_t nmagic) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header origin (e.g path or URL). +- * @param h header +- * @return header origin +- */ +-/*@observer@*/ /*@null@*/ +-const char * headerGetOrigin(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header origin (e.g path or URL). +- * @param h header +- * @param origin new header origin +- * @return 0 always +- */ +-int headerSetOrigin(/*@null@*/ Header h, const char * origin) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header parent identifier (e.g parent's NVRA). +- * @param h header +- * @return header parent +- */ +-/*@observer@*/ /*@null@*/ +-const char * headerGetParent(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header parent (e.g parent's NVRA). +- * @param h header +- * @param parent new header parent +- * @return 0 always +- */ +-int headerSetParent(/*@null@*/ Header h, const char * parent) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header base URL (e.g path or URL). +- * @param h header +- * @return header origin +- */ +-/*@observer@*/ /*@null@*/ +-const char * headerGetBaseURL(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header base URL (e.g path or URL). +- * @param h header +- * @param baseurl new header baseurl +- * @return 0 always +- */ +-int headerSetBaseURL(/*@null@*/ Header h, const char * baseurl) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header stat(2) buffer (of origin *.rpm file). +- * @param h header +- * @return header stat(2) buffer +- */ +-struct stat * headerGetStatbuf(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Copy into header stat(2) buffer (of origin *.rpm file). +- * @param h header +- * @param st new header stat(2) buffer +- * @return 0 always +- */ +-int headerSetStatbuf(/*@null@*/ Header h, struct stat * st) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return digest of origin *.rpm file. +- * @param h header +- * @return header digest +- */ +-/*@null@*/ +-const char * headerGetDigest(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store digest of origin *.rpm file. +- * @param h header +- * @param st new header digest +- * @return 0 always +- */ +-int headerSetDigest(/*@null@*/ Header h, const char * digest) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return rpmdb pointer. +- * @param h header +- * @return rpmdb pointer +- */ +-/*@null@*/ +-void * headerGetRpmdb(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store rpmdb pointer. +- * @param h header +- * @param rpmdb new rpmdb pointer (or NULL to unset) +- * @return NULL always +- */ +-/*@null@*/ +-void * headerSetRpmdb(/*@null@*/ Header h, /*@null@*/ void * rpmdb) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header instance (if from rpmdb). +- * @param h header +- * @return header instance +- */ +-uint32_t headerGetInstance(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header instance (e.g path or URL). +- * @param h header +- * @param instance new header instance +- * @return 0 always +- */ +-uint32_t headerSetInstance(/*@null@*/ Header h, uint32_t instance) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header starting byte offset. +- * @param h header +- * @return header starting byte offset +- */ +-rpmuint32_t headerGetStartOff(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header starting byte offset. +- * @param h header +- * @param startoff new header starting byte offset +- * @return 0 always +- */ +-rpmuint32_t headerSetStartOff(/*@null@*/ Header h, rpmuint32_t startoff) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header ending byte offset. +- * @param h header +- * @return header ending byte offset +- */ +-rpmuint32_t headerGetEndOff(/*@null@*/ Header h) +- /*@*/; +- +-/** \ingroup header +- * Store header ending byte offset. +- * @param h header +- * @param startoff new header ending byte offset +- * @return 0 always +- */ +-rpmuint32_t headerSetEndOff(/*@null@*/ Header h, rpmuint32_t endoff) +- /*@modifies h @*/; +- +-/** \ingroup header +- * Return header stats accumulator structure. +- * @param h header +- * @param opx per-header accumulator index (aka rpmtsOpX) +- * @return per-header accumulator pointer +- */ +-/*@null@*/ +-void * headerGetStats(Header h, int opx) +- /*@*/; +- +-/** +- * Define per-header macros. +- * @param h header +- * @return 0 always +- */ +-int headerMacrosLoad(Header h) +- /*@globals internalState @*/ +- /*@modifies internalState @*/; +- +-/** +- * Define per-header macros. +- * @param h header +- * @return 0 always +- */ +-int headerMacrosUnload(Header h) +- /*@globals internalState @*/ +- /*@modifies internalState @*/; +- +-/** \ingroup header +- * Return name, epoch, version, release, arch strings from header. +- * @param h header +- * @retval *np name pointer (or NULL) +- * @retval *ep epoch pointer (or NULL) +- * @retval *vp version pointer (or NULL) +- * @retval *rp release pointer (or NULL) +- * @retval *ap arch pointer (or NULL) +- * @return 0 always +- */ +-int headerNEVRA(Header h, +- /*@null@*/ /*@out@*/ const char ** np, +- /*@null@*/ /*@out@*/ /*@unused@*/ const char ** ep, +- /*@null@*/ /*@out@*/ const char ** vp, +- /*@null@*/ /*@out@*/ const char ** rp, +- /*@null@*/ /*@out@*/ const char ** ap) +- /*@globals internalState @*/ +- /*@modifies h, *np, *vp, *rp, *ap, internalState @*/; +- +-/** +- * Return header color. +- * @param h header +- * @return header color +- */ +-rpmuint32_t hGetColor(Header h) +- /*@globals internalState @*/ +- /*@modifies h, internalState @*/; +- +-/** \ingroup header +- * Translate and merge legacy signature tags into header. +- * @todo Remove headerSort() through headerInitIterator() modifies sig. +- * @param h header +- * @param sigh signature header +- */ +-void headerMergeLegacySigs(Header h, const Header sigh) +- /*@globals fileSystem, internalState @*/ +- /*@modifies h, sigh, fileSystem, internalState @*/; +- +-/** \ingroup header +- * Regenerate signature header. +- * @todo Remove headerSort() through headerInitIterator() modifies h. +- * @param h header +- * @param noArchiveSize don't copy archive size tag (pre rpm-4.1) +- * @return regenerated signature header +- */ +-Header headerRegenSigHeader(const Header h, int noArchiveSize) +- /*@globals fileSystem, internalState @*/ +- /*@modifies h, fileSystem, internalState @*/; +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* H_RPMTAG */ +diff --git a/src/scripts/extract-debuginfo.in b/src/scripts/extract-debuginfo.in +index 4746df2..c258ed1 100644 +--- a/src/scripts/extract-debuginfo.in ++++ b/src/scripts/extract-debuginfo.in +@@ -193,7 +193,7 @@ find "$BUILDROOT" ! -path "${debugdir}/*.debug" -type f \ + fi + + echo " Extracting debug info from ${f#${BUILDROOT}}" +- id=$(@libexecdir@/debugedit -i \ ++ id=$(debugedit -i \ + -b "${SOURCEDIR}" \ + -d /usr/src/debug \ + -l "${SOURCEFILE}" \ +-- +2.7.4 + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core106, updated. 2dfb5ee7869774a1541fca19bda135ea63eae0b4
by git＠ipfire.org 26 Oct '16

26 Oct '16

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, core106 has been updated via 2dfb5ee7869774a1541fca19bda135ea63eae0b4 (commit) via 9d1de0860d3d6c2bf892b167353f1a0a1ec7dbaa (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 2dfb5ee7869774a1541fca19bda135ea63eae0b4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 26 19:18:40 2016 +0200 core106: add language files to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9d1de0860d3d6c2bf892b167353f1a0a1ec7dbaa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 26 19:17:12 2016 +0200 core106: add traffic.cgi to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/filelists/files | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index a67d30a..31029e6 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -22,4 +22,6 @@ 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 +srv/web/ipfire/cgi-bin/traffic.cgi var/ipfire/backup/include +var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6
by git＠ipfire.org 25 Oct '16

25 Oct '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 (commit) via 76fd8bcf7be92abeae859c9ab618b30d2ea32467 (commit) from 4bdbf22ee4609aed3cc378f80a1eb656ed68a634 (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 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Oct 23 00:17:38 2016 +0200 log.dat: cosmetical upgrade Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 76fd8bcf7be92abeae859c9ab618b30d2ea32467 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Oct 23 16:09:19 2016 +0200 hdparm: Update to 9.50 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/logs.cgi/log.dat | 70 +++++++++++++++++++++++-------------------- lfs/hdparm | 4 +-- 2 files changed, 39 insertions(+), 35 deletions(-) Difference in files: 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) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2016