]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'maniacikarus/samba'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Oct 2011 12:30:20 +0000 (13:30 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Oct 2011 12:30:20 +0000 (13:30 +0100)
Conflicts:
samba/samba.nm

105 files changed:
autoconf/autoconf.nm
automake/automake.nm
bash/bash.nm
bzip2/bzip2.nm
chrony/chrony-helper
chrony/chrony.nm
cpio/cpio.nm
cpufrequtils/cpufrequtils.nm
cups/cups.nm
docbook-dsssl/docbook-dsssl.nm [new file with mode: 0644]
docbook-dtds/docbook-dtds.nm [new file with mode: 0644]
docbook-dtds/patches/docbook-4.2-euro.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd412-entities.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-dtds-ents.patch [new file with mode: 0644]
docbook-dtds/patches/docbook-sgml-systemrewrite.patch [new file with mode: 0644]
docbook-utils/docbook-utils.nm [new file with mode: 0644]
docbook-utils/patches/docbook-utils-2ndspaces.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-grepnocolors.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-newgrep.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-nofinalecho.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-papersize.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-rtfmanpage.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-sgmlinclude.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-spaces.patch [new file with mode: 0644]
docbook-utils/patches/docbook-utils-w3mtxtconvert.patch [new file with mode: 0644]
docbook-xsl/Makefile [new file with mode: 0644]
docbook-xsl/docbook-xsl.nm [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-list-item-body.patch [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-mandir.patch [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-marginleft.patch [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-newmethods.patch [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch [new file with mode: 0644]
docbook-xsl/patches/docbook-xsl-pagesetup.patch [new file with mode: 0644]
dracut/dracut.nm
file/file.nm
freetype/freetype.nm
glib2/glib2.nm
icecream/icecream.nm
initscripts/initscripts.nm
iperf/iperf.nm [new file with mode: 0644]
iputils/iputils.nm
keepalived/keepalived.nm [new file with mode: 0644]
keepalived/patches/keepalived-1.1.14-installmodules.patch [new file with mode: 0644]
keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch [new file with mode: 0644]
keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch [new file with mode: 0644]
keepalived/systemd/keepalived.service [new file with mode: 0644]
kernel/config.i686 [moved from kernel/config with 100% similarity]
kernel/config.i686-PAE [new file with mode: 0644]
kernel/kernel.nm
libsolv/libsolv.nm
libtool/libtool.nm
lua/lua.nm
ncurses/ncurses.nm
openjade/openjade.nm [new file with mode: 0644]
openjade/patches/openjade-1.3.1-manpage.patch [new file with mode: 0644]
openjade/patches/openjade-1.3.1-nsl.patch [new file with mode: 0644]
openjade/patches/openjade-1.3.2-gcc46.patch [new file with mode: 0644]
openjade/patches/openjade-deplibs.patch [new file with mode: 0644]
openjade/patches/openjade-nola.patch [new file with mode: 0644]
opensp/opensp.nm [new file with mode: 0644]
opensp/patches/opensp-multilib.patch [new file with mode: 0644]
opensp/patches/opensp-nodeids.patch [new file with mode: 0644]
opensp/patches/opensp-sigsegv.patch [new file with mode: 0644]
openssh/openssh.nm
pakfire/pakfire.nm
pcre/pcre.nm
pdns-recursor/pdns-recursor.nm
perl-SGMLSpm/perl-SGMLSpm.nm [new file with mode: 0644]
perl/perl.nm
ppl/ppl.nm
radvd/radvd.nm
radvd/systemd/radvd.service
rstp/rstp.nm
rsyslog/rsyslog.nm
samba/samba.nm
setup/setup.nm
sgml-common/MLCATALOG [new file with mode: 0644]
sgml-common/html.dcl [new file with mode: 0644]
sgml-common/html.soc [new file with mode: 0644]
sgml-common/patches/sgml-common-quotes.patch [new file with mode: 0644]
sgml-common/patches/sgml-common-umask.patch [new file with mode: 0644]
sgml-common/patches/sgml-common-xmldir.patch [new file with mode: 0644]
sgml-common/sgml-common.nm [new file with mode: 0644]
sgml-common/xml.dcl [new file with mode: 0644]
sgml-common/xml.soc [new file with mode: 0644]
sudo/sudo.nm
systemd/patches/systemd-36-no_manpages.patch [deleted file]
systemd/systemd.nm
sysvinit/sysvinit.nm
tunctl/tunctl.nm
udev/udev.nm
usb-modeswitch-data/usb-modeswitch-data.nm [new file with mode: 0644]
usb-modeswitch/usb-modeswitch.nm
util-linux/util-linux.nm
xmlto/xmlto.nm [new file with mode: 0644]
xorg-x11-fonts/xorg-x11-fonts.nm
xorg-x11-server/xorg-x11-server.nm
xz/xz.nm
zlib/patches/zlib-1.2.5-gentoo.patch [new file with mode: 0644]
zlib/zlib.nm

index e8fd519b12dad268fec09d3efdc9b78c45ac5e27..295d64c2795326af4116657b72b75b3af333ccba 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = autoconf
 version    = 2.68
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Development/Tools
@@ -33,5 +33,9 @@ end
 packages
        package %{name}
                requires = m4
+
+               filter_requires
+                       perl>=[0-9]\:.*
+               end
        end
 end
index c25f1e9df6fb8bfe1d5981806077815fbb28adc6..05812d981708fe0c399aca975d88b72cc28d6f11 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = automake
 version    = 1.11.1
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Development/Tools
@@ -31,5 +31,9 @@ end
 packages
        package %{name}
                requires = autoconf
+
+               filter_requires
+                       perl>=[0-9]\:.*
+               end
        end
 end
index 0c57eab1615720183c7c66a69bcbba9f0a257761..d9d33b34cf015b14b8ddba78138d50600049f5ec 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = bash
 version    = 4.2
-release    = 3
+release    = 4
 
 groups     = Base Build System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -67,17 +67,28 @@ end
 
 packages
        package %{name}
+               prerequires = coreutils
                requires = /etc/bashrc /etc/profile
 
                script postin
                        # Create /etc/shells, if it does not exist.
                        [ -f "/etc/shells" ] || touch /etc/shells
 
-                       if ! grep -q "/bin/bash" /etc/shells; then
+                       found_sh=0
+                       found_bash=0
+                       while read line; do
+                               if [ "/bin/bash" = "${line}" ]; then
+                                       found_bash=1
+                               elif [ "/bin/sh" = "${line}" ]; then
+                                       found_sh=1
+                               fi
+                       done < /etc/shells
+
+                       if [ "${found_bash}" = "0" ]; then
                                echo "/bin/bash" >> /etc/shells
                        fi
 
-                       if ! grep -q "/bin/sh" /etc/shells; then
+                       if [ "${found_sh}" = "0" ]; then
                                echo "/bin/sh" >> /etc/shells
                        fi
                end
@@ -87,9 +98,9 @@ packages
 
                        # Remove /bin/bash and /bin/sh from /etc/shells.
                        while read line; do
-                               if [[ $line =~ ^/bin/sh ]]; then
+                               if [ "/bin/bash" = "${line}" ]; then
                                        continue
-                               elif [[ $line =~ ^/bin/bash ]]; then
+                               elif [ "/bin/sh" = "${line}" ]; then
                                        continue
                                fi
 
index f0165c75c05571365b3b4a3eefd62cb197263ef9..41ef384111b0ab04eaa46755ef1eedee52a930a4 100644 (file)
@@ -5,9 +5,9 @@
 
 name       = bzip2
 version    = 1.0.6
-release    = 1
+release    = 2
 
-groups     = Applications/Compression Build
+groups     = Applications/Compression
 url        = http://www.bzip.org/
 license    = GPLv2+
 summary    = Bzip2 is a data compressor.
@@ -54,6 +54,7 @@ end
 
 packages
        package %{name}
+               groups += Build
        end
        
        package %{name}-devel
index a5bbf8479c082e5b0078d604786063d926637f56..34add5f40bded6cfee90ac476a99c274dc30de9e 100644 (file)
@@ -32,7 +32,7 @@ generate_commandkey() {
     commandkey=$(get_key $commandkeyid)
     [ -z "$commandkey" ] || return 0
 
-    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 8)
+    commandkey=$(tr -c -d '[\041-\176]' < /dev/urandom | head -c 16)
     [ -n "$commandkey" ] && echo "$commandkeyid $commandkey" >> $keyfile
 }
 
index fb44fbb7ea8a79fd4ecc2e3857537afd14363076..c80e02884980d82ae40033b4ff8f42767b796611 100644 (file)
@@ -5,9 +5,9 @@
 
 name       = chrony
 version    = 1.26
-release    = 6
+release    = 8
 
-groups     = Base System/Daemons
+groups     = System/Daemons
 url        = http://chrony.tuxfamily.org
 license    = GPLv2
 summary    = An NTP client/server.
@@ -73,31 +73,34 @@ end
 
 packages
        package %{name}
-               preprequires = shadow-utils systemd-units
-       
+               groups += Base
+
                configfiles
                        /etc/chrony.conf
                        /etc/chrony.keys
                end
        
+               prerequires = shadow-utils systemd-units
+
                script prein
                        %{create_user}
                end
        
                script postin
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl enable cronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable \
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script preun
                        /bin/systemctl --no-reload disable \
-                               chrony-wait.service chronyd.service &>/dev/null
-                       /bin/systemctl stop chrony-wait.service chronyd.service &>/dev/null
+                               chrony-wait.service chronyd.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop chrony-wait.service chronyd.service >/dev/null 2>&1 || :
                end
        
                script postup
-                       /bin/systemctl daemon-reload &>/dev/null
-                       /bin/systemctl try-restart chronyd.service &>/dev/null
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart chronyd.service >/dev/null 2>&1 || :
                end
        end
 end
index 53c3d42c606d1b6575f333e6cf43565a775dffeb..9ce15f37c9af9294b1c1524c441162ced16209f4 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = cpio
-version    = 2.10
+version    = 2.11
 release    = 1
 
 groups     = System/Packaging
@@ -36,5 +36,4 @@ end
 
 packages
        package %{name}
-       end
 end
index f8e13862d28ab6e07a6fefc36adfa7f1b30bd468..169592230cf6261d61ab2f762ce850b71fb0017b 100644 (file)
@@ -5,9 +5,9 @@
 
 name       = cpufrequtils
 version    = 008
-release    = 4
+release    = 5
 
-groups     = Base Applications/System
+groups     = Applications/System
 url        = http://htop.sourceforge.net/
 license    = GPLv2
 summary    = Command line tools to determine current CPUfreq settings and to modify them
@@ -30,6 +30,7 @@ end
 
 packages
        package %{name}
+               groups += Base
        end
        
        package %{name}-devel
index 9e8606e3c24311a9190d203bee6353c47785d536..3ecdae972164a258c353b2e58b62ec2dfeb65ac5 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = cups
 version    = 1.4.5
-release    = 6
+release    = 7
 
 groups     = Applications/Printing
 url        = http://cups.org/software.php
@@ -17,7 +17,7 @@ description
        by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems.
 end
 
-source_dl  =
+source_dl  = http://ftp.easysw.com/pub/cups/%{version}/
 sources    = %{thisapp}-source.tar.bz2
 
 build
@@ -81,6 +81,8 @@ packages
        
        package %{name}-devel
                template DEVEL
+
+               requires += %{name}-libs=%{thisver}
        end
        
        package %{name}-libs
diff --git a/docbook-dsssl/docbook-dsssl.nm b/docbook-dsssl/docbook-dsssl.nm
new file mode 100644 (file)
index 0000000..db78d0d
--- /dev/null
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = docbook-dsssl
+version    = 1.79
+release    = 2
+arch       = noarch
+
+groups     = Applications/Text
+url        = http://docbook.sourceforge.net/
+license    = GPLv2+
+summary    = The DocBook DSSSL Stylesheets package contains DSSSL stylesheets.
+
+description
+       The DocBook DSSSL Stylesheets package contains DSSSL stylesheets. These
+       are used by OpenJade or other tools to transform SGML and XML DocBook files.
+end
+
+source_dl = http://prdownloads.sourceforge.net/docbook/
+
+build
+       requires
+               sgml-common
+       end
+
+       build = # empty
+
+       install
+               mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1
+               install -v -m755 bin/collateindex.pl %{BUILDROOT}/usr/bin
+               install -v -m644 bin/collateindex.pl.1 %{BUILDROOT}/usr/share/man/man1
+
+               install -v -d -m755 %{BUILDROOT}/usr/share/sgml/docbook/dsssl-stylesheets-%{version}
+               cp -v -R * %{BUILDROOT}/usr/share/sgml/docbook/dsssl-stylesheets-%{version}
+
+               # Remove empty conflicting file.
+               rm -rvf %{BUILDROOT}/etc/sgml/sgml-docbook.cat
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       docbook-dtds
+                       sgml-common
+               end
+
+               prerequires +=\
+                       docbook-dtds \
+                       libxml2 \
+                       sgml-common
+
+               script postin
+                       # Install catalog files.
+                       for centralized in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --sgml --noout --add ${centralized} /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null
+                       done
+               end
+
+               script preun
+                       # Uninstall catalog files.
+                       for centralized in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --remove ${centralized} /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null
+                       done
+               end
+       end
+end
diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm
new file mode 100644 (file)
index 0000000..0adc696
--- /dev/null
@@ -0,0 +1,260 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = docbook-dtds
+version    = 1.0
+release    = 3
+arch       = noarch
+
+groups     = Applications/Text
+url        = http://www.oasis-open.org/docbook/
+license    = Copyright only
+summary    = SGML and XML document type definitions for DocBook.
+
+description
+       The DocBook Document Type Definition (DTD) describes the syntax of
+       technical documentation texts (articles, books and manual pages).
+       This syntax is XML-compliant and is developed by the OASIS consortium.
+       This package contains SGML and XML versions of the DocBook DTD.
+end
+
+sources = \
+       docbk30.zip \
+       docbk31.zip \
+       docbk40.zip \
+       docbk41.zip \
+       docbkx412.zip \
+       docbook-4.2.zip \
+       docbook-xml-4.2.zip \
+       docbook-4.3.zip \
+       docbook-xml-4.3.zip \
+       docbook-4.4.zip \
+       docbook-xml-4.4.zip \
+       docbook-4.5.zip \
+       docbook-xml-4.5.zip
+
+# Update directories at the scriptlets if there will be any changes.
+directories = \
+       3.0-sgml \
+       3.1-sgml \
+       4.0-sgml \
+       4.1-sgml \
+       4.1.2-xml \
+       4.2-sgml \
+       4.2-xml \
+       4.3-sgml \
+       4.3-xml \
+       4.4-sgml \
+       4.4-xml \
+       4.5-sgml \
+       4.5-xml
+
+build
+       requires
+               dos2unix
+               unzip>=6.0-3
+       end
+
+       prepare
+               # Define a bash function to extract the files
+               function macro_extract()
+               {
+                 mkdir -pv %{DIR_APP}/$2
+                 cd %{DIR_APP}/$2 && unzip %{DIR_DL}/$1
+               }
+
+               # Extract files
+               macro_extract docbk30.zip 3.0-sgml
+               macro_extract docbk31.zip 3.1-sgml
+               macro_extract docbk40.zip 4.0-sgml
+               macro_extract docbk41.zip 4.1-sgml
+               macro_extract docbkx412.zip 4.1.2-xml
+               macro_extract docbook-4.2.zip 4.2-sgml
+               macro_extract docbook-xml-4.2.zip 4.2-xml
+               macro_extract docbook-4.3.zip 4.3-sgml
+               macro_extract docbook-xml-4.3.zip 4.3-xml
+               macro_extract docbook-4.4.zip 4.4-sgml
+               macro_extract docbook-xml-4.4.zip 4.4-xml
+               macro_extract docbook-4.5.zip 4.5-sgml
+               macro_extract docbook-xml-4.5.zip 4.5-xml                       
+
+               # Convert all catalog files to unix format
+               cd %{DIR_APP} && dos2unix */docbook.cat
+
+               %{MACRO_PATCHES}
+
+               sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
+               sed -i 's/\r//' */*.txt
+               chown -R root:root .
+               chmod -R a+rX,g-w,o-w .
+       end
+
+       build = # Nothing to do
+
+       install
+               # Create Symlinks.
+               mkdir -pv %{BUILDROOT}/etc/sgml
+               for fmt in sgml xml; do
+                       ln -svf $fmt-docbook-4.5.cat %{BUILDROOT}/etc/sgml/$fmt-docbook.cat
+               done
+
+               for dir in %{directories}; do
+                       fmt=${dir#*-}; ver=${dir%%-*}
+                               cd %{DIR_APP}/$dir
+                               DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/$fmt-dtd-$ver
+                       mkdir -pv $DESTDIR
+                       case $fmt in
+                               sgml)   mkdir -pv $DESTDIR; install -v *.dcl $DESTDIR ;;
+                               xml)    mkdir -pv $DESTDIR/ent; install -v ent/* $DESTDIR/ent ;;
+                       esac
+                       install -v *.dtd *.mod $DESTDIR
+                       install -v docbook.cat $DESTDIR/catalog
+                       touch %{BUILDROOT}/etc/sgml/${dir#*-}-docbook-$ver.cat
+               done
+       end
+end
+
+packages
+       package %{name}
+
+               prerequires += \
+                       libxml2 \
+                       sgml-common
+
+               script postin
+                       # Install catalog files.
+                       for dir in %{directories}; do
+                               fmt=${dir#*-}
+                               ver=${dir%%-*}
+                                       /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/${fmt}-docbook-${ver}.cat \
+                                               /usr/share/sgml/docbook/${fmt}-dtd-${ver}/catalog > /dev/null 2>/dev/null
+                                       /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/${fmt}-docbook-${ver}.cat \
+                                               /usr/share/sgml/sgml-iso-entities-8879.1986/catalog > /dev/null 2>/dev/null
+                       done
+
+                       # Create XML catalog.
+                       for dir in %{directories}; do
+                               fmt=${dir#*-}
+                               ver=${dir%%-*}
+
+                               if [ $fmt = xml -a -w /usr/share/sgml/docbook/xmlcatalog ]; then
+                                       while read f desc; do
+                                       case $ver in 4.[45]) f={$f/-/} ;; esac
+                                               /usr/bin/xmlcatalog --noout --add public "$desc" /usr/share/sgml/docbook/${fmt}-dtd-${ver}/${f} \
+                                                       /etc/sgml/docbook/xmlcatalog /dev/null 2>/dev/null
+                                       done <<ENDENT
+                               ent/iso-pub.ent ISO 8879:1986//ENTITIES Publishing//EN
+                               ent/iso-grk1.ent        ISO 8879:1986//ENTITIES Greek Letters//EN
+                               dbpoolx.mod     -//OASIS//ELEMENTS DocBook XML Information Pool V${ver}//EN
+                               ent/iso-box.ent ISO 8879:1986//ENTITIES Box and Line Drawing//EN
+                               docbookx.dtd    -//OASIS//DTD DocBook XML V${ver}//EN
+                               ent/iso-grk3.ent        ISO 8879:1986//ENTITIES Greek Symbols//EN
+                               ent/iso-amsn.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN
+                               ent/iso-num.ent ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN
+                               dbcentx.mod     -//OASIS//ENTITIES DocBook XML Character Entities V${ver}//EN
+                               ent/iso-grk4.ent        ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN
+                               dbnotnx.mod     -//OASIS//ENTITIES DocBook XML Notations V${ver}//EN
+                               ent/iso-dia.ent ISO 8879:1986//ENTITIES Diacritical Marks//EN
+                               ent/iso-grk2.ent        ISO 8879:1986//ENTITIES Monotoniko Greek//EN
+                               dbgenent.mod    -//OASIS//ENTITIES DocBook XML Additional General Entities V${ver}//EN
+                               dbhierx.mod     -//OASIS//ELEMENTS DocBook XML Document Hierarchy V${vers}//EN
+                               ent/iso-amsa.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN
+                               ent/iso-amso.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN
+                               ent/iso-cyr1.ent        ISO 8879:1986//ENTITIES Russian Cyrillic//EN
+                               ent/iso-tech.ent        ISO 8879:1986//ENTITIES General Technical//EN
+                               ent/iso-amsc.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN
+                               soextblx.dtd    -//OASIS//DTD XML Exchange Table Model 19990315//EN
+                               calstblx.dtd    -//OASIS//DTD DocBook XML CALS Table Model V${ver}//EN
+                               ent/iso-lat1.ent        ISO 8879:1986//ENTITIES Added Latin 1//EN
+                               ent/iso-amsb.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN
+                               ent/iso-lat2.ent        ISO 8879:1986//ENTITIES Added Latin 2//EN
+                               ent/iso-amsr.ent        ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN
+                               ent/iso-cyr2.ent        ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN
+                       ENDENT
+
+                                       for f in System URI; do
+                                               /usr/bin/xmlcatalog --noout --add rewrite${f} "http://www.oasis-open.org/docbook/xml/${ver}" \
+                                                       /usr/share/sgml/docbook/${fmt}-dtd-${ver} /etc/sgml/docbook/xmlcatalog > /dev/null 2>/dev/null
+                                       done
+                               fi
+                       done
+
+                       sed -ni '
+                               /xml-docbook/ H
+                               /xml-docbook/ !p
+                                       $ {
+                                               g
+                                               s/^\n//p
+                                       }
+                               ' /etc/sgml/catalog
+
+                       # Finally, make sure everything in /etc/sgml is readable!
+                       chmod a+r /etc/sgml/*
+               end
+
+               script postun
+                       # remove entries only on removal of package
+                       if [ "$1" = 0 ]; then
+                               entities="
+                                       ent/iso-pub.ent
+                                       ent/iso-grk1.ent
+                                       dbpoolx.mod
+                                       ent/iso-box.ent
+                                       docbookx.dtd
+                                       ent/iso-grk3.ent
+                                       ent/iso-amsn.ent
+                                       ent/iso-num.ent
+                                       dbcentx.mod
+                                       ent/iso-grk4.ent
+                                       dbnotnx.mod
+                                       ent/iso-dia.ent
+                                       ent/iso-grk2.ent
+                                       dbgenent.mod
+                                       dbhierx.mod
+                                       ent/iso-amsa.ent
+                                       ent/iso-amso.ent
+                                       ent/iso-cyr1.ent
+                                       ent/iso-tech.ent
+                                       ent/iso-amsc.ent
+                                       soextblx.dtd
+                                       calstblx.dtd
+                                       ent/iso-lat1.ent
+                                       ent/iso-amsb.ent
+                                       ent/iso-lat2.ent
+                                       ent/iso-amsr.ent
+                                       ent/iso-cyr2.ent"
+
+                       for dir in %{directories}; do
+                               fmt=${dir#*-} ver=${dir%%-*}
+
+                               ## SGML catalog
+                               # Update the centralized catalog corresponding to this version of the DTD
+                               /usr/bin/xmlcatalog --noout --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat
+                               rm -f /etc/sgml/$fmt-docbook-$ver.cat
+
+                               ## XML catalog
+                               if [ $fmt = xml -a -w /usr/share/sgml/docbook/xmlcatalog ]; then
+                                       for f in $entities; do
+                                               case $ver in 4.[45]) f=${f/-/} ;; esac
+                                                       /usr/bin/xmlcatalog --noout --del /usr/share/sgml/docbook/$fmt-dtd-$ver/$f /usr/share/sgml/docbook/xmlcatalog
+                                       done
+                                       /usr/bin/xmlcatalog --noout --del /usr/share/sgml/docbook/$fmt-dtd-$ver /usr/share/sgml/docbook/xmlcatalog
+                               fi
+                       done
+
+                       # See the comment attached to this command in the postin scriptlet.
+                       sed -ni '
+                               /xml-docbook/ H
+                               /xml-docbook/ !p
+                                       $ {
+                                               g
+                                               s/^\n//p
+                                       }
+                               ' /etc/sgml/catalog
+                       fi
+               end
+       end
+end
diff --git a/docbook-dtds/patches/docbook-4.2-euro.patch b/docbook-dtds/patches/docbook-4.2-euro.patch
new file mode 100644 (file)
index 0000000..bbace5d
--- /dev/null
@@ -0,0 +1,22 @@
+--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro        2003-07-15 09:07:58.000000000 +0100
++++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd     2003-07-15 09:08:12.000000000 +0100
+@@ -106,7 +106,7 @@
+ <![%dbcent.module;[
+ <![%sgml.features;[
+-<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
++<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
+ ]]>
+ <![%xml.features;[
+ <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
+--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100
++++ docbook-dtds-1.0/4.2-xml/docbookx.dtd      2003-07-15 09:08:21.000000000 +0100
+@@ -106,7 +106,7 @@
+ <![%dbcent.module;[
+ <![%sgml.features;[
+-<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
++<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
+ ]]>
+ <![%xml.features;[
+ <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
diff --git a/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch
new file mode 100644 (file)
index 0000000..81bff59
--- /dev/null
@@ -0,0 +1,41 @@
+--- a/3.0-sgml/docbook.cat     Tue Dec 10 16:35:22 1996
++++ b/3.0-sgml/catalog Mon Jun  5 11:08:34 2000
+@@ -27,7 +27,7 @@
+   -- ...................................................................... --
+   -- SGML declaration associated with DocBook ............................. --
+-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
++SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+@@ -41,29 +41,6 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
+ PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+   -- End of catalog data for DocBook V3.0 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch
new file mode 100644 (file)
index 0000000..d4789b3
--- /dev/null
@@ -0,0 +1,41 @@
+--- a/3.1-sgml/docbook.cat     Tue Feb  2 06:53:32 1999
++++ b/3.1-sgml/catalog Thu May 25 11:45:01 2000
+@@ -19,7 +19,7 @@
+   -- ...................................................................... --
+   -- SGML declaration associated with DocBook ............................. --
+-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
++SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+   -- End of catalog data for DocBook V3.1 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch
new file mode 100644 (file)
index 0000000..367279f
--- /dev/null
@@ -0,0 +1,41 @@
+--- a/4.0-sgml/docbook.cat     Mon May 22 22:38:05 2000
++++ b/4.0-sgml/catalog Mon May 22 22:12:36 2000
+@@ -19,7 +19,7 @@
+   -- ...................................................................... --
+   -- SGML declaration associated with DocBook ............................. --
+-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
++SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+   -- End of catalog data for DocBook V4.0 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch
new file mode 100644 (file)
index 0000000..2a10e7d
--- /dev/null
@@ -0,0 +1,41 @@
+--- a/4.1-sgml/docbook.cat     Mon May 22 22:38:05 2000
++++ b/4.1-sgml/catalog Mon May 22 22:12:36 2000
+@@ -19,7 +19,7 @@
+   -- ...................................................................... --
+   -- SGML declaration associated with DocBook ............................. --
+-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
++SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+   -- End of catalog data for DocBook V4.1 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtd412-entities.patch b/docbook-dtds/patches/docbook-dtd412-entities.patch
new file mode 100644 (file)
index 0000000..39a7bb2
--- /dev/null
@@ -0,0 +1,48 @@
+diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat        2009-02-19 13:49:08.000000000 +0100
++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat     2009-02-19 13:50:59.000000000 +0100
+@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
+   -- ...................................................................... --
+   -- ISO entity sets ...................................................... --
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
++PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
++PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent"
+   -- End of catalog data for DocBook XML V4.1.2 ............................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch
new file mode 100644 (file)
index 0000000..d0b2cc3
--- /dev/null
@@ -0,0 +1,68 @@
+--- a/4.2-sgml/docbook.cat.orig        2002-07-17 17:14:28.000000000 +0100
++++ b/4.2-sgml/docbook.cat     2002-07-17 21:58:24.000000000 +0100
+@@ -49,65 +49,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+        "dbcentx.mod"
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+-       "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+-       "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+-       "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+-       "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+-       "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+-       "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+-       "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+-       "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+-       "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+-       "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+-       "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+-       "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+-       "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+-       "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+-       "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+-       "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+-       "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+-       "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+-       "iso-cyr2.gml"
+-
+   -- End of catalog data for DocBook V4.2 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-dtds-ents.patch b/docbook-dtds/patches/docbook-dtds-ents.patch
new file mode 100644 (file)
index 0000000..bc45628
--- /dev/null
@@ -0,0 +1,53 @@
+--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000
++++ docbook-dtds-1.0/4.3-sgml/docbook.cat      2005-12-13 13:14:38.000000000 +0000
+@@ -51,6 +51,7 @@
+   -- ...................................................................... --
+   -- ISO entity sets ...................................................... --
++--
+ PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+        "iso-dia.gml"
+@@ -109,5 +110,6 @@
+ PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+        "iso-cyr2.gml"
++--
+   -- End of catalog data for DocBook V4.3 ................................. --
+   -- ...................................................................... --
+--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000
++++ docbook-dtds-1.0/4.4-sgml/docbook.cat      2005-12-13 13:14:59.000000000 +0000
+@@ -54,6 +54,7 @@
+   -- ...................................................................... --
+   -- ISO entity sets ...................................................... --
++--
+ PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+        "iso-dia.gml"
+@@ -112,5 +113,6 @@
+ PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+        "iso-cyr2.gml"
++--
+   -- End of catalog data for DocBook V4.4 ................................. --
+   -- ...................................................................... --
+diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100
++++ docbook-dtds-1.0/4.5-sgml/docbook.cat      2009-02-19 13:47:31.000000000 +0100
+@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
+   -- ...................................................................... --
+   -- ISO entity sets ...................................................... --
++--
+ PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+        "iso-dia.gml"
+@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian 
+ PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+        "iso-cyr2.gml"
++--
++
+   -- End of catalog data for DocBook V4.5 ................................. --
+   -- ...................................................................... --
diff --git a/docbook-dtds/patches/docbook-sgml-systemrewrite.patch b/docbook-dtds/patches/docbook-sgml-systemrewrite.patch
new file mode 100644 (file)
index 0000000..4adbc50
--- /dev/null
@@ -0,0 +1,210 @@
+diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
++++ docbook-dtds-1.0/3.0-sgml/docbook.cat      2009-02-05 16:48:58.000000000 +0100
+@@ -30,6 +30,12 @@
+ SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
+diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
++++ docbook-dtds-1.0/3.1-sgml/docbook.cat      2009-02-05 16:56:51.000000000 +0100
+@@ -22,6 +22,12 @@
+ SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
+diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
++++ docbook-dtds-1.0/4.0-sgml/docbook.cat      2009-02-05 16:49:06.000000000 +0100
+@@ -22,6 +22,12 @@
+ SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
+Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
+diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
++++ docbook-dtds-1.0/4.1-sgml/docbook.cat      2009-02-05 16:49:27.000000000 +0100
+@@ -22,6 +22,12 @@
+ SGMLDECL "docbook.dcl"
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
++       "docbook.dtd"
++
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
+diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat        2000-08-27 17:19:42.000000000 +0200
++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat     2009-02-05 16:52:16.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
++       "docbookx.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
+diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100
++++ docbook-dtds-1.0/4.2-sgml/docbook.cat      2009-02-05 16:50:10.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat  2002-07-17 18:14:41.000000000 +0200
++++ docbook-dtds-1.0/4.2-xml/docbook.cat       2009-02-05 16:52:53.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
++       "docbookx.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
++++ docbook-dtds-1.0/4.3-sgml/docbook.cat      2009-02-05 16:50:37.000000000 +0100
+@@ -17,6 +17,13 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
++       "docbook.dtd"
++
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
+diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat  2004-03-31 13:22:18.000000000 +0200
++++ docbook-dtds-1.0/4.3-xml/docbook.cat       2009-02-05 16:53:12.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
++       "docbookx.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
++++ docbook-dtds-1.0/4.4-sgml/docbook.cat      2009-02-05 16:50:57.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat  2005-01-27 14:57:19.000000000 +0100
++++ docbook-dtds-1.0/4.4-xml/docbook.cat       2009-02-05 16:53:30.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
++       "docbookx.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
+--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200
++++ docbook-dtds-1.0/4.5-sgml/docbook.cat      2009-02-05 16:51:22.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
++       "docbook.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
+--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat  2006-10-03 15:26:00.000000000 +0200
++++ docbook-dtds-1.0/4.5-xml/docbook.cat       2009-02-05 16:55:45.000000000 +0100
+@@ -17,6 +17,12 @@
+   --
+   -- ...................................................................... --
++  -- SYSTEM rewrite of web URL .............. ............................. --
++
++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
++       "docbookx.dtd"
++
++  -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm
new file mode 100644 (file)
index 0000000..44a236c
--- /dev/null
@@ -0,0 +1,53 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = docbook-utils
+version    = 0.6.14
+release    = 1
+
+groups     = Applications/Text
+url        = http://sources.redhat.com/docbook-tools/
+license    = GPLv2+
+summary    = Shell scripts for managing DocBook documents.
+
+description
+       This package contains scripts are for easy conversion from DocBook
+       files to other formats, and for comparing SGML files.
+end
+
+# Manual list patches because they need to be applied in specical order
+patches = \
+       %{name}-spaces.patch \
+       %{name}-2ndspaces.patch \
+       %{name}-w3mtxtconvert.patch \
+       %{name}-grepnocolors.patch \
+       %{name}-sgmlinclude.patch \
+       %{name}-rtfmanpage.patch \
+       %{name}-papersize.patch \
+       %{name}-nofinalecho.patch \
+       %{name}-newgrep.patch
+
+build
+       requires
+               docbook-dsssl
+               docbook-dtds
+               openjade
+               sgml-common
+       end
+
+       configure_options += \
+               --libdir=/usr/lib \
+               --mandir=/usr/share/man
+end
+
+packages
+       package %{name}
+               requires
+                       docbook-dtds
+                       docbook-dsssl
+                       openjade
+               end
+       end
+end
diff --git a/docbook-utils/patches/docbook-utils-2ndspaces.patch b/docbook-utils/patches/docbook-utils-2ndspaces.patch
new file mode 100644 (file)
index 0000000..eb4d6c6
--- /dev/null
@@ -0,0 +1,260 @@
+--- Original/backends/dvi      2003-01-13 18:14:10.000000000 +0100
++++ Changes/backends/dvi       2007-05-21 14:10:42.000000000 +0200
+@@ -6,31 +6,31 @@
+ export TEXINPUTS
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ # Convert from TeX to DVI
+-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ # If there are unresolved references, re-run jadetex, twice 
+-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
+ then
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ fi
+-rm ${SGML_FILE_NAME}.log
+-rm ${SGML_FILE_NAME}.aux
+-rm ${SGML_FILE_NAME}.tex
+-rm ${SGML_FILE_NAME}.out
++rm "${SGML_FILE_NAME}.log"
++rm "${SGML_FILE_NAME}.aux"
++rm "${SGML_FILE_NAME}.tex"
++rm "${SGML_FILE_NAME}.out"
+ exit 0
+--- Original/backends/html     2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/html      2007-05-21 14:11:32.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ # Convert to HTML
+-$SGML_JADE -t sgml $SGML_ARGUMENTS
++$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/pdf      2003-03-17 18:47:11.000000000 +0100
++++ Changes/backends/pdf       2007-05-21 14:13:58.000000000 +0200
+@@ -6,26 +6,26 @@
+ export TEXINPUTS
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ # Convert from TeX to PDF
+-pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ # Unconditionally re-run pdfjadetex, twice 
+-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
+-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
+-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
+-      ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
++      "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
+ exit 0
+--- Original/backends/ps       2003-03-17 18:51:48.000000000 +0100
++++ Changes/backends/ps        2007-05-21 14:16:51.000000000 +0200
+@@ -6,30 +6,30 @@
+ export TEXINPUTS
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ # Convert from TeX to DVI
+-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ # If there are unresolved references, re-run jadetex, twice 
+-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
+ then
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ fi
+-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
+-      ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
++      "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
+ # Convert from DVI to PostScript
+ PAPERSIZE="-t letter"
+@@ -38,12 +38,12 @@
+   PAPERSIZE="-t a4"
+ fi
+-dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps
++dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps"
+ if [ $? -ne 0 ]
+ then
+-  rm ${SGML_FILE_NAME}.dvi
++  rm "${SGML_FILE_NAME}.dvi"
+   exit 3
+ fi
+-rm ${SGML_FILE_NAME}.dvi
++rm "${SGML_FILE_NAME}.dvi"
+ exit 0
+--- Original/backends/rtf      2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/rtf       2007-05-21 14:18:37.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ # Convert to RTF
+-$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS
++$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/tex      2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/tex       2007-05-21 14:21:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/txt      2004-02-11 14:58:03.000000000 +0100
++++ Changes/backends/txt       2007-05-21 14:22:33.000000000 +0200
+@@ -23,7 +23,7 @@
+ trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15
+ # Convert to HTML
+-$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML}
++$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML}
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/bin/jw.in 2003-04-30 18:21:49.000000000 +0200
++++ Changes/bin/jw.in  2007-05-21 14:28:58.000000000 +0200
+@@ -246,7 +246,7 @@ then
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FRONTEND ]
++if [ ! -s "$SGML_FRONTEND" ]
+ then
+   echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
+   exit 2
+@@ -270,14 +270,14 @@
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FILE ]
++if [ ! -s "$SGML_FILE" ]
+ then
+   echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2
+   exit 3
+ fi
+ # Separate the file name and the extension (if any)
+-SGML_FILE_NAME=`basename $SGML_FILE`
++SGML_FILE_NAME=`basename "$SGML_FILE"`
+ SGML_FILE_NAME=${SGML_FILE_NAME%.*}
+ # Determine if we are in an XML file
+@@ -416,7 +416,7 @@
+ fi
+ # Prepare the parser's arguments
+-SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE"
++SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL"
+ # Call the backend
+ echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
+@@ -430,7 +430,7 @@
+ then
+       sh $SGML_BACKEND
+ else
+-      sh $SGML_BACKEND >$SGML_FILE_NAME.html
++      sh $SGML_BACKEND >"$SGML_FILE_NAME.html"
+ fi
+ SGML_RETURN=$?
+ cd "$SGML_CURRENT_DIRECTORY"
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in  2003-02-11 13:56:23.000000000 +0100
++++ docbook-utils-0.6.14/backends/man.in       2009-07-24 15:07:04.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
+--- docbook-utils-0.6.14-orig/backends/texi.in 2002-08-05 23:20:56.000000000 +0200
++++ docbook-utils-0.6.14/backends/texi.in      2009-07-24 15:08:02.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
diff --git a/docbook-utils/patches/docbook-utils-grepnocolors.patch b/docbook-utils/patches/docbook-utils-grepnocolors.patch
new file mode 100644 (file)
index 0000000..3cce39e
--- /dev/null
@@ -0,0 +1,15 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in        2008-11-28 10:53:09.000000000 +0100
++++ docbook-utils-0.6.14/bin/jw.in     2008-11-28 11:22:28.000000000 +0100
+@@ -81,9 +81,9 @@ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+   RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
+-  SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
++  SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+   RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
+-  SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
++  SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+ # Set frontend to use
diff --git a/docbook-utils/patches/docbook-utils-newgrep.patch b/docbook-utils/patches/docbook-utils-newgrep.patch
new file mode 100644 (file)
index 0000000..a2c3591
--- /dev/null
@@ -0,0 +1,24 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in        2010-09-28 18:18:39.567895321 +0200
++++ docbook-utils-0.6.14/bin/jw.in     2010-09-28 18:23:25.849756994 +0200
+@@ -80,9 +80,9 @@ SGML_BASE_DIR="@prefix@/share/sgml"
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+-  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+   SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+-  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+   SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+@@ -312,7 +312,7 @@ case $SGML_STANDARD_CATALOGS in
+         SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG
+       else
+         SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog`
+-        SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :`
++        SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :`
+       fi
+       ;;
+   no) SGML_CATALOG_FILES=""
diff --git a/docbook-utils/patches/docbook-utils-nofinalecho.patch b/docbook-utils/patches/docbook-utils-nofinalecho.patch
new file mode 100644 (file)
index 0000000..5787b97
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in        2010-05-31 16:21:46.379401250 +0200
++++ docbook-utils-0.6.14/bin/jw.in     2010-05-31 16:23:55.348413466 +0200
+@@ -438,5 +438,7 @@ cd "$SGML_CURRENT_DIRECTORY"
+ if [ $SGML_RETURN -gt 0 ]
+ then exit `expr 7 + $SGML_RETURN`
+ fi
+-echo "Done."
++#Final echo commented out, it causes manpage noise when generating some
++#manpages with new perl(#513271, #587012)
++#echo "Done."
+ exit 0
diff --git a/docbook-utils/patches/docbook-utils-papersize.patch b/docbook-utils/patches/docbook-utils-papersize.patch
new file mode 100644 (file)
index 0000000..74e5007
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in        2009-10-07 14:41:19.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in     2009-10-07 14:45:22.000000000 +0200
+@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
+       fi
+       if [ -n "$papersize" ]
+       then
+-        SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
++        SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
+       fi
+       ;;
+ esac
diff --git a/docbook-utils/patches/docbook-utils-rtfmanpage.patch b/docbook-utils/patches/docbook-utils-rtfmanpage.patch
new file mode 100644 (file)
index 0000000..f37873b
--- /dev/null
@@ -0,0 +1,15 @@
+diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
+--- docbook-utils-0.6.14-orig/doc/man/jw.1     2004-02-11 15:16:21.000000000 +0100
++++ docbook-utils-0.6.14/doc/man/jw.1  2009-08-13 10:44:03.000000000 +0200
+@@ -192,6 +192,11 @@ by calling \fBJade\fR or
+ \fBOpenJade\fR\&. The resulting file can
+ then be inported into \fBMS Word\fR
+ or one of its Linux replacement programs.
++
++\fBNote\fR - The original picture must be
++present when RTF document is viewed, because
++the RTF documents created by \fBOpenJade\fR
++includes pictures by reference.
+ .TP
+ \fB\fItex\fB\fR
+ Converts to TeX by calling \fBJade\fR or
diff --git a/docbook-utils/patches/docbook-utils-sgmlinclude.patch b/docbook-utils/patches/docbook-utils-sgmlinclude.patch
new file mode 100644 (file)
index 0000000..a4958e0
--- /dev/null
@@ -0,0 +1,24 @@
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in  2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/backends/man.in       2009-07-24 15:20:57.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_INCLUDE" "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in        2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in     2009-07-24 15:18:51.000000000 +0200
+@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
+ echo "Using stylesheet: $SGML_STYLESHEET"
+ echo "Working on: $SGML_FILE"
+ cd "$SGML_OUTPUT_DIRECTORY"
+-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
++export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
+ export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
+ NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
+ if [ -z "$NOCHUNKS" ]
diff --git a/docbook-utils/patches/docbook-utils-spaces.patch b/docbook-utils/patches/docbook-utils-spaces.patch
new file mode 100644 (file)
index 0000000..4c18b1d
--- /dev/null
@@ -0,0 +1,32 @@
+--- docbook-utils-0.6.14/bin/jw.in.spaces      2003-04-30 17:21:49.000000000 +0100
++++ docbook-utils-0.6.14/bin/jw.in     2004-08-19 09:33:34.989426640 +0100
+@@ -405,9 +405,9 @@
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -d $SGML_OUTPUT_DIRECTORY ]
++if [ ! -d "$SGML_OUTPUT_DIRECTORY" ]
+ then
+-  mkdir $SGML_OUTPUT_DIRECTORY 2>/dev/null
++  mkdir "$SGML_OUTPUT_DIRECTORY" 2>/dev/null
+   if [ $? -ne 0 ]
+   then
+     echo "`basename $0`: Could not create \"$SGML_OUTPUT_DIRECTORY\" output directory" >&2
+@@ -422,7 +422,7 @@
+ echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
+ echo "Using stylesheet: $SGML_STYLESHEET"
+ echo "Working on: $SGML_FILE"
+-cd $SGML_OUTPUT_DIRECTORY
++cd "$SGML_OUTPUT_DIRECTORY"
+ export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
+ export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
+ NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
+@@ -433,7 +433,7 @@
+       sh $SGML_BACKEND >$SGML_FILE_NAME.html
+ fi
+ SGML_RETURN=$?
+-cd $SGML_CURRENT_DIRECTORY
++cd "$SGML_CURRENT_DIRECTORY"
+ if [ $SGML_RETURN -gt 0 ]
+ then exit `expr 7 + $SGML_RETURN`
diff --git a/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch b/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch
new file mode 100644 (file)
index 0000000..249af8e
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urNp original/txt new/txt
+--- original/backends/txt      2007-11-05 18:44:52.000000000 +0100
++++ new/backends/txt   2007-11-22 15:21:36.000000000 +0100
+@@ -13,7 +13,7 @@ then
+ elif [ -x /usr/bin/w3m ]
+ then
+   CONVERT=/usr/bin/w3m
+-  ARGS="-dump"
++  ARGS="-T text/html -dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+   exit 1
diff --git a/docbook-xsl/Makefile b/docbook-xsl/Makefile
new file mode 100644 (file)
index 0000000..281656d
--- /dev/null
@@ -0,0 +1,52 @@
+BINDIR = /usr/bin
+DESTDIR = ..overridden in spec file..
+
+all: install
+
+install: install-xsl install-img install-extensions install-misc install-epub
+
+install-xsl:
+       mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website}
+       cp common/*.dtd $(DESTDIR)/common
+       cp common/*.ent $(DESTDIR)/common
+       cp common/*.xml $(DESTDIR)/common
+       cp common/*.xsl $(DESTDIR)/common
+       cp eclipse/*.xsl $(DESTDIR)/eclipse
+       cp fo/*.xml $(DESTDIR)/fo
+       cp fo/*.xsl $(DESTDIR)/fo
+       cp html/*.xml $(DESTDIR)/html
+       cp html/*.xsl $(DESTDIR)/html
+       cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
+       cp javahelp/*.xsl $(DESTDIR)/javahelp
+       cp lib/*.xsl $(DESTDIR)/lib
+       cp template/*.xsl $(DESTDIR)/template
+       cp xhtml/*.xsl $(DESTDIR)/xhtml
+       cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1
+       cp manpages/*.xsl $(DESTDIR)/manpages
+       cp profiling/*.xsl $(DESTDIR)/profiling
+       cp highlighting/*.xml $(DESTDIR)/highlighting
+       cp highlighting/*.xsl $(DESTDIR)/highlighting
+       cp roundtrip/*.xml $(DESTDIR)/roundtrip
+       cp roundtrip/*.xsl $(DESTDIR)/roundtrip
+       cp roundtrip/*.dtd $(DESTDIR)/roundtrip
+       cp website/*.xsl $(DESTDIR)/website
+
+install-img:
+       mkdir -p $(DESTDIR)/images/callouts
+       cp images/*.gif $(DESTDIR)/images
+       cp images/*.png $(DESTDIR)/images
+       cp images/*.svg $(DESTDIR)/images
+       cp images/callouts/*.png $(DESTDIR)/images/callouts
+       cp images/callouts/*.gif $(DESTDIR)/images/callouts
+       cp images/callouts/*.svg $(DESTDIR)/images/callouts
+
+install-extensions:
+       mkdir -p $(DESTDIR)/extensions
+       cp -r extensions/* $(DESTDIR)/extensions
+
+install-epub:
+       mkdir -p $(DESTDIR)/epub
+       cp -r epub/* ${DESTDIR}/epub
+
+install-misc:
+       cp VERSION $(DESTDIR)
diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm
new file mode 100644 (file)
index 0000000..797789f
--- /dev/null
@@ -0,0 +1,85 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = docbook-xsl
+version    = 1.76.1
+release    = 2
+arch       = noarch
+
+groups     = Applications/Text
+url        = http://docbook.sourceforge.net/projects/xsl/
+license    = GPLv2+
+summary    = Norman Walsh's XSL stylesheets for DocBook XML.
+
+description
+       hese XSL stylesheets allow you to transform any DocBook XML document to
+       other formats, such as HTML, FO, and XHMTL.  They are highly customizable.
+end
+
+source_dl = http://prdownloads.sourceforge.net/docbook/
+
+sources =\
+       %{thisapp}.tar.bz2 \
+       %{name}-doc-%{version}.tar.bz2
+
+build
+       prepare_cmds
+               cp -av %{DIR_SOURCE}/Makefile %{DIR_APP}/Makefile
+       end
+
+       build = # empty
+
+       make_install_targets +=\
+               BINDIR=%{BUILDROOT}/usr/bin \
+               DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}
+
+       install_cmds
+               # Remove buggy extensions.
+               rm -rfv %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/extensions/*
+
+               # Remove unneeded tool for .epub formats.
+               rm -rvf %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/epub
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       libxslt
+                       docbook-dtds
+                       sgml-common
+               end
+
+               prerequires +=\
+                       docbook-dtds \
+                       libxml2 \
+                       sgml-common
+
+               script postin
+                       # Install catalog files.
+                       /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+                               "http://docbook.sourceforge.net/release/xsl/%{version}" \
+                               "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog
+
+                       /usr/bin/xmlcatalog --noout --add "rewriteURI" \
+                               "http://docbook.sourceforge.net/release/xsl/%{version}" \
+                               "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog
+
+                       /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+                               "http://docbook.sourceforge.net/release/xsl/current" \
+                               "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog
+
+                       /usr/bin/xmlcatalog --noout --add "rewriteURI" \
+                               "http://docbook.sourceforge.net/release/xsl/current" \
+                               "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog
+               end
+
+               script preun
+                       # Uninstall catalog files.
+                       /usr/bin/xmlcatalog --noout --del \
+                               "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog
+               end
+       end
+end
diff --git a/docbook-xsl/patches/docbook-xsl-list-item-body.patch b/docbook-xsl/patches/docbook-xsl-list-item-body.patch
new file mode 100644 (file)
index 0000000..a3d3819
--- /dev/null
@@ -0,0 +1,110 @@
+diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
+--- docbook-xsl-1.74.0.orig/fo/lists.xsl       2008-08-06 13:32:46.000000000 +0200
++++ docbook-xsl-1.74.0/fo/lists.xsl    2008-08-06 13:41:27.000000000 +0200
+@@ -248,9 +248,17 @@
+       </fo:block>
+     </fo:list-item-label>
+     <fo:list-item-body start-indent="body-start()">
+-      <fo:block>
+-        <xsl:apply-templates/>
+-      </fo:block>
++      <xsl:choose>
++        <!-- * work around broken passivetex list-item-body rendering -->
++        <xsl:when test="$passivetex.extensions = '1'">
++          <xsl:apply-templates/>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:block>
++            <xsl:apply-templates/>
++          </fo:block>
++        </xsl:otherwise>
++      </xsl:choose>
+     </fo:list-item-body>
+   </xsl:variable>
+@@ -446,10 +454,18 @@
+       </fo:block>
+     </fo:list-item-label>
+     <fo:list-item-body start-indent="body-start()">
+-      <fo:block>
+-        <xsl:apply-templates select="listitem"/>
+-      </fo:block>
+-    </fo:list-item-body>
++      <xsl:choose>
++        <!-- * work around broken passivetex list-item-body rendering -->
++        <xsl:when test="$passivetex.extensions = '1'">
++          <xsl:apply-templates select="listitem"/>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:block>
++            <xsl:apply-templates select="listitem"/>
++          </fo:block>
++        </xsl:otherwise>
++      </xsl:choose>
++     </fo:list-item-body>
+   </xsl:variable>
+   <xsl:choose>
+@@ -925,9 +941,17 @@
+       </fo:block>
+     </fo:list-item-label>
+     <fo:list-item-body start-indent="body-start()">
+-      <fo:block>
+-        <xsl:apply-templates/>
+-      </fo:block>
++      <xsl:choose>
++        <!-- * work around broken passivetex list-item-body rendering -->
++        <xsl:when test="$passivetex.extensions = '1'">
++          <xsl:apply-templates/>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:block>
++            <xsl:apply-templates/>
++          </fo:block>
++        </xsl:otherwise>
++      </xsl:choose>
+     </fo:list-item-body>
+   </fo:list-item>
+ </xsl:template>
+@@ -951,9 +975,17 @@
+       </fo:block>
+     </fo:list-item-label>
+     <fo:list-item-body start-indent="body-start()">
+-      <fo:block>
+-        <xsl:apply-templates/>
+-      </fo:block>
++      <xsl:choose>
++        <!-- * work around broken passivetex list-item-body rendering -->
++        <xsl:when test="$passivetex.extensions = '1'">
++          <xsl:apply-templates/>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:block>
++            <xsl:apply-templates/>
++          </fo:block>
++        </xsl:otherwise>
++      </xsl:choose>
+     </fo:list-item-body>
+   </fo:list-item>
+ </xsl:template>
+@@ -1141,9 +1173,17 @@
+       </fo:block>
+     </fo:list-item-label>
+     <fo:list-item-body start-indent="body-start()">
+-      <fo:block>
+-        <xsl:apply-templates/>
+-      </fo:block>
++      <xsl:choose>
++        <!-- * work around broken passivetex list-item-body rendering -->
++        <xsl:when test="$passivetex.extensions = '1'">
++          <xsl:apply-templates/>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:block>
++            <xsl:apply-templates/>
++          </fo:block>
++        </xsl:otherwise>
++      </xsl:choose>
+     </fo:list-item-body>
+   </fo:list-item>
+ </xsl:template>
diff --git a/docbook-xsl/patches/docbook-xsl-mandir.patch b/docbook-xsl/patches/docbook-xsl-mandir.patch
new file mode 100644 (file)
index 0000000..d2c5a7e
--- /dev/null
@@ -0,0 +1,19 @@
+diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl
+--- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000 +0200
++++ docbook-xsl-1.76.1/manpages/other.xsl      2011-09-06 17:17:07.973737258 +0200
+@@ -595,7 +595,14 @@ manvolnum
+           <xsl:with-param name="message-prolog">Note: </xsl:with-param>
+           <xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param>
+           <xsl:with-param name="content">
+-            <xsl:value-of select="'.so '"/>
++            <xsl:choose>
++              <xsl:when test="$man.output.in.separate.dir = 0">
++              <xsl:value-of select="concat('.so man', $section, '/')"/>
++              </xsl:when>
++              <xsl:otherwise>
++              <xsl:value-of select="'.so '"/> <!-- added case -->
++              </xsl:otherwise>
++              </xsl:choose>
+             <xsl:call-template name="make.adjusted.man.filename">
+               <xsl:with-param name="name" select="$first.refname"/>
+               <xsl:with-param name="section" select="$section"/>
diff --git a/docbook-xsl/patches/docbook-xsl-marginleft.patch b/docbook-xsl/patches/docbook-xsl-marginleft.patch
new file mode 100644 (file)
index 0000000..31c1b84
--- /dev/null
@@ -0,0 +1,100 @@
+diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
+--- docbook-xsl-1.74.0.orig/fo/lists.xsl       2008-06-01 23:36:39.000000000 +0200
++++ docbook-xsl-1.74.0/fo/lists.xsl    2008-08-06 13:32:46.000000000 +0200
+@@ -324,7 +324,7 @@
+       </xsl:when>
+       <xsl:when test="@termlength">
+         <xsl:variable name="termlength.is.number">
+-          <xsl:value-of select="@termlength + 0"/>
++          <xsl:value-of select="@termlength"/>
+         </xsl:variable>
+         <xsl:choose>
+           <xsl:when test="string($termlength.is.number) = 'NaN'">
+@@ -333,15 +333,7 @@
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:value-of select="@termlength"/>
+-            <xsl:choose>
+-              <!-- workaround for passivetex lack of support for non-constant expressions -->
+-              <xsl:when test="$passivetex.extensions != 0">
+-                <xsl:text>em</xsl:text>
+-              </xsl:when>
+-              <xsl:otherwise>
+-                <xsl:text>em * 0.60</xsl:text>
+-              </xsl:otherwise>
+-            </xsl:choose>
++            <xsl:text>em</xsl:text>
+           </xsl:otherwise>
+         </xsl:choose>
+       </xsl:when>
+@@ -350,15 +342,7 @@
+           <xsl:with-param name="terms" select="varlistentry/term"/>
+           <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
+         </xsl:call-template>
+-        <xsl:choose>
+-          <!-- workaround for passivetex lack of support for non-constant expressions -->
+-          <xsl:when test="$passivetex.extensions != 0">
+-            <xsl:text>em</xsl:text>
+-          </xsl:when>
+-          <xsl:otherwise>
+-            <xsl:text>em * 0.60</xsl:text>
+-          </xsl:otherwise>
+-        </xsl:choose>
++        <xsl:text>em</xsl:text>
+       </xsl:otherwise>
+     </xsl:choose>
+   </xsl:variable>
+@@ -372,17 +356,7 @@
+   <xsl:variable name="label-separation">1em</xsl:variable>
+   <xsl:variable name="distance-between-starts">
+-    <xsl:choose>
+-      <!-- workaround for passivetex lack of support for non-constant expressions -->
+-      <xsl:when test="$passivetex.extensions != 0">
+-        <xsl:value-of select="$termlength"/>
+-      </xsl:when>
+-      <xsl:otherwise>
+-        <xsl:value-of select="$termlength"/>
+-        <xsl:text>+</xsl:text>
+-        <xsl:value-of select="$label-separation"/>
+-      </xsl:otherwise>
+-    </xsl:choose>
++    <xsl:value-of select="$termlength"/>
+   </xsl:variable>
+   <xsl:if test="title">
+diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
+--- docbook-xsl-1.74.0.orig/fo/param.xsl       2008-06-02 01:06:18.000000000 +0200
++++ docbook-xsl-1.74.0/fo/param.xsl    2008-08-06 13:32:46.000000000 +0200
+@@ -133,8 +133,8 @@
+ <xsl:attribute-set name="component.title.properties">
+   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
++  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
+   <xsl:attribute name="hyphenate">false</xsl:attribute>
+   <xsl:attribute name="text-align">
+     <xsl:choose>
+diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
+--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl   2009-05-11 11:40:49.000000000 +0200
++++ docbook-xsl-1.75.0/fo/pagesetup.xsl        2009-05-11 11:42:29.000000000 +0200
+@@ -30,16 +30,7 @@
+ </xsl:param>
+ <xsl:param name="margin.left.inner">
+-  <xsl:choose>
+-    <xsl:when test="$passivetex.extensions != 0">
+-      <xsl:value-of select="$page.margin.inner"/>
+-    </xsl:when>
+-    <xsl:otherwise>
+-      <xsl:value-of select="$page.margin.inner"/>
+-      <xsl:text> - </xsl:text>
+-      <xsl:value-of select="$title.margin.left"/>
+-    </xsl:otherwise>
+-  </xsl:choose>
++  <xsl:value-of select="$page.margin.inner"/>
+ </xsl:param>
+ <xsl:template name="setup.pagemasters">
diff --git a/docbook-xsl/patches/docbook-xsl-newmethods.patch b/docbook-xsl/patches/docbook-xsl-newmethods.patch
new file mode 100644 (file)
index 0000000..debc51b
--- /dev/null
@@ -0,0 +1,394 @@
+diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl
+--- docbook-xsl-1.74.0.orig/html/docbook.xsl   2008-06-01 23:36:39.000000000 +0200
++++ docbook-xsl-1.74.0/html/docbook.xsl        2008-08-06 13:37:35.000000000 +0200
+@@ -26,6 +26,7 @@
+ <xsl:include href="../VERSION"/>
+ <xsl:include href="param.xsl"/>
+ <xsl:include href="../lib/lib.xsl"/>
++<xsl:include href="../lib/dumpfragment.xsl"/>
+ <xsl:include href="../common/l10n.xsl"/>
+ <xsl:include href="../common/common.xsl"/>
+ <xsl:include href="../common/utility.xsl"/>
+@@ -44,6 +45,7 @@
+ <xsl:include href="graphics.xsl"/>
+ <xsl:include href="xref.xsl"/>
+ <xsl:include href="formal.xsl"/>
++<xsl:include href="dtbl.xsl"/>
+ <xsl:include href="table.xsl"/>
+ <xsl:include href="htmltbl.xsl"/>
+ <xsl:include href="sections.xsl"/>
+diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl
+--- docbook-xsl-1.74.0.orig/html/dtbl.xsl      1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.74.0/html/dtbl.xsl   2008-08-06 13:37:35.000000000 +0200
+@@ -0,0 +1,293 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:exsl="http://exslt.org/common"
++                xmlns:func="http://exslt.org/functions"
++                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
++                extension-element-prefixes="func"
++                exclude-result-prefixes="exsl func dtbl"
++                version="1.0">
++
++<func:function name="dtbl:convertLength">
++  <xsl:param name="arbitrary.length"/>
++
++  <xsl:variable name="pixels.per.inch" select="96"/>
++
++  <xsl:variable name="unscaled.length"
++                select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/>
++
++  <xsl:variable name="units"
++                select="translate($arbitrary.length,'+-0123456789. ', '')"/>
++
++  <xsl:variable name="scaled.length">
++    <xsl:choose>
++      <xsl:when test="$units='in'">
++        <xsl:value-of select="$unscaled.length * $pixels.per.inch"/>
++      </xsl:when>
++      <xsl:when test="$units='cm'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/>
++      </xsl:when>
++      <xsl:when test="$units='mm'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/>
++      </xsl:when>
++      <xsl:when test="$units='pc'">
++        <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/>
++      </xsl:when>
++      <xsl:when test="$units='pt'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/>
++      </xsl:when>
++      <xsl:when test="$units='px' or $units=''">
++        <xsl:value-of select="$unscaled.length"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:message terminate="no">
++          <xsl:text>"</xsl:text>
++          <xsl:value-of select="$units"/>
++          <xsl:text>" is not a known unit.  Applying scaling factor of 1 instead.</xsl:text>
++        </xsl:message>
++        <xsl:value-of select="$unscaled.length"/>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <func:result select="round($scaled.length)"/>
++</func:function>
++
++<func:function name="dtbl:adjustColumnWidths">
++  <xsl:param name="colgroup"/>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>entering adjustColumnWidths(</xsl:text>
++      <xsl:call-template name="dump-fragment">
++        <xsl:with-param name="fragment" select="$colgroup"/>
++      </xsl:call-template>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <xsl:variable name="expanded.colgroup">
++    <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/>
++  </xsl:variable>
++
++  <xsl:variable name="absolute.widths.total">
++    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/>
++  </xsl:variable>
++
++  <xsl:variable name="relative.widths.total">
++    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/>
++  </xsl:variable>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>total relative widths = (</xsl:text>
++      <xsl:value-of select="$relative.widths.total"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++    <xsl:message>
++      <xsl:text>total absolute widths = (</xsl:text>
++      <xsl:value-of select="$absolute.widths.total"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <xsl:variable name="adjusted.colgroup">
++    <xsl:choose>
++      <xsl:when test="$relative.widths.total = 0">
++        <xsl:if test="$adjustColumnWidths.debug">
++          <xsl:message>all widths are absolute</xsl:message>
++        </xsl:if>
++        <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
++                             mode="dtbl-use-absolute-widths"/>
++      </xsl:when>
++      <xsl:when test="$absolute.widths.total = 0">
++        <xsl:if test="$adjustColumnWidths.debug">
++          <xsl:message>all widths are relative</xsl:message>
++        </xsl:if>
++        <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
++                             mode="dtbl-use-relative-widths">
++          <xsl:with-param name="relative.widths.total"
++                          select="$relative.widths.total"/>
++        </xsl:apply-templates>
++      </xsl:when>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="corrected.adjusted.colgroup">
++    <xsl:choose>
++      <xsl:when test="$relative.widths.total = 0">
++        <xsl:copy-of select="$adjusted.colgroup"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:variable name="widths.total"
++                      select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/>
++        <xsl:variable name="n.columns"
++                      select="count(exsl:node-set($adjusted.colgroup)//col)"/>
++        <xsl:variable name="error"
++                      select="100 - $widths.total"/>
++        <xsl:variable name="first.bad.column"
++                      select="($n.columns - $error) + 1"/>
++        <xsl:apply-templates select="exsl:node-set($adjusted.colgroup)/*"
++                             mode="dtbl-correct-rounding-error">
++          <xsl:with-param name="first.bad.column"
++                          select="$first.bad.column"/>
++        </xsl:apply-templates>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>result = (</xsl:text>
++      <xsl:call-template name="dump-fragment">
++        <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/>
++      </xsl:call-template>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <func:result select="$corrected.adjusted.colgroup"/>
++</func:function>
++
++<xsl:template match="colgroup" mode="dtbl-correct-rounding-error">
++  <xsl:param name="first.bad.column"/>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>first.bad.column = (</xsl:text>
++      <xsl:value-of select="$first.bad.column"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <colgroup>
++    <xsl:for-each select="col[position() &lt; $first.bad.column]">
++      <xsl:element name="col">
++        <xsl:attribute name="width">
++          <xsl:value-of select="concat(@width, '%')"/>
++        </xsl:attribute>
++      </xsl:element>
++    </xsl:for-each>
++    <xsl:for-each select="col[position() >= $first.bad.column]">
++      <xsl:element name="col">
++        <xsl:attribute name="width">
++          <xsl:value-of select="concat(@width + 1, '%')"/>
++        </xsl:attribute>
++      </xsl:element>
++    </xsl:for-each>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-correct-rounding-error">
++  <xsl:param name="relative.widths.total"/>
++  <xsl:param name="error"/>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-use-relative-widths">
++  <xsl:param name="relative.widths.total"/>
++
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-use-relative-widths">
++      <xsl:with-param name="relative.widths.total"
++                      select="$relative.widths.total"/>
++    </xsl:apply-templates>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-use-relative-widths">
++  <xsl:param name="relative.widths.total"/>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-use-absolute-widths">
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-use-absolute-widths">
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="@abswidth"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-split-widths">
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-split-widths"/>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-split-widths">
++
++  <!-- width = @width ? @width : '1*' -->
++  <xsl:variable name="width">
++    <xsl:choose>
++      <xsl:when test="@width != ''">
++        <xsl:value-of select="@width"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:text>1*</xsl:text>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <!-- absolute.width = contains($width,'*') ? substring-after($width, '*') : $width -->
++  <xsl:variable name="absolute.width">
++    <xsl:choose>
++      <xsl:when test="contains($width, '*')">
++        <xsl:value-of select="substring-after($width, '*')"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:value-of select="$width"/>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="converted.absolute.width">
++    <xsl:choose>
++      <xsl:when test="$absolute.width != ''">
++        <xsl:value-of select="dtbl:convertLength($absolute.width)"/>
++      </xsl:when>
++     <xsl:otherwise>0</xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="relative.width">
++    <xsl:choose>
++      <xsl:when test="substring-before($width, '*') != ''">
++        <xsl:value-of select="substring-before($width, '*')"/>
++      </xsl:when>
++      <xsl:otherwise>0</xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="$width"/>
++    </xsl:attribute>
++    <xsl:attribute name="relwidth">
++      <xsl:value-of select="$relative.width"/>
++    </xsl:attribute>
++    <xsl:attribute name="abswidth">
++      <xsl:value-of select="$converted.absolute.width"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-split-widths"/>
++  </xsl:element>
++</xsl:template>
++
++</xsl:stylesheet>
+diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl
+--- docbook-xsl-1.74.0.orig/html/table.xsl     2008-06-01 23:36:39.000000000 +0200
++++ docbook-xsl-1.74.0/html/table.xsl  2008-08-06 13:37:35.000000000 +0200
+@@ -5,7 +5,8 @@
+                 xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
+                 xmlns:lxslt="http://xml.apache.org/xslt"
+                 xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
+-                exclude-result-prefixes="doc stbl xtbl lxslt ptbl"
++                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
++                exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl"
+                 version='1.0'>
+ <xsl:include href="../common/table.xsl"/>
+@@ -365,6 +366,9 @@
+           <xsl:when test="$use.extensions != 0
+                           and $tablecolumns.extension != 0">
+             <xsl:choose>
++              <xsl:when test="function-available('dtbl:convertLength')">
++                <xsl:value-of select="dtbl:convertLength($table.width)"/>
++              </xsl:when>
+               <xsl:when test="function-available('stbl:convertLength')">
+                 <xsl:value-of select="stbl:convertLength($table.width)"/>
+               </xsl:when>
+@@ -389,6 +393,9 @@
+       <xsl:when test="$use.extensions != 0
+                       and $tablecolumns.extension != 0">
+         <xsl:choose>
++          <xsl:when test="function-available('dtbl:adjustColumnWidths')">
++            <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/>
++          </xsl:when>
+           <xsl:when test="function-available('stbl:adjustColumnWidths')">
+             <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
+           </xsl:when>
+diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl
+--- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl       1970-01-01 01:00:00.000000000 +0100
++++ docbook-xsl-1.74.0/lib/dumpfragment.xsl    2008-08-06 13:37:35.000000000 +0200
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<xsl:stylesheet version="1.0"
++                xmlns:exsl="http://exslt.org/common"
++                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns="http://www.w3.org/1999/xhtml"
++                exclude-result-prefixes="exsl">
++
++<xsl:template name="dump-fragment">
++  <xsl:param name="fragment"/>
++  <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/>
++</xsl:template>
++
++<xsl:template match="@*" mode="dump-fragment">
++  <xsl:text> </xsl:text>
++  <xsl:value-of select="local-name(.)"/>
++  <xsl:text>="</xsl:text>
++  <xsl:value-of select="."/>
++  <xsl:text>"</xsl:text>
++</xsl:template>
++
++<xsl:template match="*" mode="dump-fragment">
++  <xsl:text>&lt;</xsl:text><xsl:value-of select="local-name(.)"/>
++  <xsl:apply-templates select="@*" mode="dump-fragment"/>
++  <xsl:text>></xsl:text>
++  <xsl:apply-templates mode="dump-fragment"/>
++  <xsl:text>&lt;/</xsl:text><xsl:value-of select="local-name(.)"/>
++  <xsl:text>></xsl:text>
++</xsl:template>
++
++</xsl:stylesheet>
+diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl
+--- docbook-xsl-1.76.0-orig/html/param.xsl     2010-08-31 09:27:22.000000000 +0200
++++ docbook-xsl-1.76.0/html/param.xsl  2010-09-06 11:01:07.916914161 +0200
+@@ -68,6 +68,7 @@ div.annotation-close { position: absolut
+ http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param>
+ <xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
++<xsl:param name="adjustColumnWidths.debug" select="false()"/>
+ <xsl:param name="annotation.js">
+ <xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
diff --git a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch b/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch
new file mode 100644 (file)
index 0000000..0c3f6be
--- /dev/null
@@ -0,0 +1,25 @@
+diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
+--- docbook-xsl-1.74.0.orig/fo/param.xsl       2008-08-06 13:32:46.000000000 +0200
++++ docbook-xsl-1.74.0/fo/param.xsl    2008-08-06 13:38:36.000000000 +0200
+@@ -23,8 +23,8 @@
+   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
++  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8), 'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2), 'pt')"/></xsl:attribute>
+   <xsl:attribute name="hyphenate">false</xsl:attribute>
+   <xsl:attribute name="text-align">center</xsl:attribute>
+ </xsl:attribute-set>
+@@ -334,8 +334,8 @@ set       toc,title
+   <xsl:attribute name="font-weight">bold</xsl:attribute>
+   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute>
++  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8),'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2),'pt')"/></xsl:attribute>
+   <xsl:attribute name="start-indent">0pt</xsl:attribute>
+ </xsl:attribute-set>
+ <xsl:attribute-set name="index.entry.properties">
diff --git a/docbook-xsl/patches/docbook-xsl-pagesetup.patch b/docbook-xsl/patches/docbook-xsl-pagesetup.patch
new file mode 100644 (file)
index 0000000..e4d77ff
--- /dev/null
@@ -0,0 +1,227 @@
+diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
+--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl   2008-06-01 23:36:39.000000000 +0200
++++ docbook-xsl-1.74.0/fo/pagesetup.xsl        2008-08-06 13:31:11.000000000 +0200
+@@ -1697,36 +1697,81 @@
+         <xsl:with-param name="gentext-key" select="$gentext-key"/>
+       </xsl:call-template>
+-      <fo:table-column column-number="1">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">header</xsl:with-param>
+-            <xsl:with-param name="position" select="$column1"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
+-      <fo:table-column column-number="2">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">header</xsl:with-param>
+-            <xsl:with-param name="position" select="2"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
+-      <fo:table-column column-number="3">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">header</xsl:with-param>
+-            <xsl:with-param name="position" select="$column3"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="1">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="$column1"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="1">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="$column1"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++                      </xsl:choose>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="2">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="2"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="2">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="2"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++      </xsl:choose>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="3">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="$column3"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="3">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">header</xsl:with-param>
++                <xsl:with-param name="position" select="$column3"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++      </xsl:choose>
+       <fo:table-body>
+         <fo:table-row>
+@@ -2021,36 +2066,81 @@
+         <xsl:with-param name="sequence" select="$sequence"/>
+         <xsl:with-param name="gentext-key" select="$gentext-key"/>
+       </xsl:call-template>
+-      <fo:table-column column-number="1">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">footer</xsl:with-param>
+-            <xsl:with-param name="position" select="$column1"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
+-      <fo:table-column column-number="2">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">footer</xsl:with-param>
+-            <xsl:with-param name="position" select="2"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
+-      <fo:table-column column-number="3">
+-        <xsl:attribute name="column-width">
+-          <xsl:text>proportional-column-width(</xsl:text>
+-          <xsl:call-template name="header.footer.width">
+-            <xsl:with-param name="location">footer</xsl:with-param>
+-            <xsl:with-param name="position" select="$column3"/>
+-          </xsl:call-template>
+-          <xsl:text>)</xsl:text>
+-        </xsl:attribute>
+-      </fo:table-column>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="1">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="$column1"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="1">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="$column1"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++      </xsl:choose>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="2">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="2"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="2">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="2"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++      </xsl:choose>
++      <xsl:choose>
++        <xsl:when test="$passivetex.extensions != 0">
++          <fo:table-column column-number="3">
++            <xsl:attribute name="column-width">
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="$column3"/>
++              </xsl:call-template>
++              <xsl:text>%</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:when>
++        <xsl:otherwise>
++          <fo:table-column column-number="3">
++            <xsl:attribute name="column-width">
++              <xsl:text>proportional-column-width(</xsl:text>
++              <xsl:call-template name="header.footer.width">
++                <xsl:with-param name="location">footer</xsl:with-param>
++                <xsl:with-param name="position" select="$column3"/>
++              </xsl:call-template>
++              <xsl:text>)</xsl:text>
++            </xsl:attribute>
++          </fo:table-column>
++        </xsl:otherwise>
++      </xsl:choose>
+       <fo:table-body>
+         <fo:table-row>
index 2638db4cc49c5bb0fb5f73d1a6e2b1b2e5912760..bedfd4e17cda72c311f7beebd93eb665a29568ce 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = dracut
 version    = 010
-release    = 3
+release    = 5
 arch       = noarch
 
 groups     = System/Boot
@@ -21,12 +21,9 @@ source_dl  =
 sources    = %{thisapp}.tar.bz2
 
 build
-       prepare_cmds
-               # Remove all man pages.
-               # XXX requires docbook
-               cd %{DIR_APP} && sed -i Makefile \
-                       -e "s/^all:.*/all: \$%{targets}/" \
-                       -e "/.*man.*/d"
+       requires
+               docbook-utils
+               docbook-xsl
        end
 
        install
@@ -56,6 +53,7 @@ packages
                        libselinux
                        lvm2
                        mdadm
+                       multipath-tools
                        sysvinit
                        udev
                        util-linux
@@ -73,7 +71,7 @@ packages
                requires
                        bridge-utils
                        dhclient
-                       iproute
+                       iproute2
                        nfs-utils
                end
        
index d34169be315f7357bfcebce0058ecc0264808d4c..fc990ef6cd171ef7cd2fbbd48a72b903b7b8cef5 100644 (file)
@@ -5,9 +5,9 @@
 
 name       = file
 version    = 5.09
-release    = 1
+release    = 2
 
-groups     = Base Build System/Tools
+groups     = System/Tools
 url        = http://www.darwinsys.com/file/
 license    = BSD
 summary    = A utility for determining file types.
@@ -36,6 +36,8 @@ end
 
 packages
        package %{name}
+               groups += Base Build
+       end
 
        package %{name}-devel
                template DEVEL
index 75ae2823e5838cfc8dd60a68c7fa476cec62ff8c..f8aaa8c9a8f96c47580ac49cf5e626ad088f7edb 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = freetype
-version    = 2.3.9
+version    = 2.4.7
 release    = 1
 
 groups     = System/Graphics
@@ -13,27 +13,21 @@ license    = FTL GPLv2+
 summary    = A free and portable font rendering engine.
 
 description
-       The FreeType engine is a free and portable font rendering \
-       engine, developed to provide advanced font support for a variety of \
-       platforms and environments. FreeType is a library which can open and \
-       manages font files as well as efficiently load, hint and render \
-       individual glyphs. FreeType is not a font server or a complete \
+       The FreeType engine is a free and portable font rendering
+       engine, developed to provide advanced font support for a variety of
+       platforms and environments. FreeType is a library which can open and
+       manages font files as well as efficiently load, hint and render
+       individual glyphs. FreeType is not a font server or a complete
        text-rendering library.
 end
 
-source_dl  =
-sources    = %{thisapp}.tar.bz2
+source_dl  = http://download.savannah.gnu.org/releases/freetype/
 
 build
        requires
+               pkg-config
                zlib-devel
        end
-
-       prepare_cmds
-               sed -i -r -e 's:.*(#.*BYTE.*) .*:\1:' \
-                       -e 's:.*(#.*SUBPIX.*) .*:\1:' \
-                       include/freetype/config/ftoption.h
-       end
 end
 
 packages
index 792c03b1eff95b0bd503904c8443b84a02f40fa9..80304097fda594a9dfdced2c1b6ddd29579778c4 100644 (file)
@@ -5,8 +5,8 @@
 
 name       = glib2
 ver_major  = 2.30
-version    = %{ver_major}.0
-release    = 2
+version    = %{ver_major}.1
+release    = 1
 thisapp    = glib-%{version}
 
 groups     = System/Libraries
@@ -22,7 +22,7 @@ description
        object system.
 end
 
-source_dl  = http://ftp.gnome.org/pub/gnome/sources/glib/%{version_major}/
+source_dl  = http://ftp.gnome.org/pub/gnome/sources/glib/%{ver_major}/
 sources    = %{thisapp}.tar.xz
 
 build
index 793e1f5f43a0d4b6c3de817e1ba8a244b6a121b2..dad6c99a57ce9e5fb132af28eb87f5ad6b953ab5 100644 (file)
@@ -3,12 +3,11 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-# XXX man pages are missing
 # XXX initscripts for daemons are missing
 
 name       = icecream
-version    = 0.9.6
-release    = 3
+version    = 0.9.7
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -16,19 +15,20 @@ url        = http://en.opensuse.org/Icecream
 license    = GPLv2+
 summary    = Distributed compiler.
 
-
 description
-       Icecream is a distributed compile system. It allows parallel compiling by \
-       distributing the compile jobs to several nodes of a compile network running the \
-       icecc daemon. The icecc scheduler routes the jobs and provides status and \
-       statistics information to the icecc monitor. Each compile node can accept one \
-       or more compile jobs depending on the number of processors and the settings of \
-       the daemon. Link jobs and other jobs which cannot be distributed are executed \
+       Icecream is a distributed compile system. It allows parallel compiling by
+       distributing the compile jobs to several nodes of a compile network running the
+       icecc daemon. The icecc scheduler routes the jobs and provides status and
+       statistics information to the icecc monitor. Each compile node can accept one
+       or more compile jobs depending on the number of processors and the settings of
+       the daemon. Link jobs and other jobs which cannot be distributed are executed
        locally on the node where the compilation is started.
 end
 
-source_dl  =
-sources    = icecc-%{version}.tar.bz2
+source_dl  = ftp://ftp.suse.com/pub/projects/icecream/
+sources    = \
+       icecc-%{version}.tar.bz2 \
+       icecream-manpages.tar.bz2
 
 build
        requires
@@ -41,6 +41,13 @@ build
                --disable-static \
                --enable-shared
 
+       prepare
+               cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/icecc-%{version}.tar.bz2
+               cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/icecream-manpages.tar.bz2
+
+               %{MACRO_PATCHES}
+       end
+
        install_cmds
                ICECREAM_TARGET_PLATFORM=$(echo %{DISTRO_MACHINE} | sed -e "s/-gnu//g")
 
@@ -57,12 +64,28 @@ build
 
                # create default working dir
                mkdir -pv %{BUILDROOT}/var/cache/icecream
+
+               # install manpages
+               mkdir -pv %{BUILDROOT}/usr/share/man/man{1,7,8}
+               mv mans/scheduler.1 mans/icecc-scheduler.1
+               for i in mans/*.1 mans/*.7; do
+                       install -m 644 $i %{BUILDROOT}/usr/share/man/man${i##*.}
+               done
+
+               # Remove unwanted symlinks.
+               rm -rvf %{BUILDROOT}/usr/bin/c++
+               rm -rvf %{BUILDROOT}/usr/bin/cc
+               rm -rvf %{BUILDROOT}/usr/bin/g++
+               rm -rvf %{BUILDROOT}/usr/bin/gcc
        end
 end
 
 packages
        package %{name}
-               requires = gcc-c++ /usr/bin/ldd
+               requires
+                       gcc-c++
+                       /usr/bin/ldd
+               end
        end
        
        package %{name}-devel
index 44ed337c9494fcc8121149c7213dbbd946d450a0..dce2238b4ec76914fc8cb021cbafdff4471e76b2 100644 (file)
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 7
+release    = 8
 
 groups     = Base System/Boot
 url        =
@@ -76,5 +76,18 @@ packages
                        udev
                        util-linux
                end
+
+               prerequires = coreutils shadow-utils
+
+               script prein
+                       groupadd -g 22 -r -f utmp
+               end
+
+               script postin
+                       touch /var/log/{b,w}tmp /var/run/utmp
+                       chown root:utmp /var/log/{b,w}tmp /var/run/utmp
+                       chmod 664 /var/log/wtmp /var/run/utmp
+                       chmod 600 /var/log/btmp
+               end
        end
 end
diff --git a/iperf/iperf.nm b/iperf/iperf.nm
new file mode 100644 (file)
index 0000000..3a79375
--- /dev/null
@@ -0,0 +1,33 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = iperf
+version    = 2.0.5
+release    = 1
+
+maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
+groups     = Applications/Internet
+url        = http://www..sourceforge.net/projects/iperf/files/
+license    = GPLv3+ and LGPLv3+
+summary    = Measurement tool for TCP/UDP bandwidth performance
+
+description
+       Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
+       various parameters and UDP characteristics. Iperf reports bandwidth, delay
+       jitter, datagram loss.
+end
+
+source_dl = http://sourceforge.net/projects/iperf/files
+
+build
+       requires
+               gcc-c++
+       end
+end
+
+packages
+       package %{name}
+       end
+end
index 27b5fdef8b83d147693923e67cf42ccb5d313826..4616ba28ed0b7a28a69574c7291815fc990a3c40 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = iputils
 version    = s20071127
-release    = 1
+release    = 2
 
 groups     = Base Networking/Tools
 url        = http://www.skbuff.net/iputils
@@ -13,13 +13,13 @@ license    = BSD
 summary    = Network monitoring tools including ping.
 
 description
-       The iputils package contains basic utilities for monitoring a network, \
-       including ping. The ping command sends a series of ICMP protocol \
-       ECHO_REQUEST packets to a specified network host to discover whether \
+       The iputils package contains basic utilities for monitoring a network,
+       including ping. The ping command sends a series of ICMP protocol
+       ECHO_REQUEST packets to a specified network host to discover whether
        the target machine is alive and receiving network traffic.
 end
 
-source_dl  =
+source_dl  = http://www.skbuff.net/iputils/
 sources    = %{thisapp}.tar.bz2
 
 patches    = %{thisapp}-addrcache.patch
@@ -37,12 +37,19 @@ patches   += %{thisapp}-output.patch
 
 build
        requires
+               docbook-utils
                libcap-devel
                libidn-devel
        end
 
+       # Generate manpages with docbook.
+       build_cmds
+               make -C doc man
+       end
+
        install
                mkdir -pv %{BUILDROOT}/{bin,sbin} %{BUILDROOT}/usr/sbin
+               mkdir -pv %{BUILDROOT}/usr/share/man/man8
 
                install -cp clockdiff   %{BUILDROOT}/usr/sbin/
                install -cp arping      %{BUILDROOT}/sbin/
@@ -52,11 +59,20 @@ build
                install -cp tracepath   %{BUILDROOT}/bin/
                install -cp tracepath6  %{BUILDROOT}/bin/
 
+               install -cp doc/clockdiff.8 %{BUILDROOT}/usr/share/man/man8/
+               install -cp doc/arping.8 %{BUILDROOT}/usr/share/man/man8/
+               install -cp doc/ping.8 %{BUILDROOT}/usr/share/man/man8/
+               install -cp doc/rdisc.8 %{BUILDROOT}/usr/share/man/man8/
+               install -cp doc/tracepath.8 %{BUILDROOT}/usr/share/man/man8/
+
                ln -svf ../../sbin/arping       %{BUILDROOT}/usr/sbin/arping
                ln -svf ../../bin/ping6         %{BUILDROOT}/usr/sbin/
                ln -svf ../../bin/tracepath     %{BUILDROOT}/usr/sbin/
                ln -svf ../../bin/tracepath6    %{BUILDROOT}/usr/sbin/
 
+               ln -s ping.8 %{BUILDROOT}/usr/share/man/man8/ping6.8
+               ln -s tracepath.8 %{BUILDROOT}/usr/share/man/man8/tracepath6.8
+
                setcap cap_net_admin=ep %{BUILDROOT}/bin/ping
                setcap cap_net_admin=ep %{BUILDROOT}/bin/ping6
        end
diff --git a/keepalived/keepalived.nm b/keepalived/keepalived.nm
new file mode 100644 (file)
index 0000000..b05f158
--- /dev/null
@@ -0,0 +1,75 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = keepalived
+version    = 1.2.2
+release    = 2
+
+groups     = Applications/System
+url        = http://www.keepalived.org/
+license    = GPLv2+
+summary    = High Availability monitor built upon LVS, VRRP and service pollers.
+
+description
+       The main goal of the keepalived project is to add a strong & robust keepalive
+       facility to the Linux Virtual Server project. This project is written in C with
+       multilayer TCP/IP stack checks. Keepalived implements a framework based on
+       three family checks : Layer3, Layer4 & Layer5/7. This framework gives the
+       daemon the ability to check the state of an LVS server pool. When one of the
+       servers of the LVS server pool is down, keepalived informs the linux kernel via
+       a setsockopt call to remove this server entry from the LVS topology. In
+       addition keepalived implements an independent VRRPv2 stack to handle director
+       failover. So in short keepalived is a userspace daemon for LVS cluster nodes
+       healthchecks and LVS directors failover.
+end
+
+source_dl  = http://www.keepalived.org/software/
+
+build
+       requires
+               libnl-devel
+               openssl-devel
+               popt-devel
+       end
+
+       configure_options += \
+               --sysconfdir=/etc
+
+#              --with-kernel-dir=$(ls -1d --sort t /lib/modules/*/build | head 1)
+
+       make_targets += STRIP=/bin/true
+
+       test
+               # A build could silently have LVS support disabled if the kernel includes can't
+               # be properly found, we need to avoid that.
+               if ! grep -q "IPVS_SUPPORT='_WITH_LVS_'" config.log; then
+                       echo "ERROR: We do not want keeepalived lacking LVS support."
+                       exit 1
+               fi
+       end
+
+       install_cmds
+               rm -rvf %{BUILDROOT}/etc/rc.d \
+                       %{BUILDROOT}/etc/keepalived/samples
+       end
+end
+
+packages
+       package %{name}
+               postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               postun
+                       /bin/systemctl --no-reload disabled keepalived.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop keepalived.service >/dev/null 2>&1 || :
+               end
+
+               postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart keepalived.service >/dev/null 2>&1 || :
+               end
+       end
+end
diff --git a/keepalived/patches/keepalived-1.1.14-installmodules.patch b/keepalived/patches/keepalived-1.1.14-installmodules.patch
new file mode 100644 (file)
index 0000000..a5fc93c
--- /dev/null
@@ -0,0 +1,20 @@
+diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in
+--- keepalived-1.1.14.orig/keepalived/Makefile.in      2007-09-13 15:44:39.000000000 +0200
++++ keepalived-1.1.14/keepalived/Makefile.in   2007-09-14 12:38:43.000000000 +0200
+@@ -99,13 +99,13 @@ uninstall:
+ install:
+       install -d $(DESTDIR)$(sbindir)
+-      install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
++      install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
+       install -d $(DESTDIR)$(init_dir)
+       install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
+       install -d $(DESTDIR)$(sysconf_dir)
+-      install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
++      install -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+       install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
+-      install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
++      install -m 640 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
+       install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
+       install -d $(DESTDIR)$(mandir)/man5
+       install -d $(DESTDIR)$(mandir)/man8
diff --git a/keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch b/keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch
new file mode 100644 (file)
index 0000000..912914b
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
+--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c      2009-09-28 13:03:40.000000000 +0200
++++ keepalived-1.1.19/keepalived/check/ipvswrapper.c   2009-11-24 22:41:56.220195007 +0100
+@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
+ static int
+ modprobe_ipvs(void)
+ {
+-      char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
++      char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
+       int child;
+       int status;
+       int rc;
diff --git a/keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch b/keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch
new file mode 100644 (file)
index 0000000..468fc0e
--- /dev/null
@@ -0,0 +1,12 @@
+diff -up keepalived-1.2.2/configure.pathfix keepalived-1.2.2/configure
+--- keepalived-1.2.2/configure.pathfix 2011-09-19 12:31:19.615258629 -0400
++++ keepalived-1.2.2/configure 2011-09-19 12:31:38.872000057 -0400
+@@ -3973,7 +3973,7 @@ $as_echo "$as_me: WARNING: Cannot determ
+ IPVS_SUPPORT="_WITHOUT_LVS_"
+ if test "$enable_lvs" != "no"; then
+-  ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
+ if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then :
+   IPVS_SUPPORT="_WITH_LVS_"
+ else
diff --git a/keepalived/systemd/keepalived.service b/keepalived/systemd/keepalived.service
new file mode 100644 (file)
index 0000000..438ed78
--- /dev/null
@@ -0,0 +1,10 @@
+[Unit]
+Description=LVS and VRRP High Availability Monitor
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/keepalived
+
+[Install]
+WantedBy=multi-user.target
similarity index 100%
rename from kernel/config
rename to kernel/config.i686
diff --git a/kernel/config.i686-PAE b/kernel/config.i686-PAE
new file mode 100644 (file)
index 0000000..5844c9c
--- /dev/null
@@ -0,0 +1,4492 @@
+#
+# Automatically generated make config: don't edit
+# Linux/i386 3.0.4 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+# CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=m
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+CONFIG_PERF_COUNTERS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+CONFIG_X86_BIGSMP=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_MRST is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_X86_32_IRIS is not set
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
+CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_XADD=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_IOMMU_API=y
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=3
+CONFIG_HAVE_ARCH_BOOTMEM=y
+CONFIG_HAVE_ARCH_ALLOC_REMAP=y
+CONFIG_ARCH_HAVE_MEMORY_PRESENT=y
+CONFIG_NEED_NODE_MEMMAP_SIZE=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CLEANCACHE=y
+# CONFIG_HIGHPTE is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_MTRR_SANITIZER is not set
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_RUNTIME is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_PROC_EVENT=y
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_NUMA is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=2001
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+# CONFIG_SFI is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_INTEL_IDLE=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_DMAR=y
+CONFIG_DMAR_DEFAULT_ON=y
+CONFIG_DMAR_FLOPPY_WA=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_MISC=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+# CONFIG_ATM_LANE is not set
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=y
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+# CONFIG_NET_SCH_INGRESS is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+# CONFIG_BATMAN_ADV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+# CONFIG_MTD is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_FD=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_HD=y
+# CONFIG_BLK_DEV_RBD is not set
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+CONFIG_ICS932S401=m
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=m
+CONFIG_PCH_PHUB=m
+CONFIG_C2PORT=m
+# CONFIG_C2PORT_DURAMAR_2150 is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_LEGACY is not set
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=4000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+CONFIG_SCSI_EATA_TAGGED_QUEUE=y
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_NSP32=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+# CONFIG_SCSI_SRP is not set
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=1
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_MULTIPATH=m
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+# CONFIG_TARGET_CORE is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+# CONFIG_FUSION_FC is not set
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_ARCNET is not set
+CONFIG_MII=m
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+# CONFIG_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_NET_ETHERNET=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ETHOC=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_FORCEDETH=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
+CONFIG_SUNDANCE_MMIO=y
+CONFIG_TLAN=m
+CONFIG_KS8842=m
+CONFIG_KS8851_MLL=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_SC92031=m
+# CONFIG_NET_POCKET is not set
+CONFIG_ATL2=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_JME=m
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+CONFIG_STMMAC_DUAL_MAC=y
+CONFIG_PCH_GBE=m
+CONFIG_NETDEV_10000=y
+CONFIG_MDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_BNA=m
+CONFIG_SFC=m
+CONFIG_BE2NET=m
+# CONFIG_TR is not set
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLAGN=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_SVTOOL=y
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+# CONFIG_RT2800PCI_RT35XX is not set
+# CONFIG_RT2800PCI_RT53XX is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+# CONFIG_RT2800USB_RT35XX is not set
+# CONFIG_RT2800USB_RT53XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL1251=m
+CONFIG_WL12XX_MENU=m
+CONFIG_WL12XX=m
+# CONFIG_WL12XX_HT is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+CONFIG_USB_VL600=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+# CONFIG_WAN is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOATM=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_NET_FC is not set
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_VIRTIO_NET=m
+CONFIG_VMXNET3=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+# CONFIG_ISDN_AUDIO is not set
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+# CONFIG_ISDN_CAPI is not set
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_I4L=y
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_NOZOMI=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MFD_HSU is not set
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_TIMBERDALE=m
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+CONFIG_IPWIRELESS=m
+# CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+# CONFIG_NSC_GPIO is not set
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+# CONFIG_HANGCHECK_TIMER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+# CONFIG_RAMOOPS is not set
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_INTEL_MID=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+CONFIG_SCx200_ACB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers:
+#
+CONFIG_GPIO_BASIC_MMIO_CORE=m
+CONFIG_GPIO_BASIC_MMIO=m
+CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_VX855=m
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_ADP5588=m
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_LANGWELL=y
+CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_RDC321X=m
+
+#
+# SPI GPIO expanders:
+#
+
+#
+# AC97 GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_BQ20Z75=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DEBUG is not set
+CONFIG_MFD_SUPPORT=y
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_WM8400=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_ABX500_CORE=y
+# CONFIG_AB8500_CORE is not set
+# CONFIG_MFD_CS5535 is not set
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_LPC_SCH=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=m
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+# CONFIG_VIDEO_PVRUSB2 is not set
+CONFIG_VIDEO_HDPVR=m
+# CONFIG_VIDEO_EM28XX is not set
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+# CONFIG_VIDEO_USBVISION is not set
+# CONFIG_USB_ET61X251 is not set
+# CONFIG_USB_SN9C102 is not set
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+CONFIG_USB_S2255=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_RADIO_MAXIRADIO is not set
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_SI470X is not set
+# CONFIG_USB_MR800 is not set
+# CONFIG_RADIO_TEA5764 is not set
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported SDMC DM1105 Adapters
+#
+CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+
+#
+# Supported Earthsoft PT1 Adapters
+#
+CONFIG_DVB_PT1=m
+
+#
+# Supported Mantis Adapters
+#
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
+#
+# Supported nGene Adapters
+#
+CONFIG_DVB_NGENE=m
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+# CONFIG_DRM is not set
+CONFIG_STUB_POULSBO=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_FOREIGN_ENDIAN=y
+CONFIG_FB_BOTH_ENDIAN=y
+# CONFIG_FB_BIG_ENDIAN is not set
+# CONFIG_FB_LITTLE_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_3DFX_ACCEL=y
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_BROADSHEET=m
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_PROGEAR is not set
+# CONFIG_BACKLIGHT_CARILLO_RANCH is not set
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_RAWMIDI_SEQ=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_BT87X_OVERCLOCK=y
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+# CONFIG_SND_HDA_PATCH_LOADER is not set
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+# CONFIG_SND_FIREWIRE is not set
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_CACHE_LZO=y
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_AD193X=m
+CONFIG_SND_SOC_AD73311=m
+CONFIG_SND_SOC_ADS117X=m
+CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4641=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK4671=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CX20442=m
+CONFIG_SND_SOC_L3=m
+CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DFBMCS320=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX9850=m
+CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TVL320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320DAC33=m
+CONFIG_SND_SOC_UDA134X=m
+CONFIG_SND_SOC_UDA1380=m
+CONFIG_SND_SOC_WL1273=m
+CONFIG_SND_SOC_WM1250_EV1=m
+CONFIG_SND_SOC_WM8400=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8727=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8900=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8915=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WM8955=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8961=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8971=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_WM8988=m
+CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8991=m
+CONFIG_SND_SOC_WM8993=m
+CONFIG_SND_SOC_WM8995=m
+CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_LM4857=m
+CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_WM2000=m
+CONFIG_SND_SOC_WM9090=m
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_HID_PID is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+# CONFIG_HID_ACRUX_FF is not set
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+# CONFIG_HID_PRODIKEYS is not set
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_HID_EMS_FF is not set
+CONFIG_HID_EZKEY=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LOGITECH=m
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIWII_FF is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_QUANTA=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
+CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+# CONFIG_GREENASIA_FF is not set
+CONFIG_HID_SMARTJOYPLUS=m
+# CONFIG_SMARTJOYPLUS_FF is not set
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+# CONFIG_THRUSTMASTER_FF is not set
+CONFIG_HID_ZEROPLUS=m
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_MON is not set
+CONFIG_USB_WUSB=m
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_SEVSEG=m
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+CONFIG_USB_YUREX=m
+# CONFIG_USB_ATM is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_ALIX2=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+# CONFIG_LEDS_CLEVO_MAIL is not set
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=m
+# CONFIG_UIO_CIF is not set
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_STAGING is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACER_WMI is not set
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+# CONFIG_DELL_LAPTOP is not set
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_TC1100_WMI=m
+CONFIG_HP_ACCEL=m
+# CONFIG_HP_WMI is not set
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_CLKSRC_I8253=y
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+# CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_SIGMA=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=m
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+# CONFIG_QFMT_V1 is not set
+# CONFIG_QFMT_V2 is not set
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+CONFIG_CACHEFILES_HISTOGRAM=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_EXOFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+# CONFIG_NFSD_DEPRECATED is not set
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_STATS2=y
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=y
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+# CONFIG_FRAME_POINTER is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+
+#
+# Security options
+#
+
+#
+# Grsecurity
+#
+CONFIG_GRKERNSEC=y
+# CONFIG_GRKERNSEC_LOW is not set
+# CONFIG_GRKERNSEC_MEDIUM is not set
+CONFIG_GRKERNSEC_HIGH=y
+# CONFIG_GRKERNSEC_CUSTOM is not set
+
+#
+# Address Space Protection
+#
+CONFIG_GRKERNSEC_KMEM=y
+CONFIG_GRKERNSEC_VM86=y
+# CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_PROC_MEMMAP=y
+CONFIG_GRKERNSEC_BRUTE=y
+CONFIG_GRKERNSEC_MODHARDEN=y
+CONFIG_GRKERNSEC_HIDESYM=y
+CONFIG_GRKERNSEC_KERN_LOCKOUT=y
+
+#
+# Role Based Access Control Options
+#
+CONFIG_GRKERNSEC_NO_RBAC=y
+# CONFIG_GRKERNSEC_ACL_HIDEKERN is not set
+CONFIG_GRKERNSEC_ACL_MAXTRIES=3
+CONFIG_GRKERNSEC_ACL_TIMEOUT=30
+
+#
+# Filesystem Protections
+#
+CONFIG_GRKERNSEC_PROC=y
+# CONFIG_GRKERNSEC_PROC_USER is not set
+CONFIG_GRKERNSEC_PROC_USERGROUP=y
+CONFIG_GRKERNSEC_PROC_GID=10
+CONFIG_GRKERNSEC_PROC_ADD=y
+CONFIG_GRKERNSEC_LINK=y
+CONFIG_GRKERNSEC_FIFO=y
+CONFIG_GRKERNSEC_SYSFS_RESTRICT=y
+# CONFIG_GRKERNSEC_ROFS is not set
+CONFIG_GRKERNSEC_CHROOT=y
+CONFIG_GRKERNSEC_CHROOT_MOUNT=y
+CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
+CONFIG_GRKERNSEC_CHROOT_PIVOT=y
+CONFIG_GRKERNSEC_CHROOT_CHDIR=y
+CONFIG_GRKERNSEC_CHROOT_CHMOD=y
+CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
+CONFIG_GRKERNSEC_CHROOT_MKNOD=y
+CONFIG_GRKERNSEC_CHROOT_SHMAT=y
+CONFIG_GRKERNSEC_CHROOT_UNIX=y
+CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
+CONFIG_GRKERNSEC_CHROOT_NICE=y
+CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_CAPS=y
+
+#
+# Kernel Auditing
+#
+# CONFIG_GRKERNSEC_AUDIT_GROUP is not set
+# CONFIG_GRKERNSEC_EXECLOG is not set
+CONFIG_GRKERNSEC_RESLOG=y
+# CONFIG_GRKERNSEC_CHROOT_EXECLOG is not set
+# CONFIG_GRKERNSEC_AUDIT_PTRACE is not set
+# CONFIG_GRKERNSEC_AUDIT_CHDIR is not set
+CONFIG_GRKERNSEC_AUDIT_MOUNT=y
+CONFIG_GRKERNSEC_SIGNAL=y
+CONFIG_GRKERNSEC_FORKFAIL=y
+CONFIG_GRKERNSEC_TIME=y
+CONFIG_GRKERNSEC_PROC_IPADDR=y
+CONFIG_GRKERNSEC_RWXMAP_LOG=y
+# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set
+
+#
+# Executable Protections
+#
+CONFIG_GRKERNSEC_DMESG=y
+CONFIG_GRKERNSEC_HARDEN_PTRACE=y
+# CONFIG_GRKERNSEC_TPE is not set
+
+#
+# Network Protections
+#
+CONFIG_GRKERNSEC_RANDNET=y
+CONFIG_GRKERNSEC_BLACKHOLE=y
+# CONFIG_GRKERNSEC_SOCKET is not set
+
+#
+# Sysctl support
+#
+CONFIG_GRKERNSEC_SYSCTL=y
+CONFIG_GRKERNSEC_SYSCTL_ON=y
+
+#
+# Logging Options
+#
+CONFIG_GRKERNSEC_FLOODTIME=10
+CONFIG_GRKERNSEC_FLOODBURST=4
+
+#
+# PaX
+#
+CONFIG_ARCH_TRACK_EXEC_LIMIT=y
+CONFIG_PAX_PER_CPU_PGD=y
+CONFIG_PAX=y
+
+#
+# PaX Control
+#
+# CONFIG_PAX_SOFTMODE is not set
+CONFIG_PAX_EI_PAX=y
+CONFIG_PAX_PT_PAX_FLAGS=y
+# CONFIG_PAX_NO_ACL_FLAGS is not set
+CONFIG_PAX_HAVE_ACL_FLAGS=y
+# CONFIG_PAX_HOOK_ACL_FLAGS is not set
+
+#
+# Non-executable pages
+#
+CONFIG_PAX_NOEXEC=y
+CONFIG_PAX_PAGEEXEC=y
+CONFIG_PAX_SEGMEXEC=y
+CONFIG_PAX_EMUTRAMP=y
+CONFIG_PAX_MPROTECT=y
+# CONFIG_PAX_MPROTECT_COMPAT is not set
+CONFIG_PAX_ELFRELOCS=y
+CONFIG_PAX_KERNEXEC=y
+CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
+
+#
+# Address Space Layout Randomization
+#
+CONFIG_PAX_ASLR=y
+CONFIG_PAX_RANDKSTACK=y
+CONFIG_PAX_RANDUSTACK=y
+CONFIG_PAX_RANDMMAP=y
+
+#
+# Miscellaneous hardening features
+#
+CONFIG_PAX_MEMORY_SANITIZE=y
+CONFIG_PAX_MEMORY_STACKLEAK=y
+CONFIG_PAX_MEMORY_UDEREF=y
+CONFIG_PAX_REFCOUNT=y
+CONFIG_PAX_USERCOPY=y
+# CONFIG_KEYS is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
+CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_VHOST_NET=m
+CONFIG_LGUEST=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_RING=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
index 01b2f6989354ca8d74c4cbe84eb6d554a427491f..cc1158584f0c17c3c3dd65c446801aa7b48efac5 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.0.4
-release    = 2
+release    = 6
 thisapp    = linux-%{version}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -22,20 +22,43 @@ description
 end
 
 # Version helper variables.
-localversion = -%{DISTRO_SNAME}%{release}
-fullver      = %{version}%{localversion}
+localversion = %{release}.%{DISTRO_DISTTAG}.%{DISTRO_ARCH}
+fullver      = %{version}-%{localversion}
 
 sources      = %{thisapp}.tar.gz
 
 build
+       # icecream cannot be used to compile the kernel.
+       # Because the PaX patch does use GCC plugins to harden the kernel which
+       # are not available on the remote compilers, we need to disable it here.
+       export ICECC=no
+
        requires
+               binutils-devel
+               elfutils-devel
                module-init-tools
                ncurses-devel
+               net-tools
+               newt-devel
                perl
+               python-devel
+               slang-devel
+               xz-lzma-compat
+       end
+
+       # A list of kernels to build.
+       kernels = default
+
+       if "%{DISTRO_ARCH}" == "i686"
+               # Build a PAE-enabled kernel for the i686 architecture.
+               kernels += PAE
+
+               kernel_arch  = x86
+               kernel_image = arch/%{kernel_arch}/boot/bzImage
+               kernel_target = bzImage
        end
 
        prepare_cmds
-               echo "%{localversion}" > localversion-%{DISTRO_SNAME}
                rm -f %{DIR_APP}/localversion-grsec
 
                sed -e "s/^HOSTCFLAGS.*=.*/& -fPIC/g" -i Makefile
@@ -43,32 +66,141 @@ build
                cp -vf %{DIR_SOURCE}/%{DISTRO_SNAME}_logo.ppm \
                        drivers/video/logo/logo_linux_clut224.ppm
 
-               make mrproper
+               # Get rid of unwanted files resulting from patch fuzz.
+               find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+
+               # Remove unnecessary SCM files.
+               find . -name .gitignore -exec rm -f {} \; >/dev/null
+
+               # This prevents scripts/setlocalversion from mucking with our version numbers.
+               touch .scmversion
+
+               mkdir -pv configs
+               configure_kernel() {
+                       local flavour=${1}
+                       local suffix
+                       if [ "${flavour}" != "default" ]; then
+                               suffix="-${flavour}"
+                       fi
+
+                       # This is the place, where the configuration files
+                       # should be dynamically generated.
+                       # For now, we just copy pregenerated ones.
+                       cp %{DIR_SOURCE}/config.%{arch}${suffix} .config
 
-               # Install configuration file
-               cp -f %{DIR_SOURCE}/config %{DIR_APP}/.config
+                       make ARCH=%{kernel_arch} oldnoconfig
+                       mv .config configs/config.${flavour}
+               }
+
+               # Generate configuration files for all kernels we are going to
+               # build.
+               for kernel in %{kernels}; do
+                       configure_kernel ${kernel}
+               done
        end
 
        build
-               yes "" | make oldconfig
+               build_kernel() {
+                       local flavour=${1}
+                       local suffix
+                       local localversion="%{localversion}"
+                       local fullversion="%{fullver}"
+                       if [ "${flavour}" != "default" ]; then
+                               suffix="-${flavour}"
+                               localversion="${localversion}.${flavour}"
+                               fullversion="${fullversion}.${flavour}"
+                       fi
 
-               # Check headers
-               make ARCH=x86 headers_check
+                       # Label the build.
+                       sed -i Makefile \
+                               -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${localversion}/"
 
-               make CC="gcc -nopie" %{PARALLELISMFLAGS}
-       end
+                       # Clean up the source tree.
+                       make mrproper
 
-       install
-               make modules_install INSTALL_MOD_PATH=%{BUILDROOT}
+                       # Install configuration file.
+                       cp configs/config.${flavour} .config
+
+                       # Run the build.
+                       make ARCH=%{kernel_arch} oldnoconfig >/dev/null
+                       make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules %{PARALLELISMFLAGS}
+
+                       # Install the results.
+                       mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/lib/modules/${fullversion}
+                       install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion}
+                       install -m 644 .config %{BUILDROOT}/boot/config-${fullversion}
+                       install -m 644 System.map %{BUILDROOT}/boot/System.map-${fullversion}
+
+                       # Create empty initramfs (20M).
+                       dd if=/dev/zero of=%{BUILDROOT}/boot/initramfs-${fullversion}.img bs=1M count=20
+
+                       # Install modules.
+                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \
+                               KERNELRELEASE=${fullversion} modules_install
+                       #make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
+                       #       KERNELRELEASE=${fullversion} vdso_install
+
+                       # Create an empty settings file for dracut
+                       mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d
+                       echo "# Placeholder file, no vDSO hwcap entries used in this kernel." \
+                               > %{BUILDROOT}/etc/ld.so.conf.d/kernel-${fullversion}.conf
 
-               mkdir -pv %{BUILDROOT}/boot
-               cp -v arch/x86/boot/bzImage %{BUILDROOT}/boot/vmlinuz-%{fullver}
-               cp -v System.map %{BUILDROOT}/boot/System.map-%{fullver}
+                       # And now the scary looking part.
+                       #
+                       # Recreate source and build links.
+                       rm -vf %{BUILDROOT}/lib/modules/${fullversion}/{build,source}
+                       mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/build
+                       ln -svf build %{BUILDROOT}/lib/modules/${fullversion}/source
 
-               mkdir -pv %{BUILDROOT}/lib/modules/%{fullver}/extra
+                       # Create dirs for extra modules.
+                       mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/extra
 
-               rm -vf %{BUILDROOT}/lib/modules/%{fullver}/{build,source}
+                       cp -v --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build
+                       cp -v Module.symvers System.map \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build
+                       rm -vrf %{BUILDROOT}/lib/modules/${fullversion}/build/{Documentation,scripts,include}
 
+                       cp -v .config %{BUILDROOT}/lib/modules/${fullversion}/build
+                       cp -va scripts %{BUILDROOT}/lib/modules/${fullversion}/build
+                       find %{BUILDROOT}/lib/modules/${fullversion}/build/scripts -name "*.o" \
+                               -exec rm -vf {} \;
+
+                       cp -va --parents arch/%{kernel_arch}/include \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build
+                       cp -va include %{BUILDROOT}/lib/modules/${fullversion}/build/include
+
+                       # Make sure we can build external modules.
+                       touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/Makefile \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build/include/linux/version.h
+                       touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build/autoconf.h
+                       cp -v %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build/include/config/auto.conf
+
+                       find %{BUILDROOT}/lib/modules/${fullversion} -name "*.ko" -type f | \
+                               xargs chmod u+x
+
+                       for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap; do
+                               rm -vf %{BUILDROOT}/lib/modules/${fullversion}/modules.${i}
+                       done
+
+                       # Move all development files to /usr/src.
+                       mkdir -pv %{BUILDROOT}/usr/src/kernels
+                       mv -v %{BUILDROOT}/lib/modules/${fullversion}/build \
+                               %{BUILDROOT}/usr/src/kernels/${fullversion}
+                       ln -svf ../../../usr/src/kernels/${fullversion} \
+                               %{BUILDROOT}/lib/modules/${fullversion}/build
+
+                       find %{BUILDROOT}/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
+               }
+
+               for kernel in %{kernels}; do
+                       build_kernel ${kernel}
+               done
+       end
+
+       install
                # Install the header files
                make ARCH=x86 INSTALL_HDR_PATH=dest headers_install
                mkdir -pv %{BUILDROOT}/usr/include
@@ -81,24 +213,89 @@ build
                        %{BUILDROOT}/usr/include/asm*/io.h \
                        %{BUILDROOT}/usr/include/asm*/irq.h
 
-               # Create an empty settings file for dracut
-               mkdir -vp %{BUILDROOT}/etc/ld.so.conf.d/
-               echo "# Placeholder file, no vDSO hwcap entries used in this kernel." \
-               > %{BUILDROOT}/etc/ld.so.conf.d/kernel-%{fullver}.conf
-
                # Remove all firmware files which are distributed by linux-firmware
                rm -rfv %{BUILDROOT}/lib/firmware
+
+               # Install tools.
+               # XXX Man pages cannot be created because they need asciidoc.
+               make -C tools/perf DESTDIR=%{BUILDROOT} \
+                       HAVE_CPLUS_DEMANGLE=1 prefix=/usr perfexecdir=lib/perf-core \
+                       install #install-man
        end
 end
 
 packages
-       package kernel
+       template KERNEL
+               kernel_release = %{fullver}
+
+               summary = The Linux kernel %{kernel_release}.
+
+               prerequires = module-init-tools
+               provides = kernel
                requires
                        dracut
                        linux-firmware
                end
+
+               files
+                       /boot/System.map-%{kernel_release}
+                       /boot/vmlinuz-%{kernel_release}
+                       /boot/initramfs-%{kernel_release}.img
+                       /etc/ld.so.conf.d/kernel-%{kernel_release}.conf
+                       /lib/modules/%{kernel_release}
+               end
+
+               script postin
+                       depmod -a %{kernel_release} || :
+               end
+
+               script posttransin
+                       dracut --force /boot/initramfs-%{kernel_release}.img %{kernel_release}
+               end
+       end
+
+       template KERNELDEVEL
+               kernel_release = %{fullver}
+
+               summary = Development files of kernel-%{kernel_release}.
+               description
+                       %{summary}
+
+                       Install this package in order to compile modules for
+                       kernel release %{kernel_release}.
+               end
+
+               filter_requires
+                       perl>=[0-9]\:.*
+               end
+
+               files
+                       /lib/modules/%{kernel_release}/build
+                       /lib/modules/%{kernel_release}/source
+                       /usr/src/kernels/%{kernel_release}
+               end
+       end
+
+       package kernel
+               template KERNEL
+       end
+
+       package kernel-devel
+               template KERNELDEVEL
+       end
+
+       package kernel-PAE
+               template KERNEL
+
+               kernel_release = %{fullver}.PAE
+       end
+
+       package kernel-PAE-devel
+               template KERNELDEVEL
+
+               kernel_release = %{fullver}.PAE
        end
-       
+
        package kernel-headers
                summary = Header files of the kernel release %{fullver}.
                desciption = %{summary}
@@ -107,5 +304,21 @@ packages
                        /usr/include
                end
        end
-       
+
+       package kernel-tools
+               summary = Assortment of tools for the Linux kernel.
+               description = %{summary}
+
+               filter_requires
+                       perl>=[0-9]\:.*
+               end
+
+               files
+                       /
+                       !/boot
+                       !/lib/modules
+                       !/usr/include
+                       !/usr/src
+               end
+       end
 end
index f11aae880f7effcc60987f8d20e286c77fcc5e29..22455af868b3529e3e3aaa33314d34cfad0e129a 100644 (file)
@@ -6,7 +6,7 @@
 name       = libsolv
 version    = 0.0.0
 git_ver    = 0db9d7f
-release    = 1
+release    = 2.git%{git_ver}
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
index 57192cb3eb75540938aa8e66a1d489d64ab4aaf8..a8c6c13655de27b07d2d0db11e72132d3690b9d0 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libtool
-version    = 2.4
-release    = 2
+version    = 2.4.2
+release    = 1
 
 groups     = Build System/Libraries
 url        = http://www.gnu.org/software/libtool/
index a3231db09c0ec7b00afb366c9d0f116bd746812e..b27d23848deb817b29ed48cdd2ce292386f5d72e 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = lua
 version    = 5.1.4
-release    = 2
+release    = 3
 
 groups     = Development/Languages
 url        = http://www.lua.org/
@@ -27,6 +27,7 @@ source_dl  =
 
 build
        requires
+               perl-Carp
                autoconf
                automake
                libtool
@@ -65,6 +66,6 @@ packages
        package %{name}-libs
                template LIBS
        
-               files += /usr/lib/*/liblua-5.1.so
+               files += /usr/lib*/liblua-5.1.so
        end
 end
index 063f472b26fa8d93498171502fb793a774c2bc28..81d989ac75f15349443a355a2fd24d183a10c51e 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = ncurses
 version    = 5.9
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = http://invisible-island.net/ncurses/ncurses.html
@@ -72,6 +72,8 @@ packages
                        the ncurses-base package.
                end
 
+               provides += /usr/share/terminfo
+
                files
                        /usr/share/terminfo
                end
@@ -84,6 +86,8 @@ packages
                        descriptions are included in the ncurses-term package.
                end
 
+               conflicts = ncurses<=5.9-1
+
                files
                        /usr/share/terminfo/*/Eterm*
                        /usr/share/terminfo/*/aterm
diff --git a/openjade/openjade.nm b/openjade/openjade.nm
new file mode 100644 (file)
index 0000000..fe2ca1a
--- /dev/null
@@ -0,0 +1,96 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = openjade
+version    = 1.3.2
+release    = 2
+
+groups     = Application/Text
+url        = http://openjade.sourceforge.net/
+license    = MIT
+summary    = A DSSSL implementation.
+
+description
+       OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL
+       (Document Style Semantics and Specification Language).
+end
+
+source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
+
+build
+       requires
+               gcc-c++
+               opensp-devel
+               perl
+       end
+
+       configure_options += \
+               --disable-static \
+               --disable-rpath \
+               --datadir=/usr/share/sgml/openjade-%{version} \
+               --enable-splibdir=/usr/lib
+
+       install_cmds
+               # Create symlink for jade
+               ln -s openjade %{BUILDROOT}/usr/bin/jade
+
+               # Install jade catalog
+               cp %{DIR_APP}/dsssl/catalog %{BUILDROOT}/usr/share/sgml/openjade-%{version}/
+               cp %{DIR_APP}/dsssl/{dsssl,style-sheet,fot}.dtd %{BUILDROOT}/usr/share/sgml/openjade-%{version}/
+
+               # Add unversioned/versioned catalog and symlink
+               mkdir -p %{BUILDROOT}/etc/sgml
+               touch %{BUILDROOT}/etc/sgml/openjade-%{version}.soc
+               ln -s openjade-%{version}.soc openjade.soc
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       jade
+               end
+
+               requires
+                       docbook-dtds>=1.0-3
+                       libxml2
+                       opensp>=1.5.2-2
+                       sgml-common
+               end
+
+               prerequires +=\
+                       docbook-dtds>=1.0-3 \
+                       libxml2 \
+                       sgml-common 
+
+               script postin
+                       # Install catalog files on system.
+                       /usr/bin/install-catalog --add /etc/sgml/openjade-%{version}.soc \
+                               /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null
+
+                       # Add openjade catalog to docbook catalogs.
+                       for catalog in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --sgml --noout --add ${catalog} \
+                                       /usr/share/sgml/openjade-%{version}/catalog /dev/null 2>/dev/null
+                       done
+               end
+
+               script preun
+                       # Uninstall the catalog files.
+                       /usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}.soc \
+                               /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null
+
+                       # Remove openjade catalog from docbook catalogs.
+                       for catalog in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --sgml --noout --remove ${catalog} \
+                                       /usr/share/sgml/openjade-%{version}/catalog > /dev/null 2>/dev/null
+                       done
+               end
+       end
+
+       package %{name}-devel
+               template DEVEL
+       end
+end
diff --git a/openjade/patches/openjade-1.3.1-manpage.patch b/openjade/patches/openjade-1.3.1-manpage.patch
new file mode 100644 (file)
index 0000000..935ad2d
--- /dev/null
@@ -0,0 +1,5 @@
+--- openjade-1.3.1/docsrc/sgmlnorm.1.manpage   2002-06-13 17:45:48.000000000 +0100
++++ openjade-1.3.1/docsrc/sgmlnorm.1   2002-06-13 17:45:58.000000000 +0100
+@@ -1 +1 @@
+-.so man1/sgmlnorm.1
++.so man1/osgmlnorm.1
diff --git a/openjade/patches/openjade-1.3.1-nsl.patch b/openjade/patches/openjade-1.3.1-nsl.patch
new file mode 100644 (file)
index 0000000..48d1302
--- /dev/null
@@ -0,0 +1,21 @@
+--- openjade-1.3.1/config/configure.in.lr      2003-09-12 08:03:22.000000000 -0600
++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600
+@@ -156,7 +156,6 @@
+     then
+         AC_MSG_RESULT(yes)
+       AC_DEFINE(SP_HAVE_SOCKET)
+-      AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl")
+       AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket")
+       AC_MSG_CHECKING(h_errno in netdb.h)
+       AC_EGREP_HEADER(h_errno,netdb.h,
+--- openjade-1.3.1/configure.lr        2003-09-12 08:35:55.000000000 -0600
++++ openjade-1.3.1/configure   2003-09-12 08:36:07.000000000 -0600
+@@ -5530,7 +5530,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl  $LIBS"
++LIBS="-lXXXnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
diff --git a/openjade/patches/openjade-1.3.2-gcc46.patch b/openjade/patches/openjade-1.3.2-gcc46.patch
new file mode 100644 (file)
index 0000000..962ac19
--- /dev/null
@@ -0,0 +1,82 @@
+If a class or struct has no user-defined default constructor, C++ doesn't
+allow you to default construct a const instance of it.
+
+https://bugs.gentoo.org/358021
+http://clang.llvm.org/compatibility.html#default_init_const
+http://gcc.gnu.org/PR44499
+
+
+--- a/jade/TeXFOTBuilder.cxx
++++ b/jade/TeXFOTBuilder.cxx
+@@ -88,6 +88,8 @@ public:
+       value.convertString(nic_.placement);
+       }
+     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
++  public:
++    PageFloatFlowObj() {}
+   private:
+     PageFloatNIC nic_;
+     StringC name_;
+@@ -101,6 +103,8 @@ public:
+       fotb.endPageFootnote();
+     }
+     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
++  public:
++    PageFootnoteFlowObj() {}
+   private:
+   };
+   //////////////////////////////////////////////////////////////////////
+--- a/jade/TransformFOTBuilder.cxx
++++ b/jade/TransformFOTBuilder.cxx
+@@ -41,6 +41,7 @@ public:
+   };
+   class EntityRefFlowObj : public TransformExtensionFlowObj {
+   public:
++    EntityRefFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.entityRef(name_);
+     }
+@@ -56,6 +57,7 @@ public:
+   };
+   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
+   public:
++    ProcessingInstructionFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.processingInstruction(data_);
+     }
+@@ -98,6 +100,8 @@ public:
+       }
+     }
+     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
++  public:
++    EmptyElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -133,6 +137,8 @@ public:
+       }
+     }
+     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
++  public:
++    ElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -150,6 +156,8 @@ public:
+       value.convertString(systemId_);
+     }
+     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
++  public:
++    EntityFlowObj() {}
+   private:
+     StringC systemId_;
+   };
+@@ -174,6 +182,8 @@ public:
+       }
+     }
+     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
++  public:
++    DocumentTypeFlowObj() {}
+   private:
+     DocumentTypeNIC nic_;
+   };
diff --git a/openjade/patches/openjade-deplibs.patch b/openjade/patches/openjade-deplibs.patch
new file mode 100644 (file)
index 0000000..3466ad7
--- /dev/null
@@ -0,0 +1,40 @@
+diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub
+--- openjade-1.3.2/grove/Makefile.sub  2002-10-20 23:47:24.000000000 +0200
++++ devel/grove/Makefile.sub   2007-07-23 15:39:23.000000000 +0200
+@@ -1,4 +1,4 @@
+ LTVERSION=0:1:0
+ LIB=ogrove
+-DEPLIBS=-lm
++DEPLIBS=-lm -lstdc++
+ OBJS=Node.o LocNode.o
+diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub
+--- openjade-1.3.2/spgrove/Makefile.sub        2002-11-15 23:46:50.000000000 +0100
++++ devel/spgrove/Makefile.sub 2007-07-23 16:06:13.000000000 +0200
+@@ -1,9 +1,10 @@
+ LTVERSION=0:1:0
+ LIB=ospgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
++DEPLIBS=$(TOP)/grove/libogrove.la \
++       -lm -losp -L$(TOP)/grove/.libs \
+       -L$(TOP)/lib -L$(TOP)/lib/.libs \
+-      $(LIB_THREADS)
++      $(LIB_THREADS) -lstdc++
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
+ GENSRCS=grove_inst.cxx
+diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub
+--- openjade-1.3.2/style/Makefile.sub  2003-04-18 19:18:10.000000000 +0200
++++ devel/style/Makefile.sub   2007-07-23 16:08:26.000000000 +0200
+@@ -1,8 +1,8 @@
+ LTVERSION=0:1:0
+ LIB=ostyle
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
+-  -L$(TOP)/lib -L$(TOP)/lib/.libs \
+-  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs 
++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \
++  -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \
++  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++
+ OBJS=LangObj.o \
+   Collector.o \
+   DssslApp.o \
diff --git a/openjade/patches/openjade-nola.patch b/openjade/patches/openjade-nola.patch
new file mode 100644 (file)
index 0000000..1e23ca5
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urNp openjade-1.3.2-orig/jade/Makefile.sub openjade-1.3.2/jade/Makefile.sub
+--- openjade-1.3.2-orig/jade/Makefile.sub      2002-11-15 23:46:50.000000000 +0100
++++ openjade-1.3.2/jade/Makefile.sub   2009-02-13 11:52:30.000000000 +0100
+@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so
+ GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
+  HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
+  TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
diff --git a/opensp/opensp.nm b/opensp/opensp.nm
new file mode 100644 (file)
index 0000000..4dabe2f
--- /dev/null
@@ -0,0 +1,63 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = opensp
+version    = 1.5.2
+release    = 2
+
+groups     = Application/Text
+url        = http://openjade.sourceforge.net/
+license    = MIT
+summary    = SGML and XML parser.
+
+description
+       OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML
+       (Standard Generalized Markup Language).
+end
+
+source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
+
+thisapp = OpenSP-%{version}
+
+build
+       requires
+               gcc-c++
+               docbook-dtds
+               docbook-xsl
+               libxml2
+               libxslt
+               xmlto
+       end
+
+       configure_options += \
+               --mandir=/usr/share/man/ \
+               --disable-dependency-tracking \
+               --disable-static \
+               --disable-rpath \
+               --enable-http \
+               --enable-default-catalog=/etc/sgml/catalog \
+               --enable-default-search-path=/usr/share/sgml:/usr/share/xml
+
+       install_cmds
+               # Create symlinks and manpages for binaries wtitout "o".
+               for file in nsgmls sgmlnorm spam spent sx ; do
+                       ln -s o${file} %{BUILDROOT}/usr/bin/${file}
+                       echo ".so man1/o${file}.1" > %{BUILDROOT}/usr/share/man/man1/${file}.1
+               done
+
+               # Rename sx to sgml2xml.
+               mv %{BUILDROOT}/usr/bin/sx %{BUILDROOT}/usr/bin/sgml2xml
+               mv %{BUILDROOT}/usr/share/man//man1/{sx,sgml2xml}.1
+       end
+
+end
+
+packages
+       package %{name}
+
+       package %{name}-devel
+               template DEVEL
+       end
+end
diff --git a/opensp/patches/opensp-multilib.patch b/opensp/patches/opensp-multilib.patch
new file mode 100644 (file)
index 0000000..a988613
--- /dev/null
@@ -0,0 +1,91 @@
+--- OpenSP-1.5.2/configure.in.multilib 2005-12-23 14:15:21.000000000 +0000
++++ OpenSP-1.5.2/configure.in  2006-06-13 13:36:49.000000000 +0100
+@@ -90,7 +90,7 @@
+ #define SP_SIZEOF_BOOL_1
+ #endif
+-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
++#if (WCHAR_MAX == SHRT_MAX)
+ #define SP_WCHAR_T_USHORT
+ #endif
+--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib  2005-07-21 16:33:41.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.cxx   2006-06-13 13:36:49.000000000 +0100
+@@ -9,6 +9,7 @@
+ // Copyright (c) 1994 James Clark
+ // See the file COPYING for copying permission.
++#include <limits.h>
+ #include "splib.h"
+ #ifdef SP_MANUAL_INST
+@@ -1338,7 +1339,7 @@
+ #endif
+ #endif
+  // we really just want to test if size_t == unsigned int
+-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
++#if INT_MAX != SSIZE_MAX
+ #ifdef __DECCXX
+ #pragma define_template Vector<unsigned int>
+ #else
+--- OpenSP-1.5.2/lib/parser_inst.m4.multilib   2005-05-14 10:17:35.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.m4    2006-06-13 13:36:49.000000000 +0100
+@@ -1,6 +1,7 @@
+ // Copyright (c) 1994 James Clark
+ // See the file COPYING for copying permission.
++#include <limits.h>
+ #include "splib.h"
+ #ifdef SP_MANUAL_INST
+@@ -166,7 +167,7 @@
+ __instantiate(Vector<LeafContentToken*>)
+ __instantiate(Vector<size_t>)
+  // we really just want to test if size_t == unsigned int
+-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
++#if INT_MAX != SSIZE_MAX
+ __instantiate(Vector<unsigned int>)
+ #endif
+--- OpenSP-1.5.2/config.h.in.multilib  2005-11-05 09:43:42.000000000 +0000
++++ OpenSP-1.5.2/config.h.in   2006-06-13 13:41:45.000000000 +0100
+@@ -1,5 +1,7 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
++#include <limits.h>
++
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+    systems. This function is required for `alloca.c' support on those systems.
+    */
+@@ -333,22 +335,6 @@
+ /* The size of a `bool', as computed by sizeof. */
+ #undef SIZEOF_BOOL
+-/* The size of a `size_t', as computed by sizeof. */
+-#undef SIZEOF_SIZE_T
+-
+-/* The size of a `unsigned int', as computed by sizeof. */
+-#undef SIZEOF_UNSIGNED_INT
+-
+-/* The size of a `unsigned short', as computed by sizeof. */
+-#undef SIZEOF_UNSIGNED_SHORT
+-
+-/* The size of a `wchar_t', as computed by sizeof. */
+-#undef SIZEOF_WCHAR_T
+-
+-/* Define as the maximum value of type 'size_t', if the system doesn't define
+-   it. */
+-#undef SIZE_MAX
+-
+ /* define this if h_errno should be declared extern int */
+ #undef SP_DECLARE_H_ERRNO
+@@ -503,7 +489,7 @@
+ #define SP_SIZEOF_BOOL_1
+ #endif
+-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
++#if (WCHAR_MAX == SHRT_MAX)
+ #define SP_WCHAR_T_USHORT
+ #endif
diff --git a/opensp/patches/opensp-nodeids.patch b/opensp/patches/opensp-nodeids.patch
new file mode 100644 (file)
index 0000000..4e539d0
--- /dev/null
@@ -0,0 +1,128 @@
+--- OpenSP-1.5.2/docsrc/releasenotes.xml.nodeids       2006-10-13 13:54:59.000000000 +0100
++++ OpenSP-1.5.2/docsrc/releasenotes.xml       2006-10-13 13:58:25.000000000 +0100
+@@ -1,7 +1,7 @@
+ <?xml version='1.0'?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+-<book>
++<book id="relnotesb">
+   <bookinfo>
+     <title>OpenSP 1.5.2</title>
+     <subtitle>Release Notes</subtitle>
+@@ -16,7 +16,7 @@
+     </copyright>
+   </bookinfo>
+-  <chapter><title>OpenSP 1.5.2 Release Notes</title>
++  <chapter id="relnotesc"><title>OpenSP 1.5.2 Release Notes</title>
+     <para>The OpenJade project provides a suite of tools and libraries for
+ validating, processing and applying DSSSL (Document Style Semantics and
+@@ -29,7 +29,7 @@
+ can be used as a basis for either open source or commerical projects. The
+ library can be built as either a dynamic or static library.
+ </para>
+-    <sect1><title>Applications of OpenSP</title>
++    <sect1 id="apps"><title>Applications of OpenSP</title>
+       <para>The OpenSP library has been used in a number of projects. The
+ World Wide Web consortium on-line HTML and XHTML validator is based on the
+ OpenSP library. In addition to the OpenSP library a set of command line tools
+@@ -41,7 +41,7 @@
+ tools.</para>
+     </sect1>
+-    <sect1><title>Obtaining OpenSP</title>
++    <sect1 id="obtaining"><title>Obtaining OpenSP</title>
+       <para>OpenSP is a project hosted at sourceforge.net and is available
+ from the OpenJade web site at http://openjade.sourceforge.net or directly from
+ the OpenJade project page at http://sourceforge.net/projects/openjade</para>
+@@ -49,7 +49,7 @@
+ linkend="bindist"/> for information on how to obtain pre-compiled
+ binary packages.</para>
+     </sect1>
+-    <sect1><title>Supported Platforms</title>
++    <sect1 id="supported"><title>Supported Platforms</title>
+       <para>OpenSP is intended to be as portable as possible. It should be
+ possible to compile and build on most contemporary UNIX type platforms. In
+ addition OpenSP should also build on Microsoft's Win32 based operating
+@@ -166,7 +166,7 @@
+ <email>openjade-devel@lists.sourceforge.net</email>, including any
+ diffs/patches you have used.</para>
+     </sect1>
+-    <sect1><title>Building OpenSP from Source</title>
++    <sect1 id="building"><title>Building OpenSP from Source</title>
+       <para>OpenSP requires 20Mb to 50Mb of disk space to build. An
+ installation will require around 10Mb to 20Mb depending on
+ architecture.</para>
+@@ -249,7 +249,7 @@
+ the latest version of OpenSP to be available from your distributor in due
+ course.</para>
+     </sect1>
+-    <sect1><title>Installation</title>
++    <sect1 id="installation"><title>Installation</title>
+       <para>In addition to the OpenSP executables and libraries you will also
+ need various DTDs and declaration files. Some DTDs and associated files
+ (entity definitions) are available in the <filename>pubtext</filename>
+@@ -263,7 +263,7 @@
+ recommended that you set up and use such a catalog system.
+ </para>
+     </sect1>
+-    <sect1><title>Support</title>
++    <sect1 id="support"><title>Support</title>
+       <para>If, after reading the documentation, you still have a problem,
+ then you may require some additional help. The OpenJade project is a volunteer
+ effort and as such does not provide any formal support. Instead, you should
+@@ -299,7 +299,7 @@
+ often the case that someone has had the same problem before.</para>
+     </sect1>
+-    <sect1><title>Version 1.5.2</title>
++    <sect1 id="v152"><title>Version 1.5.2</title>
+       <formalpara><title>Released December 2005.</title>
+       <para>The release contains a number of enhancements together with
+ support for version 4.0 of the GNU C++ compiler.</para>
+@@ -418,7 +418,7 @@
+       </table>
+     </sect1>
+-    <sect1><title>Version 1.5.1</title>
++    <sect1 id="v151"><title>Version 1.5.1</title>
+       <formalpara><title>Released October 2003.</title>
+       <para>The release contains a number of new features together with
+ support for version 3.3 for the GNU C++ compiler.</para>
+@@ -613,7 +613,7 @@
+       </table>
+     </sect1>
+-    <sect1><title>Version 1.5</title>
++    <sect1 id="v15"><title>Version 1.5</title>
+       <formalpara><title>Released November 2002.</title>
+       <para>In addition to many new features this version also supports the
+ latest GNU C++ compiler: gcc 3.2 at the time of writing.</para>
+@@ -976,7 +976,7 @@
+       </tgroup>
+       </table>
+     </sect1>
+-    <sect1>
++    <sect1 id="v14">
+       <title>Version 1.4</title>
+       <formalpara><title>Released February 2000</title>
+       <para>Version 1.4 added many improvements. Changes
+@@ -1023,7 +1023,7 @@
+       </listitem>
+       </itemizedlist>
+     </sect1>
+-    <sect1><title>Version 1.3.4</title>
++    <sect1 id="v134"><title>Version 1.3.4</title>
+       <formalpara><title>Released October 1999</title>
+       <para>The second release from the OpenJade project. This version was
+ distributed as part of OpenJade 1.3</para>
+@@ -1040,7 +1040,7 @@
+       </itemizedlist>
+     </sect1>
+-    <sect1><title>Version 1.3.3</title>
++    <sect1 id="v133"><title>Version 1.3.3</title>
+       <para>The first release from the OpenJade project</para>
+     </sect1>
+   </chapter>
diff --git a/opensp/patches/opensp-sigsegv.patch b/opensp/patches/opensp-sigsegv.patch
new file mode 100644 (file)
index 0000000..69bd3a9
--- /dev/null
@@ -0,0 +1,20 @@
+--- OpenSP-1.5.2/lib/ExtendEntityManager.cxx   2005-11-05 10:05:20.000000000 +0100
++++ OpenSP-1.5.2.new/lib/ExtendEntityManager.cxx       2007-06-21 12:56:26.000000000 +0200
+@@ -1238,7 +1238,8 @@ StorageObjectSpec::StorageObjectSpec()
+ }
+ StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x)
+-: codingSystemName(x.codingSystemName),
++: storageManager(x.storageManager),
++  codingSystemName(x.codingSystemName),
+   codingSystem(x.codingSystem),
+   specId(x.specId),
+   baseId(x.baseId),
+@@ -1253,6 +1254,7 @@ StorageObjectSpec::StorageObjectSpec(con
+ StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x)
+ {
+   if (this != &x) {
++    storageManager = x.storageManager;
+     codingSystemName = x.codingSystemName;
+     codingSystem = x.codingSystem;
+     specId = x.specId;
index 3deb364014b1e1e35a810d87c148742d64ede347..55bf24dcc68ad7b3d947b0801fac52e02f0df303 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = openssh
 version    = 5.8p1
-release    = 8
+release    = 9
 
 maintainer =
 groups     = Application/Internet
@@ -127,17 +127,31 @@ packages
                        /usr/share/man/cat8/sftp-server.8*
                        /var/lib/sshd
                end
-       
-               script postin
+
+               prerequires = shadow-utils systemd-units
+
+               script prein
                        # Create unprivileged user and group.
                        getent group sshd || groupadd -r sshd
                        getent passwd sshd || useradd -r -g sshd \
                                -d /var/lib/sshd -s /sbin/nologin sshd
-       
-                       systemctl --system daemon-reload
-                       systemctl enable openssh.service
                end
-       
-               #script postup = postin
+
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable openssh.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop openssh.service >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
        end
 end
index bd8f296201e53cead6f8771cabb54f5a6b4a6bbb..ca8cf443f0c775bb17906a1ca41f1a68a62560b3 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.15
+version    = 0.9.17
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -58,7 +58,7 @@ packages
                end
        end
        
-       package %{name}-build
+       package %{name}-builder
                summary = The pakfire builder.
                description
                        The tools that are needed to build new pakfire packages.
@@ -69,6 +69,8 @@ packages
                        %{name}=%{thisver}
                        quality-agent=%{thisver}
                end
+               provides = pakfire-build=%{thisver}
+               obsoletes = pakfire-build<%{thisver}
                conflicts = build-essentials
 
                files
index f51e459aafd54eabea167beaef122f7492ed3f64..64e4a4bfb83e5e0ded83c9520fc486a6606a7e7f 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pcre
-version    = 8.13
+version    = 8.20
 release    = 1
 
 groups     = System/Libraries
@@ -30,6 +30,7 @@ build
        end
 
        configure_options += \
+               --disable-static \
                --docdir=/usr/share/doc/pcre-%{version} \
                --enable-utf8 \
                --enable-pcregrep-libz \
index e8d839d57b32de2a46d6d066da995c8d28b139fe..80f295211fcba26cc143cc97f624b01c0f34a120 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = pdns-recursor
 version    = 3.3
-release    = 4
+release    = 5
 
 groups     = Networking/DNS
 url        = http://powerdns.com/
@@ -50,9 +50,38 @@ build
        end
 end
 
-# XXX Need to create user and group "pdns-recursor" at installation
-# useradd -r -g pdns-recursor pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin
-
 packages
        package %{name}
+               configfiles
+                       /etc/%{name}/recursor.conf
+               end
+
+               prerequires = shadow-utils systemd-units
+
+               script prein
+                       getent group pdns-recursor >/dev/null || groupadd -r pdns-recursor
+                       getent passwd pdns-recursor >/dev/null || \
+                               useradd -r -g pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin \
+                                       pdns-recursor
+               end
+
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable pdns-recursor.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable pdns-recursor.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop pdns-recursor.service >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart pdns-recursor.service >/dev/null 2>&1 || :
+               end
+       end
 end
diff --git a/perl-SGMLSpm/perl-SGMLSpm.nm b/perl-SGMLSpm/perl-SGMLSpm.nm
new file mode 100644 (file)
index 0000000..4590ed9
--- /dev/null
@@ -0,0 +1,44 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = perl-SGMLSpm
+version    = 1.03ii
+release    = 1
+arch       = noarch
+
+groups     = Development/Libraries
+url        = http://search.cpan.org/dist/SGMLSpm/
+license    = GPLv2+
+summary    = Perl library for parsing the output of nsgmls.
+
+description
+       Perl programs can use the SGMLSpm module to help convert SGML, HTML or XML
+       documents into new formats.
+end
+
+source_dl  = http://www.cpan.org/authors/id/D/DM/DMEGG/
+
+thisapp    = SGMLSpm-%{version}
+
+build
+       DIR_APP = %{DIR_SRC}/SGMLSpm
+
+       build = # Nothing to do.
+
+       install
+               # Create directory layout.
+               mkdir -pv %{BUILDROOT}/usr/bin
+               mkdir -pv %{BUILDROOT}/usr/share/perl5
+
+               # Install the module.
+               make install_system \
+                       BINDIR=%{BUILDROOT}/usr/bin/ \
+                       PERL5DIR=%{BUILDROOT}/usr/share/perl5/
+       end
+end
+
+packages
+       package %{name}
+end
index 291aa5edfe80b19d2dcf2259be04e302fea5ae42..19ff646efdee4e6192f44ced30898f01fa40fade 100644 (file)
@@ -6,7 +6,7 @@
 name       = perl
 version    = 5.14.2
 # Never reset release in this package, just increase.
-release    = 8
+release    = 9
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Languages
@@ -130,6 +130,7 @@ packages
        package perl
                requires
                        perl-libs=%{thisver}
+                       perl(Carp)
                end
 
                provides
index 60c5cf27fa2b61742102139610fa538e606032da..05a73e9e4722e13f7b63cca8b8a3e77f23627fe3 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = ppl
 version    = 0.11.2
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Libraries
@@ -56,4 +56,8 @@ end
 
 packages
        package %{name}
+
+       package %{name}-devel
+               template DEVEL
+       end
 end
index 89d91a2d14650e7d2091fddcbdaa9ef994c294f5..0835bd2a7b7b148a4519a84fb9146f7db249198c 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = radvd
 version    = 1.8.3
-release    = 2
+release    = 3
 
 groups     = System/Daemons
 url        = http://www.litech.org/radvd/
index 25cff9994957b4567b11ad9f428274174f6ac743..48a6cecd18608031c06feb53891a7267b8b0180b 100644 (file)
@@ -6,8 +6,8 @@ After=network.target
 [Service]
 ExecStartPre=/lib/network/network-radvd-config start
 ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd
-ExecStopPre=/lib/network/network-radvd-config stop
 ExecReload=/bin/kill -HUP $MAINPID
+ExecStopPost=/lib/network/network-radvd-config stop
 Type=forking
 PIDFile=/run/radvd/radvd.pid
 Restart=on-failure
index 65e00822f1b3011c394091e0fed38052f247563b..1fb976ac503d6f7cc8968aee837ac5851a3c4628 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = rstp
 version    = 0.21
-release    = 5
+release    = 6
 
 groups     = Networking/Tools
 url        = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary
@@ -31,5 +31,19 @@ end
 
 packages
        package %{name}
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl --no-reload enable rstp.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable rstp.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop rstp.service >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart rstp.service >/dev/null 2>&1 || :
+               end
        end
 end
index 70362ae7f9b3f41493045a7ca6a594dfb3598fce..dfe904b32d720db4560f0894272d0208c0a540f7 100644 (file)
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = rsyslog
-version    = 5.8.0
-release    = 3
+version    = 5.8.6
+release    = 1
 
 groups     = Base System/Daemons
 url        = http://www.rsyslog.com/
index 9b8f8be3786b3b4d4a2ab1f19f7214334b40e77b..e0f55378898ed87ceffa49dc73b6dc57a1fac89e 100644 (file)
@@ -37,7 +37,9 @@ build
                automake
                avahi-devel
                cups-devel
+               gettext
                ncurses-devel
+               libacl-devel
                libcap-devel
                openldap-devel
                openssl-devel
@@ -45,6 +47,7 @@ build
                popt-devel
                readline-devel
                which
+               zlib-devel
        end
 
        DIR_APP = %{DIR_SRC}/%{thisapp}/source3
@@ -85,14 +88,14 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-libs
                template LIBS
        end
-       
+
        package %{name}-devel
                template DEVEL
+
+               requires += %{name}-libs=%{thisver}
        end
 end
-
index e8a9b8c9297050d4c73dade1cdc2ab6874a871d0..58641f3061a53842e88c88182b7e9b6cb9e8e675 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = setup
 version    = 3.0
-release    = 2
+release    = 3
 
 groups     = Base Build System/Base
 url        =
@@ -48,5 +48,22 @@ end
 packages
        package %{name}
                requires = iana-etc
+
+               configfiles
+                       /etc/aliases
+                       /etc/exports
+                       /etc/fstab
+                       /etc/group
+                       /etc/gshadow
+                       /etc/host.conf
+                       /etc/hosts
+                       /etc/hosts.allow
+                       /etc/hosts.deny
+                       /etc/motd
+                       /etc/passwd
+                       /etc/printcap
+                       /etc/shadow
+                       /etc/shells
+               end
        end
 end
diff --git a/sgml-common/MLCATALOG b/sgml-common/MLCATALOG
new file mode 100644 (file)
index 0000000..2ca27aa
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/sgml/docbook/xmlcatalog"/>
+  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/sgml/docbook/xmlcatalog"/>
+  <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///etc/sgml/docbook/xmlcatalog"/>
+  <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/sgml/docbook/xmlcatalog"/>
+  <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/sgml/docbook/xmlcatalog"/>
+</catalog>
diff --git a/sgml-common/html.dcl b/sgml-common/html.dcl
new file mode 100644 (file)
index 0000000..710e9e2
--- /dev/null
@@ -0,0 +1,88 @@
+<!SGML  "ISO 8879:1986"
+--
+       SGML Declaration for HyperText Markup Language (HTML).
+
+--
+
+CHARSET
+         BASESET  "ISO 646:1983//CHARSET
+                   International Reference Version
+                   (IRV)//ESC 2/5 4/0"
+         DESCSET  0   9   UNUSED
+                  9   2   9
+                  11  2   UNUSED
+                  13  1   13
+                  14  18  UNUSED
+                  32  95  32
+                  127 1   UNUSED
+     BASESET   "ISO Registration Number 100//CHARSET
+                ECMA-94 Right Part of
+                Latin Alphabet Nr. 1//ESC 2/13 4/1"
+
+         DESCSET  128  32   UNUSED
+                  160  96    32
+
+CAPACITY        SGMLREF
+                TOTALCAP        150000
+                GRPCAP          150000
+               ENTCAP          150000
+  
+SCOPE    DOCUMENT
+SYNTAX   
+         SHUNCHAR CONTROLS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+                17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 127
+         BASESET  "ISO 646:1983//CHARSET
+                   International Reference Version
+                   (IRV)//ESC 2/5 4/0"
+         DESCSET  0 128 0
+         FUNCTION
+                 RE          13
+                  RS          10
+                  SPACE       32
+                  TAB SEPCHAR  9
+       
+
+         NAMING   LCNMSTRT ""
+                  UCNMSTRT ""
+                  LCNMCHAR ".-"
+                  UCNMCHAR ".-"
+                  NAMECASE GENERAL YES
+                           ENTITY  NO
+         DELIM    GENERAL  SGMLREF
+                  SHORTREF SGMLREF
+         NAMES    SGMLREF
+         QUANTITY SGMLREF
+                  ATTSPLEN 2100
+                  LITLEN   1024
+                  NAMELEN  72    -- somewhat arbitrary; taken from
+                                internet line length conventions --
+                  PILEN    1024
+                  TAGLVL   100
+                  TAGLEN   2100
+                  GRPGTCNT 150
+                  GRPCNT   64                   
+
+FEATURES
+  MINIMIZE
+    DATATAG  NO
+    OMITTAG  YES
+    RANK     NO
+    SHORTTAG YES
+  LINK
+    SIMPLE   NO
+    IMPLICIT NO
+    EXPLICIT NO
+  OTHER
+    CONCUR   NO
+    SUBDOC   NO
+    FORMAL   YES
+  APPINFO    "SDA"  -- conforming SGML Document Access application
+                   --
+>
+<!-- 
+       $Id: html.dcl,v 1.1 2004/09/09 12:19:26 cvsdist Exp $
+
+       Author: Daniel W. Connolly <connolly@w3.org>
+
+       See also: http://www.w3.org/hypertext/WWW/MarkUp/MarkUp.html
+ -->
diff --git a/sgml-common/html.soc b/sgml-common/html.soc
new file mode 100644 (file)
index 0000000..c0b1949
--- /dev/null
@@ -0,0 +1,31 @@
+       -- catalog: SGML Open style entity catalog for HTML --
+       -- $Id: html.soc,v 1.1 2004/09/09 12:19:26 cvsdist Exp $ --
+       -- Hacked by jjc --
+
+       -- Ways to refer to Level 2: most general to most specific --
+PUBLIC "-//IETF//DTD HTML//EN"                 html.dtd
+PUBLIC "-//IETF//DTD HTML 2.0//EN"             html.dtd
+PUBLIC "-//IETF//DTD HTML Level 2//EN"         html.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN"     html.dtd
+
+       -- Ways to refer to Level 1: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Level 1//EN"         html-1.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN"     html-1.dtd
+
+       -- Ways to refer to
+                Strict Level 2: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Strict//EN"                  html-s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN"              html-s.dtd
+PUBLIC "-//IETF//DTD HTML Strict Level 2//EN"          html-s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN"      html-s.dtd
+
+       -- Ways to refer to
+                Strict Level 1: most general to most specific --
+PUBLIC "-//IETF//DTD HTML Strict Level 1//EN"          html-1s.dtd
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN"      html-1s.dtd
+
+       -- ISO latin 1 entity set for HTML -- 
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"       ISOlat1.sgm
+
+SGMLDECL html.dcl
+DOCTYPE html html.dtd
diff --git a/sgml-common/patches/sgml-common-quotes.patch b/sgml-common/patches/sgml-common-quotes.patch
new file mode 100644 (file)
index 0000000..c901b9e
--- /dev/null
@@ -0,0 +1,94 @@
+--- sgml-common-0.6.3/bin/install-catalog.in.quotes    Mon Nov  5 11:19:23 2001
++++ sgml-common-0.6.3/bin/install-catalog.in   Mon Nov  5 11:20:12 2001
+@@ -39,8 +39,8 @@
+ # Process actions
+ case $1 in
+    -a|--add)    SGML_ACTION="addition"
+-              SGML_CENTRALIZED=$2
+-              SGML_ORDINARY=$3
++              SGML_CENTRALIZED="$2"
++              SGML_ORDINARY="$3"
+               ;;
+    -r|--remove)       if [ -z "$3" -o "$3" = "--version" ]
+               then
+@@ -48,8 +48,8 @@
+                 exit 0
+               fi
+               SGML_ACTION="removal"
+-              SGML_CENTRALIZED=$2
+-              SGML_ORDINARY=$3
++              SGML_CENTRALIZED="$2"
++              SGML_ORDINARY="$3"
+               ;;
+    -h|--help) echo -e $SGML_HELP_MESSAGE
+               exit 0
+@@ -96,14 +96,14 @@
+ fi
+ case $SGML_ACTION in
+    addition)
+-      if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ]
++      if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ]
+       then
+         echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
+         exit 2
+       fi
+       ;;
+    removal)
+-      if [ ! -w $SGML_CENTRALIZED ]
++      if [ ! -w "$SGML_CENTRALIZED" ]
+       then
+         echo "`basename $0`: can not modify \"$SGML_CENTRALIZED\"." >&2
+         exit 2
+@@ -119,7 +119,7 @@
+ fi
+ case $SGML_ACTION in
+    addition)
+-      if [ ! -s $SGML_ORDINARY ]
++      if [ ! -s "$SGML_ORDINARY" ]
+       then
+         echo "`basename $0`: \"$SGML_ORDINARY\" does not exist or is empty." >&2
+         exit 2
+@@ -131,33 +131,33 @@
+ case $SGML_ACTION in
+     addition)
+       echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
+-      if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
++      if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
+       then
+         echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
+       else
+-        echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED
++        echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_CENTRALIZED"
+       fi
+-      grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null
++      grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null
+       if [ $? -ne 0 ]
+       then
+         echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog"
+-        echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog
++        echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> /etc/sgml/catalog
+       fi
+       ;;
+    removal)
+       echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
+-      if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null
++      if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null
+       then
+-          sed -e "\:$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new
+-          mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED
++          sed -e "\:$SGML_POINTER \"\\?$SGML_ORDINARY\"\\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new"
++          mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED"
+       else
+         echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
+       fi
+-      if [ ! -s $SGML_CENTRALIZED ]
++      if [ ! -s "$SGML_CENTRALIZED" ]
+       then
+-        rm $SGML_CENTRALIZED
++        rm "$SGML_CENTRALIZED"
+         echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog"
+-          sed -e "\:$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
++          sed -e "\:$SGML_POINTER \"\\?$SGML_CENTRALIZED\"\\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new
+           mv /etc/sgml/catalog.new /etc/sgml/catalog
+       fi
+       ;;
diff --git a/sgml-common/patches/sgml-common-umask.patch b/sgml-common/patches/sgml-common-umask.patch
new file mode 100644 (file)
index 0000000..90bda3b
--- /dev/null
@@ -0,0 +1,12 @@
+--- sgml-common-0.6.3/bin/install-catalog.in.umask     Mon May 21 11:48:37 2001
++++ sgml-common-0.6.3/bin/install-catalog.in   Mon May 21 12:00:34 2001
+@@ -13,6 +13,9 @@
+ \040 -h, --help: \t\t\t\t Print this help message and exit\n\
+ \040 -v, --version: \t\t\t Print the version number and exit\n"
++# We need the files we create to be world readable
++umask 022
++
+ # Set version message
+ SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"
diff --git a/sgml-common/patches/sgml-common-xmldir.patch b/sgml-common/patches/sgml-common-xmldir.patch
new file mode 100644 (file)
index 0000000..d7c2b2b
--- /dev/null
@@ -0,0 +1,19 @@
+--- sgml-common-0.6.3/xml-iso-entities/Makefile.am.xmldir      Fri Oct  5 16:37:43 2001
++++ sgml-common-0.6.3/xml-iso-entities/Makefile.am     Fri Oct  5 16:37:57 2001
+@@ -1,4 +1,4 @@
+-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986
++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986
+ isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \
+               ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \
+               ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \
+--- sgml-common-0.6.3/xml-iso-entities/Makefile.in.xmldir      2007-05-15 17:21:31.000000000 +0100
++++ sgml-common-0.6.3/xml-iso-entities/Makefile.in     2007-05-15 17:21:43.000000000 +0100
+@@ -62,7 +62,7 @@
+ VERSION = @VERSION@
+ docdir = @docdir@
+-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986
++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986
+ isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent               ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent               ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent               ISOtech.ent catalog
diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm
new file mode 100644 (file)
index 0000000..a6e6d8e
--- /dev/null
@@ -0,0 +1,112 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = sgml-common
+version    = 0.6.3
+release    = 2
+arch       = noarch
+
+groups     = Applications/Text
+url        =
+license    = GPL+
+summary    = Common SGML catalog and DTD files.
+
+desciption
+       The sgml-common package contains a collection of entities and DTDs
+       that are useful for processing SGML, but that don't need to be
+       included in multiple packages.  Sgml-common also includes an
+       up-to-date Open Catalog file.
+end
+
+source_dl =
+sources   = %{thisapp}.tgz
+
+build
+       requires
+               autoconf
+               automake
+               libxml2-devel
+       end
+
+       configure_options += \
+               --mandir=/usr/share/man \
+               --sysconfdir=/etc
+
+       prepare_cmds
+               for i in COPYING INSTALL install-sh missing mkinstalldirs; do \
+                       rm -f ${i}; \
+                       cp -pvf /usr/share/automake*/${i} .; \
+               done
+       end
+
+       install_cmds
+               mkdir -pv %{BUILDROOT}/etc/{sg,x}ml/docbook
+               mkdir -pv %{BUILDROOT}/usr/share/sgml/docbook
+       
+               # Touch SGML catalog
+               touch %{BUILDROOT}/etc/sgml/catalog
+
+               # Create an empty XML catalog.
+               xmlcatalog --noout --create %{BUILDROOT}/etc/xml/catalog
+
+               # Now put the common DocBook entries in it
+               xmlcatalog --noout --add "delegatePublic" \
+                       "-//OASIS//ENTITIES DocBook XML" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegatePublic" \
+                       "-//OASIS//DTD DocBook XML" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegatePublic" \
+                       "ISO 8879:1986" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegateSystem" \
+                       "http://www.oasis-open.org/docbook/" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegateURI" \
+                       "http://www.oasis-open.org/docbook/" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               # Also create the common DocBook catalog
+               xmlcatalog --noout --create \
+                       %{BUILDROOT}/etc/sgml/docbook/xmlcatalog
+
+               ln -svf ../../../../etc/sgml/docbook/xmlcatalog \
+                       %{BUILDROOT}/usr/share/sgml/docbook/xmlcatalog
+
+               rm -f %{BUILDROOT}/usr/share/sgml/xml.dcl
+
+               install -p -m0644 %{DIR_SOURCE}/*.dcl %{DIR_SOURCE}/*.soc \
+                       %{BUILDROOT}/usr/share/sgml
+
+               rm -rf %{BUILDROOT}/usr/share/xml/*
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       xml-common
+               end
+       end
+
+       package xml-common
+               summary = Common XML catalog and DTD files.
+               description
+                       The xml-common is a subpackage of sgml-common which contains
+                       a collection XML catalogs that are useful for processing XML,
+                       but that don't need to be included in main package.
+               end
+
+               files
+                       /etc/xml
+                       /etc/sgml/docbook/xmlcatalog
+                       /usr/share/sgml/docbook/xmlcatalog
+               end
+       end
+end
diff --git a/sgml-common/xml.dcl b/sgml-common/xml.dcl
new file mode 100644 (file)
index 0000000..fed2103
--- /dev/null
@@ -0,0 +1,179 @@
+<!SGML -- SGML Declaration for valid XML documents --
+     "ISO 8879:1986 (WWW)"
+
+     CHARSET
+         BASESET
+             "ISO Registration Number 176//CHARSET
+             ISO/IEC 10646-1:1993 UCS-4 with implementation 
+             level 3//ESC 2/5 2/15 4/6"
+         DESCSET
+                0       9       UNUSED
+                9       2       9
+                11      2       UNUSED
+                13      1       13
+                14      18      UNUSED
+                32      95      32
+                127     1       UNUSED
+                128     32      UNUSED
+             -- use this instead of the official declaration because SP only
+                supports 16-bit characters --
+                160     65374   160
+                65534   2       UNUSED 
+             -- 55296   2048    UNUSED
+                57344   8190    57344
+                65534   2       UNUSED
+                65536   1048576 65536 --
+     CAPACITY NONE
+
+     SCOPE DOCUMENT
+
+     SYNTAX
+         SHUNCHAR NONE
+         BASESET "ISO Registration Number 176//CHARSET
+                 ISO/IEC 10646-1:1993 UCS-4 with implementation 
+                 level 3//ESC 2/5 2/15 4/6"
+         DESCSET
+             0 1114112 0
+         FUNCTION
+             RE    13
+             RS    10
+             SPACE 32
+             TAB   SEPCHAR 9
+
+         NAMING
+             LCNMSTRT ""
+             UCNMSTRT ""
+             NAMESTRT
+                 58 95 192-214 216-246 248-305 308-318 321-328
+                 330-382 384-451 461-496 500-501 506-535 592-680
+                 699-705 902 904-906 908 910-929 931-974 976-982
+                 986 988 990 992 994-1011 1025-1036 1038-1103
+                 1105-1116 1118-1153 1168-1220 1223-1224
+                 1227-1228 1232-1259 1262-1269 1272-1273
+                 1329-1366 1369 1377-1414 1488-1514 1520-1522
+                 1569-1594 1601-1610 1649-1719 1722-1726
+                 1728-1742 1744-1747 1749 1765-1766 2309-2361
+                 2365 2392-2401 2437-2444 2447-2448 2451-2472
+                 2474-2480 2482 2486-2489 2524-2525 2527-2529
+                 2544-2545 2565-2570 2575-2576 2579-2600
+                 2602-2608 2610-2611 2613-2614 2616-2617
+                 2649-2652 2654 2674-2676 2693-2699 2701
+                 2703-2705 2707-2728 2730-2736 2738-2739
+                 2741-2745 2749 2784 2821-2828 2831-2832
+                 2835-2856 2858-2864 2866-2867 2870-2873 2877
+                 2908-2909 2911-2913 2949-2954 2958-2960
+                 2962-2965 2969-2970 2972 2974-2975 2979-2980
+                 2984-2986 2990-2997 2999-3001 3077-3084
+                 3086-3088 3090-3112 3114-3123 3125-3129
+                 3168-3169 3205-3212 3214-3216 3218-3240
+                 3242-3251 3253-3257 3294 3296-3297 3333-3340
+                 3342-3344 3346-3368 3370-3385 3424-3425
+                 3585-3630 3632 3634-3635 3648-3653 3713-3714
+                 3716 3719-3720 3722 3725 3732-3735 3737-3743
+                 3745-3747 3749 3751 3754-3755 3757-3758 3760
+                 3762-3763 3773 3776-3780 3904-3911 3913-3945
+                 4256-4293 4304-4342 4352 4354-4355 4357-4359
+                 4361 4363-4364 4366-4370 4412 4414 4416 4428
+                 4430 4432 4436-4437 4441 4447-4449 4451 4453
+                 4455 4457 4461-4462 4466-4467 4469 4510 4520
+                 4523 4526-4527 4535-4536 4538 4540-4546 4587
+                 4592 4601 7680-7835 7840-7929 7936-7957
+                 7960-7965 7968-8005 8008-8013 8016-8023 8025
+                 8027 8029 8031-8061 8064-8116 8118-8124 8126
+                 8130-8132 8134-8140 8144-8147 8150-8155
+                 8160-8172 8178-8180 8182-8188 8486 8490-8491
+                 8494 8576-8578 12295 12321-12329 12353-12436
+                 12449-12538 12549-12588 19968-40869 44032-55203
+
+             LCNMCHAR ""
+             UCNMCHAR ""
+             NAMECHAR
+                 45-46 183 720-721 768-837 864-865 903 1155-1158
+                 1425-1441 1443-1465 1467-1469 1471 1473-1474
+                 1476 1600 1611-1618 1632-1641 1648 1750-1764
+                 1767-1768 1770-1773 1776-1785 2305-2307 2364
+                 2366-2381 2385-2388 2402-2403 2406-2415
+                 2433-2435 2492 2494-2500 2503-2504 2507-2509
+                 2519 2530-2531 2534-2543 2562 2620 2622-2626
+                 2631-2632 2635-2637 2662-2673 2689-2691 2748
+                 2750-2757 2759-2761 2763-2765 2790-2799
+                 2817-2819 2876 2878-2883 2887-2888 2891-2893
+                 2902-2903 2918-2927 2946-2947 3006-3010
+                 3014-3016 3018-3021 3031 3047-3055 3073-3075
+                 3134-3140 3142-3144 3146-3149 3157-3158
+                 3174-3183 3202-3203 3262-3268 3270-3272
+                 3274-3277 3285-3286 3302-3311 3330-3331
+                 3390-3395 3398-3400 3402-3405 3415 3430-3439
+                 3633 3636-3642 3654-3662 3664-3673 3761
+                 3764-3769 3771-3772 3782 3784-3789 3792-3801
+                 3864-3865 3872-3881 3893 3895 3897 3902-3903
+                 3953-3972 3974-3979 3984-3989 3991 3993-4013
+                 4017-4023 4025 8400-8412 8417 12293 12330-12335
+                 12337-12341 12441-12442 12445-12446 12540-12542
+
+             NAMECASE
+                 GENERAL NO
+                 ENTITY  NO
+
+         DELIM
+             GENERAL SGMLREF
+             HCRO "&#38;#x" -- 38 is the number for ampersand --
+             NESTC "/"
+             NET ">"
+             PIC "?>"
+             SHORTREF NONE
+
+         NAMES
+             SGMLREF
+
+         QUANTITY NONE
+
+         ENTITIES
+             "amp" 38
+             "lt" 60
+             "gt" 62
+             "quot" 34
+             "apos" 39
+
+     FEATURES
+         MINIMIZE
+             DATATAG NO
+             OMITTAG NO
+             RANK NO
+             SHORTTAG
+                 STARTTAG
+                     EMPTY NO
+                     UNCLOSED NO 
+                     NETENABL IMMEDNET
+                 ENDTAG
+                     EMPTY NO 
+                     UNCLOSED NO
+                 ATTRIB
+                     DEFAULT YES
+                     OMITNAME NO
+                     VALUE NO
+             EMPTYNRM YES
+             IMPLYDEF
+                 ATTLIST NO
+                 DOCTYPE NO
+                 ELEMENT NO
+                 ENTITY NO
+                 NOTATION NO
+         LINK
+             SIMPLE NO
+             IMPLICIT NO
+             EXPLICIT NO
+         OTHER
+             CONCUR NO
+             SUBDOC NO
+             FORMAL NO
+             URN NO
+             KEEPRSRE YES
+             VALIDITY TYPE
+             ENTITIES
+                 REF ANY
+                 INTEGRAL YES
+     APPINFO NONE
+     SEEALSO "ISO 8879:1986//NOTATION
+             Extensible Markup Language (XML) 1.0//EN"
+>
diff --git a/sgml-common/xml.soc b/sgml-common/xml.soc
new file mode 100644 (file)
index 0000000..278c6f3
--- /dev/null
@@ -0,0 +1 @@
+SGMLDECL "xml.dcl"
index a85f6119d4ffb6642cb4fa93dab4fc01037a93f6..45dfc170417123be2800c5adc40fb1a3fe16a56f 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = sudo
-version    = 1.7.4p3
+version    = 1.8.3
 release    = 1
 
 groups     = Base Applications/System
diff --git a/systemd/patches/systemd-36-no_manpages.patch b/systemd/patches/systemd-36-no_manpages.patch
deleted file mode 100644 (file)
index 5c5480f..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am      2011-09-23 18:30:02.000000000 +0200
-+++ b/Makefile.am      2011-10-09 16:44:18.293116056 +0200
-@@ -749,82 +749,13 @@
-         src/dbus-loop.h \
-         src/spawn-agent.h
--MANPAGES = \
--      man/systemd.1 \
--      man/systemctl.1 \
--      man/systemadm.1 \
--      man/systemd-cgls.1 \
--      man/systemd-nspawn.1 \
--      man/systemd-tmpfiles.8 \
--      man/systemd-notify.1 \
--      man/sd_notify.3 \
--      man/sd_readahead.3 \
--      man/sd_booted.3 \
--      man/sd_listen_fds.3 \
--      man/sd_is_fifo.3 \
--      man/systemd.unit.5 \
--      man/systemd.service.5 \
--      man/systemd.socket.5 \
--      man/systemd.mount.5 \
--      man/systemd.automount.5 \
--      man/systemd.swap.5 \
--      man/systemd.timer.5 \
--      man/systemd.path.5 \
--      man/systemd.target.5 \
--      man/systemd.device.5 \
--      man/systemd.snapshot.5 \
--      man/systemd.exec.5 \
--      man/daemon.7 \
--      man/sd-daemon.7 \
--      man/sd-readahead.7 \
--      man/runlevel.8 \
--      man/telinit.8 \
--      man/halt.8 \
--      man/shutdown.8 \
--      man/pam_systemd.8 \
--      man/systemd.conf.5 \
--      man/systemd-logind.conf.5 \
--      man/tmpfiles.d.5 \
--      man/hostname.5 \
--        man/timezone.5 \
--      man/machine-id.5 \
--      man/vconsole.conf.5 \
--      man/locale.conf.5 \
--      man/os-release.5 \
--        man/machine-info.5 \
--      man/modules-load.d.5 \
--      man/sysctl.d.5 \
--        man/systemd-ask-password.1 \
--        man/systemd-loginctl.1
-+MANPAGES =
--if ENABLE_BINFMT
--MANPAGES += \
--      man/binfmt.d.5
--endif
-+MANPAGES_ALIAS =
--MANPAGES_ALIAS = \
--      man/reboot.8 \
--      man/poweroff.8 \
--      man/sd_is_socket.3 \
--      man/sd_is_socket_unix.3 \
--      man/sd_is_socket_inet.3 \
--      man/sd_notifyf.3 \
--      man/init.1
--
--man/reboot.8: man/halt.8
--man/poweroff.8: man/halt.8
--man/sd_is_socket.3: man/sd_is_fifo.3
--man/sd_is_socket_unix.3: man/sd_is_fifo.3
--man/sd_is_socket_inet.3: man/sd_is_fifo.3
--man/sd_notifyf.3: man/sd_notify.3
--man/init.1: man/systemd.1
--
--dist_man_MANS = \
--      $(MANPAGES) \
--      $(MANPAGES_ALIAS)
-+dist_man_MANS =
--nodist_man_MANS = \
--      man/systemd.special.7
-+nodist_man_MANS =
- XML_FILES = \
-       ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
index 322aea359a0dcb61d60f8ee905d1a7f40e01cf17..129e8bacd3c3cfd26b19edfbd2459be02c0a5412 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 36
-release    = 3
+release    = 5
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -27,6 +27,8 @@ build
                autoconf
                cryptsetup-luks-devel
                dbus-devel
+               docbook-utils
+               docbook-xsl
                gperf
                intltool
                libacl-devel
@@ -35,6 +37,7 @@ build
                libtool
                libudev-devel>=172
                pam-devel
+               vala
        end
 
        configure_options += \
index 31f82c2d58f17404d799a27db4d7e2aba0e8c679..0a4a3010a73f3c72ace721baa1c16784ffb841fa 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = sysvinit
 version    = 2.86
-release    = 1
+release    = 2
 
 groups     = System/Base
 url        = https://alioth.debian.org/projects/pkg-sysvinit/
@@ -40,5 +40,6 @@ end
 
 packages
        package %{name}
+               groups += Base
        end
 end
index a57f1a387381457c110b5147efc16bb22e30c40c..21c542c3094b50bd86aae247165d06c7b17d257d 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = tunctl
 version    = 1.5
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://tunctl.sourceforge.net/
@@ -22,19 +22,15 @@ end
 
 source_dl  = http://sourceforge.net/projects/tunctl/files/tunctl/%{version}/%{sources}/download
 
-# XXX needs docbook for man page
-
 build
+       requires
+               docbook-utils
+       end
+
        prepare_cmds
                sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS}/" -i Makefile
        end
 
-       make_build_targets = tunctl CC=gcc
-
-       install
-               mkdir -pv %{BUILDROOT}/usr/sbin
-               install -m 755 tunctl %{BUILDROOT}/usr/sbin
-       end
 end
 
 packages
index 9e9416e27ae60b17e5fd1db16c3a1a2a2543759c..f7375ab7015d64abc1d1feef478e0037d478b3e8 100644 (file)
@@ -5,9 +5,9 @@
 
 name       = udev
 version    = 172
-release    = 3
+release    = 4
 
-groups     = Base System/Base
+groups     = System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 license    = GPLv2+
 summary    = A userspace implementation of devfs.
@@ -62,6 +62,8 @@ end
 
 packages
        package %{name}
+               groups += Base
+       end
 
        package lib%{name}
                template LIBS
diff --git a/usb-modeswitch-data/usb-modeswitch-data.nm b/usb-modeswitch-data/usb-modeswitch-data.nm
new file mode 100644 (file)
index 0000000..af02b40
--- /dev/null
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = usb-modeswitch-data
+version    = 20111023
+release    = 1
+arch       = noarch
+
+groups     = Applications/System
+url        = http://www.draisberghof.de/usb_modeswitch
+license    = GPLv2
+summary    = A USB mode switching tool.
+
+description
+       USB_ModeSwitch is (surprise!) a mode switching tool for controlling
+       "flip flop" (multiple device) USB gear.
+end
+
+source_dl  = http://www.draisberghof.de/usb_modeswitch/
+sources    = %{thisapp}.tar.bz2
+
+build
+       build
+               # Nothing to do here.
+       end
+
+       install
+               mkdir -pv %{BUILDROOT}/etc/usb_modeswitch.d/
+               mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
+
+               install -p -m 644 usb_modeswitch.d/* %{BUILDROOT}/etc/usb_modeswitch.d/
+               install -p -m 644 40-usb_modeswitch.rules %{BUILDROOT}/lib/udev/rules.d/
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       udev
+                       usb-modeswitch
+               end
+       end
+end
index 7b50d3a319b91869b6261c5c4026b090396bd54b..7aa7115528f649e0a053d5be448c1468faccf3e3 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = usb-modeswitch
 version    = 1.1.9
-release    = 1
+release    = 2
 
 groups     = Applications/System
 url        = http://www.draisberghof.de/usb_modeswitch
@@ -28,4 +28,6 @@ end
 
 packages
        package %{name}
+               requires += usb-modeswitch-data
+       end
 end
index 4247cabca660b947ee6bf98763f829c7ca0fa7e8..36ab421cfb21566d0d9d7ae248c818689940370a 100644 (file)
@@ -6,7 +6,7 @@
 name       = util-linux
 version    = 2.19
 major_ver  = 2.19
-release    = 6
+release    = 7
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -82,10 +82,6 @@ build
                        %{BUILDROOT}/usr/share/man/man8/{vipw,vigr}.*
                rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh
 
-               # Create /etc/mtab symlink
-               mkdir -pv %{BUILDROOT}/etc
-               ln -svf /proc/mounts %{BUILDROOT}/etc/mtab
-
                # Set capabilities
                chmod -v -s %{BUILDROOT}/bin/mount
                setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/mount
@@ -94,13 +90,6 @@ build
        end
 end
 
-# This symlink is allowed to be absolute.
-quality-agent
-       whitelist_symlink
-               /etc/mtab
-       end
-end
-
 packages
        package %{name}
                groups += Base
@@ -109,14 +98,22 @@ packages
                        /etc/pam.d/system-auth
                end
 
-               filter_requires = /proc/.*/mounts
-
                obsoletes = util-linux-ng
 
                conflicts
                        setup<3.0-2
                        util-linux-ng
                end
+
+               preprequires += coreutils
+
+               script postin
+                       touch /var/log/lastlog
+
+                       # mtab symlink
+                       rm -f /etc/mtab
+                       ln -s /proc/mounts /etc/mtab
+               end
        end
 
        # Package information for libblkid
diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm
new file mode 100644 (file)
index 0000000..b0cf500
--- /dev/null
@@ -0,0 +1,46 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = xmlto
+version    = 0.0.24
+release    = 1
+
+groups     = Applications/System
+url        = https://fedorahosted.org/xmlto/
+license    = GPLv2+
+summary    = A tool for converting XML files to various formats.
+
+description
+       This is a package for converting XML files to various formats using XSL
+       stylesheets.
+end
+
+source_dl  = https://fedorahosted.org/releases/x/m/%{name}/
+source     = %{thisapp}.tar.bz2
+
+build
+       requires
+               docbook-dtds
+               docbook-xsl
+               flex
+               libxslt
+               util-linux
+       end
+
+       configure_options +=\
+               BASH=/bin/bash
+
+       test
+               make check
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       util-linux
+               end
+       end
+end
index 6b98ac6c323d629d1feb24118ce47000d44ba7f1..5744b319864a2497033cda6d569a80fcc4b0f807 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-fonts
 version    = 7.2
-release    = 3
+release    = 4
 arch       = noarch
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -19,7 +19,8 @@ description
        Arabic fonts for use with X Window System.
 end
 
-source_dl = http://ftp.x.org/pub/individual/font/ http://unifoundry.com/
+source_dl  = http://ftp.x.org/pub/individual/font/
+source_dl += http://unifoundry.com/
 
 sources = \
        encodings-1.0.3.tar.bz2 \
@@ -113,11 +114,290 @@ build
                mkdir -pv %{BUILDROOT}/usr/share/X11/fonts/misc
                cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \
                        %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz
+
+               # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. 
+               # Install catalogue symlinks
+               #mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d
+               #ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi
+               #ln -svf ../../../usr/share/X11/fonts/75dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-75dpi
+               #ln -svf ../../../usr/share/X11/fonts/cyrillic %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-cyrillic
+               #ln -svf ../../../usr/share/X11/fonts/misc %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-misc
+               #ln -svf ../../../usr/share/X11/fonts/Type1 %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-Type1
        end
 end
 
 packages
+       # Template for 75 DPI fonts
+       template 75DPI
+               requires
+                       fontconfig
+               end
+
+               #files
+               #       /etc/X11/fontpath.d/xorg-x11-fonts-75dpi
+               #end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi
+               end
+       end
+
+       # Template for 100 DPI fonts
+       template 100DPI
+               requires
+                       fontconfig
+               end
+
+               #files
+               #       /etc/X11/fontpath.d/xorg-x11-fonts-100
+               #end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi
+               end
+       end
+
        package %{name}
-               requires = fontconfig
+               summary = Bitmap fonts for the X Window System.
+               description
+                       This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic
+                       fonts for use with X Window System.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
+               end
+
+               script postun
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc
+               end
+       end
+
+       package %{name}-Type1
+               summary = Type1 fonts provided by the X Window System.
+               description
+                       A collection of Type1 fonts which are part of the core X Window System
+                       distribution.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               files
+                       /usr/share/X11/fonts/Type1/
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
+               end
+
+               script postun
+                       /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1
+               end
+       end
+
+       package %{name}-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi resolution fonts for the X Window System.
+               description
+                       A set of 75 dpi fonts used by the X window system.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/
+       end
+
+       package %{name}-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi resolution fonts for the X Window System.
+               description
+                       A set of 100 dpi fonts used by the X window system.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/
+       end
+
+       package %{name}-ISO8859-1-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi ISO-8859-1 fonts for X.
+               description
+                       Contains a set of 75dpi fonts for ISO-8859-1.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-1.*
+       end
+
+       package %{name}-ISO8859-1-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi ISO-8859-1 fonts for X.
+               description
+                       Contains a set of 100dpi fonts for ISO-8859-1.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-1.*
+       end
+
+       package %{name}-ISO8859-2-75dpi
+               template 75DPI
+
+               summary = A set of 75dpi Central European language fonts for X.
+               description
+                       Contains a set of 75dpi fonts for Central European languages.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-2.*
+       end
+
+       package %{name}-ISO8859-2-100dpi
+               template 100DPI
+
+               summary = A set of 100dpi Central European language fonts for X.
+               description
+                       Contains a set of 100dpi fonts for Central European languages.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-2.*
+       end
+
+       package %{name}-ISO8859-9-75dpi
+               template 75DPI
+
+               summary = ISO8859-9-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts for the Turkish language.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-9.*
+       end
+
+       package %{name}-ISO8859-9-100dpi
+               template 100DPI
+
+               summary = ISO8859-9-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts for the Turkish language.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-9.*
+       end
+
+       package %{name}-ISO8859-14-75dpi
+               template 75DPI
+
+               summary = ISO8859-14-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts in the ISO8859-14 encoding which
+                       provide Welsh support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-14.*
+       end
+
+       package %{name}-ISO8859-14-100dpi
+               template 100DPI
+
+               summary = ISO8859-14-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts in the ISO8859-14 encoding which
+                       provide Welsh support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-14.*
+       end
+
+       package %{name}-ISO8859-15-75dpi
+               template 75DPI
+
+               summary = ISO8859-15-75dpi fonts.
+               description
+                       Contains a set of 75dpi fonts in the ISO8859-15 encoding which
+                       provide Euro support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/75dpi/*ISO8859-15.*
+       end
+
+       package %{name}-ISO8859-15-100dpi
+               template 100DPI
+
+               summary = ISO8859-15-100dpi fonts.
+               description
+                       Contains a set of 100dpi fonts in the ISO8859-15 encoding which
+                       provide Euro support.
+               end
+
+               files +=\
+                       /usr/share/X11/fonts/100dpi/*ISO8859-15.*
+       end
+
+       package %{name}-cyrillic
+               summary = Cyrillic fonts for X.
+               description
+                       Contains a set of Cyrillic fonts.
+               end
+
+               requires
+                       fontconfig
+               end
+
+               files
+                       /usr/share/X11/fonts/cyrillic/
+               end
+
+               prerequires = xorg-x11-font-utils
+
+               script postin
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
+               end
+
+               script postun
+                       /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic
+               end
+       end
+
+       package %{name}-unifont
+               summary = The GNU unifont.
+               description
+                       GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP).
+               end
+       
+               files
+                       /usr/share/X11/fonts/misc/unifont.pcf.gz        
+               end
        end
 end
index c46aa314d5dac938bf368de7e8807dee553894c7..5897513a807f8d74900f21ed42ac707d8f14c677 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-server
 version    = 1.8.2
-release    = 3
+release    = 4
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = X/Server
@@ -137,6 +137,10 @@ packages
                        pixman
                        udev
                        xkeyboard-config
+                       xorg-x11-drv-evdev
+                       xorg-x11-drv-keyboard
+                       xorg-x11-drv-mouse
+                       xorg-x11-drv-vesa
                        xorg-x11-fonts
                        xorg-x11-font-utils
                        xorg-x11-xkb-utils
index a44f47278afb557c80fd4719a0c7d672091dd344..1fdb24ebfb84122eeb4f14b760195754da13f4c2 100644 (file)
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -5,11 +5,11 @@
 
 name       = xz
 version    = 5.0.3
-release    = 2
+release    = 4
 
-groups     = Build Applications/Compression
+groups     = Applications/Compression
 url        = http://tukaani.org/xz/
-license    = GPLv2+
+license    = LGPLv2+
 summary    = LZMA Utils.
 
 description
@@ -25,6 +25,8 @@ sources    = %{thisapp}.tar.xz
 
 packages
        package %{name}
+               groups += Build
+       end
 
        package %{name}-libs
                template LIBS
@@ -33,4 +35,23 @@ packages
        package %{name}-devel
                template DEVEL
        end
+
+       package xz-lzma-compat
+               summary = Older LZMA format compatibility binaries.
+               description
+                       The xz-lzma-compat package contains compatibility
+                       links for older commands that deal with the older
+                       LZMA format.
+               end
+               license = GPLv2+ and LGPLv2+
+               groups += Build
+
+               requires = %{name}=%{thisver}
+               provides = lzma
+
+               files
+                       /usr/bin/*lz*
+                       /usr/share/man/man1/*lz*
+               end
+       end
 end
diff --git a/zlib/patches/zlib-1.2.5-gentoo.patch b/zlib/patches/zlib-1.2.5-gentoo.patch
new file mode 100644 (file)
index 0000000..82c7f39
--- /dev/null
@@ -0,0 +1,12 @@
+diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
+--- zlib-1.2.5/zlib.h.pom      2010-04-20 06:12:48.000000000 +0200
++++ zlib-1.2.5/zlib.h  2010-06-16 13:08:59.000000000 +0200
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ #  define gzoffset gzoffset64
+ #  define adler32_combine adler32_combine64
+ #  define crc32_combine crc32_combine64
+-#  ifdef _LARGEFILE64_SOURCE
++#  ifndef _LARGEFILE64_SOURCE
+      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
index f1611f4358224b569801510f88239cd676b56bd8..a1bafc20cd433debb6ccda22db5514863aba405b 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = zlib
 version    = 1.2.5
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.gzip.org/zlib/