Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2017-06-15 18:40:32 +02:00
27 changed files with 15724 additions and 2200 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -33,13 +33,23 @@ usr/lib/libgnutls-dane.so.0.4.1
#usr/lib/libgnutls.la
#usr/lib/libgnutls.so
usr/lib/libgnutls.so.30
usr/lib/libgnutls.so.30.14.0
usr/lib/libgnutls.so.30.14.2
#usr/lib/libgnutlsxx.la
#usr/lib/libgnutlsxx.so
usr/lib/libgnutlsxx.so.28
usr/lib/libgnutlsxx.so.28.1.0
#usr/lib/pkgconfig/gnutls-dane.pc
#usr/lib/pkgconfig/gnutls.pc
#usr/share/doc/gnutls
#usr/share/doc/gnutls/gnutls-client-server-use-case.png
#usr/share/doc/gnutls/gnutls-handshake-sequence.png
#usr/share/doc/gnutls/gnutls-handshake-state.png
#usr/share/doc/gnutls/gnutls-internals.png
#usr/share/doc/gnutls/gnutls-layers.png
#usr/share/doc/gnutls/gnutls-logo.png
#usr/share/doc/gnutls/gnutls-modauth.png
#usr/share/doc/gnutls/gnutls-x509.png
#usr/share/doc/gnutls/pkcs11-vision.png
#usr/share/info/gnutls-client-server-use-case.png
#usr/share/info/gnutls-guile.info
#usr/share/info/gnutls-handshake-sequence.png

File diff suppressed because it is too large Load Diff

View File

@@ -56,7 +56,7 @@
#usr/lib/libxml2.la
usr/lib/libxml2.so
usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.9.3
usr/lib/libxml2.so.2.9.4
#usr/lib/pkgconfig/libxml-2.0.pc
usr/lib/python2.7/site-packages/drv_libxml2.py
usr/lib/python2.7/site-packages/libxml2.py
@@ -64,220 +64,222 @@ usr/lib/python2.7/site-packages/libxml2.py
usr/lib/python2.7/site-packages/libxml2mod.so
#usr/lib/xml2Conf.sh
#usr/share/aclocal/libxml.m4
#usr/share/doc/libxml2-2.9.3
#usr/share/doc/libxml2-2.9.3/Copyright
#usr/share/doc/libxml2-2.9.3/examples
#usr/share/doc/libxml2-2.9.3/examples/testHTML.c
#usr/share/doc/libxml2-2.9.3/examples/testSAX.c
#usr/share/doc/libxml2-2.9.3/examples/testXPath.c
#usr/share/doc/libxml2-2.9.3/examples/xmllint.c
#usr/share/doc/libxml2-2.9.3/html
#usr/share/doc/libxml2-2.9.3/html/DOM.gif
#usr/share/doc/libxml2-2.9.3/html/FAQ.html
#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-180x168.gif
#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-90x34.gif
#usr/share/doc/libxml2-2.9.3/html/encoding.html
#usr/share/doc/libxml2-2.9.3/html/examples.xml
#usr/share/doc/libxml2-2.9.3/html/examples.xsl
#usr/share/doc/libxml2-2.9.3/html/html
#usr/share/doc/libxml2-2.9.3/html/html/book1.html
#usr/share/doc/libxml2-2.9.3/html/html/home.png
#usr/share/doc/libxml2-2.9.3/html/html/index.html
#usr/share/doc/libxml2-2.9.3/html/html/left.png
#usr/share/doc/libxml2-2.9.3/html/html/libxml-DOCBparser.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLparser.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLtree.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX2.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-c14n.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-catalog.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-chvalid.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-debugXML.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-dict.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-encoding.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-entities.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-globals.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-hash.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-lib.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-list.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanoftp.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanohttp.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-parser.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-parserInternals.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-pattern.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-relaxng.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-schemasInternals.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-schematron.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-threads.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-tree.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-uri.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-valid.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xinclude.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xlink.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlIO.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlautomata.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlerror.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlexports.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmemory.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmodule.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlreader.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlregexp.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlsave.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemas.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemastypes.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlstring.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlunicode.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlversion.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlwriter.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpath.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpathInternals.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpointer.html
#usr/share/doc/libxml2-2.9.3/html/html/libxml-xzlib.html
#usr/share/doc/libxml2-2.9.3/html/html/right.png
#usr/share/doc/libxml2-2.9.3/html/html/up.png
#usr/share/doc/libxml2-2.9.3/html/index.html
#usr/share/doc/libxml2-2.9.3/html/io1.c
#usr/share/doc/libxml2-2.9.3/html/io1.res
#usr/share/doc/libxml2-2.9.3/html/io2.c
#usr/share/doc/libxml2-2.9.3/html/io2.res
#usr/share/doc/libxml2-2.9.3/html/libxml.gif
#usr/share/doc/libxml2-2.9.3/html/parse1.c
#usr/share/doc/libxml2-2.9.3/html/parse2.c
#usr/share/doc/libxml2-2.9.3/html/parse3.c
#usr/share/doc/libxml2-2.9.3/html/parse4.c
#usr/share/doc/libxml2-2.9.3/html/reader1.c
#usr/share/doc/libxml2-2.9.3/html/reader1.res
#usr/share/doc/libxml2-2.9.3/html/reader2.c
#usr/share/doc/libxml2-2.9.3/html/reader3.c
#usr/share/doc/libxml2-2.9.3/html/reader3.res
#usr/share/doc/libxml2-2.9.3/html/reader4.c
#usr/share/doc/libxml2-2.9.3/html/reader4.res
#usr/share/doc/libxml2-2.9.3/html/redhat.gif
#usr/share/doc/libxml2-2.9.3/html/smallfootonly.gif
#usr/share/doc/libxml2-2.9.3/html/structure.gif
#usr/share/doc/libxml2-2.9.3/html/test1.xml
#usr/share/doc/libxml2-2.9.3/html/test2.xml
#usr/share/doc/libxml2-2.9.3/html/test3.xml
#usr/share/doc/libxml2-2.9.3/html/testWriter.c
#usr/share/doc/libxml2-2.9.3/html/tree1.c
#usr/share/doc/libxml2-2.9.3/html/tree1.res
#usr/share/doc/libxml2-2.9.3/html/tree2.c
#usr/share/doc/libxml2-2.9.3/html/tree2.res
#usr/share/doc/libxml2-2.9.3/html/tst.xml
#usr/share/doc/libxml2-2.9.3/html/tutorial
#usr/share/doc/libxml2-2.9.3/html/tutorial/apa.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/apb.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/apc.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/apd.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ape.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/apf.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/apg.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/aph.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/api.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s02.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s03.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s04.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s05.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s06.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s07.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s08.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s09.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/images
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/blank.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/1.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/10.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/2.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/3.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/4.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/5.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/6.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/7.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/8.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/9.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/caution.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/draft.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/home.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/important.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/next.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/note.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/prev.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/tip.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-blank.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-minus.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-plus.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/up.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/images/warning.png
#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddattribute.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddkeyword.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/includeconvert.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/includegetattribute.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/includekeyword.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/includexpath.c
#usr/share/doc/libxml2-2.9.3/html/tutorial/index.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/ix01.html
#usr/share/doc/libxml2-2.9.3/html/tutorial/xmltutorial.pdf
#usr/share/doc/libxml2-2.9.3/html/w3c.png
#usr/share/doc/libxml2-2.9.3/html/writer.xml
#usr/share/doc/libxml2-2.9.3/html/xml.html
#usr/share/doc/libxml2-2.9.3/html/xpath1.c
#usr/share/doc/libxml2-2.9.3/html/xpath1.res
#usr/share/doc/libxml2-2.9.3/html/xpath2.c
#usr/share/doc/libxml2-2.9.3/html/xpath2.res
#usr/share/doc/libxml2-python-2.9.3
#usr/share/doc/libxml2-python-2.9.3/TODO
#usr/share/doc/libxml2-python-2.9.3/examples
#usr/share/doc/libxml2-python-2.9.3/examples/attribs.py
#usr/share/doc/libxml2-python-2.9.3/examples/build.py
#usr/share/doc/libxml2-python-2.9.3/examples/compareNodes.py
#usr/share/doc/libxml2-python-2.9.3/examples/ctxterror.py
#usr/share/doc/libxml2-python-2.9.3/examples/cutnpaste.py
#usr/share/doc/libxml2-python-2.9.3/examples/dtdvalid.py
#usr/share/doc/libxml2-python-2.9.3/examples/error.py
#usr/share/doc/libxml2-python-2.9.3/examples/inbuf.py
#usr/share/doc/libxml2-python-2.9.3/examples/indexes.py
#usr/share/doc/libxml2-python-2.9.3/examples/input_callback.py
#usr/share/doc/libxml2-python-2.9.3/examples/invalid.xml
#usr/share/doc/libxml2-python-2.9.3/examples/nsdel.py
#usr/share/doc/libxml2-python-2.9.3/examples/outbuf.py
#usr/share/doc/libxml2-python-2.9.3/examples/push.py
#usr/share/doc/libxml2-python-2.9.3/examples/pushSAX.py
#usr/share/doc/libxml2-python-2.9.3/examples/pushSAXhtml.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader2.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader3.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader4.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader5.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader6.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader7.py
#usr/share/doc/libxml2-python-2.9.3/examples/reader8.py
#usr/share/doc/libxml2-python-2.9.3/examples/readererr.py
#usr/share/doc/libxml2-python-2.9.3/examples/readernext.py
#usr/share/doc/libxml2-python-2.9.3/examples/regexp.py
#usr/share/doc/libxml2-python-2.9.3/examples/relaxng.py
#usr/share/doc/libxml2-python-2.9.3/examples/resolver.py
#usr/share/doc/libxml2-python-2.9.3/examples/schema.py
#usr/share/doc/libxml2-python-2.9.3/examples/serialize.py
#usr/share/doc/libxml2-python-2.9.3/examples/sync.py
#usr/share/doc/libxml2-python-2.9.3/examples/test.dtd
#usr/share/doc/libxml2-python-2.9.3/examples/thread2.py
#usr/share/doc/libxml2-python-2.9.3/examples/tst.py
#usr/share/doc/libxml2-python-2.9.3/examples/tst.xml
#usr/share/doc/libxml2-python-2.9.3/examples/tstLastError.py
#usr/share/doc/libxml2-python-2.9.3/examples/tstURI.py
#usr/share/doc/libxml2-python-2.9.3/examples/tstmem.py
#usr/share/doc/libxml2-python-2.9.3/examples/tstxpath.py
#usr/share/doc/libxml2-python-2.9.3/examples/valid.xml
#usr/share/doc/libxml2-python-2.9.3/examples/validDTD.py
#usr/share/doc/libxml2-python-2.9.3/examples/validRNG.py
#usr/share/doc/libxml2-python-2.9.3/examples/validSchemas.py
#usr/share/doc/libxml2-python-2.9.3/examples/validate.py
#usr/share/doc/libxml2-python-2.9.3/examples/walker.py
#usr/share/doc/libxml2-python-2.9.3/examples/xpath.py
#usr/share/doc/libxml2-python-2.9.3/examples/xpathext.py
#usr/share/doc/libxml2-python-2.9.3/examples/xpathleak.py
#usr/share/doc/libxml2-python-2.9.3/examples/xpathns.py
#usr/share/doc/libxml2-python-2.9.3/examples/xpathret.py
#usr/share/doc/libxml2-2.9.4
#usr/share/doc/libxml2-2.9.4/Copyright
#usr/share/doc/libxml2-2.9.4/examples
#usr/share/doc/libxml2-2.9.4/examples/testHTML.c
#usr/share/doc/libxml2-2.9.4/examples/testSAX.c
#usr/share/doc/libxml2-2.9.4/examples/testXPath.c
#usr/share/doc/libxml2-2.9.4/examples/xmllint.c
#usr/share/doc/libxml2-2.9.4/html
#usr/share/doc/libxml2-2.9.4/html/DOM.gif
#usr/share/doc/libxml2-2.9.4/html/FAQ.html
#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-180x168.gif
#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-90x34.gif
#usr/share/doc/libxml2-2.9.4/html/encoding.html
#usr/share/doc/libxml2-2.9.4/html/examples.xml
#usr/share/doc/libxml2-2.9.4/html/examples.xsl
#usr/share/doc/libxml2-2.9.4/html/html
#usr/share/doc/libxml2-2.9.4/html/html/book1.html
#usr/share/doc/libxml2-2.9.4/html/html/home.png
#usr/share/doc/libxml2-2.9.4/html/html/index.html
#usr/share/doc/libxml2-2.9.4/html/html/left.png
#usr/share/doc/libxml2-2.9.4/html/html/libxml-DOCBparser.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLparser.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLtree.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX2.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-c14n.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-catalog.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-chvalid.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-debugXML.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-dict.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-encoding.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-entities.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-globals.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-hash.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-lib.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-list.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanoftp.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanohttp.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-parser.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-parserInternals.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-pattern.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-relaxng.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-schemasInternals.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-schematron.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-threads.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-tree.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-uri.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-valid.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xinclude.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xlink.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlIO.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlautomata.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlerror.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlexports.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmemory.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmodule.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlreader.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlregexp.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlsave.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemas.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemastypes.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlstring.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlunicode.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlversion.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlwriter.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpath.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpathInternals.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpointer.html
#usr/share/doc/libxml2-2.9.4/html/html/libxml-xzlib.html
#usr/share/doc/libxml2-2.9.4/html/html/right.png
#usr/share/doc/libxml2-2.9.4/html/html/up.png
#usr/share/doc/libxml2-2.9.4/html/index.html
#usr/share/doc/libxml2-2.9.4/html/io1.c
#usr/share/doc/libxml2-2.9.4/html/io1.res
#usr/share/doc/libxml2-2.9.4/html/io2.c
#usr/share/doc/libxml2-2.9.4/html/io2.res
#usr/share/doc/libxml2-2.9.4/html/libxml.gif
#usr/share/doc/libxml2-2.9.4/html/parse1.c
#usr/share/doc/libxml2-2.9.4/html/parse2.c
#usr/share/doc/libxml2-2.9.4/html/parse3.c
#usr/share/doc/libxml2-2.9.4/html/parse4.c
#usr/share/doc/libxml2-2.9.4/html/reader1.c
#usr/share/doc/libxml2-2.9.4/html/reader1.res
#usr/share/doc/libxml2-2.9.4/html/reader2.c
#usr/share/doc/libxml2-2.9.4/html/reader3.c
#usr/share/doc/libxml2-2.9.4/html/reader3.res
#usr/share/doc/libxml2-2.9.4/html/reader4.c
#usr/share/doc/libxml2-2.9.4/html/reader4.res
#usr/share/doc/libxml2-2.9.4/html/redhat.gif
#usr/share/doc/libxml2-2.9.4/html/smallfootonly.gif
#usr/share/doc/libxml2-2.9.4/html/structure.gif
#usr/share/doc/libxml2-2.9.4/html/test1.xml
#usr/share/doc/libxml2-2.9.4/html/test2.xml
#usr/share/doc/libxml2-2.9.4/html/test3.xml
#usr/share/doc/libxml2-2.9.4/html/testWriter.c
#usr/share/doc/libxml2-2.9.4/html/tree1.c
#usr/share/doc/libxml2-2.9.4/html/tree1.res
#usr/share/doc/libxml2-2.9.4/html/tree2.c
#usr/share/doc/libxml2-2.9.4/html/tree2.res
#usr/share/doc/libxml2-2.9.4/html/tst.xml
#usr/share/doc/libxml2-2.9.4/html/tutorial
#usr/share/doc/libxml2-2.9.4/html/tutorial/apa.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/apb.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/apc.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/apd.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ape.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/apf.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/apg.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/aph.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/api.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s02.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s03.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s04.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s05.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s06.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s07.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s08.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s09.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/images
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/blank.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/1.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/10.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/2.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/3.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/4.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/5.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/6.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/7.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/8.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/9.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/caution.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/draft.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/home.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/important.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/next.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/note.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/prev.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/tip.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-blank.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-minus.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-plus.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/up.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/images/warning.png
#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddattribute.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddkeyword.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/includeconvert.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/includegetattribute.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/includekeyword.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/includexpath.c
#usr/share/doc/libxml2-2.9.4/html/tutorial/index.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/ix01.html
#usr/share/doc/libxml2-2.9.4/html/tutorial/xmltutorial.pdf
#usr/share/doc/libxml2-2.9.4/html/w3c.png
#usr/share/doc/libxml2-2.9.4/html/writer.xml
#usr/share/doc/libxml2-2.9.4/html/xml.html
#usr/share/doc/libxml2-2.9.4/html/xpath1.c
#usr/share/doc/libxml2-2.9.4/html/xpath1.res
#usr/share/doc/libxml2-2.9.4/html/xpath2.c
#usr/share/doc/libxml2-2.9.4/html/xpath2.res
#usr/share/doc/libxml2-python-2.9.4
#usr/share/doc/libxml2-python-2.9.4/TODO
#usr/share/doc/libxml2-python-2.9.4/examples
#usr/share/doc/libxml2-python-2.9.4/examples/attribs.py
#usr/share/doc/libxml2-python-2.9.4/examples/build.py
#usr/share/doc/libxml2-python-2.9.4/examples/compareNodes.py
#usr/share/doc/libxml2-python-2.9.4/examples/ctxterror.py
#usr/share/doc/libxml2-python-2.9.4/examples/cutnpaste.py
#usr/share/doc/libxml2-python-2.9.4/examples/dtdvalid.py
#usr/share/doc/libxml2-python-2.9.4/examples/error.py
#usr/share/doc/libxml2-python-2.9.4/examples/inbuf.py
#usr/share/doc/libxml2-python-2.9.4/examples/indexes.py
#usr/share/doc/libxml2-python-2.9.4/examples/input_callback.py
#usr/share/doc/libxml2-python-2.9.4/examples/invalid.xml
#usr/share/doc/libxml2-python-2.9.4/examples/nsdel.py
#usr/share/doc/libxml2-python-2.9.4/examples/outbuf.py
#usr/share/doc/libxml2-python-2.9.4/examples/push.py
#usr/share/doc/libxml2-python-2.9.4/examples/pushSAX.py
#usr/share/doc/libxml2-python-2.9.4/examples/pushSAXhtml.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader2.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader3.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader4.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader5.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader6.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader7.py
#usr/share/doc/libxml2-python-2.9.4/examples/reader8.py
#usr/share/doc/libxml2-python-2.9.4/examples/readererr.py
#usr/share/doc/libxml2-python-2.9.4/examples/readernext.py
#usr/share/doc/libxml2-python-2.9.4/examples/regexp.py
#usr/share/doc/libxml2-python-2.9.4/examples/relaxng.py
#usr/share/doc/libxml2-python-2.9.4/examples/resolver.py
#usr/share/doc/libxml2-python-2.9.4/examples/schema.py
#usr/share/doc/libxml2-python-2.9.4/examples/serialize.py
#usr/share/doc/libxml2-python-2.9.4/examples/sync.py
#usr/share/doc/libxml2-python-2.9.4/examples/test.dtd
#usr/share/doc/libxml2-python-2.9.4/examples/thread2.py
#usr/share/doc/libxml2-python-2.9.4/examples/tst.py
#usr/share/doc/libxml2-python-2.9.4/examples/tst.xml
#usr/share/doc/libxml2-python-2.9.4/examples/tstLastError.py
#usr/share/doc/libxml2-python-2.9.4/examples/tstURI.py
#usr/share/doc/libxml2-python-2.9.4/examples/tstmem.py
#usr/share/doc/libxml2-python-2.9.4/examples/tstxpath.py
#usr/share/doc/libxml2-python-2.9.4/examples/valid.xml
#usr/share/doc/libxml2-python-2.9.4/examples/validDTD.py
#usr/share/doc/libxml2-python-2.9.4/examples/validRNG.py
#usr/share/doc/libxml2-python-2.9.4/examples/validSchemas.py
#usr/share/doc/libxml2-python-2.9.4/examples/validate.py
#usr/share/doc/libxml2-python-2.9.4/examples/walker.py
#usr/share/doc/libxml2-python-2.9.4/examples/xpath.py
#usr/share/doc/libxml2-python-2.9.4/examples/xpathext.py
#usr/share/doc/libxml2-python-2.9.4/examples/xpathleak.py
#usr/share/doc/libxml2-python-2.9.4/examples/xpathns.py
#usr/share/doc/libxml2-python-2.9.4/examples/xpathret.py
#usr/share/gtk-doc
#usr/share/gtk-doc/html
#usr/share/gtk-doc/html/libxml2
#usr/share/gtk-doc/html/libxml2/general.html
#usr/share/gtk-doc/html/libxml2/home.png

View File

@@ -0,0 +1,2 @@
sbin/paxctl
#usr/share/man/man1/paxctl.1

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
usr/bin/netcat
#usr/info/dir
#usr/info/netcat.info
#usr/man/man1/netcat.1
#usr/share/locale/it/LC_MESSAGES/netcat.mo

View File

@@ -2555,18 +2555,6 @@ sub checkip
}
return 1;
}
sub checksubnet
{
my %hash=%{(shift)};
&General::readhasharray("$confignet", \%hash);
foreach my $key (keys %hash) {
if(&General::IpInSubnet($fwhostsettings{'IP'},$hash{$key}[1],$hash{$key}[2]))
{
return 1;
}
}
return 0;
}
sub checkservicegroup
{
&General::readhasharray("$configsrvgrp", \%customservicegrp);

View File

@@ -253,99 +253,94 @@ if (-e "/etc/snort/snort.conf") {
####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') {
$url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
$url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'community') {
$url=" https://www.snort.org/rules/community";
} else {
$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
if ($snortsettings{'OINKCODE'} ne "") {
$errormessage = $Lang::tr{'invalid input for oink code'} unless ($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/);
}
if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" )
{
$errormessage = $Lang::tr{'invalid input for oink code'} unless (
($snortsettings{'OINKCODE'} =~ /^[a-z0-9]+$/) ||
($snortsettings{'RULES'} eq 'nothing' ) ||
($snortsettings{'RULES'} eq 'emerging' ) ||
($snortsettings{'RULES'} eq 'community' ));
&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
if ($snortsettings{'ENABLE_SNORT'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable");
if (!$errormessage) {
if ($snortsettings{'RULES'} eq 'subscripted') {
$url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'registered') {
$url=" https://www.snort.org/rules/snortrules-snapshot-2990.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
} elsif ($snortsettings{'RULES'} eq 'community') {
$url=" https://www.snort.org/rules/community";
} else {
unlink "${General::swroot}/snort/enable";
}
if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
} else {
unlink "${General::swroot}/snort/enable_green";
}
if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
} else {
unlink "${General::swroot}/snort/enable_blue";
}
if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
} else {
unlink "${General::swroot}/snort/enable_orange";
}
if ($snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_preprocessor_http_inspect");
} else {
unlink "${General::swroot}/snort/enable_preprocessor_http_inspect";
$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
}
system('/usr/local/bin/snortctrl restart >/dev/null');
if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) {
&General::writehash("${General::swroot}/snort/settings", \%snortsettings);
if ($snortsettings{'ENABLE_SNORT'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable");
} else {
unlink "${General::swroot}/snort/enable";
}
if ($snortsettings{'ENABLE_SNORT_GREEN'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_green");
} else {
unlink "${General::swroot}/snort/enable_green";
}
if ($snortsettings{'ENABLE_SNORT_BLUE'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_blue");
} else {
unlink "${General::swroot}/snort/enable_blue";
}
if ($snortsettings{'ENABLE_SNORT_ORANGE'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_orange");
} else {
unlink "${General::swroot}/snort/enable_orange";
}
if ($snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} eq 'on')
{
system ('/usr/bin/touch', "${General::swroot}/snort/enable_preprocessor_http_inspect");
} else {
unlink "${General::swroot}/snort/enable_preprocessor_http_inspect";
}
}
system('/usr/local/bin/snortctrl restart >/dev/null');
}
# INSTALLMD5 is not in the form, so not retrieved by getcgihash
# INSTALLMD5 is not in the form, so not retrieved by getcgihash
&General::readhash("${General::swroot}/snort/settings", \%snortsettings);
if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} || $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} || $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
my @df = `/bin/df -B M /var`;
foreach my $line (@df) {
next if $line =~ m/^Filesystem/;
my $return;
my @df = `/bin/df -B M /var`;
foreach my $line (@df) {
next if $line =~ m/^Filesystem/;
my $return;
if ($line =~ m/dev/ ) {
$line =~ m/^.* (\d+)M.*$/;
my @temp = split(/ +/,$line);
if ($1<300) {
$errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
} else {
if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'}) {
&downloadrulesfile();
sleep(3);
$return = `cat /var/tmp/log 2>/dev/null`;
if ($line =~ m/dev/ ) {
$line =~ m/^.* (\d+)M.*$/;
my @temp = split(/ +/,$line);
if ($1<300) {
$errormessage = "$Lang::tr{'not enough disk space'} < 300MB, /var $1MB";
} else {
if ( $snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'} ){
&downloadrulesfile();
sleep(3);
$return = `cat /var/tmp/log 2>/dev/null`;
} elsif ( $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'} ) {
my $upload = $a->param("UPLOAD");
open UPLOADFILE, ">/var/tmp/snortrules.tar.gz";
binmode $upload;
while ( <$upload> ) {
print UPLOADFILE;
} elsif ( $snortsettings{'ACTION'} eq $Lang::tr{'upload new ruleset'}) {
my $upload = $a->param("UPLOAD");
open UPLOADFILE, ">/var/tmp/snortrules.tar.gz";
binmode $upload;
while ( <$upload> ) {
print UPLOADFILE;
}
close UPLOADFILE;
}
close UPLOADFILE;
}
if ($return =~ "ERROR"){
if ($return =~ "ERROR") {
$errormessage = "<br /><pre>".$return."</pre>";
} else {
system("/usr/local/bin/oinkmaster.pl -v -s -u file:///var/tmp/snortrules.tar.gz -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort/rules >>/var/tmp/log 2>&1 &");
sleep(2);
}
}
}
}
}

View File

@@ -56,8 +56,6 @@ my %sections = (
'ddns' => '(ddns\[\d+\]:)',
'dhcp' => '(dhcpd: )',
'dma' => '(dma\[.*\]: )',
'dnsmasq' => '(dnsmasq\[.*\]: )',
'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
'guardian' => '(guardian\[.*\]: )',
'ipfire' => '(ipfire: )',
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
@@ -69,6 +67,7 @@ my %sections = (
'snort' => '(snort\[.*\]: )',
'squid' => '(squid\[.*\]: |squid: )',
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
'unbound' => '(unbound: \[.*:.*\])(.*:.*$)',
'urlfilter bl' => '(installpackage\[urlfilter\]: )',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)'
);
@@ -82,8 +81,6 @@ my %trsections = (
'ddns' => "$Lang::tr{'dynamic dns'}",
'dhcp' => "$Lang::tr{'dhcp server'}",
'dma' => 'Mail',
'dnsmasq' => 'DNS: Dnsmasq',
'unbound' => 'DNS: Unbound',
'guardian' => "$Lang::tr{'guardian'}",
'ipfire' => 'IPFire',
'ipsec' => 'IPSec',
@@ -95,6 +92,7 @@ my %trsections = (
'snort' => "$Lang::tr{'intrusion detection'}",
'squid' => "$Lang::tr{'web proxy'}",
'ssh' => 'SSH',
'unbound' => 'DNS: Unbound',
'urlfilter bl' => 'URLFilter Blacklist',
'wireless' => 'Wireless'
);

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2015 IPFire Team <info@ipfire.org> #
# Copyright (C) 2017 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 1.5.0
VER = 1.6.3
THISAPP = bird-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bird
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 330bde6372afa106abfe5a9737e471c1
$(DL_FILE)_MD5 = 63dd93a7a23c274fc5b7f2e37664bfb7
install : $(TARGET)

View File

@@ -98,6 +98,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown clamav:clamav /var/run/clamav
#install initscripts
$(call INSTALL_INITSCRIPT,clamav)
# Disable PaX mprotect for clamd, clamscan and freshclam
paxctl -Cm /usr/sbin/clamd
paxctl -Cm /usr/bin/clamscan
paxctl -Cm /usr/bin/freshclam
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2015 IPFire Team <info@ipfire.org> #
# Copyright (C) 2017 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 3.2.3
VER = 3.8.1
THISAPP = cmake-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d51c92bf66b1e9d4fe2b7aaedd51377c
$(DL_FILE)_MD5 = e8ef820ddf7a650845252bca846696e7
install : $(TARGET)
@@ -71,16 +71,17 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt
cd $(DIR_APP) && sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake
cd $(DIR_APP) && ./bootstrap \
--prefix=/usr \
--system-libs \
--mandir=/share/man \
--no-system-jsoncpp \
--docdir=/share/doc/cmake-2.8.12.2
--no-system-librhash \
--docdir=/share/doc/cmake
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -118,6 +118,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/glibc-build
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
ifneq "$(TOOLCHAIN)" "1"
ifeq "$(BUILD_ARCH)" "x86_64"
cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 -o|' \

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.5.9
VER = 3.5.11
THISAPP = gnutls-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0ab25eb6a1509345dd085bc21a387951
$(DL_FILE)_MD5 = a3ff8cf5ca7522e3ba14f487e6326e11
install : $(TARGET)
@@ -78,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-p11-kit \
--disable-openssl-compatibility \
--disable-guile
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

View File

@@ -100,6 +100,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-mkdir -pv /etc/default
install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
# Disable hardening.
paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
paxctl -Cmpexs /usr/bin/grub-script-check
# We don't need to install unifont just to generate a grub2 compatible
# font archive for the graphical boot menu. The following command only
# converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters.

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.9.3
VER = 2.9.4
THISAPP = libxml2-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = daece17e045f1c107610e137ab50c179
$(DL_FILE)_MD5 = ae249165c173b1ff386ee8ad676815f5
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 5.19.0
VER = 5.23.0
THISAPP = monit-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = monit
PAK_VER = 8
PAK_VER = 9
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 51ee50dd71e1bb9fe9a128bc88456b77
$(DL_FILE)_MD5 = 5fbaf7746a233f31ad0aed416ca1d0f9
install : $(TARGET)
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
dist:
@$(PAK)
###############################################################################
@@ -77,22 +77,26 @@ $(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 --sysconfdir=/etc --localstatedir=/var
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mkdir -p /var/lib/monit
install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \
/var/ipfire/backup/addons/includes/monit
/var/ipfire/backup/addons/includes/monit
# Install default configuration
install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
# Install default configuration
install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc
#install initscripts
$(call INSTALL_INITSCRIPT,monit)
# Install start links and backup include file.
# Install start links and backup include file.
ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit
ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit
ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit

79
lfs/paxctl Normal file
View File

@@ -0,0 +1,79 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# 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 = 0.9
THISAPP = paxctl-$(VER)
DL_FILE = $(THISAPP).tar.gz
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 = 9bea59b1987dc4e16c2d22d745374e64
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -88,6 +88,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# install wrapper for old kvm parameter handling
install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
# disable PaX MPROTECT and RANDMMAP
paxctl -cmr /usr/bin/qemu-system-arm
paxctl -cmr /usr/bin/qemu-system-i386
paxctl -cmr /usr/bin/qemu-system-x86_64
paxctl -cmr /usr/bin/qemu-arm
paxctl -cmr /usr/bin/qemu-i386
paxctl -cmr /usr/bin/qemu-x86_64
# install an udev script to set the permissions of /dev/kvm
cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.5.25
VER = 3.5.26
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6b7dd7b42b1adacf08f3155640ea2782
$(DL_FILE)_MD5 = 510e2c84773879c00d0e7ced997864d9
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.25-fix-max-file-descriptors.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.26-fix-max-file-descriptors.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.3
VER = 2.5
THISAPP = tmux-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tmux
PAK_VER = 4
PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = fcfd1611d705d8b31df3c26ebc93bd3e
$(DL_FILE)_MD5 = 4a5d73d96d8f11b0bdf9b6f15ab76d15
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 0.3.0.7
VER = 0.3.0.8
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 20
PAK_VER = 21
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = fee12ede9172905ba3258db871b6c499
$(DL_FILE)_MD5 = c5c88b7e17f652c9fb4fc2c2ee92943c
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.6.2
VER = 1.6.3
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5a5d0cdf7164957ff2e7498db1758f01
$(DL_FILE)_MD5 = d964d04c8d2b25f3271ac60fc630b654
install : $(TARGET)

View File

@@ -390,6 +390,7 @@ buildbase() {
lfsmake2 udev
lfsmake2 vim
lfsmake2 xz
lfsmake2 paxctl
}
buildipfire() {

View File

@@ -0,0 +1,11 @@
diff -Nrup a/localedata/Makefile b/localedata/Makefile
--- a/localedata/Makefile 2012-06-05 07:42:49.000000000 -0600
+++ b/localedata/Makefile 2012-06-07 12:15:21.776318827 -0600
@@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \
+ --no-archive \
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale \
&& echo ' done'; \