Merge branch 'next' into fifteen

This commit is contained in:
Michael Tremer
2013-10-27 13:12:12 +01:00
19 changed files with 4591 additions and 981 deletions

View File

@@ -0,0 +1,8 @@
#usr/include/libusb-1.0
#usr/include/libusb-1.0/libusb.h
#usr/lib/libusb-1.0.a
#usr/lib/libusb-1.0.la
#usr/lib/libusb-1.0.so
usr/lib/libusb-1.0.so.0
usr/lib/libusb-1.0.so.0.1.0
#usr/lib/pkgconfig/libusb-1.0.pc

View File

@@ -0,0 +1,9 @@
#usr/bin/mpage
#usr/man/man1/mpage.1
#usr/share/mpage
#usr/share/mpage/CP850.PC
#usr/share/mpage/ISO+STD+OTH
#usr/share/mpage/ISO-8859.1
#usr/share/mpage/ISO-8859.15
#usr/share/mpage/ISO-Latin.1
#usr/share/mpage/ISO-Latin.2

View File

@@ -10,6 +10,7 @@ etc/ipsec.d/private
etc/ipsec.d/reqs
etc/ipsec.secrets
etc/strongswan.conf
usr/bin/pki
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
#usr/lib/ipsec/libcharon.la
@@ -85,11 +86,21 @@ usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
usr/libexec/ipsec/pki
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
#usr/share/man/man1/pki---gen.1
#usr/share/man/man1/pki---issue.1
#usr/share/man/man1/pki---keyid.1
#usr/share/man/man1/pki---pkcs7.1
#usr/share/man/man1/pki---print.1
#usr/share/man/man1/pki---pub.1
#usr/share/man/man1/pki---req.1
#usr/share/man/man1/pki---self.1
#usr/share/man/man1/pki---signcrl.1
#usr/share/man/man1/pki---verify.1
#usr/share/man/man1/pki.1
#usr/share/man/man5/ipsec.conf.5
#usr/share/man/man5/ipsec.secrets.5
#usr/share/man/man5/strongswan.conf.5

View File

@@ -1,2 +1,3 @@
usr/bin/check_mk_agent
etc/xinetd.d/check_mk_agent
usr/bin/waitmax

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -37,7 +37,7 @@ usr/lib/gutenprint/5.2/modules
#usr/lib/libgutenprint.la
usr/lib/libgutenprint.so
usr/lib/libgutenprint.so.2
usr/lib/libgutenprint.so.2.0.6
usr/lib/libgutenprint.so.2.1.0
#usr/lib/pkgconfig/gutenprint.pc
usr/sbin/cups-genppd.5.2
usr/sbin/cups-genppdupdate
@@ -77,6 +77,7 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_blacktrans-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_bluedensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_borderless.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_brightness-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdallowothermedia.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdinnerradius.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdxadjustment-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_cdyadjustment-1.xml
@@ -163,10 +164,14 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentabalance.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentadensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablemagentagamma.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableorangedensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablepagedrytime.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablepaperthickness.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableplatengap.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableprintmethod.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablereddensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablescandrytime.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablescanmindrytime.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablesubchannelcutoff.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enablevacuumintensity.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowbalance.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_enableyellowdensity.xml
@@ -212,6 +217,8 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-3.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-4.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-5.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-6.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-7.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inklimit-8.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inkset.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inktype.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_inputslot.xml
@@ -234,6 +241,7 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentadensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_magentagamma-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_mediatype.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_orangedensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_pagedrytime-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_paperthickness-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_platengap-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printingdirection.xml
@@ -241,6 +249,9 @@ usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_printmethod-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_quality.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_reddensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_resolution.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_scandrytime-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_scanmindrytime-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_subchannelcutoff-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_usegloss.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_vacuumintensity-1.xml
usr/share/foomatic/db/source/opt/gutenprint-ijs.5.2-stp_weave.xml
@@ -274,6 +285,7 @@ usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo7_japan.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v_2.xml
usr/share/gutenprint/5.2/xml/escp2/inks/nx100.xml
usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen0.xml
usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen1.xml
@@ -289,6 +301,9 @@ usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen2.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
@@ -303,6 +318,8 @@ usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/pro3880.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_roll_feed.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/r1800.xml
usr/share/gutenprint/5.2/xml/escp2/inputslots/r2400.xml
@@ -340,11 +357,13 @@ usr/share/gutenprint/5.2/xml/escp2/media/photo_gen4.xml
usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml
usr/share/gutenprint/5.2/xml/escp2/media/picturemate_6.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
@@ -358,7 +377,24 @@ usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_100.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_101.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_102.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_103.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_104.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_105.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_106.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_107.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_108.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_109.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_11.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_110.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_111.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_112.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_113.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_114.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_115.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_116.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_117.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml
usr/share/gutenprint/5.2/xml/escp2/model/model_14.xml
@@ -458,6 +494,7 @@ usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml
#usr/share/gutenprint/5.2/xml/escp2/qualitypresets
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/prox900.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml
usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml
@@ -508,16 +545,20 @@ usr/share/gutenprint/samples/testpattern.sample
#usr/share/locale/cs/gutenprint_cs.po
#usr/share/locale/da/LC_MESSAGES/gutenprint.mo
#usr/share/locale/da/gutenprint_da.po
usr/share/locale/de/LC_MESSAGES/gutenprint.mo
usr/share/locale/de/gutenprint_de.po
#usr/share/locale/de/LC_MESSAGES/gutenprint.mo
#usr/share/locale/de/gutenprint_de.po
#usr/share/locale/el/LC_MESSAGES/gutenprint.mo
#usr/share/locale/el/gutenprint_el.po
#usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
#usr/share/locale/en_GB/gutenprint_en_GB.po
#usr/share/locale/es/LC_MESSAGES/gutenprint.mo
#usr/share/locale/es/gutenprint_es.po
#usr/share/locale/fi/LC_MESSAGES/gutenprint.mo
#usr/share/locale/fi/gutenprint_fi.po
#usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
#usr/share/locale/fr/gutenprint_fr.po
#usr/share/locale/gl/LC_MESSAGES/gutenprint.mo
#usr/share/locale/gl/gutenprint_gl.po
#usr/share/locale/hu/LC_MESSAGES/gutenprint.mo
#usr/share/locale/hu/gutenprint_hu.po
#usr/share/locale/it/LC_MESSAGES/gutenprint.mo
@@ -536,12 +577,18 @@ usr/share/locale/de/gutenprint_de.po
#usr/share/locale/ru/gutenprint_ru.po
#usr/share/locale/sk/LC_MESSAGES/gutenprint.mo
#usr/share/locale/sk/gutenprint_sk.po
#usr/share/locale/sl/LC_MESSAGES/gutenprint.mo
#usr/share/locale/sl/gutenprint_sl.po
#usr/share/locale/sv/LC_MESSAGES/gutenprint.mo
#usr/share/locale/sv/gutenprint_sv.po
#usr/share/locale/uk/LC_MESSAGES/gutenprint.mo
#usr/share/locale/uk/gutenprint_uk.po
#usr/share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
#usr/share/locale/zh_CN/gutenprint_zh_CN.po
#usr/share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
#usr/share/locale/zh_TW/gutenprint_zh_TW.po
#usr/share/man/man1/escputil.1
#usr/share/man/man8/cups-calibrate.8
#usr/share/man/man8/cups-genppd.8
#usr/share/man/man8/cups-genppdupdate.8
var/ipfire/cups/command.types
var/ipfire/cups/command.types

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.2.0p3
VER = 1.2.2p2
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar xzf agents.tar.gz
cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
-mkdir /etc/xinetd.d
cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
@rm -rf $(DIR_APP)

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.4.8
VER = 1.7.0
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
PAK_VER = 8
PAK_VER = 9
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0ec52d3f3c69bc2ab5ed70c594edbce6
$(DL_FILE)_MD5 = 5ab496a2ce27017fcdb3d7ec4818a75a
install : $(TARGET)
@@ -77,12 +77,22 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire \
--enable-libusb=no
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
--sysconfdir=/var/ipfire \
--localstatedir=/var \
--enable-libusb \
--disable-dbus \
--disable-avahi
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/cups /etc/rc.d/init.d
cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,37 +24,41 @@
include Config
DATE = 20070813
VER = 3.0-20070813
VER = 4.0.9
VER_DB = 4.0-$(DATE)
VER_FILTERS = 4.0.17
DATE = 20131023
THISAPP = foomatic-$(VER)
DL_FILE = foomatic-filters-$(VER).tar.gz
DL_FILE = foomatic-filters-$(VER_FILTERS).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER)
DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = foomatic
PAK_VER = 1
PAK_VER = 2
DEPS = "cups ghostscript libtiff hplip"
export LIB_CUPS=/usr/lib/cups
export CUPS_BACKENDS=/usr/lib/cups/backends
export CUPS_FILTERS=/usr/lib/cups/filters
export CUPS_PPDS=/usr/share/cups/model
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
foomatic-db-$(DATE).tar.gz \
foomatic-db-engine-$(VER).tar.gz \
foomatic-db-hpijs-$(DATE).tar.gz
foomatic-db-$(VER_DB).tar.gz \
foomatic-db-engine-$(VER).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
foomatic-db-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-$(DATE).tar.gz
foomatic-db-$(VER_DB).tar.gz = $(DL_FROM)/foomatic-db-$(VER_DB).tar.gz
foomatic-db-engine-$(VER).tar.gz = $(DL_FROM)/foomatic-db-engine-$(VER).tar.gz
foomatic-db-hpijs-$(DATE).tar.gz = $(DL_FROM)/foomatic-db-hpijs-$(DATE).tar.gz
$(DL_FILE)_MD5 = 41de0f45866ab4c19c1d5e3e2cdab42f
foomatic-db-$(DATE).tar.gz_MD5 = a3ab04b7cc5d870b040ffce19e664698
foomatic-db-engine-$(VER).tar.gz_MD5 = ec9639719a9c1d4095248e534c3f2d0d
foomatic-db-hpijs-$(DATE).tar.gz_MD5 = e59fa189336e96a9d43cfcfb6222a9c2
$(DL_FILE)_MD5 = b05f5dcbfe359f198eef3df5b283d896
foomatic-db-$(VER_DB).tar.gz_MD5 = ffe38b354cb06a1f3d5e3b01b7e58b0e
foomatic-db-engine-$(VER).tar.gz_MD5 = 5b33c1adb21e7b6f3652e9a18d0e6f4e
install : $(TARGET)
@@ -86,11 +90,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/foomatic-* /usr/share/foomatic && cd $(DIR_SRC) && \
@rm -rf $(DIR_SRC)/foomatic-* && cd $(DIR_SRC) && \
tar zxf $(DIR_DL)/$(DL_FILE) && \
tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \
tar zxf $(DIR_DL)/foomatic-db-hpijs-$(DATE).tar.gz
tar zxf $(DIR_DL)/foomatic-db-$(VER_DB).tar.gz && \
tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@@ -100,8 +103,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make $(MAKETUNING)
cd $(DIR_SRC)/foomatic-db-engine-$(VER) && make install
cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make $(MAKETUNING)
cd $(DIR_SRC)/foomatic-db-hpijs-$(DATE) && make install
# Remove unwanted files
rm -rfv /usr/lib/ppr \
/etc/foomatic/filter.conf.sample \
/usr/share/foomatic/templates
-mkdir -pv /var/cache/foomatic
-mkdir -pv /etc/foomatic
echo "cups" > /etc/foomatic/defaultspooler
-mkdir -pv /usr/lib/cups/filter
ln -svf ../../../bin/foomatic-rip /usr/lib/cups/filter/foomatic-rip
ln -svf ../../../bin/foomatic-ppdfile /usr/lib/cups/filter/foomatic-ppdfile
@rm -rf $(DIR_SRC)/foomatic-*
@$(POSTBUILD)

View File

@@ -24,7 +24,7 @@
include Config
VER = 5.2.5
VER = 5.2.9
THISAPP = gutenprint-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = gutenprint
PAK_VER = 2
PAK_VER = 3
DEPS = "cups"
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 10a0a9fac081d8116ec5ed47fbc1591c
$(DL_FILE)_MD5 = aefbec27b96dd404d9ac9811e17d58ce
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))

78
lfs/libusbx Normal file
View File

@@ -0,0 +1,78 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# 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.0.11
THISAPP = libusbx-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4
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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr \
--enable-examples-build
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

77
lfs/mpage Normal file
View File

@@ -0,0 +1,77 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 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 = 2.5.6
THISAPP = mpage-$(VER)
DL_FILE = $(THISAPP).tgz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d
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 axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpage25-config.patch
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -103,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
--libexecdir=/usr/lib/nagios \
--with-nagios-user=nobody --with-nagios-group=nobody
cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
cd $(DIR_SRC)/nagios-plugins* && make
cd $(DIR_SRC)/nagios-plugins* && make install
chown -R nobody:nobody /var/nagios
ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios

View File

@@ -24,7 +24,7 @@
include Config
VER = 5.1.0
VER = 5.1.1dr4
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
$(DL_FILE)_MD5 = 05899faa9b8a8f253474af809b283ef9
install : $(TARGET)

View File

@@ -386,6 +386,7 @@ buildipfire() {
ipfiremake dhcp
ipfiremake dhcpcd
ipfiremake libusb
ipfiremake libusbx
ipfiremake libpcap
ipfiremake ppp
ipfiremake pptp
@@ -594,6 +595,8 @@ buildipfire() {
ipfiremake lzo
ipfiremake openvpn
ipfiremake pammysql
ipfiremake mpage
ipfiremake dbus
ipfiremake cups
ipfiremake ghostscript
ipfiremake foomatic
@@ -692,7 +695,6 @@ buildipfire() {
ipfiremake syslinux
ipfiremake tftpd
ipfiremake cpufrequtils
ipfiremake dbus
ipfiremake bluetooth
ipfiremake gutenprint
ipfiremake apcupsd

View File

@@ -24,3 +24,13 @@
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
mkdir -p /usr/lib/check_mk_agent/plugins
if [[ -x /usr/sbin/xinetd ]];
then
if [[ -x /etc/init.d/xinetd ]]
then
/etc/init.d/xinetd restart
fi
fi

View File

@@ -24,3 +24,11 @@
. /opt/pakfire/lib/functions.sh
make_backup ${NAME}
remove_files
if [[ -x /usr/sbin/xinetd ]];
then
if [[ -x /etc/init.d/xinetd ]]
then
/etc/init.d/xinetd restart
fi
fi

View File

@@ -0,0 +1,46 @@
diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
--- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200
+++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100
@@ -40,7 +40,7 @@ CC=gcc
# See glob.c for all possibilities
#
# PAGESIZE=Letter
-PAGESIZE=A4
+PAGESIZE=Letter
#
# Define your spooler type
@@ -50,7 +50,7 @@ PAGESIZE=A4
SPOOL_TYPE=BSD_SPOOLER
# PREFIX=e:/usr # OS/2 type
-PREFIX=/usr/local
+PREFIX=/usr
#PREFIX=/usr
BINDIR=$(PREFIX)/bin
LIBDIR=$(PREFIX)/share
@@ -73,7 +73,7 @@ SHEETMARGIN=18
#
DEFAULT_DUPLEX=0
-DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} # -DKANJI
+DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} -DKANJI
############################################################################
@@ -107,7 +107,7 @@ O = .o
# If you are using gcc, you probably don't need to change anything here.
# Linux:
-CFLAGS = -O2 -s $(DEFS) -Wall
+CFLAGS = $(RPM_OPT_FLAGS) $(DEFS) -Wall
# AIX (xlC on aix 4):
#CFLAGS = -O2 -s $(DEFS)
@@ -183,5 +183,4 @@ install:
if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
cp mpage$(E) $(BINDIR)
cp mpage.1 $(MANDIR)
- -cp Encodings/* $(LIBDIR)/mpage
- -chmod 644 $(LIBDIR)/mpage/*
+ install -p -m 644 Encodings/* $(LIBDIR)/mpage