IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7870 discussions

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

13 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 093faec544fdd5f2201b607a8c0815555868815d (commit) via 83b38b676a1acee7e89fd79de772c99b5487af78 (commit) via fadae9ad8554e1758a482b002783ae2849b1fbc3 (commit) via 1ccb4c07adf6e7bcecceecde1482ee46e70acd22 (commit) from 63c3f2f085041cd2fc3d93505cc099d29b8002e7 (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 093faec544fdd5f2201b607a8c0815555868815d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Oct 13 09:22:38 2016 +0200 lsof: Update to 4.89. This is an update to the latest available version of lsof. * Drop support for SELinux. Fixes #11214. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 83b38b676a1acee7e89fd79de772c99b5487af78 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 5 14:22:54 2016 +0200 e2fsprogs: Update to 1.43.3. This is a major update to the latest stable version of e2fsprogs. * Drop SELinux support. Fixes #11205. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fadae9ad8554e1758a482b002783ae2849b1fbc3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 7 15:15:36 2016 +0200 shadow-utils: Update to 4.4. This is a major update to the latest version of shadow-utils. * They are now hosted on github. * Adjust code to not generate manpages or binaries for a certain tools. * Drop support for SELinux. Fixes #11228. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ccb4c07adf6e7bcecceecde1482ee46e70acd22 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 7 15:17:19 2016 +0200 dbus: Update to 1.11.4 This is a minor update to the latest version of dbus. * Drop support for SELinux. Fixes #11203. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: dbus/dbus.nm | 8 ++++---- e2fsprogs/e2fsprogs.nm | 19 +++++++++++++++---- lsof/lsof.nm | 8 ++------ shadow-utils/shadow-utils.nm | 27 ++++++++++++++++++--------- 4 files changed, 39 insertions(+), 23 deletions(-) Difference in files: diff --git a/dbus/dbus.nm b/dbus/dbus.nm index ad8a7e6..8b8d304 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -4,7 +4,7 @@ ############################################################################### name = dbus -version = 1.11.2 +version = 1.11.4 release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> @@ -23,16 +23,16 @@ source_dl = http://dbus.freedesktop.org/releases/dbus/ build requires + /usr/bin/xsltproc audit-devel expat-devel libcap-ng-devel - libselinux-devel - systemd-units + systemd-devel + xmlto end configure_options += \ --enable-libaudit \ - --enable-selinux=yes \ --with-systemdsystemunitdir=%{unitdir} \ --with-dbus-user=dbus end diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index ba95d9d..f140c4f 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -4,8 +4,8 @@ ############################################################################### name = e2fsprogs -version = 1.42.13 -release = 2 +version = 1.43.3 +release = 1 groups = System/Filesystems url = http://e2fsprogs.sourceforge.net/ @@ -23,8 +23,6 @@ source_dl = http://prdownloads.sourceforge.net/%{name}/ build requires libblkid-devel - libselinux-devel - libsepol-devel libuuid-devel psmisc end @@ -65,6 +63,19 @@ build # Create empty mtab file if it does not exist. [ -e /etc/mtab ] || touch /etc/mtab + # Disable failing test to fallocate sparse files and big files on a blockmap fs. + # + # test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** + # test_filesys: 13/4096 files (7.7% non-contiguous), 12422/65536 blocks + # Exit status is 1 + # + # But the test fails because the Inode 12 and 13 have differnet permissions. + # ( 0644 instead of 0666 ). + # -Inode: 12 Type: regular Mode: 0666 Flags: 0x0 + # +Inode: 12 Type: regular Mode: 0644 Flags: 0x0 + rm -rvf tests/d_fallocate_blkmap + + # Run testsuite. cd build && make check end diff --git a/lsof/lsof.nm b/lsof/lsof.nm index 6b8a022..6ee9764 100644 --- a/lsof/lsof.nm +++ b/lsof/lsof.nm @@ -4,8 +4,8 @@ ############################################################################### name = lsof -version = 4.85 -release = 2 +version = 4.89 +release = 1 groups = Development/Debuggers url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ @@ -21,10 +21,6 @@ end thisapp = %{name}_%{version}_src build - requires - libselinux-devel - end - export LSOF_CFGL = %{CFLAGS} %{LDFLAGS} build diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm index 378121e..11dcf28 100644 --- a/shadow-utils/shadow-utils.nm +++ b/shadow-utils/shadow-utils.nm @@ -4,13 +4,13 @@ ############################################################################### name = shadow-utils -version = 4.2.1 -release = 2.1 +version = 4.4 +release = 1 thisapp = shadow-%{version} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base -url = http://pkg-shadow.alioth.debian.org/ +url = https://github.com/shadow-maint/shadow/ license = GPLv2+ summary = Utilities to deal with user accounts. @@ -20,37 +20,46 @@ description format, plus programs for managing user and group accounts. end -source_dl = http://pkg-shadow.alioth.debian.org/releases/ -sources = %{thisapp}.tar.xz +source_dl = https://github.com/shadow-maint/shadow/archive/%{version}.tar.gz#/ build requires + autoconf + automake audit-devel bison + docbook-xsl flex + gettext-devel gnome-doc-utils libacl-devel libattr-devel libcap-devel - libselinux-devel - libsemanage-devel + libtool end configure_options += \ --enable-shadowgrp \ + --enable-man \ --with-sha-crypt \ - --with-selinux \ --without-libcrack \ --without-libpam \ --disable-static \ --with-group-name-max-length=32 prepare_cmds + autoreconf -vfi + # Do not build these files: for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \ logoutd passwd su; do \ + + # Do not generate any manpages for them. + find man -name Makefile.in -exec sed -i -e "/$i\.[1-9]\.xml/d" {} \;; \ + find man -name Makefile.in -exec sed -i -e "s/man1\/$i\.1/ /" {} \;; \ + + # Do not compile them. sed -i "s/$i\$(EXEEXT)//" src/Makefile.in; \ - find man -name Makefile.in -exec sed -i "s/$i\.1/ /" {} \;; \ done sed -i src/Makefile.in \ hooks/post-receive -- IPFire 3.x development tree

1 0

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

13 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 b8a5c2fc7b844784abb17c030615d58e9f448a56 (commit) via 894fea37d4a1d6169d27611502f117feae6cf080 (commit) via 71a95ee3300c9db2ab3765f314973aec7c4c4862 (commit) via 1cd30812d6860300756d32cc637c322e5755eaf5 (commit) from d1778a773eb5870f7c95568533e260163b7e8db7 (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 b8a5c2fc7b844784abb17c030615d58e9f448a56 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 14 00:01:10 2016 +0100 netpbm: Bump release version to 2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 894fea37d4a1d6169d27611502f117feae6cf080 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Oct 7 18:26:38 2016 +0200 netpbm: update to 10.47.61 To keep the files in the right place, the files are installed into the build directory and only the files which are useful are copied to the usual places in /usr. Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71a95ee3300c9db2ab3765f314973aec7c4c4862 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Oct 7 18:17:13 2016 +0200 libjpeg: update to 1.5.1 The old libjpeg is renamed to libjpeg-compat The compat makes the old libs maintainable Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1cd30812d6860300756d32cc637c322e5755eaf5 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Oct 7 18:29:26 2016 +0200 texinfo: update to 6.3 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(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/packages/netpbm | 993 ++++++++++----------------- lfs/libjpeg | 15 +- lfs/{libjpeg => libjpeg-compat} | 2 +- lfs/netpbm | 23 +- lfs/texinfo | 8 +- make.sh | 1 + 10 files changed, 521 insertions(+), 700 deletions(-) copy config/netpbm/{Makefile.config => config.mk} (82%) create mode 100644 config/rootfiles/common/libjpeg-compat copy lfs/{libjpeg => libjpeg-compat} (97%) 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/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/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/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/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 9289d81..8faa83a 100755 --- a/make.sh +++ b/make.sh @@ -508,6 +508,7 @@ buildipfire() { ipfiremake libidn ipfiremake nasm ipfiremake libjpeg + ipfiremake libjpeg-compat ipfiremake libexif ipfiremake libpng ipfiremake libtiff hooks/post-receive -- IPFire 2.x development tree

1 0

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

13 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 d1778a773eb5870f7c95568533e260163b7e8db7 (commit) from 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4 (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 d1778a773eb5870f7c95568533e260163b7e8db7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 13 17:21:28 2016 +0200 unbound/dhcp: stop lease bridge if dhcp was needed to killed Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/dhcp | 1 - 1 file changed, 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/dhcp index 2182bc4..2ae86db 100644 --- a/src/initscripts/init.d/dhcp +++ b/src/initscripts/init.d/dhcp @@ -58,7 +58,6 @@ case "$1" in killall -w -s KILL /usr/sbin/dhcpd > /dev/null 2>&1 rm -f /var/run/dhcpd.pid > /dev/null 2>&1 echo_ok; - exit 0 fi boot_mesg "Stopping Unbound DHCP Leases Bridge..." hooks/post-receive -- IPFire 2.x development tree

1 0

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

13 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 63c3f2f085041cd2fc3d93505cc099d29b8002e7 (commit) from 7dcf09a681fba7e1b5d511e92caea9b59dcea8b1 (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 63c3f2f085041cd2fc3d93505cc099d29b8002e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 13 13:17:38 2016 +0100 nettle: Update to 3.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: nettle/nettle.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 9f2213f..1c0695f 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,7 +4,7 @@ ############################################################################### name = nettle -version = 3.2 +version = 3.3 release = 1 groups = System/Libraries @@ -23,7 +23,7 @@ source_dl = http://www.lysator.liu.se/~nisse/archive/ build requires - gmp-devel + gmp-devel >= 5.0.0 m4 end @@ -63,7 +63,7 @@ packages package %{name}-devel template DEVEL - requires += gmp-devel + requires += gmp-devel >= 5.0.0 end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

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

12 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 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4 (commit) from 1b4d5ad9af5d3603331f31aef5dca67833808694 (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 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Oct 12 21:04:48 2016 +0200 squid: Update to 3.5.22 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/squid | 6 +++--- ...escriptors.patch => squid-3.5.22-fix-max-file-descriptors.patch} | 0 2 files changed, 3 insertions(+), 3 deletions(-) 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/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/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 branch, core106, created. 1b4d5ad9af5d3603331f31aef5dca67833808694
by git＠ipfire.org 12 Oct '16

12 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 created at 1b4d5ad9af5d3603331f31aef5dca67833808694 (commit) - Log ----------------------------------------------------------------- commit 1b4d5ad9af5d3603331f31aef5dca67833808694 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 12 22:37:26 2016 +0100 unbound: Move "listen on all" to main configuration file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b06187f5b65b6911ea90f0daa20ec0a50682070f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Oct 12 21:08:50 2016 +0200 Midnight Commander: Update to 4.8.18 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 693928d781bee3151d5108a6f68a464202e78eeb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 23:01:51 2016 +0200 unbound: start prior network Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0fa8a4e98e3c7b44f0e66f9958693a66bbb7fdeb Merge: 11ecfb9 d653b43 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:52:34 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 11ecfb92a0b9b9020c646e66f15dd1a5b2720f7c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:51:35 2016 +0200 backup: add unbound config Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d221f41fbe38e32afc2fd0bab6ee80aa94b9f1a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:41:19 2016 +0200 unbound: bind to all interfaces this allow to add interfaces without restart unbound. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3a6752d9282ba78283f8a31564f359868662ff79 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:39:41 2016 +0200 setup: restart unbound after network config change Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d653b433ec6ffbc92a448766852fa4202586be9a Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Date: Wed Oct 12 12:17:06 2016 +0200 drop of the obsolete and deprecated vdr addon vdr_vnsiserver3 Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 86c9deb2ea39001c488b7b65f6dfac6fe88a1a35 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 11 19:14:33 2016 +0200 unbound: Public static leases in DNS, too Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 998e880b61b4c201a9483a0beafc6d139a29f0db Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 10 20:11:57 2016 +0100 unbound: Skip invalid hostnames If there are any invalid hostnames in the DHCP leases table, we just skip them and do not create and RRs for them. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5eeea642371892e0ecdd6064746a1f6c38bd32a5 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Oct 9 14:56:52 2016 +0200 guardian 2.0: fixes for rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3a52755b973a21ac15b033f4b39a3ff4c82b0be4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 10 12:05:01 2016 +0100 core106: Ship changed pakfire.cgi This was actually changed over a year ago, but was never shipped in an update. Commit 212fd689a30a7b2f627149ead8d45823dc8a68af Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b32a8aefa2dea0146df34bf6e4e785afec1600b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 10 12:04:24 2016 +0100 core106: Ship updated iptables.cgi file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 58c2333bdc4494c34197432791f6d67d974f3588 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Oct 8 15:20:38 2016 +0200 iptables.cgi: cosmetics - wider columns Hi, Since the first three columns of 'iptables.cgi' gave a nearly unreadable output with large numbers, so I made 'pkts', 'bytes' and 'target'-columns a bit wider. BEFORE - it was something like this: Chain INPUT (policy DROP 0 packets, 0 bytes) pkts bytestarget proc opt in out source destination 32M38G BADTCP tcp -- * * 0.0.0.0/0 0.0.0.0/0 32M38G CUSTOMINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G P2PBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G GUARDIAN all -- * * 0.0.0.0/0 0.0.0.0/0 00 OVPNBLOCK all -- tun+ * 0.0.0.0/0 0.0.0.0/0 32M38G IPTVINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G ICMPINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M38G LOOPBACK all -- * * 0.0.0.0/0 0.0.0.0/0 21M21G CONNTRACK all -- * * 0.0.0.0/0 0.0.0.0/0 393873484KDHCPGREENINPUTall -- green0 * 0.0.0.0/0 0.0.0.0/0 645153642KGEOIPBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 386592304KIPSECINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 386592304KGUIINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KWIRELESSINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 ctstate NEW 368332209KOVPNINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KTOR_INPUT all -- * * 0.0.0.0/0 0.0.0.0/0 368332209KINPUTFW all -- * * 0.0.0.0/0 0.0.0.0/0 309641833KREDINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 309641833KPOLICYIN all -- * * 0.0.0.0/0 0.0.0.0/0 AFTER - somehow better readable - I think: ;-) Chain INPUT (policy DROP 0 packets, 0 bytes) pkts bytes target proc opt in out source destination 32M 38G BADTCP tcp -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G CUSTOMINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G P2PBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G GUARDIAN all -- * * 0.0.0.0/0 0.0.0.0/0 0 0 OVPNBLOCK all -- tun+ * 0.0.0.0/0 0.0.0.0/0 32M 38G IPTVINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G ICMPINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 32M 38G LOOPBACK all -- * * 0.0.0.0/0 0.0.0.0/0 21M 21G CONNTRACK all -- * * 0.0.0.0/0 0.0.0.0/0 39387 3484K DHCPGREENINPUT all -- green0 * 0.0.0.0/0 0.0.0.0/0 64515 3642K GEOIPBLOCK all -- * * 0.0.0.0/0 0.0.0.0/0 38659 2304K IPSECINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 38659 2304K GUIINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K WIRELESSINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 ctstate NEW 36833 2209K OVPNINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K TOR_INPUT all -- * * 0.0.0.0/0 0.0.0.0/0 36833 2209K INPUTFW all -- * * 0.0.0.0/0 0.0.0.0/0 30964 1833K REDINPUT all -- * * 0.0.0.0/0 0.0.0.0/0 30964 1833K POLICYIN all -- * * 0.0.0.0/0 0.0.0.0/0 Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f824cd285b72ca1e2837614607b15e93bf6d5819 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 9 12:10:15 2016 +0200 setclock: accept also empty logfile timestamp Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0807ce69eead5a35cdb699b61a48bffdf81ebcc4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 8 15:43:54 2016 +0200 setclock: prevent time bacjump by empty rtc batteries This is a work around to prevent not working dns resolution if the time jumps before the DNSSec signing key. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0d7ca700bd2c8eafbedf2261038496d4588bd5b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 7 11:27:33 2016 +0200 unbound: skip green interface if ip was set to 1.1.1.1 this is a reserved marker for unused green ip. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e22bcd38d6857cd1ee7292cbf634db80d0dd813c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 6 10:42:49 2016 +0100 unbound: Correctly format PTR records Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71cf56fe53a1f561a8d11f2f354a0cc91bfe37ba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 6 10:41:54 2016 +0100 core106: Restart DHCP server to import leases into DNS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit eef9b2529c3cab522dac4f4bcfa1a0075376514e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 4 22:40:03 2016 +0100 setup: Store passwords in SHA format htpasswd doesn't protect passwords very well. MD5 was used before and now any newly created passwords will use the SHA format. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8 Merge: 350e29c e3a90a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 4 22:34:23 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit e3a90a5736be84bd4292a05c006802aa26ffcc0d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 4 22:05:26 2016 +0200 Revert "core106: Add DNS root key to exclude list" This reverts commit f58002a83f279246cdd58bfb5e9dfbf9d5aa99c7. commit a48a2034f5320baf32c10ec877d0c3c53cf4c699 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 4 19:24:26 2016 +0200 unbound: fix update forwarders if unbound was not running psgrep has no "-q" switch so i use pidof. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d Merge: f75c279 52587ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:55:42 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit f75c279b97552118ee06ae660230465d0a469bc8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:53:13 2016 +0200 unbound: fix reverse lockup of webif defined hosts and make the own host resolveable. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 350e29c26fe9d6cb8c075f47674db04a81f4ddc7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 3 12:13:43 2016 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c5f633c91712e4e1f5bb68633f4d55f030aed8a6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 23 16:33:04 2016 +0200 guardian 2.0: suggested cosmetic changes I did the following: - Rearranged the fields on 'guardian.cgi' a bit - in a (hopefully) logical manner, so that they don't need so much room. - Added some translation-strings and explanations to (revised) 'guardian.cgi'. - Added missing language string(s), deleted obsolete. - Deleted all guardian entries from standard language files in '/var/ipfire/langs'-directory. - Added (upgraded) addon-specific language files to '/var/ipfire/addon-lang'-directory. I hope, I didn't forget something... Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 52587edac4f6e3fba0923cb808740de6c5cbd61e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 3 11:45:36 2016 +0100 core106: Ship updated libidn Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64602fdf7da260801cdf6d07b5390ab41129e32b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Oct 3 08:58:48 2016 +0200 libidn: Update to 1.33 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 642b831b72b42c7ecab4ac05828db2ebc29c3845 Merge: e24d611 5edc06b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 16:36:57 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit e24d6112bb364697d925ca436dddd5436448b477 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 16:35:50 2016 +0200 index.cgi: display unbound dns servers Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5edc06b701548df78adf746bb4023ef61460d957 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 15:13:55 2016 +0100 Remove IPAC stuff This is unused for a very very very long time and serves no purpose any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc60329d88d647a425812b8fb1ff31bb6752f576 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 15:32:14 2016 +0200 Add search domain to /etc/resolv.conf at boot time unbound does not append the local domain to the request any more (like dnsmasq did). Therefore, the client needs to do that if desired. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b29c97b1685c4eafdbc30841f5eae358befc8343 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 15:25:23 2016 +0200 unbound: Test upstream name servers before using unbound has some trouble with validating DNSSEC-enabled domains when the upstream name server is stripping signatures from the authoritative responses. This script now checks that, removes any broken upstream name servers from the list and prints a warning. If all name servers fail the test, unbound falls back into recursor mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f58002a83f279246cdd58bfb5e9dfbf9d5aa99c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 13:36:07 2016 +0200 core106: Add DNS root key to exclude list Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9f50355a8c192e453998b6bd15c26b94eabcc72f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 13:35:45 2016 +0200 unbound: Update to 1.5.10 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a1de9f6fc9cd011cc33708bae31a731394b6d26a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 1 18:56:42 2016 +0100 core106: Ship updated /etc/login.defs Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 80bc60228b53635aa3e742467195b63adff30c59 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 1 18:55:23 2016 +0100 unbound: Print nicer error message when already running Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 46d8d50f459be1cc2220b8b0a0de9c6943e9ab1f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 1 18:52:07 2016 +0100 unbound: Start unbound when invoked by DHCP scripts Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit da314725051fe0ebf56fd9d28dae78ab7406c6f4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 1 18:37:28 2016 +0100 shadow-utils: Create standard set of configuration files Previously we copied the default configuration from the upstream package and modified that. Unfortunately a patch and a sed command changed the file which resulted in unwanted changes. This patch removes the patch and sed command and adds a new set of configuration files that just need to be copied to the system. Fixes #11195 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 60fc489b045bc35ff50b15c9b263ca9a3b7d4247 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 1 15:17:37 2016 +0200 attr: rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 829435bea3eee286cd1b1c73a81d53fcd0336c07 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 20:15:53 2016 +0200 ntp: fix wait for red if dhcp or wpasupplicant is running. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3cf764f338da36c28b348c46db1dbbdff8c97d5b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 19:38:38 2016 +0200 samba: default enable SMBv2. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b547554aea406f99740eeee8c31584708a4f000f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 19:20:14 2016 +0200 core106: ship mt7601u firmware. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit dee3be75f908e083f865f6275b4f2ce7692d0f26 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 18:39:53 2016 +0200 mpfr: fix missing eof in rootfile. this is the reason for missing mt7601u firmware. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 09:44:19 2016 +0100 Revert "libjpeg: update to 1.4.2" This reverts commit feba68e4af48630d0c5dcd16bd799a0e02db2b36. Breaks building netpbm Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 01176164b5c1989cf37afad36fe967ddfe0f3612 Merge: de48b89 e26a933 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 23:18:30 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit de48b89ca140fff432754ef8e83c9c5acbd717fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 18:55:51 2016 +0200 Revert "Revert "tcl: update to 8.6.6"" with new krb5 also the tcl update works. This reverts commit 053c554822e9d7342bf21535ccae4812100f94c5. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e26a93322da5dc6d0c1537c0122b24a6dd63119d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 21:03:33 2016 +0100 core106: Add recently updated packages, etc. This update removes dnsmasq and replaces it with unbound. Also many packages are updated and shipped. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59bddc7989e44800b7a855e88e28d6a6eb69e9b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 20:24:21 2016 +0100 Start Core Update 106 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit feba68e4af48630d0c5dcd16bd799a0e02db2b36 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 14:06:19 2016 +0200 libjpeg: update to 1.4.2 The old libjpeg is renamed to libjpeg-compat The compat makes the old libs maintainable Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8987235d26e4bdf99fa1c4a574a3da0c7674d07 Merge: 724c0b8 4141e0a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 18:53:49 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 724c0b8e4b244bd3627d9beacb3771abc0f46a72 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 18:51:27 2016 +0200 attr: rootfile update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4141e0aad1652d85daef1bafee85d155f8eb9129 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Sep 25 18:50:03 2016 +0200 Update krb5 to 1.14.4 This commit updates krb5 to version 1.14.4 The patch is removed, because he is upstream since 1.12.2. The samba version is incremented, to link samba against the new krb5 version. Otherwise samba for example is linked against /usr/lib/libkdb5.so.7 but the current version is /usr/lib/libkdb5.so.8 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 78c3ea61b29ed527e4854f2f03ca0614888f5dd1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 14:37:20 2016 +0100 openssl: Update to 1.0.2j Missing CRL sanity check (CVE-2016-7052) ======================================== Severity: Moderate This issue only affects OpenSSL 1.0.2i, released on 22nd September 2016. A bug fix which included a CRL sanity check was added to OpenSSL 1.1.0 but was omitted from OpenSSL 1.0.2i. As a result any attempt to use CRLs in OpenSSL 1.0.2i will crash with a null pointer exception. OpenSSL 1.0.2i users should upgrade to 1.0.2j The issue was reported to OpenSSL on 22nd September 2016 by Bruce Stephens and Thomas Jakobi. The fix was developed by Matt Caswell of the OpenSSL development team. https://www.openssl.org/news/secadv/20160926.txt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit def1ad3e948a8473c2443985b234180238aaf66a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 13:08:02 2016 +0200 rootfile updates: attr, ed, gawk Check rootfiles before commit !!! Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 053c554822e9d7342bf21535ccae4812100f94c5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 25 19:55:49 2016 +0200 Revert "tcl: update to 8.6.6" breaks kerberos (krb5) build. This reverts commit 282dfe0bb9780fa39dac5d2285719497f6a9f3d5. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e70d2dc27d388e8598791e043c4c2f62937d4b04 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 24 16:44:47 2016 +0200 transmission: update to 2.92 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1031bcee2040803ba88126220dbb447ade2ac3c8 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 15:26:10 2016 +0200 iproute2: update to 4.7.0 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 54a59fd89212fee8783146ed1ae168e578440b05 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:54:37 2016 +0200 usb_modeswitch_data: update to 20160803 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 96f333a627176a8e9880250855dec6b76ce10661 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:53:20 2016 +0200 usb_modeswitch: update to 2.4.0 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2429b9210f65d875155861a3369df7bd0617c2f2 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:13:56 2016 +0200 ipset: update to 6.29 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3fc734f0f9e64ffeaea8b5c4b1c26951456979a7 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 10:58:02 2016 +0200 libmnl: update to 1.0. Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0e7699cbb5855728f32ea3180e95997fa9e00654 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 10:52:13 2016 +0200 libnetfilter_conntrack: update to 1.0.6 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 087fee9c6a782c7e566de9505ea2b1d272bb0993 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:12:13 2016 +0200 attr: update to 2.4.47 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f36046c814a8cae5306ad9e28c45e40adf2d68c Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:07:58 2016 +0200 expat: update to 2.2.0 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b4b56b4f5c224398c7e29093babe352aed10d8e5 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 11:08:51 2016 +0200 make: update to 4.2.1 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cde96f746a3bffd98bc3e2b2e0787b849136436b Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri Sep 2 10:44:59 2016 +0200 file: update to 5.28 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1c7a3c56ef10d5bc2bb2905846210606bfe1cd9c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 12:54:39 2016 +0100 Revert "strongswan 5.5.0: update for rootfile" The padlock module is only built on i586 This reverts commit 2ac05ca54c6a49e7f4a82aae57d1924fa7c998b2. commit 345f1f3c0bbb8e8e82783475d4c3f189f3020b0b Author: Marcel Lorenz <mlorenz(a)ipfire.org> Date: Fri Sep 2 10:30:06 2016 +0200 gettext: update to 0.19.8.1 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b48a6c971e24f4eb991781df4108e5d4c3826207 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:28:57 2016 +0200 make.sh: add autoamke to toolchain to fix coreutils build fail Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 35f37bf02b6de4a4b2bd15c672e6dd408ea56564 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:28:56 2016 +0200 pkg-config: update lfs file to build with new dejagnu Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a7054dd83c5f8c79ad2a5001f914a4638e75e562 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:28:55 2016 +0200 dejagnu: update to 1.6 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 282dfe0bb9780fa39dac5d2285719497f6a9f3d5 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:28:54 2016 +0200 tcl: update to 8.6.6 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b48c31167bef08f6a2b41e5b72a1cf7016f7331c Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:28:53 2016 +0200 flex: update to 2.6.1 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c54847dc2909297afcbc905a6759a9ced3a570e Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 10:30:44 2016 +0200 diffutils: update to 3.5 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2ac05ca54c6a49e7f4a82aae57d1924fa7c998b2 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 23 16:51:36 2016 +0200 strongswan 5.5.0: update for rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 702bd2cd9834181276cbb772e637dd53e8e79392 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Thu Sep 22 09:05:10 2016 +0200 asterisk addon: update to 11.23.1 Changelog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11-current Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e0b76ebc55ebacf0745e1086824dec83278e1f77 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Thu Sep 22 09:59:39 2016 +0200 monit addon: update to 5.19.0 See changelog https://mmonit.com/monit/changes for details. Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4c8f144e582dc5bd7d3415777cf496efb68697b0 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Thu Sep 22 12:03:33 2016 +0200 Fix URL to list of public name servers in dns.cgi We have only one english wiki, so the link to the list of public dns servers can point directly to the right page. (The link was also not correct). Fixes: #11191 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2 Merge: 8029c2a 2d850c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 23 18:49:06 2016 +0200 Merge remote-tracking branch 'origin/core105' into next commit 8029c2a899b3b70e5e35f8461daddc288b9abe75 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 14:47:47 2016 +0100 strongswan: Update to 5.5.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5275b5930016b466e136dd6fb8ce535be618c4a Merge: bbe8e00 cd805ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 12:05:13 2016 +0100 Merge branch 'core105' into next commit bbe8e009b824aef745c9ab9718dce9a1b557f5fc Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Sep 15 15:31:48 2016 +0200 BUG11184: Error if DNAT address ends with 0 or 255 now disabled When using dnat addresses, it is possible to use big subnets and host addresses like 172.16.0.0/12. These addresses where rejected because it was recognised as network address. The check is now removed. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5ab60e9aa9d77fd9ef4b29f082eb6b00cb211f3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 15 11:04:11 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 48b1876a48ae485f371fe6baa5fe3c1d000ef7d8 Merge: 3f1b94b ccba939 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:41:38 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 3f1b94b9faf319ef82f1fde727563b02c9772c6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:41:12 2016 +0100 python-ipaddress: New package Required for the unbound DHCP leases bridge Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d20ef9d703dd4f4c16d8ce68f6b093d21d1a04ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:35:41 2016 +0100 unbound+DHCP: Make sure to only remove old leases and not static hosts Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74a5ab67fef3726f1d47bee6181423cd9d18a2c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:29:53 2016 +0100 unbound+DHCP: Read correct DHCP domain name for lease Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8dd42b9a6b42d69bcabbedb962bc13ecc44d22a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 15:54:36 2016 +0100 unbound+DHCP: Read existing leases from unbound This allows us to restart unbound and all DHCP leases will be re-imported even if the unbound-dhcp-leases-bridge is not restarted. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ccba93959baf64aefe8c63d4e44888bb7500b036 Merge: 077ea71 7331b24 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:41:36 2016 +0200 Merge branch 'core104' into next commit 077ea717e035aa5fa37ce670957d3312fcaabcf1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 21:14:44 2016 +0100 unbound+DHCP: Set TTL for local leases to 1m Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 811f3d3050c713c9e86572c922734a5f44d70797 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 21:13:25 2016 +0100 unbound: Start service after network has been brought up Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc53e7ef230255bbf2ebf6ed6af8206d88206e8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:52:51 2016 +0100 unbound: Restart after local hosts have been modified Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 36792be6ce3775b86a58e4696f793ead2dc97e7f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:46:02 2016 +0100 DNS: Import local hosts into unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f5d8f0cce3c8eeab754f00ad2e367ffc83112b2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:20:08 2016 +0100 Start unbound+DHCP bridge only when DHCP server is running Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a66c4880d9a43893933bdaf19ca64654a6ebe210 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:11:47 2016 +0100 unbound: Start service at system boot Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 266735a12faddf4635d2b3a772c4f4e9a472763c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 11:07:44 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e63727d2d3f71760b09e4be9e6d7543ce0a24ea Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Sep 10 19:25:22 2016 +0200 next: rootfile updates for 'unbound' and 'initscripts' These two came to my view during the last builds. I hope they're ok now. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a80606ecb568f9def80015ed961362a276f1e4aa Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Sep 10 14:35:39 2016 +0200 squid: Update to 3.5.21 For details, see: http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID_3_5_21.html Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 69f8d8ee6cc005c7ca9e0f5bdb0ea017f7a7c0c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 9 14:57:07 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fba8a0b1ebcb29340e225707193c0147c4cb64a Merge: 3364c93 b658a45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 19:50:45 2016 +0100 Merge branch 'unbound' into next commit b658a451fbb2f551f4e2765ab14eac34e0eca7b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 8 19:46:43 2016 +0100 unbound: Automatically scale configuration to system Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3364c93e37c65ed8544066ed55afe1941b2b6f8d Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Sep 8 08:36:58 2016 +0200 BUG11177: pppoe password not required anymore fixes: #11177 There are providers which do not use passwords anymore. For this reason the password field is no longer mandatory. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3943a54036fcce71d57b1bbd2c2759c64c5f1f86 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Sep 2 20:35:23 2016 +0200 Libvirt: Fix update.sh script The virtlogd could only be restarted when the daemons run. The update.sh script tried to restart the daemon no matter if the daemons run or not. This behaviour produce problems. An If statement now checks if the daemon runs or not and execute the command that is suitable for the situation. Fixes: #11172 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d996e17ab80ce674e3facc04aaa6e918e4d66fbb Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Aug 28 19:59:19 2016 +0200 Update libvirt to 2.1 This is the update of libvirt to the latest version 2.1. The most important change from a packager view is the new virtlogd daemon. This daemon handles the qemu output and wrote it to log files. The require some changes: - A new init script to start, stop restart the daemon called virtlogd. The daemon is restart with SIGUSR1 (this is important because the daemon keeps all pipelines etc. open). This introduces a problem with the uninstall.sh install.sh script. It is not possible to stop the daemon while virtual machines are running, so the script update.sh execute from now not uninstall.sh and install.sh instead it contains all steps from uninstall.sh install.sh expect the start / stop routine for virtlogd. The daemon is just restarted after the update, which makes sure that all changes take effect. - new symlinks in the uninstall.sh and install.sh script and some root file changes because of the new virtlogd init script. - the archive format changes from tar.gz to tar.xz For Changelogs see: https://libvirt.org/news-2015.html https://libvirt.org/news.html (2017 and later: https://libvirt.org/news-2016.html ) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 457367e13d23ac774ba62005e9ec6b294a935527 Merge: a07b8a2 5e35881 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 31 22:40:16 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 5e358816c5aca1fd62ab307235cc1f1278a4fa70 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Aug 17 18:30:02 2016 +0200 dnsmasq 2.76: latest patches (015-016) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bfce482806f59fc178aeec48e84d5f330ddd7bf5 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Aug 23 18:30:03 2016 +0200 gnupg: Update to 1.4.21 Second try: Update from 1.4.18 to 1.4.21, based on current 'next'. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0542a945703fd7a20e0001b0d9daa2ca4ec8a410 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Aug 23 18:32:54 2016 +0200 nano: Update to 2.6.3 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71434e5b4abd45f59a9ab9d519c38f29d471dbc2 Merge: 53aad60 69f3684 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 22 07:26:37 2016 +0200 Merge branch 'core104' into next commit 53aad60d6f35b622ea571faf3fc1c5d4ee28e1f0 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 23:51:20 2016 +0200 smartmontools: Update to 6.5 For details, see: https://www.smartmontools.org/browser/tags/RELEASE_6_5/smartmontools/NEWS Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d8e31f431168d8eb56fb314a2d0f5e9e7e90fadc Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 12:39:17 2016 +0200 libgpg-error: Update to 1.24 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a59e2e1c65c8061627acfaddf7a44f5f716071e4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 12:33:55 2016 +0200 libgcrypt: Update to 1.7.3 Fixes CVE-2016-6313 For details, see: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html https://bugzilla.redhat.com/show_bug.cgi?id=1366105 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 616edca2ba4cfe8d8ad6d628d9d2cab4a91cd047 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 12:20:10 2016 +0200 libassuan: Update to 2.4.3 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d8efad249a19fb3a9a43b087685aabde7b534de9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 00:15:55 2016 +0200 squid: Update to 3.5.20 with latest patches (14067-14075) For details, see: http://www.squid-cache.org/Versions/v3/3.5/changesets/ Since there were problems with "trailing white spaces" I started a new 'squid_3' branch from scratch, based on current 'next'. I hope this is what is needed and that it helps. This one was built without errors and is running here without seen problems. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a07b8a2d554234780b95b0f2d005e5fa3a8df8ac Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Aug 14 11:25:01 2016 +0200 Libvirt: load vhost_net before libvirtd start. If the kernel module vhot_net is loaded, the performance of virtio networking is better then without vhost_net. So the module is loaded before libvirtd ist started to get the benefit of vhost_net. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cf5c7c9f2bb5dd2af43ab3ff39a4fd06efaaef24 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Aug 14 11:10:36 2016 +0200 Libvirt: fix configuration options Adds a missed - to -without-dbus and -with-interface. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ae2919a502a0a2f26f2e849e6fe4e9e42cda3b80 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Aug 14 10:55:38 2016 +0200 Libvirt: enable storage-fs Fixes: 11154 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b4255d757f98cc5bd6cf60ac245c60b78871849f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 15:02:08 2016 +0100 Rootfile update Forgot to commit this one Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 47c3e83253693f80a5ef38af6e9cdd276bf9a5da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 12:45:11 2016 +0100 unbound is not supposed to be a package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6302a24890f8530924e4468daca575e7336f4a87 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 20:58:50 2016 +0100 make.sh: Unbound depends on libevent Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1b4f2493a5beeb38336c6d98a4dd3bc6a24b1aa4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:41:27 2016 +0100 unbound: Update dynamically configured DNS servers after connecting RED Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df7340d2f3232a87ae6e3e11a6cb4e15b74e55a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:32:34 2016 +0100 Add unboundctrl Control binary to relaunch unbound from the web user interface Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9625be6f24f73a40f987b9a79657f026405f9c29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:30:14 2016 +0100 webinterface: Replace dnsmasq with unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 61b4250af56cdd8cb97187098ed5b4b6b93acb85 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:25:48 2016 +0100 Drop dnsmasq This will be replaced by unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8f5eda86b6d1c7270e858214a96e5eded18876a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:20:27 2016 +0100 unbound: Rewrite configuration and initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0fbd7c3c81ca0740cf8e6f4c47253ff4dd48e7df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 16:48:39 2016 +0100 Import Unbound DHCP Lease Bridge Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb21683968ddc0d5eab4c131c69aa665ff5d7dc8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:24:00 2016 +0100 unbound: Ship ICANN's certificates for trust anchor validation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c648dd88f57309f08d2703bdb4596aaa75d776aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:20:07 2016 +0100 unbound: Update trust anchor once a day Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 76f5c54236fdb2714fbb6d890a7b079d5aa4f9fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 15:12:01 2016 +0100 unbound: Install trust anchor in /var/lib/unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89b0810b240967e4ae4101ad2736b74792a3c80a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 14:43:47 2016 +0100 python-daemon: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 08f6cdcf828aa6e03e59b9054b68eede80a13ebe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 5 13:33:47 2016 +0100 New package: python inotify Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0e5f71f77e5bcbeef1edbded3ca0a0bd564a34f Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Tue Aug 2 20:48:17 2016 +0200 New package: unbound 1.5.9 Unbound is a validating, recursive, and caching DNS resolver. https://www.unbound.net Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 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 1b4d5ad9af5d3603331f31aef5dca67833808694 (commit) via b06187f5b65b6911ea90f0daa20ec0a50682070f (commit) from 693928d781bee3151d5108a6f68a464202e78eeb (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 1b4d5ad9af5d3603331f31aef5dca67833808694 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 12 22:37:26 2016 +0100 unbound: Move "listen on all" to main configuration file Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b06187f5b65b6911ea90f0daa20ec0a50682070f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Oct 12 21:08:50 2016 +0200 Midnight Commander: Update to 4.8.18 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/mc | 2 ++ config/unbound/unbound.conf | 6 ++++-- lfs/mc | 6 +++--- src/initscripts/init.d/unbound | 3 --- 4 files changed, 9 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index f41e2d5..baf8e06 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -136,6 +136,7 @@ usr/share/mc/syntax/changelog.syntax usr/share/mc/syntax/cmake.syntax usr/share/mc/syntax/cs.syntax usr/share/mc/syntax/css.syntax +usr/share/mc/syntax/cuda.syntax usr/share/mc/syntax/cxx.syntax usr/share/mc/syntax/cython.syntax usr/share/mc/syntax/d.syntax @@ -152,6 +153,7 @@ usr/share/mc/syntax/erlang.syntax usr/share/mc/syntax/f90.syntax usr/share/mc/syntax/filehighlight.syntax usr/share/mc/syntax/fortran.syntax +usr/share/mc/syntax/glsl.syntax usr/share/mc/syntax/go.syntax usr/share/mc/syntax/haskell.syntax usr/share/mc/syntax/html.syntax diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf index 6d8a7f2..5193dd9 100644 --- a/config/unbound/unbound.conf +++ b/config/unbound/unbound.conf @@ -61,11 +61,13 @@ server: harden-algo-downgrade: no use-caps-for-id: no + # Listen on all interfaces + interface: 0.0.0.0 + # Deny access from everywhere access-control: 0.0.0.0/0 refuse - # Listen on localhost - interface: 127.0.0.1 + # Allow access from localhost access-control: 127.0.0.0/8 allow # Bootstrap root servers diff --git a/lfs/mc b/lfs/mc index b682d64..d5d57bf 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@ include Config -VER = 4.8.17 +VER = 4.8.18 THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 13 +PAK_VER = 14 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0b3965f3267a76d895ce8ab90df2402b +$(DL_FILE)_MD5 = 85ff9279f912c5482fe9f110f8892c96 install : $(TARGET) diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index 1360844..4c6b452 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -148,9 +148,6 @@ write_interfaces_conf() { ( config_header - echo "# bound to all interfaces" - echo "interface: 0.0.0.0" - # 1.1.1.1 is reserved for unused green if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then echo "# allow access from GREEN" hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 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 693928d781bee3151d5108a6f68a464202e78eeb (commit) via 0fa8a4e98e3c7b44f0e66f9958693a66bbb7fdeb (commit) via 11ecfb92a0b9b9020c646e66f15dd1a5b2720f7c (commit) via d221f41fbe38e32afc2fd0bab6ee80aa94b9f1a4 (commit) via 3a6752d9282ba78283f8a31564f359868662ff79 (commit) from d653b433ec6ffbc92a448766852fa4202586be9a (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 693928d781bee3151d5108a6f68a464202e78eeb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 23:01:51 2016 +0200 unbound: start prior network Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0fa8a4e98e3c7b44f0e66f9958693a66bbb7fdeb Merge: 11ecfb9 d653b43 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:52:34 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 11ecfb92a0b9b9020c646e66f15dd1a5b2720f7c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:51:35 2016 +0200 backup: add unbound config Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d221f41fbe38e32afc2fd0bab6ee80aa94b9f1a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:41:19 2016 +0200 unbound: bind to all interfaces this allow to add interfaces without restart unbound. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3a6752d9282ba78283f8a31564f359868662ff79 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 12 22:39:41 2016 +0200 setup: restart unbound after network config change Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/106/filelists/files | 3 ++- config/rootfiles/core/106/update.sh | 3 +++ lfs/initscripts | 2 +- src/initscripts/init.d/unbound | 9 +++++---- src/setup/networking.c | 2 ++ 9 files changed, 17 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index eb76ebf..e1edeff 100644 --- a/config/backup/include +++ b/config/backup/include @@ -5,6 +5,7 @@ /var/ipfire/*/enable /var/ipfire/*/*enable* /var/ipfire/ovpn/collectd.vpn +/etc/unbound /etc/passwd /etc/shadow /etc/group diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 5cf7061..a807760 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -181,7 +181,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 352fac6..6ec7c63 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 352fac6..6ec7c63 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 3b5af01..fd363f3 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -10,7 +10,7 @@ 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/S21unbound +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 @@ -23,3 +23,4 @@ srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/services.cgi usr/sbin/setup +var/ipfire/backup/include diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh index 09d183e..c3609af 100644 --- a/config/rootfiles/core/106/update.sh +++ b/config/rootfiles/core/106/update.sh @@ -55,6 +55,9 @@ rm -vf \ /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 \ diff --git a/lfs/initscripts b/lfs/initscripts index 4369ffe..c5baf68 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -128,7 +128,7 @@ $(TARGET) : ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K79unbound - ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S21unbound + ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K79unbound ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index 3b8beee..1360844 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -148,16 +148,17 @@ write_interfaces_conf() { ( config_header + echo "# bound to all interfaces" + echo "interface: 0.0.0.0" + # 1.1.1.1 is reserved for unused green if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then - echo "# GREEN" - echo "interface: ${GREEN_ADDRESS}" + echo "# allow access from GREEN" echo "access-control: $(cidr ${GREEN_NETADDRESS} ${GREEN_NETMASK}) allow" fi if [ -n "${BLUE_ADDRESS}" ]; then - echo "# BLUE" - echo "interface: ${BLUE_ADDRESS}" + echo "# allow access from BLUE" echo "access-control: $(cidr ${BLUE_NETADDRESS} ${BLUE_NETMASK}) allow" fi ) > /etc/unbound/interfaces.conf diff --git a/src/setup/networking.c b/src/setup/networking.c index b840ec1..00dfc4b 100644 --- a/src/setup/networking.c +++ b/src/setup/networking.c @@ -113,6 +113,8 @@ int handlenetworking(void) runcommandwithstatus("/etc/rc.d/init.d/network start", _("Networking"), _("Restarting network..."), NULL); + runcommandwithstatus("/etc/rc.d/init.d/unbound restart", + _("Networking"), _("Restarting unbound..."), NULL); } } else { rename_nics(); hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 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 7dcf09a681fba7e1b5d511e92caea9b59dcea8b1 (commit) via 4034c523117d03861162c0b66cdc5f07c66b4b27 (commit) via c552562aea45eb921e4635fc55ba8fe7071690bf (commit) via 7f27ab78b2229383a276d5eaa7ae3e51fec2e2c5 (commit) via cb87081b3f6c6aeffc571a672da7d3c7790cba8c (commit) via a309947b04557d6e92c9e3319dcd1626e95fe538 (commit) from fdaf9476f6a493fef43d90d6cf3149e4702c9f26 (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 7dcf09a681fba7e1b5d511e92caea9b59dcea8b1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 12 14:40:01 2016 +0200 smartmontools: Rework package. * Enable useage of libcap-ng. * Drop support for SELinux. * Replace hardcoded path values. * Enable testsuite. * Add scriptlet for systemd. Fixes #11229. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4034c523117d03861162c0b66cdc5f07c66b4b27 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 12 13:41:12 2016 +0200 python: Update to 2.7.12. This is a minor update to the lastest available version of the python 2.7 series. * Drop support for SELinux. Fixes #11226. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c552562aea45eb921e4635fc55ba8fe7071690bf Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 12 11:10:37 2016 +0200 pam: Update to 1.3.0 This is a major update to the latest available version of pam. * Adjust source download location. * Replace various hardcode path. * Enable testsuite. * Drop SELinux support. Fixes #11219. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7f27ab78b2229383a276d5eaa7ae3e51fec2e2c5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 12 11:01:03 2016 +0200 sudo: Enable testsuite. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb87081b3f6c6aeffc571a672da7d3c7790cba8c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 12 08:11:04 2016 +0200 sudo: Update to 1.8.18p1. This is a minor update to the latest available version of sudo. * Replace hardcoded path. * Drop SELinux support. Fixes #11230. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a309947b04557d6e92c9e3319dcd1626e95fe538 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Oct 5 13:40:33 2016 +0200 parted: Update to 3.2. This is an major update to the latest stable version of parted. * Drop SELinux support. * Enable testsuite. Fixes #11220. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: pam/pam.nm | 25 ++- pam/patches/pam-1.1.5-unix-no-fallback.patch | 69 ------ parted/parted.nm | 27 ++- ...0134-fix-COUNT_ALLOCS-failure-in-test_sys.patch | 14 +- ...6-skip-tests-of-seeking-stdin-in-rpmbuild.patch | 25 +-- python/patches/00157-uid-gid-overflows.patch | 76 +++---- python/patches/00170-gc-assertions.patch | 4 +- ...00173-workaround-ENOPROTOOPT-in-bind_port.patch | 7 +- ...-4238-hostname-check-bypass-in-SSL-module.patch | 247 --------------------- python/patches/00186-memory-leak-marshalc.patch | 57 ----- python/patches/05000-autotool-intermediates.patch | 13 +- python/patches/python-2.5.1-plural-fix.patch | 2 +- python/patches/python-2.6-rpath.patch | 2 +- python/patches/python-2.7rc1-binutils-no-dep.patch | 14 -- ...2.7.3-lib64.patch => python-2.7.12-lib64.patch} | 140 ++++++------ python/python.nm | 7 +- smartmontools/smartmontools.nm | 55 ++++- sudo/sudo.nm | 26 ++- 18 files changed, 234 insertions(+), 576 deletions(-) delete mode 100644 pam/patches/pam-1.1.5-unix-no-fallback.patch delete mode 100644 python/patches/00185-CVE-2013-4238-hostname-check-bypass-in-SSL-module.patch delete mode 100644 python/patches/00186-memory-leak-marshalc.patch delete mode 100644 python/patches/python-2.7rc1-binutils-no-dep.patch rename python/{python-2.7.3-lib64.patch => python-2.7.12-lib64.patch} (63%) Difference in files: diff --git a/pam/pam.nm b/pam/pam.nm index 54be8d0..1f4da19 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -4,7 +4,7 @@ ############################################################################### name = pam -version = 1.1.6 +version = 1.3.0 release = 1 thisapp = Linux-PAM-%{version} @@ -22,7 +22,7 @@ end # This is the old location that might be revived in future # source_dl = http://ftp.us.kernel.org/pub/linux/libs/pam/library/ -source_dl = https://fedorahosted.org/releases/l/i/linux-pam/ +source_dl = http://www.linux-pam.org/library/ build requires @@ -30,24 +30,35 @@ build bison cracklib-devel flex - libselinux-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/libpam/.libs + configure_options += \ --includedir=%{includedir}/security \ --docdir=/usr/share/doc/Linux-PAM-%{version} \ --enable-read-both-confs \ --disable-rpath + test + # Temporary copy our pam config files to the sysconfdir + # the chroot environment. They are required by various tests + # of the testsuite. + cp -avf %{DIR_SOURCE}/pam.d %{sysconfdir} + + # Run the testsuite. + make check + end + install_cmds #useradd -D -b /home #sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd - mkdir -pv %{BUILDROOT}/etc/security + mkdir -pv %{BUILDROOT}%{sysconfdir}/security install -v -m644 %{DIR_SOURCE}/pam_env.conf \ - %{BUILDROOT}/etc/security/pam_env.conf + %{BUILDROOT}%{sysconfdir}/security/pam_env.conf # Included in setup package - rm -f %{BUILDROOT}/etc/environment + rm -f %{BUILDROOT}%{sysconfdir}/environment # Install man pages. mkdir -pv %{BUILDROOT}%{mandir}/man5 @@ -61,7 +72,7 @@ end packages package %{name} configfiles - /etc/pam.d + %{sysconfdir}/pam.d end end diff --git a/pam/patches/pam-1.1.5-unix-no-fallback.patch b/pam/patches/pam-1.1.5-unix-no-fallback.patch deleted file mode 100644 index 7857196..0000000 --- a/pam/patches/pam-1.1.5-unix-no-fallback.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up Linux-PAM-1.1.5/modules/pam_unix/pam_unix.8.xml.no-fallback Linux-PAM-1.1.5/modules/pam_unix/pam_unix.8.xml ---- Linux-PAM-1.1.5/modules/pam_unix/pam_unix.8.xml.no-fallback 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.5/modules/pam_unix/pam_unix.8.xml 2012-05-09 11:54:34.442036404 +0200 -@@ -265,11 +265,10 @@ - <listitem> - <para> - When a user changes their password next, -- encrypt it with the SHA256 algorithm. If the -- SHA256 algorithm is not known to the <citerefentry> -+ encrypt it with the SHA256 algorithm. The -+ SHA256 algorithm must be supported by the <citerefentry> - <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum> -- </citerefentry> function, -- fall back to MD5. -+ </citerefentry> function. - </para> - </listitem> - </varlistentry> -@@ -280,11 +279,10 @@ - <listitem> - <para> - When a user changes their password next, -- encrypt it with the SHA512 algorithm. If the -- SHA512 algorithm is not known to the <citerefentry> -+ encrypt it with the SHA512 algorithm. The -+ SHA512 algorithm must be supported by the <citerefentry> - <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum> -- </citerefentry> function, -- fall back to MD5. -+ </citerefentry> function. - </para> - </listitem> - </varlistentry> -@@ -295,11 +293,10 @@ - <listitem> - <para> - When a user changes their password next, -- encrypt it with the blowfish algorithm. If the -- blowfish algorithm is not known to the <citerefentry> -+ encrypt it with the blowfish algorithm. The -+ blowfish algorithm must be supported by the <citerefentry> - <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum> -- </citerefentry> function, -- fall back to MD5. -+ </citerefentry> function. - </para> - </listitem> - </varlistentry> -diff -up Linux-PAM-1.1.5/modules/pam_unix/passverify.c.no-fallback Linux-PAM-1.1.5/modules/pam_unix/passverify.c ---- Linux-PAM-1.1.5/modules/pam_unix/passverify.c.no-fallback 2012-05-09 11:48:12.409632377 +0200 -+++ Linux-PAM-1.1.5/modules/pam_unix/passverify.c 2012-05-09 11:48:36.953172291 +0200 -@@ -427,15 +427,14 @@ PAMH_ARG_DECL(char * create_password_has - if (!sp || strncmp(algoid, sp, strlen(algoid)) != 0) { - /* libxcrypt/libc doesn't know the algorithm, use MD5 */ - pam_syslog(pamh, LOG_ERR, -- "Algo %s not supported by the crypto backend, " -- "falling back to MD5\n", -+ "Algo %s not supported by the crypto backend.\n", - on(UNIX_BLOWFISH_PASS, ctrl) ? "blowfish" : - on(UNIX_SHA256_PASS, ctrl) ? "sha256" : - on(UNIX_SHA512_PASS, ctrl) ? "sha512" : algoid); - if(sp) { - memset(sp, '\0', strlen(sp)); - } -- return crypt_md5_wrapper(password); -+ return NULL; - } - - return x_strdup(sp); diff --git a/parted/parted.nm b/parted/parted.nm index 3beb58a..a37b1f8 100644 --- a/parted/parted.nm +++ b/parted/parted.nm @@ -4,7 +4,7 @@ ############################################################################### name = parted -version = 3.1 +version = 3.2 release = 1 groups = Applications/System @@ -24,18 +24,37 @@ sources = %{thisapp}.tar.xz build requires + # Testsuite + /usr/sbin/mkswap + /usr/bin/udevadm + + # Build dependencies libdevmapper-devel - libselinux-devel - libsepol-devel libuuid-devel ncurses-devel pkg-config readline-devel end + export LD_LIBRARY_PATH=%{DIR_APP}/libparted/.libs:%{DIR_APP}/libparted/fs/.libs + configure_options += \ - --enable-selinux \ --disable-Werror + + test + # Disable test because it needs a locale C.UTF-8. + sed -i '/t0251-gpt-unicode.sh/d' tests/Makefile + + # Disable tests because they force to require loopback devices. + sed -i '/t6001-psep.sh/d' tests/Makefile + sed -i '/t6002-dm-busy.sh/d' tests/Makefile + sed -i '/t6003-dm-hide.sh/d' tests/Makefile + sed -i '/t6004-dm-many-partitions.sh/d' tests/Makefile + sed -i '/t6005-dm-uuid.sh/d' tests/Makefile + + # Run testsuite. + make check + end end packages diff --git a/python/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch b/python/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch index 38381ef..71e7f68 100644 --- a/python/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch +++ b/python/patches/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch @@ -1,9 +1,11 @@ ---- Python-2.7.2/Lib/test/test_sys.py.mark-tests-that-fail-in-rpmbuild 2011-09-08 18:02:31.627362039 -0400 -+++ Python-2.7.2/Lib/test/test_sys.py 2011-09-08 18:15:29.450308851 -0400 -@@ -734,6 +734,11 @@ class SizeofTest(unittest.TestCase): - # (PyTypeObject + PyNumberMethods + PyMappingMethods + - # PySequenceMethods + PyBufferProcs) - s = vsize('P2P15Pl4PP9PP11PI') + struct.calcsize('41P 10P 3P 6P') +diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py +index 0dd4258..d9b3267 100644 +--- a/Lib/test/test_sys.py ++++ b/Lib/test/test_sys.py +@@ -769,6 +769,11 @@ class SizeofTest(unittest.TestCase): + '10P' # PySequenceMethods + '6P' # PyBufferProcs + '2P') + + # COUNT_ALLOCS adds further fields to the end of a PyTypeObject: + if hasattr(sys, 'getcounts'): diff --git a/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch b/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch index 845fb2a..4d7626f 100644 --- a/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch +++ b/python/patches/00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch @@ -1,22 +1,11 @@ -diff -up Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file2k.py ---- Python-2.7.2/Lib/test/test_file2k.py.skip-tests-of-seeking-stdin-in-rpmbuild 2011-09-08 17:23:50.922520729 -0400 -+++ Python-2.7.2/Lib/test/test_file2k.py 2011-09-08 17:24:41.368517277 -0400 -@@ -213,6 +213,7 @@ class OtherFileTests(unittest.TestCase): +diff -up Python-2.7.6/Lib/test/test_file2k.py.stdin-test Python-2.7.6/Lib/test/test_file2k.py +--- Python-2.7.6/Lib/test/test_file2k.py.stdin-test 2013-11-10 08:36:40.000000000 +0100 ++++ Python-2.7.6/Lib/test/test_file2k.py 2014-01-29 14:28:01.029488055 +0100 +@@ -223,6 +223,7 @@ class OtherFileTests(unittest.TestCase): else: f.close() + @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji') - def testStdin(self): - # This causes the interpreter to exit on OSF1 v5.1. - if sys.platform != 'osf1V5': -diff -up Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild Python-2.7.2/Lib/test/test_file.py ---- Python-2.7.2/Lib/test/test_file.py.skip-tests-of-seeking-stdin-in-rpmbuild 2011-09-08 17:20:31.146534389 -0400 -+++ Python-2.7.2/Lib/test/test_file.py 2011-09-08 17:24:45.016517030 -0400 -@@ -154,6 +154,7 @@ class OtherFileTests(unittest.TestCase): - f.close() - self.fail('%r is an invalid file mode' % mode) - -+ @unittest._skipInRpmBuild('seems not to raise the exception when run in Koji') - def testStdin(self): - # This causes the interpreter to exit on OSF1 v5.1. - if sys.platform != 'osf1V5': + def testStdinSeek(self): + if sys.platform == 'osf1V5': + # This causes the interpreter to exit on OSF1 v5.1. diff --git a/python/patches/00157-uid-gid-overflows.patch b/python/patches/00157-uid-gid-overflows.patch index 13546bb..a31c98a 100644 --- a/python/patches/00157-uid-gid-overflows.patch +++ b/python/patches/00157-uid-gid-overflows.patch @@ -2,48 +2,48 @@ diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/tes --- Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400 +++ Python-2.7.3/Lib/test/test_os.py 2012-06-26 14:51:36.000817929 -0400 @@ -677,30 +677,36 @@ if sys.platform != 'win32': - def test_setuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setuid, 0) -+ self.assertRaises(TypeError, os.setuid, 'not an int') - self.assertRaises(OverflowError, os.setuid, 1<<32) + def test_setuid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.setuid, 0) ++ self.assertRaises(TypeError, os.setuid, 'not an int') + self.assertRaises(OverflowError, os.setuid, 1<<32) - if hasattr(os, 'setgid'): - def test_setgid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setgid, 0) -+ self.assertRaises(TypeError, os.setgid, 'not an int') - self.assertRaises(OverflowError, os.setgid, 1<<32) + @unittest.skipUnless(hasattr(os, 'setgid'), 'test needs os.setgid()') + def test_setgid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.setgid, 0) ++ self.assertRaises(TypeError, os.setgid, 'not an int') + self.assertRaises(OverflowError, os.setgid, 1<<32) - if hasattr(os, 'seteuid'): - def test_seteuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.seteuid, 0) -+ self.assertRaises(TypeError, os.seteuid, 'not an int') - self.assertRaises(OverflowError, os.seteuid, 1<<32) + @unittest.skipUnless(hasattr(os, 'seteuid'), 'test needs os.seteuid()') + def test_seteuid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.seteuid, 0) ++ self.assertRaises(TypeError, os.seteuid, 'not an int') + self.assertRaises(OverflowError, os.seteuid, 1<<32) - if hasattr(os, 'setegid'): - def test_setegid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setegid, 0) -+ self.assertRaises(TypeError, os.setegid, 'not an int') - self.assertRaises(OverflowError, os.setegid, 1<<32) + @unittest.skipUnless(hasattr(os, 'setegid'), 'test needs os.setegid()') + def test_setegid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.setegid, 0) ++ self.assertRaises(TypeError, os.setegid, 'not an int') + self.assertRaises(OverflowError, os.setegid, 1<<32) - if hasattr(os, 'setreuid'): - def test_setreuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setreuid, 0, 0) -+ self.assertRaises(TypeError, os.setreuid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setreuid, 0, 'not an int') - self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) - self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) + @unittest.skipUnless(hasattr(os, 'setreuid'), 'test needs os.setreuid()') + def test_setreuid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.setreuid, 0, 0) ++ self.assertRaises(TypeError, os.setreuid, 'not an int', 0) ++ self.assertRaises(TypeError, os.setreuid, 0, 'not an int') + self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) + self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) @@ -715,6 +721,8 @@ if sys.platform != 'win32': - def test_setregid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setregid, 0, 0) -+ self.assertRaises(TypeError, os.setregid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setregid, 0, 'not an int') - self.assertRaises(OverflowError, os.setregid, 1<<32, 0) - self.assertRaises(OverflowError, os.setregid, 0, 1<<32) + def test_setregid(self): + if os.getuid() != 0: + self.assertRaises(os.error, os.setregid, 0, 0) ++ self.assertRaises(TypeError, os.setregid, 'not an int', 0) ++ self.assertRaises(TypeError, os.setregid, 0, 'not an int') + self.assertRaises(OverflowError, os.setregid, 1<<32, 0) + self.assertRaises(OverflowError, os.setregid, 0, 1<<32) diff --git a/python/patches/00170-gc-assertions.patch b/python/patches/00170-gc-assertions.patch index 3fb37ff..f3a0838 100644 --- a/python/patches/00170-gc-assertions.patch +++ b/python/patches/00170-gc-assertions.patch @@ -3,8 +3,8 @@ diff -up Python-2.7.3/Lib/test/test_gc.py.gc-assertions Python-2.7.3/Lib/test/te +++ Python-2.7.3/Lib/test/test_gc.py 2013-02-20 16:39:52.720489297 -0500 @@ -1,6 +1,7 @@ import unittest --from test.test_support import verbose, run_unittest -+from test.test_support import verbose, run_unittest, import_module +-from test.test_support import verbose, run_unittest, start_threads ++from test.test_support import verbose, run_unittest, start_threads, import_module import sys +import sysconfig import time diff --git a/python/patches/00173-workaround-ENOPROTOOPT-in-bind_port.patch b/python/patches/00173-workaround-ENOPROTOOPT-in-bind_port.patch index eb34610..3e83d67 100644 --- a/python/patches/00173-workaround-ENOPROTOOPT-in-bind_port.patch +++ b/python/patches/00173-workaround-ENOPROTOOPT-in-bind_port.patch @@ -8,6 +8,7 @@ diff -up Python-2.7.3/Lib/test/test_support.py.rhbz913732 Python-2.7.3/Lib/test/ - if hasattr(socket, 'SO_REUSEPORT'): + if hasattr(socket, 'SO_REUSEPORT') \ + and 'WITHIN_PYTHON_RPM_BUILD' not in os.environ: # rhbz#913732 - if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: - raise TestFailed("tests should never set the SO_REUSEPORT " \ - "socket option on TCP/IP sockets!") + try: + if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: + raise TestFailed("tests should never set the SO_REUSEPORT " \ + "socket option on TCP/IP sockets!") diff --git a/python/patches/00185-CVE-2013-4238-hostname-check-bypass-in-SSL-module.patch b/python/patches/00185-CVE-2013-4238-hostname-check-bypass-in-SSL-module.patch deleted file mode 100644 index e215589..0000000 --- a/python/patches/00185-CVE-2013-4238-hostname-check-bypass-in-SSL-module.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff -r 9ddc63c039ba Lib/test/nullbytecert.pem ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/Lib/test/nullbytecert.pem Sun Aug 11 18:13:17 2013 +0200 -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff -r 9ddc63c039ba Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py Sun Aug 11 13:04:50 2013 +0300 -+++ b/Lib/test/test_ssl.py Sun Aug 11 18:13:17 2013 +0200 -@@ -25,6 +25,7 @@ - HOST = test_support.HOST - CERTFILE = None - SVN_PYTHON_ORG_ROOT_CERT = None -+NULLBYTECERT = None - - def handle_error(prefix): - exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) -@@ -123,6 +124,27 @@ - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4073(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if test_support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev(a)python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -1360,7 +1382,7 @@ - - - def test_main(verbose=False): -- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT -+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT - CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, - "keycert.pem") - SVN_PYTHON_ORG_ROOT_CERT = os.path.join( -@@ -1368,10 +1390,13 @@ - "https_svn_python_org_root.pem") - NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, - "nokia.pem") -+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, -+ "nullbytecert.pem") - - if (not os.path.exists(CERTFILE) or - not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or -- not os.path.exists(NOKIACERT)): -+ not os.path.exists(NOKIACERT) or -+ not os.path.exists(NULLBYTECERT)): - raise test_support.TestFailed("Can't read certificate files!") - - tests = [BasicTests, BasicSocketTests] -diff -r 9ddc63c039ba Modules/_ssl.c ---- a/Modules/_ssl.c Sun Aug 11 13:04:50 2013 +0300 -+++ b/Modules/_ssl.c Sun Aug 11 18:13:17 2013 +0200 -@@ -741,8 +741,13 @@ - - /* get a rendering of each name in the set of names */ - -+ int gntype; -+ ASN1_STRING *as = NULL; -+ - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: - - /* we special-case DirName as a tuple of tuples of attributes */ - -@@ -764,11 +769,61 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string -+ correctly. */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyUnicode_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyUnicode_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyUnicode_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_Warn(PyExc_RuntimeWarning, -+ "Unknown general name type") == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -794,6 +849,7 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ diff --git a/python/patches/00186-memory-leak-marshalc.patch b/python/patches/00186-memory-leak-marshalc.patch deleted file mode 100644 index 19fb175..0000000 --- a/python/patches/00186-memory-leak-marshalc.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- Python-2.7.5/Python/marshal.c 2013-05-12 05:32:53.000000000 +0200 -+++ /home/rkuska/hg/cpython/Python/marshal.c 2013-07-18 10:33:26.392486235 +0200 -@@ -88,7 +88,7 @@ - } - - static void --w_string(char *s, Py_ssize_t n, WFILE *p) -+w_string(const char *s, Py_ssize_t n, WFILE *p) - { - if (p->fp != NULL) { - fwrite(s, 1, n, p->fp); -@@ -141,6 +141,13 @@ - # define W_SIZE w_long - #endif - -+static void -+w_pstring(const char *s, Py_ssize_t n, WFILE *p) -+{ -+ W_SIZE(n, p); -+ w_string(s, n, p); -+} -+ - /* We assume that Python longs are stored internally in base some power of - 2**15; for the sake of portability we'll always read and write them in base - exactly 2**15. */ -@@ -338,9 +345,7 @@ - else { - w_byte(TYPE_STRING, p); - } -- n = PyString_GET_SIZE(v); -- W_SIZE(n, p); -- w_string(PyString_AS_STRING(v), n, p); -+ w_pstring(PyBytes_AS_STRING(v), PyString_GET_SIZE(v), p); - } - #ifdef Py_USING_UNICODE - else if (PyUnicode_CheckExact(v)) { -@@ -352,9 +357,7 @@ - return; - } - w_byte(TYPE_UNICODE, p); -- n = PyString_GET_SIZE(utf8); -- W_SIZE(n, p); -- w_string(PyString_AS_STRING(utf8), n, p); -+ w_pstring(PyString_AS_STRING(utf8), PyString_GET_SIZE(utf8), p); - Py_DECREF(utf8); - } - #endif -@@ -441,8 +444,7 @@ - PyBufferProcs *pb = v->ob_type->tp_as_buffer; - w_byte(TYPE_STRING, p); - n = (*pb->bf_getreadbuffer)(v, 0, (void **)&s); -- W_SIZE(n, p); -- w_string(s, n, p); -+ w_pstring(s, n, p); - } - else { - w_byte(TYPE_UNKNOWN, p); diff --git a/python/patches/05000-autotool-intermediates.patch b/python/patches/05000-autotool-intermediates.patch index cfedc25..dfe0257 100644 --- a/python/patches/05000-autotool-intermediates.patch +++ b/python/patches/05000-autotool-intermediates.patch @@ -43,15 +43,6 @@ diff -up ./configure.autotool-intermediates ./configure --with-wctype-functions use wctype.h functions --with-fpectl enable SIGFPE catching --with-libm=STRING math library -@@ -5171,7 +5181,7 @@ esac - $as_echo_n "checking LIBRARY... " >&6; } - if test -z "$LIBRARY" - then -- LIBRARY='libpython$(VERSION).a' -+ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 - $as_echo "$LIBRARY" >&6; } @@ -5343,8 +5353,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -60,7 +51,7 @@ diff -up ./configure.autotool-intermediates ./configure - BLDLIBRARY='-L. -lpython$(VERSION)' + LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' + BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} case $ac_sys_system in FreeBSD*) @@ -5367,7 +5377,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> @@ -69,7 +60,7 @@ diff -up ./configure.autotool-intermediates ./configure LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)' + BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} ;; atheos*) @@ -5894,6 +5904,14 @@ $as_echo "no" >&6; } diff --git a/python/patches/python-2.5.1-plural-fix.patch b/python/patches/python-2.5.1-plural-fix.patch index 040adaf..5002cb2 100644 --- a/python/patches/python-2.5.1-plural-fix.patch +++ b/python/patches/python-2.5.1-plural-fix.patch @@ -7,6 +7,6 @@ diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py continue + if item.startswith("#"): + continue + k = v = None if ':' in item: k, v = item.split(':', 1) - k = k.strip().lower() diff --git a/python/patches/python-2.6-rpath.patch b/python/patches/python-2.6-rpath.patch index 43e3ec4..33d7cf6 100644 --- a/python/patches/python-2.6-rpath.patch +++ b/python/patches/python-2.6-rpath.patch @@ -7,6 +7,6 @@ diff -up Python-2.6/configure.ac.rpath Python-2.6/configure.ac LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)' + BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} ;; atheos*) diff --git a/python/patches/python-2.7rc1-binutils-no-dep.patch b/python/patches/python-2.7rc1-binutils-no-dep.patch deleted file mode 100644 index ee6157c..0000000 --- a/python/patches/python-2.7rc1-binutils-no-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up Python-2.7rc1/Lib/ctypes/util.py.binutils-no-dep Python-2.7rc1/Lib/ctypes/util.py ---- Python-2.7rc1/Lib/ctypes/util.py.binutils-no-dep 2010-03-15 09:42:23.000000000 -0400 -+++ Python-2.7rc1/Lib/ctypes/util.py 2010-06-06 05:03:02.155975210 -0400 -@@ -140,7 +140,9 @@ elif os.name == "posix": - dump = f.read() - rv = f.close() - if rv == 10: -- raise OSError, 'objdump command not found' -+ return os.path.basename(f) # This is good for GLibc, I think, -+ # and a dep on binutils is big (for -+ # live CDs). - f = os.popen(cmd) - try: - data = f.read() diff --git a/python/python-2.7.12-lib64.patch b/python/python-2.7.12-lib64.patch new file mode 100644 index 0000000..00c835c --- /dev/null +++ b/python/python-2.7.12-lib64.patch @@ -0,0 +1,184 @@ +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index b9f1c6c..7b23714 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -42,14 +42,14 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { + 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 068d1ba..3e7f077 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -119,8 +119,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": ++ if plat_specific or standard_lib: ++ lib = "lib64" ++ else: ++ lib = "lib" + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff --git a/Lib/site.py b/Lib/site.py +index e8433b4..e8e6b50 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -288,12 +288,16 @@ def getsitepackages(): + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': ++ sitepackages.append(os.path.join(prefix, "lib64", ++ "python" + sys.version[:3], ++ "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: + sitepackages.append(prefix) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple +diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py +index 78c4809..3b9e74d 100644 +--- a/Lib/test/test_site.py ++++ b/Lib/test/test_site.py +@@ -246,17 +246,20 @@ class HelperFunctionsTests(unittest.TestCase): + self.assertEqual(dirs[2], wanted) + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc +- self.assertEqual(len(dirs), 2) +- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ self.assertEqual(len(dirs), 3) ++ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], + 'site-packages') + self.assertEqual(dirs[0], wanted) +- wanted = os.path.join('xoxo', 'lib', 'site-python') ++ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ 'site-packages') + self.assertEqual(dirs[1], wanted) ++ wanted = os.path.join('xoxo', 'lib', 'site-python') ++ self.assertEqual(dirs[2], wanted) + else: + # other platforms + self.assertEqual(len(dirs), 2) + self.assertEqual(dirs[0], 'xoxo') +- wanted = os.path.join('xoxo', 'lib', 'site-packages') ++ wanted = os.path.join('xoxo', 'lib64', 'site-packages') + self.assertEqual(dirs[1], wanted) + + class PthFile(object): +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 5741a4c..0faa5c5 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -111,7 +111,7 @@ LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +diff --git a/Modules/Setup.dist b/Modules/Setup.dist +index c70a0d6..051fd41 100644 +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -416,7 +416,7 @@ gdbm gdbmmodule.c -lgdbm + # Edit the variables DB and DBLIBVERto point to the db top directory + # and the subdirectory of PORT where you built it. + DBINC=/usr/include/libdb +-DBLIB=/usr/lib ++DBLIB=/usr/lib64 + _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb + + # Historical Berkeley DB 1.85 +@@ -462,7 +462,7 @@ cPickle cPickle.c + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz + + # Interface to the Expat XML parser + # +diff --git a/Modules/getpath.c b/Modules/getpath.c +index 428684c..9ef6711 100644 +--- a/Modules/getpath.c ++++ b/Modules/getpath.c +@@ -108,7 +108,7 @@ static char prefix[MAXPATHLEN+1]; + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib64/python" VERSION; + + static void + reduce(char *dir) +@@ -550,7 +550,7 @@ calculate_path(void) + fprintf(stderr, + "Could not find platform dependent libraries <exec_prefix>\n"); + strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); +- joinpath(exec_prefix, "lib/lib-dynload"); ++ joinpath(exec_prefix, "lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +diff --git a/setup.py b/setup.py +index 55c4f5d..19efe82 100644 +--- a/setup.py ++++ b/setup.py +@@ -456,7 +456,7 @@ class PyBuildExt(build_ext): + def detect_modules(self): + # Ensure that /usr/local is always used + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() +@@ -782,11 +782,11 @@ class PyBuildExt(build_ext): + elif curses_library: + readline_libs.append(curses_library) + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -821,8 +821,8 @@ class PyBuildExt(build_ext): + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/python/python-2.7.3-lib64.patch b/python/python-2.7.3-lib64.patch deleted file mode 100644 index 71f32c5..0000000 --- a/python/python-2.7.3-lib64.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -up Python-2.7.3/Lib/distutils/command/install.py.lib64 Python-2.7.3/Lib/distutils/command/install.py ---- Python-2.7.3/Lib/distutils/command/install.py.lib64 2012-04-09 19:07:29.000000000 -0400 -+++ Python-2.7.3/Lib/distutils/command/install.py 2013-02-19 13:58:20.446015129 -0500 -@@ -42,14 +42,14 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -diff -up Python-2.7.3/Lib/distutils/sysconfig.py.lib64 Python-2.7.3/Lib/distutils/sysconfig.py ---- Python-2.7.3/Lib/distutils/sysconfig.py.lib64 2012-04-09 19:07:29.000000000 -0400 -+++ Python-2.7.3/Lib/distutils/sysconfig.py 2013-02-19 13:58:20.446015129 -0500 -@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -diff -up Python-2.7.3/Lib/site.py.lib64 Python-2.7.3/Lib/site.py ---- Python-2.7.3/Lib/site.py.lib64 2012-04-09 19:07:31.000000000 -0400 -+++ Python-2.7.3/Lib/site.py 2013-02-19 13:58:20.447015128 -0500 -@@ -300,12 +300,16 @@ def getsitepackages(): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitepackages.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: - sitepackages.append(prefix) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple -diff -up Python-2.7.3/Lib/test/test_site.py.lib64 Python-2.7.3/Lib/test/test_site.py ---- Python-2.7.3/Lib/test/test_site.py.lib64 2012-04-09 19:07:32.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_site.py 2013-02-19 13:58:20.447015128 -0500 -@@ -241,17 +241,20 @@ class HelperFunctionsTests(unittest.Test - self.assertEqual(dirs[2], wanted) - elif os.sep == '/': - # OS X non-framwework builds, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 2) -- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], -+ self.assertEqual(len(dirs), 3) -+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], - 'site-packages') - self.assertEqual(dirs[0], wanted) -- wanted = os.path.join('xoxo', 'lib', 'site-python') -+ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], -+ 'site-packages') - self.assertEqual(dirs[1], wanted) -+ wanted = os.path.join('xoxo', 'lib', 'site-python') -+ self.assertEqual(dirs[2], wanted) - else: - # other platforms - self.assertEqual(len(dirs), 2) - self.assertEqual(dirs[0], 'xoxo') -- wanted = os.path.join('xoxo', 'lib', 'site-packages') -+ wanted = os.path.join('xoxo', 'lib64', 'site-packages') - self.assertEqual(dirs[1], wanted) - - class PthFile(object): -diff -up Python-2.7.3/Makefile.pre.in.lib64 Python-2.7.3/Makefile.pre.in ---- Python-2.7.3/Makefile.pre.in.lib64 2013-02-19 13:58:20.435015131 -0500 -+++ Python-2.7.3/Makefile.pre.in 2013-02-19 13:58:20.447015128 -0500 -@@ -97,7 +97,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -diff -up Python-2.7.3/Modules/getpath.c.lib64 Python-2.7.3/Modules/getpath.c ---- Python-2.7.3/Modules/getpath.c.lib64 2012-04-09 19:07:34.000000000 -0400 -+++ Python-2.7.3/Modules/getpath.c 2013-02-19 13:58:20.448015128 -0500 -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ -+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib64/python" VERSION; - - static void - reduce(char *dir) -@@ -528,7 +528,7 @@ calculate_path(void) - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "lib64/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -538,7 +538,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -up Python-2.7.3/Modules/Setup.dist.lib64 Python-2.7.3/Modules/Setup.dist ---- Python-2.7.3/Modules/Setup.dist.lib64 2013-02-19 13:58:20.442015131 -0500 -+++ Python-2.7.3/Modules/Setup.dist 2013-02-19 14:02:25.255998391 -0500 -@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm - # Edit the variables DB and DBLIBVERto point to the db top directory - # and the subdirectory of PORT where you built it. - DBINC=/usr/include/libdb --DBLIB=/usr/lib -+DBLIB=/usr/lib64 - _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb - - # Historical Berkeley DB 1.85 -@@ -459,7 +459,7 @@ cPickle cPickle.c - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz - - # Interface to the Expat XML parser - # -diff -up Python-2.7.3/setup.py.lib64 Python-2.7.3/setup.py ---- Python-2.7.3/setup.py.lib64 2012-04-09 19:07:36.000000000 -0400 -+++ Python-2.7.3/setup.py 2013-02-19 13:58:20.449015129 -0500 -@@ -369,7 +369,7 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - self.add_gcc_paths() - self.add_multiarch_paths() -@@ -677,11 +677,11 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -715,8 +715,8 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/python/python.nm b/python/python.nm index 84704b5..0123eb9 100644 --- a/python/python.nm +++ b/python/python.nm @@ -5,8 +5,8 @@ name = python major_ver = 2.7 -version = %{major_ver}.5 -release = 2 +version = %{major_ver}.12 +release = 1 thisapp = Python-%{version} groups = Development/Languages @@ -35,7 +35,6 @@ build glibc-headers >= 2.16-4 libdb-devel libffi-devel - libselinux-devel ncurses-devel openssl-devel pakfire-builder >= 0.9.23-4 @@ -51,7 +50,7 @@ build export OPT = %{CFLAGS} if "%{lib}" == "lib64" - patches += %{DIR_SOURCE}/python-2.7.3-lib64.patch + patches += %{DIR_SOURCE}/python-2.7.12-lib64.patch patches += %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch end diff --git a/smartmontools/smartmontools.nm b/smartmontools/smartmontools.nm index 222d5d9..9e85375 100644 --- a/smartmontools/smartmontools.nm +++ b/smartmontools/smartmontools.nm @@ -5,7 +5,7 @@ name = smartmontools version = 6.5 -release = 1 +release = 2 groups = System/Statistics url = http://smartmontools.sourceforge.net/ @@ -13,11 +13,11 @@ license = GPLv2 summary = A set of tools that watches HDD S.M.A.R.T status. description - The smartmontools package contains two utility programs (smartctl \ - and smartd) to control and monitor storage systems using the \ - Self-Monitoring, Analysis and Reporting Technology System (SMART) \ - built into most modern ATA and SCSI harddisks. In many cases, \ - these utilities will provide advanced warning of disk degradation \ + The smartmontools package contains two utility programs (smartctl + and smartd) to control and monitor storage systems using the + Self-Monitoring, Analysis and Reporting Technology System (SMART) + built into most modern ATA and SCSI harddisks. In many cases, + these utilities will provide advanced warning of disk degradation and failure. end @@ -26,21 +26,56 @@ source_dl = http://sourceforge.net/projects/smartmontools/files/smartmontools/% build requires gcc-c++ - libselinux-devel + libcap-ng-devel end configure_options += \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-selinux + --mandir=%{mandir} \ + --sysconfdir=%{sysconfdir}/%{name} \ + --with-libcap-ng=yes \ + --with-systemdsystemunitdir=%{unitdir} + + test + make check + end install_cmds + # Drop old sysvinit script. rm -rvf %{BUILDROOT}/etc/rc.d + + # Fix sysconfig path in systemd file. + sed -i 's|/etc/smartmontools/sysconfig|/etc/sysconfig|g' \ + %{BUILDROOT}%{unitdir}/smartd.service end end packages package %{name} + configfiles + %{sysconfdir}/smartmontools/smartd.conf + end + + prerequires + systemd-units + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable smartd.service >/dev/null 2>&1 || : + systemctl stop smartd.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart smartd.service >/dev/null 2>&1 || : + end end package %{name}-debuginfo diff --git a/sudo/sudo.nm b/sudo/sudo.nm index 5087c1e..1b2dcb1 100644 --- a/sudo/sudo.nm +++ b/sudo/sudo.nm @@ -4,8 +4,8 @@ ############################################################################### name = sudo -version = 1.8.17p1 -release = 1 +version = 1.8.18p1 +release = 2 groups = Applications/System url = http://www.sudo.ws/ @@ -30,29 +30,39 @@ build requires audit-devel cyrus-sasl-devel - libselinux-devel openldap-devel pam-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/lib/util/.libs/ + configure_options += \ --libexecdir=%{libdir} \ --with-logging=syslog \ --with-logfac=authpriv \ --with-pam \ --with-pam-login \ - --with-editor=/usr/bin/vi \ + --with-editor=%{bindir}/vi \ --with-env-editor \ --with-ignore-dot \ --with-tty-tickets \ --with-ldap \ --with-passprompt="[sudo] password for %p: " \ - --with-selinux \ --with-linux-audit + prepare_cmds + # The tarball contains files owned by a stange uid:gid which will let + # the testsuite (testsudoers/test3) fail. Fix the ownership of this files. + chown -R 0:0 %{DIR_APP} + end + + test + make check + end + install_cmds - mkdir -pv %{BUILDROOT}/etc - cp -vf %{DIR_SOURCE}/sudoers %{BUILDROOT}/etc/sudoers + mkdir -pv %{BUILDROOT}%{sysconfdir} + cp -vf %{DIR_SOURCE}/sudoers %{BUILDROOT}%{sysconfdir}/sudoers end end @@ -61,7 +71,7 @@ packages groups += Base configfiles - /etc/sudoers + %{sysconfdir}/sudoers end end hooks/post-receive -- IPFire 3.x development tree

1 0

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

12 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 d653b433ec6ffbc92a448766852fa4202586be9a (commit) from 86c9deb2ea39001c488b7b65f6dfac6fe88a1a35 (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 d653b433ec6ffbc92a448766852fa4202586be9a Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Date: Wed Oct 12 12:17:06 2016 +0200 drop of the obsolete and deprecated vdr addon vdr_vnsiserver3 Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/vdr_vnsiserver3 | 4 -- lfs/vdr_vnsiserver3 | 99 ------------------------------- make.sh | 1 - 3 files changed, 104 deletions(-) delete mode 100644 config/rootfiles/packages/vdr_vnsiserver3 delete mode 100644 lfs/vdr_vnsiserver3 Difference in files: diff --git a/config/rootfiles/packages/vdr_vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3 deleted file mode 100644 index 4eee282..0000000 --- a/config/rootfiles/packages/vdr_vnsiserver3 +++ /dev/null @@ -1,4 +0,0 @@ -etc/sysconfig/vdr-plugins.d/vnsiserver3.conf -etc/vdr/plugins/vnsiserver3 -etc/vdr/plugins/vnsiserver3/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 diff --git a/lfs/vdr_vnsiserver3 b/lfs/vdr_vnsiserver3 deleted file mode 100644 index 77d066b..0000000 --- a/lfs/vdr_vnsiserver3 +++ /dev/null @@ -1,99 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 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 # -# 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 = cc03615 -THISAPP = vdr-vnsiserver3-$(VER) -DL_FILE = $(THISAPP).tar.xz - -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr_vnsiserver3 -PAK_VER = 2 - -DEPS = "" - -VDRPLUGVER = 2.0.0 - -EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -CFLAGS += $(EXTRA_FLAGS) -CXXFLAGS += $(EXTRA_FLAGS) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5100b1cb1ee936f64b99a76c492fbc3f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download : $(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - LOCALEDIR=$$(pwd)/locale all - - -mkdir -pv /etc/vdr/plugins/vnsiserver3 - cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ - /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDRPLUGVER) - ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf - install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ - /etc/sysconfig/vdr-plugins.d - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5a2c6da..9289d81 100755 --- a/make.sh +++ b/make.sh @@ -731,7 +731,6 @@ buildipfire() { ipfiremake vdr ipfiremake vdr_streamdev ipfiremake vdr_vnsiserver5 - ipfiremake vdr_vnsiserver3 ipfiremake vdr_epgsearch ipfiremake vdr_dvbapi ipfiremake vdr_eepg hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM