Development October 2016

development@lists.ipfire.org

10 participants
79 discussions

[PATCH] guardian 2.0: fixes for rootfile
by Matthias Fischer 09 Oct '16

09 Oct '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/guardian | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/rootfiles/packages/guardian b/config/rootfiles/packages/guardian index 9eb3fed..3838af5 100644 --- a/config/rootfiles/packages/guardian +++ b/config/rootfiles/packages/guardian @@ -16,6 +16,15 @@ usr/lib/perl5/site_perl/5.12.3/Guardian/Logger.pm usr/lib/perl5/site_perl/5.12.3/Guardian/Parser.pm usr/lib/perl5/site_perl/5.12.3/Guardian/Socket.pm usr/sbin/guardian +var/ipfire/addon-lang/guardian.de.pl +var/ipfire/addon-lang/guardian.en.pl +var/ipfire/addon-lang/guardian.es.pl +var/ipfire/addon-lang/guardian.fr.pl +var/ipfire/addon-lang/guardian.it.pl +var/ipfire/addon-lang/guardian.nl.pl +var/ipfire/addon-lang/guardian.pl.pl +var/ipfire/addon-lang/guardian.ru.pl +var/ipfire/addon-lang/guardian.tr.pl var/ipfire/backup/addons/includes/guardian var/ipfire/guardian var/ipfire/menu.d/EX-guardian.menu -- 2.10.1

1 0

[PATCH] squid 3.5.21: latest patches (14092-14093)
by Matthias Fischer 09 Oct '16

09 Oct '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/squid | 2 + src/patches/squid/squid-3.5-14092.patch | 65 +++++++++++++++++++++++++++++++++ src/patches/squid/squid-3.5-14093.patch | 35 ++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 src/patches/squid/squid-3.5-14092.patch create mode 100644 src/patches/squid/squid-3.5-14093.patch diff --git a/lfs/squid b/lfs/squid index 4fa60b2..5aec480 100644 --- a/lfs/squid +++ b/lfs/squid @@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14089.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14090.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14091.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14092.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14093.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi diff --git a/src/patches/squid/squid-3.5-14092.patch b/src/patches/squid/squid-3.5-14092.patch new file mode 100644 index 0000000..2314911 --- /dev/null +++ b/src/patches/squid/squid-3.5-14092.patch @@ -0,0 +1,65 @@ +------------------------------------------------------------ +revno: 14092 +revision-id: squid3(a)treenet.co.nz-20161008203735-4q3zmw5j4w1ueopy +parent: squid3(a)treenet.co.nz-20160924223605-2xa0er35fx3dc8jg +fixes bugs: http://bugs.squid-cache.org/show_bug.cgi?id=4302 http://bugs.squid-cache.org/show_bug.cgi?id=2842 +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.5 +timestamp: Sun 2016-10-09 09:37:35 +1300 +message: + Bug 4302 pt2: IPFilter v5 transparent interception +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20161008203735-4q3zmw5j4w1ueopy +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: 03c7ec8b1506681d8b3889bf31ace737dd0271ad +# timestamp: 2016-10-08 20:51:07 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20160924223605-\ +# 2xa0er35fx3dc8jg +# +# Begin patch +=== modified file 'src/ip/Intercept.cc' +--- src/ip/Intercept.cc 2016-04-12 06:52:39 +0000 ++++ src/ip/Intercept.cc 2016-10-08 20:37:35 +0000 +@@ -207,16 +207,21 @@ + debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); + warningLevel = (warningLevel + 1) % 10; + return false; ++ } ++ newConn->local.getInAddr(natLookup.nl_inip); ++ newConn->remote.getInAddr(natLookup.nl_outip); + #else + natLookup.nl_v = 6; ++ newConn->local.getInAddr(natLookup.nl_inipaddr.in6); ++ newConn->remote.getInAddr(natLookup.nl_outipaddr.in6); + } else { + natLookup.nl_v = 4; ++ newConn->local.getInAddr(natLookup.nl_inipaddr.in4); ++ newConn->remote.getInAddr(natLookup.nl_outipaddr.in4); ++ } + #endif +- } + natLookup.nl_inport = htons(newConn->local.port()); +- newConn->local.getInAddr(natLookup.nl_inip); + natLookup.nl_outport = htons(newConn->remote.port()); +- newConn->remote.getInAddr(natLookup.nl_outip); + // ... and the TCP flag + natLookup.nl_flags = IPN_TCP; + +@@ -281,7 +286,14 @@ + debugs(89, 9, HERE << "address: " << newConn); + return false; + } else { ++#if IPFILTER_VERSION < 5000003 + newConn->local = natLookup.nl_realip; ++#else ++ if (newConn->remote.isIPv6()) ++ newConn->local = natLookup.nl_realipaddr.in6; ++ else ++ newConn->local = natLookup.nl_realipaddr.in4; ++#endif + newConn->local.port(ntohs(natLookup.nl_realport)); + debugs(89, 5, HERE << "address NAT: " << newConn); + return true; + diff --git a/src/patches/squid/squid-3.5-14093.patch b/src/patches/squid/squid-3.5-14093.patch new file mode 100644 index 0000000..5a70751 --- /dev/null +++ b/src/patches/squid/squid-3.5-14093.patch @@ -0,0 +1,35 @@ +------------------------------------------------------------ +revno: 14093 +revision-id: squidadm(a)squid-cache.org-20161009001414-pksjx5jduk9uf5t8 +parent: squid3(a)treenet.co.nz-20161008203735-4q3zmw5j4w1ueopy +committer: Source Maintenance <squidadm(a)squid-cache.org> +branch nick: 3.5 +timestamp: Sun 2016-10-09 00:14:14 +0000 +message: + SourceFormat Enforcement +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squidadm(a)squid-cache.org-20161009001414-\ +# pksjx5jduk9uf5t8 +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# testament_sha1: f3814f4520a0465c972544ae3dd595faf8286f43 +# timestamp: 2016-10-09 00:51:05 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 +# base_revision_id: squid3(a)treenet.co.nz-20161008203735-\ +# 4q3zmw5j4w1ueopy +# +# Begin patch +=== modified file 'src/ip/Intercept.cc' +--- src/ip/Intercept.cc 2016-10-08 20:37:35 +0000 ++++ src/ip/Intercept.cc 2016-10-09 00:14:14 +0000 +@@ -214,7 +214,8 @@ + natLookup.nl_v = 6; + newConn->local.getInAddr(natLookup.nl_inipaddr.in6); + newConn->remote.getInAddr(natLookup.nl_outipaddr.in6); +- } else { ++ } ++ else { + natLookup.nl_v = 4; + newConn->local.getInAddr(natLookup.nl_inipaddr.in4); + newConn->remote.getInAddr(natLookup.nl_outipaddr.in4); + -- 2.10.1

1 0

[PATCH] iptables.cgi: cosmetics - wider columns
by Matthias Fischer 08 Oct '16

08 Oct '16

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> --- html/cgi-bin/iptables.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi index d456375..30fce27 100644 --- a/html/cgi-bin/iptables.cgi +++ b/html/cgi-bin/iptables.cgi @@ -150,8 +150,8 @@ END print "</tr>\n"; print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n"; @@ -272,8 +272,8 @@ END print "</tr>\n"; print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n"; @@ -399,8 +399,8 @@ END print "</tr>\n"; print "<tr>\n"; - print " <td width='0'></td>\n <td width='35'></td>\n <td width='35'></td>\n"; - print " <td width='130'></td>\n <td width='30'></td>\n"; + print " <td width='0'></td>\n <td width='60'></td>\n <td width='60'></td>\n"; + print " <td width='150'></td>\n <td width='30'></td>\n"; print " <td width='30'></td>\n <td width='40'></td>\n"; print " <td width='40'></td>\n <td width='95'></td>\n"; print " <td width='95'></td>\n <td width='260'></td>\n"; -- 2.10.1

1 0

[PATCH v2] netpbm: update to 10.47.61
by Marcel Lorenz 07 Oct '16

07 Oct '16

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> --- config/netpbm/config.mk | 657 ++++++++++++++++++++++++++ config/rootfiles/packages/netpbm | 993 ++++++++++++++------------------------- lfs/netpbm | 21 +- 3 files changed, 1033 insertions(+), 638 deletions(-) create mode 100644 config/netpbm/config.mk 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/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/netpbm b/lfs/netpbm index ab5e4f8..716c5d9 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 @@ -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) -- 2.9.3

2 2

[PATCH] libjpeg: update to 1.5.1
by Marcel Lorenz 07 Oct '16

07 Oct '16

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> --- config/rootfiles/common/libjpeg | 36 +++++++-------- config/rootfiles/common/libjpeg-compat | 3 ++ lfs/libjpeg | 15 ++++--- lfs/libjpeg-compat | 80 ++++++++++++++++++++++++++++++++++ make.sh | 1 + 5 files changed, 111 insertions(+), 24 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat create mode 100644 lfs/libjpeg-compat 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/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/make.sh b/make.sh index 5a2c6da..5e97c96 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 -- 2.9.3

2 1

[PATCH] texinfo: update to 6.3
by Marcel Lorenz 07 Oct '16

07 Oct '16

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/texinfo | 12 +++++++++--- lfs/texinfo | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) 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/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) -- 2.9.3

2 1

[PATCH] dbus: Update to 1.11.4
by Stefan Schantl 07 Oct '16

07 Oct '16

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> --- dbus/dbus.nm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 -- 2.7.4

1 0

[PATCH] shadow-utils: Update to 4.4.
by Stefan Schantl 07 Oct '16

07 Oct '16

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> --- shadow-utils/shadow-utils.nm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) 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 \ -- 2.7.4

1 0

Question concerning commit #eef9b2529c3cab522dac4f4bcfa1a0075376514e
by IT Superhack 06 Oct '16

06 Oct '16

Hello Michael, hello List, I have a question concerning the commit #eef9b2529c3cab522dac4f4bcfa1a0075376514e (http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=eef9b2529c3cab522dac4f4b…). It is correct that htpasswd uses the MD5 algorithm as default, which is not very secure indeed. However, the -s option (which enforces the use of SHA) is insecure since there is no salt. In case IPFire uses the same htpasswd version I use, I'd suggest the use of bcrypt (option: -B), since it is stronger than both SHA and MD5. This issue also appears in the help output of htpasswd: twilson@fra-03-47-1b:~> htpasswd --help [...] -m Force MD5 encryption of the password (default). -B Force bcrypt encryption of the password (very secure). -C Set the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31). -d Force CRYPT encryption of the password (8 chars max, insecure). -s Force SHA encryption of the password (insecure). -p Do not encrypt the password (plaintext, insecure). [...] On other systems than Windows and NetWare the '-p' flag will probably not work. The SHA algorithm does not use a salt and is less secure than the MD5 algorithm. twilson@fra-03-47-1b:~> If your htpasswd version is somehow patched against this problem, just ignore my e-mail. :-) Best regards, Timmothy Wilson

2 3

[PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng)
by Marcel Lorenz 06 Oct '16

06 Oct '16

The next 3 patches update the image libaries to the last versions with many security fixes. They are necessary for apache 2.4.x update and other software (netpbm) Please merge this patches first. Marcel Lorenz (3): libjpeg: update to 1.4.2 libtiff: update to 4.0.6 libpng: update to 1.2.56 config/rootfiles/common/libjpeg | 19 +- config/rootfiles/common/libjpeg-compat | 33 ++++ config/rootfiles/common/libpng | 13 +- config/rootfiles/packages/libtiff | 310 ++++++++++++++++++--------------- lfs/libjpeg | 14 +- lfs/libjpeg-compat | 80 +++++++++ lfs/libpng | 11 +- lfs/libtiff | 13 +- make.sh | 1 + 9 files changed, 313 insertions(+), 181 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat create mode 100644 lfs/libjpeg-compat -- 1.9.1

3 9

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2016