From 3aa2501acb56f292240c46e40c0f2fe49b1e3921 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 22 Jan 2014 01:24:01 +0000
Subject: linhes-theme: theme mythgame and mytharchive. refs #940
---
abs/core/linhes-theme/PKGBUILD | 16 +-
abs/core/linhes-theme/base.xml.patch | 11 +-
abs/core/linhes-theme/game-ui.xml | 716 ++++++++++++++++++++
abs/core/linhes-theme/music-ui.xml.patch | 11 +
abs/core/linhes-theme/mytharchive-ui.xml | 1084 ++++++++++++++++++++++++++++++
abs/core/linhes-theme/mythburn-ui.xml | 976 +++++++++++++++++++++++++++
abs/core/linhes-theme/mythnative-ui.xml | 640 ++++++++++++++++++
7 files changed, 3448 insertions(+), 6 deletions(-)
create mode 100644 abs/core/linhes-theme/game-ui.xml
create mode 100644 abs/core/linhes-theme/music-ui.xml.patch
create mode 100644 abs/core/linhes-theme/mytharchive-ui.xml
create mode 100644 abs/core/linhes-theme/mythburn-ui.xml
create mode 100644 abs/core/linhes-theme/mythnative-ui.xml
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 2b1aba3..6145f7e 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,19 +1,20 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=20
+pkgrel=21
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://linhes.org/"
-patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
+patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'music-ui.xml.patch'
'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'qtlook.txt.patch')
#The LinHES theme is based on TintedGlass 4.39 by Harley Peters
source=("git+https://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
- 'LHLogoAndText.png')
+ 'LHLogoAndText.png'
+ 'game-ui.xml' 'mytharchive-ui.xml' 'mythburn-ui.xml' 'mythnative-ui.xml')
package() {
THEMEROOT=usr/share/mythtv/themes
@@ -57,7 +58,8 @@ package() {
md5sums=('SKIP'
'95478bd9bab15e9e4365c1048757c225'
'ed4f8baf431e20babc345e4e2602426f'
- '9c2c8f2a8d881e01ea84457ae508f655'
+ 'f52ad93730ae53ea0e1ac5d3c599133c'
+ '90476c9d03c734a4177954b5b0a4e864'
'ec11d601d47cd4b2954e1609262a571b'
'4ad8bc893412eeeb890f0b1f1f1bd541'
'9fe3371a8b964a7028126405cfaa330b'
@@ -66,4 +68,8 @@ md5sums=('SKIP'
'12d26a786fde397348653128a6d7676a'
'4b1c27297bb5f8d9d7bbaf72b35130b5'
'2bd09b8049aaf5ba21db5baf3a0ce077'
- '09ad14842f828b7a8d24070ec8214fe5')
+ '09ad14842f828b7a8d24070ec8214fe5'
+ '8933e2c7c3569091bebc9d086e574ffe'
+ '8151dcda813a9a01b989d45f3d17eedd'
+ 'a0f423ab4089a2e8d65def7777169cd4'
+ '8bd8e94068b03fea2138423acb170559')
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index bbf971d..f2487c3 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,5 @@
--- base.xml.orig 2014-01-02 20:11:41.055260777 +0000
-+++ base.xml 2014-01-02 20:20:50.598179696 +0000
++++ base.xml 2014-01-22 01:11:14.443221510 +0000
@@ -424,7 +424,7 @@
<!-- Base definition of a base popup backdrop -->
@@ -9,3 +9,12 @@
</shape>
<!-- Base definition of a heading group -->
+@@ -2140,7 +2140,7 @@
+
+ <button name="ok" from="base_button">
+ <position>252,634</position>
+- <value>Ok</value>
++ <value>OK</value>
+ </button>
+
+ <textarea name="info_label" from="basetextarea">
diff --git a/abs/core/linhes-theme/game-ui.xml b/abs/core/linhes-theme/game-ui.xml
new file mode 100644
index 0000000..ed782e3
--- /dev/null
+++ b/abs/core/linhes-theme/game-ui.xml
@@ -0,0 +1,716 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+<mythuitheme>
+
+ <window name="gameui">
+ <area>0,0,1280,720</area>
+
+ <group name="fanart-group" from="base_fanart_group" />
+
+ <textarea name="heading" from="base_heading">
+ <value>Games</value>
+ </textarea>
+
+ <shape name="tree-backdrop" from="base_backdrop">
+ <area>20,36,1240,401</area>
+ </shape>
+
+ <shape name="tree-backdrop-line" from="base_backdrop_line">
+ <area>21,37,1238,399</area>
+ </shape>
+
+ <shape name="tree-top-line" from="base_highlight_line">
+ <area>22,38,1236,2</area>
+ </shape>
+
+ <shape name="tree-bottom-line" from="base_highlight_line">
+ <area>22,433,1236,2</area>
+ </shape>
+
+ <shape name="tree-left-line" from="base_highlight_vertical_line">
+ <area>22,40,2,344</area>
+ </shape>
+
+ <shape name="tree-right-line" from="base_highlight_vertical_line">
+ <area>1256,40,2,344</area>
+ </shape>
+
+ <shape name="tree-arrows-first-list-backdrop" from="base_arrows_backdrop">
+ <area>385,436,50,11</area>
+ </shape>
+
+ <shape name="tree-arrows-second-list-backdrop" from="base_arrows_backdrop">
+ <area>796,436,50,11</area>
+ </shape>
+
+ <shape name="tree-arrows-third-list-backdrop" from="base_arrows_backdrop">
+ <area>1207,436,50,11</area>
+ </shape>
+
+ <shape name="description-backdrop" from="base_backdrop">
+ <area>20,447,1240,238</area>
+ </shape>
+
+ <shape name="description-backdrop-line" from="base_backdrop_line">
+ <area>21,448,1238,236</area>
+ </shape>
+
+ <shape name="description-top-line" from="base_highlight_line">
+ <area>22,449,1236,2</area>
+ </shape>
+
+ <shape name="description-bottom-line" from="base_highlight_line">
+ <area>22,681,1236,2</area>
+ </shape>
+
+ <shape name="description-left-line" from="base_highlight_vertical_line">
+ <area>22,451,2,230</area>
+ </shape>
+
+ <shape name="description-right-line" from="base_highlight_vertical_line">
+ <area>1256,451,2,230</area>
+ </shape>
+
+ <shape name="description-seperator-top-line" from="base_line">
+ <area>188,487,684,2</area>
+ </shape>
+
+ <shape name="description-seperator-bottom-line" from="base_line">
+ <area>188,643,684,2</area>
+ </shape>
+
+ <shape name="coverart-border">
+ <area>37,464,136,204</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#AAAAAA" alpha="100" width="2" />
+ <cornerradius>6</cornerradius>
+ </shape>
+
+ <shape name="preview-border">
+ <area>887,464,356,204</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#AAAAAA" alpha="100" width="2" />
+ <cornerradius>6</cornerradius>
+ </shape>
+
+ <buttontree name="gametreelist">
+ <area>28,51,1224,387</area>
+ <numlists>3</numlists>
+ <spacing>10</spacing>
+ <buttonlist name="listtemplate" from="base_list">
+ <searchposition>-1,308</searchposition>
+ <buttonarea>0,0,1224,387</buttonarea>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,402,30</area>
+ <textarea name="buttontext">
+ <area>8,0,378,30</area>
+ </textarea>
+ <imagetype name="buttonarrow">
+ <position>383,7</position>
+ </imagetype>
+ <statetype name="buttoncheck">
+ <area>374,5,20,20</area>
+ </statetype>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,402,64</area>
+ <textarea name="buttontext">
+ <area>8,0,378,64</area>
+ </textarea>
+ <imagetype name="buttonarrow">
+ <position>383,22</position>
+ </imagetype>
+ <statetype name="buttoncheck">
+ <area>374,22,20,20</area>
+ </statetype>
+ </state>
+ <state name="selectedinactive">
+ <area>0,0,402,64</area>
+ <textarea name="buttontext">
+ <area>8,0,378,64</area>
+ </textarea>
+ <imagetype name="buttonarrow">
+ <position>383,22</position>
+ </imagetype>
+ <statetype name="buttoncheck">
+ <area>374,22,20,20</area>
+ </statetype>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>364,387</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>384,387</position>
+ </statetype>
+
+ </buttonlist>
+ </buttontree>
+
+ <textarea name="title" from="basetextarea">
+ <area>189,451,682,36</area>
+ <font>basemediumyellow</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="genrelabel" from="basetextarea">
+ <area>189,641,50,42</area>
+ <font>baseextrasmall</font>
+ <value>Genre:</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="genre" from="basetextarea">
+ <area>249,641,331,42</area>
+ <font>baseextrasmallblue</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="systemlabel" from="genrelabel">
+ <area>580,641,60,42</area>
+ <value>System:</value>
+ </textarea>
+
+ <textarea name="system" from="genre">
+ <area>650,641,120,42</area>
+ </textarea>
+
+ <textarea name="favlabel" from="genrelabel">
+ <area>770,641,65,42</area>
+ <value>Favorite:</value>
+ </textarea>
+
+ <statetype name="favorite">
+ <state name="no">
+ <textarea name="favorite" from="basetextarea">
+ <font>baseextrasmallblue</font>
+ <area>840,641,30,42</area>
+ <value>No</value>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="yes" from="no">
+ <textarea name="favorite">
+ <value>Yes</value>
+ </textarea>
+ </state>
+ </statetype>
+
+ <textarea name="description" from="basetextarea">
+ <area>189,498,682,140</area>
+ <multiline>yes</multiline>
+ <cutdown>yes</cutdown>
+ </textarea>
+
+ <imagetype name="no_coverart_without_fanart" depends="!fanart">
+ <area>41,468,128,196</area>
+ <filename>images/masks/watchrecordings_coverart_mask.png</filename>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <imagetype name="coverart">
+ <area>41,468,128,196</area>
+ <mask>images/masks/watchrecordings_coverart_mask.png</mask>
+ <preserveaspect>true</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <imagetype name="no_screenshot_without_fanart" depends="!fanart">
+ <area>891,468,348,196</area>
+ <filename>images/masks/watchrecordings_preview_mask.png</filename>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <imagetype name="screenshot">
+ <area>891,468,348,196</area>
+ <mask>images/masks/watchrecordings_preview_mask.png</mask>
+ <preserveaspect>true</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
+
+ <clock name="clock" from="base_clock" />
+
+ </window>
+
+ <window name="gamedetailspopup">
+
+ <!-- Make window behave as a popup -->
+ <area>-1,-1,850,516</area>
+
+ <animation trigger="AboutToShow">
+ <section>
+ <alpha start="0" end="255" easingcurve="OutQuart"/>
+ <zoom start="0" end="100" easingcurve="OutQuart"/>
+ </section>
+ </animation>
+
+ <animation trigger="AboutToHide">
+ <section>
+ <alpha start="255" end="0" easingcurve="InQuart"/>
+ <zoom start="100" end="0" easingcurve="InQuart"/>
+ </section>
+ </animation>
+
+ <!--this works around buttons being disabled in the popup-->
+ <textarea name="fix" from="basetextarea">
+ <area>0,0,1,1</area>
+ <scroll direction="left" startdelay="0"/>
+ <value>_</value>
+ </textarea>
+
+ <shape name="detail-popup-backdrop" from="base_popup_backdrop">
+ <area>0,0,850,516</area>
+ </shape>
+
+ <shape name="detail-popup-backdrop-line" from="base_backdrop_line">
+ <area>1,1,571,406</area>
+ </shape>
+
+ <shape name="detail-popup-top-line" from="base_highlight_line">
+ <area>2,2,569,2</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-line" from="base_highlight_line">
+ <area>2,404,569,2</area>
+ </shape>
+
+ <shape name="detail-popup-left-line" from="base_highlight_vertical_line">
+ <area>2,4,2,400</area>
+ </shape>
+
+ <shape name="detail-popup-right-line" from="base_highlight_vertical_line">
+ <area>569,4,2,400</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-first-line" from="base_line">
+ <area>22,45,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-second-line" from="base_line">
+ <area>22,278,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-third-line" from="base_line">
+ <area>22,303,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-fourth-line" from="base_line">
+ <area>22,328,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-fifth-line" from="base_line">
+ <area>22,353,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-seperator-sixth-line" from="base_line">
+ <area>22,378,529,2</area>
+ </shape>
+
+ <shape name="detail-popup-coverart-backdrop-line" from="base_backdrop_line">
+ <area>575,1,274,406</area>
+ </shape>
+
+ <shape name="detail-popup-coverart-top-line" from="base_highlight_line">
+ <area>576,2,272,2</area>
+ </shape>
+
+ <shape name="detail-popup-coverart-bottom-line" from="base_highlight_line">
+ <area>576,404,272,2</area>
+ </shape>
+
+ <shape name="detail-popup-coverart-left-line" from="base_highlight_vertical_line">
+ <area>576,4,2,400</area>
+ </shape>
+
+ <shape name="detail-popup-coverart-right-line" from="base_highlight_vertical_line">
+ <area>846,4,2,400</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-backdrop-line" from="base_backdrop_line">
+ <area>1,411,848,104</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-top-line" from="base_highlight_line">
+ <area>2,412,846,2</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-bottom-line" from="base_highlight_line">
+ <area>2,512,846,2</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-left-line" from="base_highlight_vertical_line">
+ <area>2,414,2,98</area>
+ </shape>
+
+ <shape name="detail-popup-bottom-right-line" from="base_highlight_vertical_line">
+ <area>846,414,2,98</area>
+ </shape>
+
+ <textarea name="title" from="basetextarea">
+ <area>9,4,555,40</area>
+ <multiline>no</multiline>
+ <font>basesmalldarkyellow</font>
+ <scroll direction="left" startdelay="1" />
+ <align>allcenter</align>
+ </textarea>
+
+ <textarea name="description" from="basetextarea">
+ <area>23,54,527,214</area>
+ <multiline>yes</multiline>
+ <font>basesmaller</font>
+ </textarea>
+
+ <imagetype name="coverart">
+ <area>580,6,264,396</area>
+ <mask>images/masks/item_detail_popup_coverart_mask.png</mask>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
+ <textarea name="gametype_lab" from="basetextarea">
+ <area>23,279,50,24</area>
+ <font>basesmaller</font>
+ <value>Type:</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="gametype" from="basetextarea">
+ <area>83,280,150,24</area>
+ <font>basesmallerblue</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="allsystems_lab" from="basetextarea">
+ <area>243,279,100,24</area>
+ <font>basesmaller</font>
+ <value>System(s):</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="allsystems" from="basetextarea">
+ <area>353,280,197,24</area>
+ <font>basesmallerblue</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="rompath_lab" from="basetextarea">
+ <area>23,304,46,24</area>
+ <font>basesmaller</font>
+ <value>Path:</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="rompath" from="basetextarea">
+ <area>79,305,327,24</area>
+ <font>basesmallerblue</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="romname_lbl" from="basetextarea">
+ <area>390,304,46,24</area>
+ <font>basesmaller</font>
+ <value>File:</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="romname" from="basetextarea">
+ <area>436,305,114,24</area>
+ <font>basesmallerblue</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="genre_lab" from="basetextarea">
+ <area>23,329,70,24</area>
+ <font>basesmaller</font>
+ <value>Genre:</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="genre" from="basetextarea">
+ <area>103,330,447,24</area>
+ <font>basesmallerblue</font>
+ <scroll direction="left" startdelay="1" />
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="year_lab" from="basetextarea">
+ <area>23,354,46,24</area>
+ <font>basesmaller</font>
+ <align>left,vcenter</align>
+ <value>Year:</value>
+ </textarea>
+
+ <textarea name="year" from="basetextarea">
+ <area>79,356,80,24</area>
+ <font>basesmallerblue</font>
+ </textarea>
+
+ <textarea name="crc_lab" from="basetextarea">
+ <area>342,354,84,24</area>
+ <font>basesmaller</font>
+ <align>right,vcenter</align>
+ <value>CRC:</value>
+ </textarea>
+
+ <textarea name="crc" from="basetextarea">
+ <area>436,355,114,24</area>
+ <font>basesmallerblue</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="country_lab" from="basetextarea">
+ <area>88,382,90,20</area>
+ <font>baseextrasmall</font>
+ <value>Country:</value>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="country" from="basetextarea">
+ <area>188,382,110,20</area>
+ <font>baseextrasmallblue</font>
+ <align>vcenter</align>
+ </textarea>
+
+ <textarea name="publisher_lab" from="basetextarea">
+ <area>331,382,94,20</area>
+ <font>baseextrasmall</font>
+ <align>right,vcenter</align>
+ <value>Publisher:</value>
+ </textarea>
+
+ <textarea name="publisher" from="basetextarea">
+ <area>435,382,110,20</area>
+ <font>baseextrasmallblue</font>
+ <align>vcenter</align>
+ </textarea>
+
+ <button name="play_button">
+ <position>435,443</position>
+ <statetype name="buttonstate">
+ <state name="active">
+ <shape name="background" from="base_button_background_active">
+ <area>0,0,390,40</area>
+ </shape>
+ <textarea name="buttontext">
+ <area>10,0,370,40</area>
+ <align>allcenter</align>
+ <font>basesmall</font>
+ <value>Play</value>
+ </textarea>
+ </state>
+ <state name="selected" from="active">
+ <shape name="background" from="base_button_background_selected">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ <state name="pushed" from="active">
+ <shape name="background" from="base_button_background_pushed">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ </statetype>
+ </button>
+
+ <button name="done_button">
+ <position>25,443</position>
+ <statetype name="buttonstate">
+ <state name="active">
+ <shape name="background" from="base_button_background_active">
+ <area>0,0,390,40</area>
+ </shape>
+ <textarea name="buttontext">
+ <area>10,0,370,40</area>
+ <align>allcenter</align>
+ <font>basesmall</font>
+ <value>Done</value>
+ </textarea>
+ </state>
+ <state name="selected" from="active">
+ <shape name="background" from="base_button_background_selected">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ <state name="pushed" from="active">
+ <shape name="background" from="base_button_background_pushed">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ </statetype>
+ </button>
+
+ </window>
+
+ <window name="edit_metadata">
+
+ <group name="fanart-group" from="base_fanart_group" />
+
+ <textarea name="heading" from="base_heading">
+ <value>Edit Game Information</value>
+ </textarea>
+
+ <shape name="edit-metadata-backdrop" from="base_backdrop">
+ <area>190,36,900,648</area>
+ </shape>
+
+ <shape name="edit-metadata-backdrop-line" from="base_backdrop_line">
+ <area>191,37,898,646</area>
+ </shape>
+
+ <shape name="edit-metadata-top-line" from="base_highlight_line">
+ <area>192,38,896,2</area>
+ </shape>
+
+ <shape name="edit-metadata-bottom-line" from="base_highlight_line">
+ <area>192,680,896,2</area>
+ </shape>
+
+ <shape name="edit-metadata-left-line" from="base_highlight_vertical_line">
+ <area>192,40,2,640</area>
+ </shape>
+
+ <shape name="edit-metadata-right-line" from="base_highlight_vertical_line">
+ <area>1086,40,2,640</area>
+ </shape>
+
+ <shape name="edit-metadata-buttons-top-line" from="base_line">
+ <area>213,604,854,2</area>
+ </shape>
+
+ <textarea name="gamename_label" from="basetextarea">
+ <area>164,66,230,32</area>
+ <font>basemedium</font>
+ <align>right,vcenter</align>
+ <value>Title:</value>
+ </textarea>
+
+ <textedit name="title_edit" from="base_wide_textedit">
+ <area>414,66,580,32</area>
+ </textedit>
+
+ <textarea name="genre_label" from="gamename_label">
+ <position>164,123</position>
+ <value>Genre:</value>
+ </textarea>
+
+ <textedit name="genre_edit" from="title_edit">
+ <position>414,123</position>
+ </textedit>
+
+ <textarea name="country_label" from="gamename_label">
+ <position>164,180</position>
+ <value>Country:</value>
+ </textarea>
+
+ <textedit name="country_edit" from="title_edit">
+ <position>414,180</position>
+ </textedit>
+
+ <textarea name="publisher_label" from="gamename_label">
+ <position>164,237</position>
+ <value>Publisher:</value>
+ </textarea>
+
+ <textedit name="publisher_edit" from="title_edit">
+ <position>414,237</position>
+ </textedit>
+
+ <textarea name="plot_label" from="gamename_label">
+ <position>164,294</position>
+ <value>Description:</value>
+ </textarea>
+
+ <textedit name="description_edit" from="title_edit">
+ <position>414,294</position>
+ </textedit>
+
+ <textarea name="year_label" from="gamename_label">
+ <position>164,351</position>
+ <value>Year:</value>
+ </textarea>
+
+ <textedit name="year_edit" from="title_edit">
+ <area>414,351,120,32</area>
+ <textarea name="text">
+ <area>0,0,120,32</area>
+ <align>allcenter</align>
+ </textarea>
+ </textedit>
+
+ <textarea name="fav_label" from="gamename_label">
+ <position>845,351</position>
+ <align>left,vcenter</align>
+ <value>Favorite:</value>
+ </textarea>
+
+ <checkbox name="favorite_check" from="base_checkbox">
+ <position>960,351</position>
+ </checkbox>
+
+ <textarea name="coverart_label" from="gamename_label">
+ <position>164,408</position>
+ <value>Coverart:</value>
+ </textarea>
+
+ <button name="coverart_button" from="base_searchbutton">
+ <area>414,408,30,30</area>
+ </button>
+
+ <textarea name="coverart_text" from="basetextarea">
+ <area>456,408,545,32</area>
+ <font>basesmaller</font>
+ <cutdown>left</cutdown>
+ <value>/path/to/the/thing.jpg</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="fanart_label" from="gamename_label">
+ <position>164,465</position>
+ <value>Fanart:</value>
+ </textarea>
+
+ <button name="fanart_button" from="coverart_button">
+ <position>414,465</position>
+ </button>
+
+ <textarea name="fanart_text" from="coverart_text">
+ <position>456,465</position>
+ </textarea>
+
+ <textarea name="screenshot_label" from="gamename_label">
+ <position>164,522</position>
+ <value>Screenshot:</value>
+ </textarea>
+
+ <button name="screenshot_button" from="coverart_button">
+ <area>414,522,30,30</area>
+ </button>
+
+ <textarea name="screenshot_text" from="coverart_text">
+ <position>456,522</position>
+ </textarea>
+
+ <button name="done_button" from="base_wide_button">
+ <position>400,623</position>
+ <value>Done</value>
+ </button>
+
+ <!-- Widgets -->
+
+ <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
+
+ <clock name="clock" from="base_clock" />
+
+ </window>
+
+</mythuitheme>
diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch
new file mode 100644
index 0000000..61fe4be
--- /dev/null
+++ b/abs/core/linhes-theme/music-ui.xml.patch
@@ -0,0 +1,11 @@
+--- music-ui.xml.orig 2014-01-13 21:56:30.959750358 +0000
++++ music-ui.xml 2014-01-13 21:56:47.534325378 +0000
+@@ -1972,7 +1972,7 @@
+ <group name="heading-backdrop" from="base_heading_group" />
+
+ <textarea name="heading" from="base_heading">
+- <value>Edit Track Information</value>
++ <value>Edit Track Information</value>
+ </textarea>
+
+ <shape name="edit-metadata-backdrop" from="base_backdrop">
diff --git a/abs/core/linhes-theme/mytharchive-ui.xml b/abs/core/linhes-theme/mytharchive-ui.xml
new file mode 100644
index 0000000..81a3fe3
--- /dev/null
+++ b/abs/core/linhes-theme/mytharchive-ui.xml
@@ -0,0 +1,1084 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+
+<mythuitheme>
+
+ <window name="selectdestination">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Archive Files</value>
+ </textarea>
+
+ <shape name="destination-backdrop" from="base_backdrop">
+ <area>115,36,1050,649</area>
+ </shape>
+
+ <shape name="destination-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,506</area>
+ </shape>
+
+ <shape name="destination-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-line" from="base_highlight_line">
+ <area>117,540,1046,2</area>
+ </shape>
+
+ <shape name="destination-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="destination-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="destination-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,547,1048,137</area>
+ </shape>
+
+ <shape name="destination-bottom-top-line" from="base_highlight_line">
+ <area>117,548,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="destination-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="destination-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <textarea name="destination_label" from="basetextarea">
+ <area>128,67,430,32</area>
+ <align>right,vcenter</align>
+ <value>Destination:</value>
+ </textarea>
+
+ <buttonlist name="destination_selector" from="base_selector">
+ <area>578,67,300,32</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active" />
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>304,-2</position>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>304,15</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="destination_text" from="basetextarea">
+ <area>139,552,1003,66</area>
+ <font>basesmallerblue</font>
+ <cutdown>yes</cutdown>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+
+ <button name="find_button" from="base_button">
+ <position>408,140</position>
+ <value>File...</value>
+ </button>
+
+ <textedit name="filename_edit" from="base_textedit">
+ <area>578,140,450,35</area>
+ </textedit>
+
+ <textarea name="freespace_label" from="destination_label">
+ <position>128,206</position>
+ <value>Destination Free Space:</value>
+ </textarea>
+
+ <textarea name="freespace_text" from="basetextarea">
+ <area>578,206,200,32</area>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="iso_label" from="destination_label">
+ <position>128,263</position>
+ <value>Create ISO Image:</value>
+ </textarea>
+
+ <checkbox name="makeisoimage_check" from="base_checkbox">
+ <position>578,263</position>
+ </checkbox>
+
+ <textarea name="burntodvdr_text" from="destination_label">
+ <position>128,320</position>
+ <value>Burn to DVD:</value>
+ </textarea>
+
+ <checkbox name="burntodvdr_check" from="base_checkbox">
+ <position>578,320</position>
+ </checkbox>
+
+ <textarea name="erasedvdrw_text" from="destination_label">
+ <position>128,377</position>
+ <value>Overwrite DVD-RW Media:</value>
+ </textarea>
+
+ <checkbox name="erasedvdrw_check" from="base_checkbox">
+ <position>578,377</position>
+ </checkbox>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_small_button">
+ <position>722,631</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="next_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Next</value>
+ </button>
+
+ </window>
+
+ <window name="recording_selector">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Add Recordings</value>
+ </textarea>
+
+ <shape name="groups-backdrop" from="base_backdrop">
+ <area>20,36,316,352</area>
+ </shape>
+
+ <shape name="groups-backdrop-line" from="base_backdrop_line">
+ <area>21,37,314,350</area>
+ </shape>
+
+ <shape name="groups-top-line" from="base_highlight_line">
+ <area>22,38,312,2</area>
+ </shape>
+
+ <shape name="groups-bottom-line" from="base_highlight_line">
+ <area>22,384,312,2</area>
+ </shape>
+
+ <shape name="groups-left-line" from="base_highlight_vertical_line">
+ <area>22,40,2,344</area>
+ </shape>
+
+ <shape name="groups-right-line" from="base_highlight_vertical_line">
+ <area>332,40,2,344</area>
+ </shape>
+
+ <shape name="reclist-backdrop" from="base_backdrop">
+ <area>346,36,914,352</area>
+ </shape>
+
+ <shape name="reclist-backdrop-line" from="base_backdrop_line">
+ <area>347,37,912,350</area>
+ </shape>
+
+ <shape name="reclist-top-line" from="base_highlight_line">
+ <area>348,38,910,2</area>
+ </shape>
+
+ <shape name="reclist-bottom-line" from="base_highlight_line">
+ <area>348,384,910,2</area>
+ </shape>
+
+ <shape name="reclist-left-line" from="base_highlight_vertical_line">
+ <area>348,40,2,344</area>
+ </shape>
+
+ <shape name="reclist-right-line" from="base_highlight_vertical_line">
+ <area>1256,40,2,344</area>
+ </shape>
+
+ <shape name="groups-arrows-backdrop" from="base_arrows_backdrop">
+ <area>283,387,50,11</area>
+ </shape>
+
+ <shape name="relist-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1207,387,50,11</area>
+ </shape>
+
+ <shape name="description-backdrop" from="base_backdrop">
+ <area>20,398,1240,287</area>
+ </shape>
+
+ <shape name="description-backdrop-line" from="base_backdrop_line">
+ <area>21,399,1238,285</area>
+ </shape>
+
+ <shape name="description-top-line" from="base_highlight_line">
+ <area>22,400,1236,2</area>
+ </shape>
+
+ <shape name="description-bottom-line" from="base_highlight_line">
+ <area>22,681,1236,2</area>
+ </shape>
+
+ <shape name="description-left-line" from="base_highlight_vertical_line">
+ <area>22,402,2,230</area>
+ </shape>
+
+ <shape name="description-right-line" from="base_highlight_vertical_line">
+ <area>1256,402,2,230</area>
+ </shape>
+
+ <shape name="description-seperator-top-line" from="base_line">
+ <area>188,438,684,2</area>
+ </shape>
+
+ <shape name="description-seperator-bottom-line" from="base_line">
+ <area>188,594,684,2</area>
+ </shape>
+
+ <shape name="description-seperator-bottom-line2" from="base_line">
+ <area>37,632,1206,2</area>
+ </shape>
+
+ <shape name="coverart-border">
+ <area>37,415,136,204</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#AAAAAA" alpha="100" width="2" />
+ <cornerradius>6</cornerradius>
+ </shape>
+
+ <shape name="preview-border">
+ <area>887,415,356,204</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#AAAAAA" alpha="100" width="2" />
+ <cornerradius>6</cornerradius>
+ </shape>
+
+ <buttonlist name="category_selector" from="base_list">
+ <area>28,44,300,338</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,300,30</area>
+ <textarea name="buttontext">
+ <area>8,0,284,30</area>
+ <font>basesmaller</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,300,64</area>
+ <textarea name="buttontext">
+ <area>8,0,284,64</area>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+ </state>
+ <state name="selectedinactive">
+ <area>0,0,300,64</area>
+ <textarea name="buttontext">
+ <area>8,0,284,64</area>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>262,345</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>282,345</position>
+ </statetype>
+ </buttonlist>
+
+ <buttonlist name="recordinglist">
+ <area>354,44,898,338</area>
+ <layout>vertical</layout>
+ <spacing>4</spacing>
+ <scrollstyle>free</scrollstyle>
+ <arrange>stack</arrange>
+ <wrapstyle>items</wrapstyle>
+ <buttonarea>0,0,100%,100%</buttonarea>
+ <align>top</align>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,898,30</area>
+ <shape name="buttonbackground" from="base_select_bar_active">
+ <area>0,0,100%,100%</area>
+ </shape>
+ <statetype name="buttoncheck">
+ <area>8,5,20,20</area>
+ <state type="off">
+ <imagetype name="checkoff">
+ <filename>images/lb-check-empty.png</filename>
+ </imagetype>
+ </state>
+ <state type="half">
+ <imagetype name="checkhalf">
+ <filename>images/lb-check-half.png</filename>
+ </imagetype>
+ </state>
+ <state type="full">
+ <imagetype name="checkfull">
+ <filename>images/lb-check-full.png</filename>
+ </imagetype>
+ </state>
+ </statetype>
+ <textarea name="titlesubtitle" from="base_text_font_state_small">
+ <area>36,0,694,30</area>
+ <font state="normal">basesmallverylightgrey</font>
+ </textarea>
+ <textarea name="filesize_str" from="base_text_font_state_extrasmall">
+ <area>818,0,72,30</area>
+ <font state="normal">baseextrasmallverylightgrey</font>
+ <cutdown>no</cutdown>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active" />
+ <state name="selectedactive" from="active" >
+ <area>0,0,898,64</area>
+ <shape name="buttonbackground" from="base_select_bar_selectedactive">
+ <area>0,0,100%,100%</area>
+ </shape>
+ <statetype name="cutlist">
+ <state name="no">
+ <textarea name="cutlistoff" from="basetextarea">
+ <area>600,24,80,20</area>
+ <font>basesupersmall</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+ <alpha>80</alpha>
+ <value>CUTLIST</value>
+ </textarea>
+ </state>
+ <state name="yes">
+ <textarea name="cutlist" from="basetextarea">
+ <area>600,24,80,20</area>
+ <font>basesupersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+ <value>CUTLIST</value>
+ </textarea>
+ </state>
+ </statetype>
+ <textarea name="s00e00" from="base_text_font_state_extrasmall">
+ <area>500,42,70,20</area>
+ <font state="normal">baseextrasmall</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+ </textarea>
+ <textarea name="timedate" from="base_text_font_state_extrasmall">
+ <area>575,42,315,20</area>
+ <font state="normal">baseextrasmall</font>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>860,345</position>
+ <state type="off">
+ <imagetype name="upoff">
+ <filename>images/lists_up_arrow.png</filename>
+ <alpha>80</alpha>
+ </imagetype>
+ </state>
+ <state type="full">
+ <imagetype name="upon">
+ <filename>images/lists_up_arrow.png</filename>
+ <alpha>200</alpha>
+ </imagetype>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>880,345</position>
+ <state type="off">
+ <imagetype name="dnoff">
+ <filename>images/lists_down_arrow.png</filename>
+ <alpha>80</alpha>
+ </imagetype>
+ </state>
+ <state type="full">
+ <imagetype name="dnon">
+ <filename>images/lists_down_arrow.png</filename>
+ <alpha>200</alpha>
+ </imagetype>
+ </state>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="progtitle" from="basetextarea">
+ <area>189,402,682,36</area>
+ <font>basemediumyellow</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="progdescription" from="basetextarea">
+ <area>189,449,682,140</area>
+ <multiline>yes</multiline>
+ <cutdown>yes</cutdown>
+ </textarea>
+
+ <imagetype name="preview_image">
+ <area>41,419,128,196</area>
+ <filename>images/no_coverart.png</filename>
+ <mask>images/masks/watchrecordings_coverart_mask.png</mask>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <imagetype name="no_preview_image_without_fanart">
+ <area>891,419,348,196</area>
+ <filename>images/no_preview.png</filename>
+ <mask>images/masks/watchrecordings_preview_mask.png</mask>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <button name="cancel_button" from="base_button">
+ <position>37,640</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="ok_button" from="base_button">
+ <position>1093,640</position>
+ <value>OK</value>
+ </button>
+
+ </window>
+
+
+ <window name="file_selector">
+ <area>0,0,1280,720</area>
+
+ <textarea name="title_text" from="base_heading">
+ <value>Select Files</value>
+ </textarea>
+
+ <shape name="fullpath-backdrop" from="base_backdrop">
+ <area>0,37,1280,44</area>
+ <type>box</type>
+ </shape>
+
+ <shape name="fullpath-top-line" from="base_line">
+ <area>0,38,1280,2</area>
+ </shape>
+
+ <shape name="fullpath-bottom-line" from="base_line">
+ <area>0,77,1280,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-backdrop" from="base_backdrop">
+ <area>20,92,615,592</area>
+ </shape>
+
+ <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line">
+ <area>21,93,613,590</area>
+ </shape>
+
+ <shape name="file-browser-preview-top-line" from="base_highlight_line">
+ <area>22,94,611,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-bottom-line" from="base_highlight_line">
+ <area>22,680,611,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line">
+ <area>22,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line">
+ <area>631,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-line" from="base_backdrop_line">
+ <area>42,158,571,324</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-top-line" from="base_highlight_line">
+ <area>43,159,569,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line">
+ <area>43,479,569,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line">
+ <area>43,161,2,318</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line">
+ <area>610,161,2,318</area>
+ </shape>
+
+ <shape name="file-browser-backdrop" from="base_backdrop">
+ <area>645,92,615,592</area>
+ </shape>
+
+ <shape name="file-browser-backdrop-line" from="base_backdrop_line">
+ <area>646,93,613,590</area>
+ </shape>
+
+ <shape name="file-browser-top-line" from="base_highlight_line">
+ <area>647,94,611,2</area>
+ </shape>
+
+ <shape name="file-browser-bottom-line" from="base_highlight_line">
+ <area>647,680,611,2</area>
+ </shape>
+
+ <shape name="file-browser-left-line" from="base_highlight_vertical_line">
+ <area>647,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-right-line" from="base_highlight_vertical_line">
+ <area>1256,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1207,684,50,10</area>
+ </shape>
+
+ <buttonlist name="filelist" from="base_list">
+ <area>653,100,599,578</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,599,54</area>
+ <statetype name="buttoncheck">
+ <area>4,17,20,20</area>
+ </statetype>
+ <imagetype name="buttonimage">
+ <area>28,2,77,50</area>
+ <filename>images/file_browser_no_preview.png</filename>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+ <textarea name="buttontext">
+ <area>115,0,382,54</area>
+ <font>basesmaller</font>
+ <multiline>yes</multiline>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="size" from="buttontext">
+ <area>497,0,100,54</area>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,599,112</area>
+ <statetype name="buttoncheck">
+ <area>10,46,20,20</area>
+ </statetype>
+ <imagetype name="buttonimage">
+ <area>38,4,138,104</area>
+ <filename>images/file_browser_no_preview.png</filename>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+ <textarea name="buttontext">
+ <area>186,0,307,112</area>
+ <font>basesmallyellow</font>
+ <multiline>yes</multiline>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="size" from="buttontext">
+ <area>493,0,100,112</area>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="selectedactive">
+ <shape name="buttonbackground" from="base_select_bar_selectedinactive">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>561,585</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>581,585</position>
+ </statetype>
+ </buttonlist>
+
+ <textedit name="location_edit" from="base_wide_textedit">
+ <area>40,107,575,40</area>
+ </textedit>
+
+ <imagetype name="no_preview">
+ <area>46,161,563,318</area>
+ <filename>images/file_browser_no_preview.png</filename>
+ <mask>images/masks/file_browser_preview_mask.png</mask>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
+ <imagetype name="preview">
+ <area>46,161,563,318</area>
+ <mask>images/masks/file_browser_preview_mask.png</mask>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
+ <button name="back_button" from="base_button">
+ <position>252,493</position>
+ <value>Up Level</value>
+ </button>
+
+ <button name="home_button" from="base_button">
+ <position>252,540</position>
+ <value>Home</value>
+ </button>
+
+ <button name="cancel_button" from="base_button">
+ <position>252,587</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="ok_button" from="base_button">
+ <position>252,634</position>
+ <value>OK</value>
+ </button>
+
+ </window>
+
+
+ <window name="video_selector">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Add Videos</value>
+ </textarea>
+
+ <shape name="video-tree-directory-backdrop" from="base_backdrop">
+ <area>20,36,613,352</area>
+ </shape>
+
+ <shape name="video-tree-directory-backdrop-line" from="base_backdrop_line">
+ <area>21,37,611,350</area>
+ </shape>
+
+ <shape name="video-tree-top-line" from="base_highlight_line">
+ <area>22,38,609,2</area>
+ </shape>
+
+ <shape name="video-tree-bottom-line" from="base_highlight_line">
+ <area>22,384,609,2</area>
+ </shape>
+
+ <shape name="video-tree-left-line" from="base_highlight_vertical_line">
+ <area>22,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-right-line" from="base_highlight_vertical_line">
+ <area>629,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-files-backdrop" from="base_backdrop">
+ <area>647,36,613,352</area>
+ </shape>
+
+ <shape name="video-tree-files-backdrop-line" from="base_backdrop_line">
+ <area>648,37,611,350</area>
+ </shape>
+
+ <shape name="video-tree-files-top-line" from="base_highlight_line">
+ <area>649,38,609,2</area>
+ </shape>
+
+ <shape name="video-tree-files-bottom-line" from="base_highlight_line">
+ <area>649,384,609,2</area>
+ </shape>
+
+ <shape name="video-tree-left-line" from="base_highlight_vertical_line">
+ <area>22,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-right-line" from="base_highlight_vertical_line">
+ <area>629,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-files-backdrop" from="base_backdrop">
+ <area>647,36,613,352</area>
+ </shape>
+
+ <shape name="video-tree-files-backdrop-line" from="base_backdrop_line">
+ <area>648,37,611,350</area>
+ </shape>
+
+ <shape name="video-tree-files-top-line" from="base_highlight_line">
+ <area>649,38,609,2</area>
+ </shape>
+
+ <shape name="video-tree-files-bottom-line" from="base_highlight_line">
+ <area>649,384,609,2</area>
+ </shape>
+
+ <shape name="video-tree-files-left-line" from="base_highlight_vertical_line">
+ <area>649,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-files-right-line" from="base_highlight_vertical_line">
+ <area>1256,40,2,384</area>
+ </shape>
+
+ <shape name="video-tree-arrows-backdrop" from="base_arrows_backdrop">
+ <area>580,388,50,11</area>
+ </shape>
+
+ <shape name="video-tree-files-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1207,388,50,11</area>
+ </shape>
+
+ <shape name="video-bottom-backdrop" from="base_backdrop">
+ <area>20,398,1240,287</area>
+ </shape>
+
+ <shape name="video-bottom-backdrop-line" from="base_backdrop_line">
+ <area>21,399,1039,285</area>
+ </shape>
+
+ <shape name="video-bottom-top-line" from="base_highlight_line">
+ <area>22,400,1037,2</area>
+ </shape>
+
+ <shape name="video-bottom-bottom-line" from="base_highlight_line">
+ <area>22,681,1037,2</area>
+ </shape>
+
+ <shape name="video-bottom-left-line" from="base_highlight_vertical_line">
+ <area>22,402,2,279</area>
+ </shape>
+
+ <shape name="video-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1057,402,2,279</area>
+ </shape>
+
+ <shape name="video-bottom-seperator-first-line" from="base_line">
+ <area>39,442,1003,2</area>
+ </shape>
+
+ <shape name="video-bottom-seperator-second-line" from="base_line">
+ <area>39,484,1003,2</area>
+ </shape>
+
+ <shape name="video-bottom-seperator-third-line" from="base_line">
+ <area>39,639,1003,2</area>
+ </shape>
+
+ <shape name="video-coverart-backdrop-line" from="base_backdrop_line">
+ <area>1066,399,193,285</area>
+ </shape>
+
+ <shape name="video-coverart-top-line" from="base_highlight_line">
+ <area>1054,400,204,2</area>
+ </shape>
+
+ <shape name="video-coverart-bottom-line" from="base_highlight_line">
+ <area>1067,681,191,2</area>
+ </shape>
+
+ <shape name="video-coverart-left-line" from="base_highlight_vertical_line">
+ <area>1067,402,2,279</area>
+ </shape>
+
+ <shape name="video-coverart-right-line" from="base_highlight_vertical_line">
+ <area>1256,402,2,279</area>
+ </shape>
+
+ <buttonlist name="category_selector" from="base_list">
+ <buttonarea>28,44,1224,338</buttonarea>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,597,30</area>
+ <textarea name="buttontext">
+ <area>8,0,581,30</area>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,597,64</area>
+ <textarea name="buttontext">
+ <area>8,0,561,64</area>
+ <align>left,vcenter</align>
+ </textarea>
+ <imagetype name="buttonarrow">
+ <position>577,22</position>
+ </imagetype>
+ </state>
+ <state name="selectedinactive">
+ <area>0,0,597,64</area>
+ <textarea name="buttontext">
+ <area>8,0,581,64</area>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>586,389</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>606,389</position>
+ </statetype>
+ </buttonlist>
+
+ <buttonlist name="videolist" from="base_list">
+ <buttonarea>655,44,1224,338</buttonarea>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,597,30</area>
+ <statetype name="buttoncheck">
+ <area>8,5,20,20</area>
+ </statetype>
+ <textarea name="buttontext">
+ <area>36,0,581,30</area>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,597,64</area>
+ <statetype name="buttoncheck">
+ <area>8,21,20,20</area>
+ </statetype>
+ <textarea name="buttontext">
+ <area>36,0,561,64</area>
+ <align>left,vcenter</align>
+ </textarea>
+ <imagetype name="buttonarrow">
+ <position>577,22</position>
+ </imagetype>
+ </state>
+ <state name="selectedinactive">
+ <area>0,0,597,64</area>
+ <statetype name="buttoncheck">
+ <area>8,21,20,20</area>
+ </statetype>
+ <textarea name="buttontext">
+ <area>36,0,581,64</area>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>1213,389</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>1233,389</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="videotitle" from="basetextarea">
+ <area>40,402,553,42</area>
+ <cutdown>yes</cutdown>
+ <font>basemediumyellow</font>
+ <align>vcenter</align>
+ </textarea>
+
+ <textarea name="videoplot" from="basetextarea">
+ <area>40,493,1001,140</area>
+ <font>basesmall</font>
+ <align>justify</align>
+ <multiline>yes</multiline>
+ <cutdown>yes</cutdown>
+ </textarea>
+
+ <textarea name="filesizelbl" from="basetextarea">
+ <area>847,444,60,42</area>
+ <font>basesmall</font>
+ <value>Size:</value>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="filesize" from="basetextarea">
+ <area>912,444,124,42</area>
+ <font>basesmallblue</font>
+ <align>allcenter</align>
+ </textarea>
+
+ <imagetype name="cover_background">
+ <area>1070,403,185,277</area>
+ <filename>images/no_coverart.png</filename>
+ <mask>images/masks/tree_coverart_mask.png</mask>
+ <preserveaspect>no</preserveaspect>
+ </imagetype>
+
+ <imagetype name="cover_image">
+ <area>1070,403,185,277</area>
+ <mask>images/masks/tree_coverart_mask.png</mask>
+ <preserveaspect>no</preserveaspect>
+ </imagetype>
+
+ <textarea name="parentallabel" from="basetextarea">
+ <area>847,411,158,24</area>
+ <font>basesmall</font>
+ <cutdown>no</cutdown>
+ <align>right,vcenter</align>
+ <value>Parental Level:</value>
+ </textarea>
+
+ <textarea name="parentallevel_text" from="basetextarea">
+ <area>1002,411,40,24</area>
+ <font>basesmallblue</font>
+ <align>allcenter</align>
+ </textarea>
+
+ <textarea name="warning_text" from="basetextarea">
+ <area>26,42,601,340</area>
+ <multiline>yes</multiline>
+ <font>basesmall</font>
+ <align>allcenter</align>
+ <value>No videos available</value>
+ </textarea>
+
+ <button name="cancel_button" from="base_button">
+ <position>39,643</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="ok_button" from="base_button">
+ <position>892,643</position>
+ <value>OK</value>
+ </button>
+
+ </window>
+
+ <window name="logviewer">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Archive Log Viewer</value>
+ </textarea>
+
+ <shape name="viewer-backdrop" from="base_backdrop">
+ <area>115,36,1050,498</area>
+ </shape>
+
+ <shape name="viewer-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,496</area>
+ </shape>
+
+ <shape name="viewer-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="viewer-bottom-line" from="base_highlight_line">
+ <area>117,531,1046,2</area>
+ </shape>
+
+ <shape name="viewer-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="viewer-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="viewer-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1112,534,50,11</area>
+ </shape>
+
+ <shape name="viewer-bottom-backdrop" from="base_backdrop">
+ <area>115,545,1050,140</area>
+ </shape>
+
+ <shape name="viewer-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,546,1048,138</area>
+ </shape>
+
+ <shape name="viewer-bottom-top-line" from="base_highlight_line">
+ <area>117,547,1046,2</area>
+ </shape>
+
+ <shape name="viewer-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="viewer-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="viewer-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="viewer-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <buttonlist name="loglist" from="base_list">
+ <area>123,49,1034,488</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,1034,30</area>
+ <textarea name="buttontext">
+ <area>8,0,1018,30</area>
+ <font>basesmaller</font>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,1034,64</area>
+ <textarea name="buttontext">
+ <area>8,0,1018,64</area>
+ <align>vcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+ </state>
+ <state name="selectedinactive">
+ <area>0,0,1034,64</area>
+ <textarea name="buttontext">
+ <area>8,0,1018,64</area>
+ <align>vcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>997,487</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>1017,487</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="logitem_text" from="basetextarea">
+ <area>139,552,1003,66</area>
+ <font>basesmallerblue</font>
+ <cutdown>yes</cutdown>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel Job</value>
+ </button>
+
+ <button name="update_button" from="base_small_button">
+ <position>540,631</position>
+ <value>Update</value>
+ </button>
+
+ <button name="exit_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Exit</value>
+ </button>
+
+ </window>
+
+</mythuitheme>
diff --git a/abs/core/linhes-theme/mythburn-ui.xml b/abs/core/linhes-theme/mythburn-ui.xml
new file mode 100644
index 0000000..af8596d
--- /dev/null
+++ b/abs/core/linhes-theme/mythburn-ui.xml
@@ -0,0 +1,976 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+<!--
+
+MythArchive GUI theme
+
+-->
+<mythuitheme>
+
+ <window name="profilepopup">
+ <area>-1,-1,602,488</area>
+
+ <animation trigger="AboutToShow">
+ <section>
+ <alpha start="0" end="255" easingcurve="OutQuart"/>
+ <zoom start="0" end="100" easingcurve="OutQuart"/>
+ </section>
+ </animation>
+
+ <animation trigger="AboutToHide">
+ <section>
+ <alpha start="255" end="0" easingcurve="InQuart"/>
+ <zoom start="100" end="0" easingcurve="InQuart"/>
+ </section>
+ </animation>
+
+ <shape name="profile-popup-backdrop" from="base_popup_backdrop">
+ <area>0,0,602,488</area>
+ </shape>
+
+ <shape name="profile-popup-backdrop-line" from="base_backdrop_line">
+ <area>1,1,600,486</area>
+ </shape>
+
+ <shape name="profile-popup-top-line" from="base_highlight_line">
+ <area>2,2,596,2</area>
+ </shape>
+
+ <shape name="profile-popup-bottom-line" from="base_highlight_line">
+ <area>2,484,596,2</area>
+ </shape>
+
+ <shape name="profile-popup-left-line" from="base_highlight_vertical_line">
+ <area>2,4,2,480</area>
+ </shape>
+
+ <shape name="profile-popup-right-line" from="base_highlight_vertical_line">
+ <area>598,4,2,480</area>
+ </shape>
+
+ <shape name="profile-popup-seperator-first-line" from="base_line">
+ <area>23,50,556,2</area>
+ </shape>
+
+ <shape name="profile-popup-seperator-second-line" from="base_line">
+ <area>23,436,556,2</area>
+ </shape>
+
+ <textarea name="title" from="basetextarea">
+ <area>10,4,582,46</area>
+ <font>basemediumlargerdarkyellow</font>
+ <align>allcenter</align>
+ <value>Encoding Profile</value>
+ </textarea>
+
+ <textarea name="caption_text" from="basetextarea">
+ <area>10,80,582,32</area>
+ <font>basemedium</font>
+ <align>allcenter</align>
+ </textarea>
+
+ <buttonlist name="profile_list" from="base_selector">
+ <area>149,142,300,32</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active" />
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>304,-2</position>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>304,15</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="description_text" from="basetextarea">
+ <area>70,204,462,64</area>
+ <align>allcenter</align>
+ <font>basesmallblue</font>
+ <multiline>yes</multiline>
+ </textarea>
+
+ <textarea name="oldsize_lbl" from="basetextarea">
+ <area>10,298,281,32</area>
+ <font>basesmall</font>
+ <align>right,vcenter</align>
+ <value>Original Size:</value>
+ </textarea>
+
+ <textarea name="oldsize_text" from="basetextarea">
+ <area>311,298,281,32</area>
+ <font>basesmall</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="newsize_lbl" from="oldsize_lbl">
+ <area>10,360,281,32</area>
+ <value>Encoded Size:</value>
+ </textarea>
+
+ <textarea name="newsize_text" from="oldsize_text">
+ <area>311,360,281,32</area>
+ </textarea>
+
+ <button name="ok_button" from="base_medium_button">
+ <position>126,441</position>
+ <value>OK</value>
+ </button>
+ </window>
+
+ <!--
+ theme selector
+ -->
+
+ <window name="themeselector">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>DVD Menu Theme</value>
+ </textarea>
+
+ <shape name="theme-backdrop" from="base_backdrop">
+ <area>115,36,1050,649</area>
+ </shape>
+
+ <shape name="theme-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,506</area>
+ </shape>
+
+ <shape name="theme-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="theme-bottom-line" from="base_highlight_line">
+ <area>117,540,1046,2</area>
+ </shape>
+
+ <shape name="theme-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="theme-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="theme-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,547,1048,137</area>
+ </shape>
+
+ <shape name="theme-bottom-top-line" from="base_highlight_line">
+ <area>117,548,1046,2</area>
+ </shape>
+
+ <shape name="theme-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="theme-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="theme-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="theme-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <textarea name="themetitle" from="basetextarea">
+ <area>208,67,300,32</area>
+ <align>right,vcenter</align>
+ <value>Theme:</value>
+ </textarea>
+
+ <buttonlist name="theme_selector" from="base_selector">
+ <area>528,67,300,32</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,300,32</area>
+ <textarea name="buttontext">
+ <area>15,0,270,32</area>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active" />
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>304,-2</position>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>304,15</position>
+ </statetype>
+ </buttonlist>
+
+ <imagetype name="theme_image" >
+ <area>0,0,1,1</area>
+ </imagetype>
+
+ <!--
+ theme preview images
+ -->
+
+ <textarea name="introtitle" from="themetitle">
+ <area>207,205,150,32</area>
+ <value>Intro --></value>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="intronone" from="themetitle">
+ <area>377,189,175,64</area>
+ <value>Not available in this theme</value>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
+
+ <imagetype name="intro_image">
+ <area>367,140,195,162</area>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+
+ <textarea name="menutitle" from="introtitle">
+ <area>922,205,150,32</area>
+ <value><-- Main Menu</value>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="menunone" from="intronone">
+ <area>727,189,175,64</area>
+ <value>Not Available in this Theme</value>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
+
+ <imagetype name="mainmenu_image" from="intro_image">
+ <area>717,140,195,162</area>
+ </imagetype>
+
+ <textarea name="chaptertitle" from="introtitle">
+ <area>177,408,180,32</area>
+ <value>Chapter Menu --></value>
+ </textarea>
+
+ <textarea name="chapternone" from="intronone">
+ <area>377,392,175,64</area>
+ <value>Not Available in this Theme</value>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
+
+ <imagetype name="chapter_image" from="intro_image">
+ <area>367,343,195,162</area>
+ </imagetype>
+
+ <textarea name="detailtitle" from="menutitle">
+ <area>922,408,150,32</area>
+ <value><-- Details</value>
+ </textarea>
+
+ <textarea name="detailnone" from="intronone">
+ <area>727,392,175,64</area>
+ <value>Not Available in this Theme</value>
+ <multiline>yes</multiline>
+ <align>allcenter</align>
+ </textarea>
+
+ <imagetype name="details_image" from="intro_image">
+ <area>717,343,195,162</area>
+ </imagetype>
+
+ <!--
+ theme description
+ -->
+
+ <textarea name="themedescription" from="basetextarea">
+ <area>139,552,1003,66</area>
+ <font>basesmallerblue</font>
+ <cutdown>yes</cutdown>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ </textarea>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_small_button">
+ <position>722,631</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="next_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Next</value>
+ </button>
+
+ </window>
+
+ <!--
+ ******************************************************************
+ The main mythburn screen
+ *******************************************************************
+ -->
+
+ <window name="mythburn">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Archive Items to DVD</value>
+ </textarea>
+
+ <shape name="add-backdrop" from="base_backdrop">
+ <area>115,36,1050,498</area>
+ </shape>
+
+ <shape name="add-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,496</area>
+ </shape>
+
+ <shape name="add-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-line" from="base_highlight_line">
+ <area>117,531,1046,2</area>
+ </shape>
+
+ <shape name="add-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="add-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="add-seperator-first-line" from="base_line">
+ <area>138,137,1004,2</area>
+ </shape>
+
+ <shape name="add-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1112,534,50,11</area>
+ </shape>
+
+ <shape name="add-bottom-backdrop" from="base_backdrop">
+ <area>115,545,1050,140</area>
+ </shape>
+
+ <shape name="add-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,546,1048,138</area>
+ </shape>
+
+ <shape name="add-bottom-top-line" from="base_highlight_line">
+ <area>117,547,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="add-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="add-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <button name="addrecording_button" from="base_small_button">
+ <position>165,67</position>
+ <value>Add Recording</value>
+ </button>
+
+ <button name="addvideo_button" from="base_small_button">
+ <position>540,67</position>
+ <value>Add Video</value>
+ </button>
+
+ <button name="addfile_button" from="base_small_button">
+ <position>915,67</position>
+ <value>Add File</value>
+ </button>
+
+ <buttonlist name="archivelist" from="base_list">
+ <area>123,169,1034,368</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,1034,30</area>
+ <textarea name="buttontext" from="basetextarea">
+ <area>8,2,433,30</area>
+ <font>basesmall</font>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="subtitle" from="buttontext">
+ <area>441,0,393,30</area>
+ <font>baseextrasmallverylightgrey</font>
+ <align>right,vcenter</align>
+ </textarea>
+ <textarea name="size" from="basetextarea">
+ <area>954,0,72,30</area>
+ <font>baseextrasmallverylightgrey</font>
+ <cutdown>no</cutdown>
+ <align>right,vcenter</align>
+ </textarea>
+ <textarea name="profile" from="size">
+ <area>839,0,110,30</area>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,1034,64</area>
+ <textarea name="buttontext" from="basetextarea">
+ <area>8,2,413,30</area>
+ <font>basesmallyellow</font>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="subtitle" from="buttontext">
+ <area>8,32,613,30</area>
+ <font>basesmalleryellow</font>
+ </textarea>
+ <textarea name="size" from="basetextarea">
+ <area>954,0,72,30</area>
+ <font>baseextrasmallverylightgrey</font>
+ <cutdown>no</cutdown>
+ <align>right,vcenter</align>
+ </textarea>
+ <textarea name="profile" from="size">
+ <area>839,0,110,30</area>
+ </textarea>
+ <textarea name="date" from="basetextarea">
+ <area>711,42,315,20</area>
+ <font>baseextrasmall</font>
+ <align>right,vcenter</align>
+ </textarea>
+ <statetype name="cutliststatus">
+ <state name="none" />
+ <state name="using">
+ <textarea name="cutlist" from="basetextarea">
+ <area>736,24,80,20</area>
+ <font>basesupersmallblue</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+ <value>CUTLIST</value>
+ </textarea>
+ </state>
+ <state name="notusing">
+ <textarea name="cutlistoff" from="basetextarea">
+ <area>736,24,80,20</area>
+ <font>basesupersmall</font>
+ <cutdown>no</cutdown>
+ <align>allcenter</align>
+ <alpha>80</alpha>
+ <value>CUTLIST</value>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="movestate" />
+ </state>
+ <state name="selectedinactive" from="active" />
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>997,367</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>1017,367</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="nofiles" from="basetextarea">
+ <area>150,169,980,32</area>
+ <align>allcenter</align>
+ <value>Add a recording, video or file to archive.</value>
+ </textarea>
+
+ <progressbar name="size_bar" from="baseprogressbar">
+ <position>372,590</position>
+ </progressbar>
+
+ <textarea name="maxsize" from="basetextarea">
+ <area>798,560,100,30</area>
+ <font>basesmall</font>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="minsize" from="maxsize">
+ <area>383,560,100,30</area>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="currentsize" from="maxsize">
+ <area>372,560,536,30</area>
+ <align>allcenter</align>
+ </textarea>
+
+ <textarea name="currentsize_error" from="currentsize">
+ <font>basesmallred</font>
+ </textarea>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_small_button">
+ <position>722,631</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="next_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Finish</value>
+ </button>
+
+ </window>
+
+ <!--
+ *******************************************************************
+ The editmetadata dialog
+ *******************************************************************
+ -->
+
+ <window name="edit_metadata">
+ <area>-1,-1,602,488</area>
+
+ <animation trigger="AboutToShow">
+ <section>
+ <alpha start="0" end="255" easingcurve="OutQuart"/>
+ <zoom start="0" end="100" easingcurve="OutQuart"/>
+ </section>
+ </animation>
+
+ <animation trigger="AboutToHide">
+ <section>
+ <alpha start="255" end="0" easingcurve="InQuart"/>
+ <zoom start="100" end="0" easingcurve="InQuart"/>
+ </section>
+ </animation>
+
+ <shape name="popup-backdrop" from="base_popup_backdrop">
+ <area>0,0,602,488</area>
+ </shape>
+
+ <shape name="popup-backdrop-line" from="base_backdrop_line">
+ <area>1,1,600,486</area>
+ </shape>
+
+ <shape name="popup-top-line" from="base_highlight_line">
+ <area>2,2,596,2</area>
+ </shape>
+
+ <shape name="popup-bottom-line" from="base_highlight_line">
+ <area>2,484,596,2</area>
+ </shape>
+
+ <shape name="popup-left-line" from="base_highlight_vertical_line">
+ <area>2,4,2,480</area>
+ </shape>
+
+ <shape name="popup-right-line" from="base_highlight_vertical_line">
+ <area>598,4,2,480</area>
+ </shape>
+
+ <shape name="popup-seperator-first-line" from="base_line">
+ <area>23,50,556,2</area>
+ </shape>
+
+ <shape name="popup-seperator-second-line" from="base_line">
+ <area>23,436,556,2</area>
+ </shape>
+
+ <textarea name="title" from="basetextarea">
+ <area>23,4,556,46</area>
+ <font>basemediumlargerdarkyellow</font>
+ <align>allcenter</align>
+ <value>Edit Details</value>
+ </textarea>
+
+ <textarea name="title_label" from="basetextarea">
+ <area>23,100,120,32</area>
+ <font>basesmall</font>
+ <align>right,vcenter</align>
+ <value>Title:</value>
+ </textarea>
+
+ <textarea name="subtitle_label" from="title_label">
+ <area>23,164,120,32</area>
+ <value>Subtitle:</value>
+ </textarea>
+
+ <textarea name="startdate_label" from="title_label">
+ <area>23,228,120,32</area>
+ <value>Start Date:</value>
+ </textarea>
+
+ <textarea name="starttime_label" from="title_label">
+ <area>23,292,120,32</area>
+ <value>Time:</value>
+ </textarea>
+
+ <textarea name="description_label" from="title_label">
+ <area>23,356,120,32</area>
+ <value>Description:</value>
+ </textarea>
+
+ <textedit name="title_edit" from="base_textedit">
+ <area>160,100,419,32</area>
+ </textedit>
+
+ <textedit name="subtitle_edit" from="base_textedit">
+ <area>160,164,419,32</area>
+ </textedit>
+
+ <textedit name="startdate_edit" from="base_textedit">
+ <area>160,228,419,32</area>
+ </textedit>
+
+ <textedit name="starttime_edit" from="base_textedit">
+ <area>160,292,419,32</area>
+ </textedit>
+
+ <textedit name="description_edit" from="base_textedit">
+ <area>160,356,419,32</area>
+ </textedit>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>63,441</position>
+ <value>Cancel</value>
+ </button>
+ <button name="ok_button" from="base_small_button">
+ <position>325,441</position>
+ <value>OK</value>
+ </button>
+
+ </window>
+
+ <window name="thumbfinder">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Edit Thumbnails</value>
+ </textarea>
+
+ <shape name="thumb-backdrop" from="base_backdrop">
+ <area>115,36,1050,498</area>
+ </shape>
+
+ <shape name="thumb-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,496</area>
+ </shape>
+
+ <shape name="thumb-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="thumb-bottom-line" from="base_highlight_line">
+ <area>117,531,1046,2</area>
+ </shape>
+
+ <shape name="thumb-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="thumb-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="thumb-seperator-first-line" from="base_line">
+ <area>138,279,1004,2</area>
+ </shape>
+
+ <shape name="thumb-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1106,256,45,11</area>
+ </shape>
+
+ <shape name="thumb-bottom-backdrop" from="base_backdrop">
+ <area>115,545,1050,140</area>
+ </shape>
+
+ <shape name="thumb-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,546,1048,138</area>
+ </shape>
+
+ <shape name="thumb-bottom-top-line" from="base_highlight_line">
+ <area>117,547,1046,2</area>
+ </shape>
+
+ <shape name="thumb-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="thumb-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="thumb-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="thumb-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <shape name="position-background-line" from="base_backdrop_line">
+ <area>521,374,621,66</area>
+ </shape>
+
+ <shape name="position-top-line" from="base_highlight_line">
+ <area>522,375,623,2</area>
+ </shape>
+
+ <shape name="position-line" from="base_highlight_line">
+ <area>522,438,623,2</area>
+ </shape>
+
+ <shape name="position-left-line" from="base_highlight_vertical_line">
+ <area>522,377,2,62</area>
+ </shape>
+
+ <shape name="position-right-line" from="base_highlight_vertical_line">
+ <area>1140,377,2,62</area>
+ </shape>
+
+ <buttonlist name="thumblist">
+ <area>124,59,1032,197</area>
+ <layout>grid</layout>
+ <spacing>2</spacing>
+ <buttonarea>0,0,1032,197</buttonarea>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,205,188</area>
+ <shape name="buttonbackground" from="base_backdrop">
+ <area>0,0,205,188</area>
+ <fill color="#333333" alpha="175" />
+ </shape>
+ <shape name="buttonbackground-line" from="base_backdrop_line">
+ <area>1,1,203,186</area>
+ </shape>
+ <imagetype name="buttonimage">
+ <area>5,5,195,146</area>
+ <!--<area>5,21,195,146</area>-->
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+ <textarea name="buttontext" from="basetextarea">
+ <area>5,159,195,24</area>
+ <font>basesmallgrey</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive" from="active">
+ <area>0,0,209,192</area>
+ <shape name="buttonbackground">
+ <area>-2,-2,209,192</area>
+ <type>roundbox</type>
+ <fill color="#101017" alpha="255" />
+ <cornerradius>8</cornerradius>
+ </shape>
+ <shape name="buttonbackground-line">
+ <area>-2,-2,209,192</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#ffffff" alpha="45" width="4" />
+ <cornerradius>4</cornerradius>
+ </shape>
+ <shape name="buttonbackground-top-highlight-line">
+ <area>2,0,201,4</area>
+ <type>box</type>
+ <fill style="gradient">
+ <gradient direction="horizontal" alpha="0">
+ <stop position="0" color="#ffffff" />
+ <stop position="50" color="#ffffff" alpha="180" />
+ <stop position="100" color="#ffffff" />
+ </gradient>
+ </fill>
+ </shape>
+ <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line">
+ <area>2,184,201,4</area>
+ </shape>
+ <shape name="buttonbackground-left-highlight-line">
+ <area>0,2,4,184</area>
+ <type>box</type>
+ <fill style="gradient">
+ <gradient alpha="0" direction="vertical">
+ <stop position="0" color="#ffffff" />
+ <stop position="50" color="#ffffff" alpha="220" />
+ <stop position="100" color="#ffffff" />
+ </gradient>
+ </fill>
+ </shape>
+ <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line">
+ <area>201,2,4,184</area>
+ </shape>
+ <textarea name="buttontext" from="basetextarea">
+ <area>5,159,195,24</area>
+ <font>basesmallyellow</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active">
+ <shape name="buttonbackground" from="base_backdrop">
+ <area>0,0,205,188</area>
+ </shape>
+ <textarea name="buttontext" from="basetextarea">
+ <area>5,159,195,24</area>
+ <font>basesmallyellow</font>
+ <align>allcenter</align>
+ </textarea>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>987,200</position>
+ <state type="off">
+ <imagetype name="upoff">
+ <filename>images/lists_up_arrow.png</filename>
+ <alpha>80</alpha>
+ </imagetype>
+ </state>
+ <state type="full">
+ <imagetype name="upon">
+ <filename>images/lists_up_arrow.png</filename>
+ <alpha>200</alpha>
+ </imagetype>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>1007,200</position>
+ <state type="off">
+ <imagetype name="dnoff">
+ <filename>images/lists_down_arrow.png</filename>
+ <alpha>80</alpha>
+ </imagetype>
+ </state>
+ <state type="full">
+ <imagetype name="dnon">
+ <filename>images/lists_down_arrow.png</filename>
+ <alpha>200</alpha>
+ </imagetype>
+ </state>
+ </statetype>
+
+ </buttonlist>
+
+ <shape name="buttonbackground">
+ <area>136,300,374,214</area>
+ <type>roundbox</type>
+ <fill color="#101017" alpha="255" />
+ <cornerradius>8</cornerradius>
+ </shape>
+
+ <imagetype name="frameimage">
+ <area>144,306,359,202</area>
+ <filename>images/no_preview.png</filename>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <button name="frame_button">
+ <area>138,302,370,210</area>
+ <statetype name="buttonstate">
+ <state name="active">
+ <area>0,0,370,210</area>
+ <shape name="background-line" from="base_backdrop_line">
+ <area>1,1,368,208</area>
+ </shape>
+ </state>
+ <state name="selected" from="active">
+ <area>0,0,374,214</area>
+ <shape name="buttonbackground-line">
+ <area>-2,-2,374,214</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#ffffff" alpha="45" width="4" />
+ <cornerradius>4</cornerradius>
+ </shape>
+ <shape name="buttonbackground-top-highlight-line">
+ <area>2,0,366,4</area>
+ <type>box</type>
+ <fill style="gradient">
+ <gradient direction="horizontal" alpha="0">
+ <stop position="0" color="#ffffff" />
+ <stop position="50" color="#ffffff" alpha="180" />
+ <stop position="100" color="#ffffff" />
+ </gradient>
+ </fill>
+ </shape>
+ <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line">
+ <area>2,206,366,4</area>
+ </shape>
+ <shape name="buttonbackground-left-highlight-line">
+ <area>0,2,4,206</area>
+ <type>box</type>
+ <fill style="gradient">
+ <gradient alpha="0" direction="vertical">
+ <stop position="0" color="#ffffff" />
+ <stop position="50" color="#ffffff" alpha="220" />
+ <stop position="100" color="#ffffff" />
+ </gradient>
+ </fill>
+ </shape>
+ <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line">
+ <area>366,2,4,206</area>
+ </shape>
+ </state>
+ <state name="disabled" from="active" />
+ <state name="pushed" from="active">
+ </state>
+ </statetype>
+ </button>
+
+ <textarea name="seekamount" from="basetextarea">
+ <area>531,379,601,24</area>
+ <align>right,vcenter</align>
+ <value>frame</value>
+ </textarea>
+
+ <imagetype name="positionimage">
+ <area>531,403,601,8</area>
+ <filename>images/osd/progressbar_background.png</filename>
+ </imagetype>
+
+ <textarea name="currentpos" from="basetextarea">
+ <area>531,411,601,24</area>
+ <font>basesmall</font>
+ <align>allcenter</align>
+ </textarea>
+
+ <textarea name="help_text" from="basetextarea">
+ <area>139,552,1003,66</area>
+ <font>basesmallerblue</font>
+ <cutdown>yes</cutdown>
+ <align>allcenter</align>
+ <multiline>yes</multiline>
+ <value>MENU changes focus. Numbers 0-9 jump to that thumb image.\nWhen the preview image has focus, UP/DOWN changes the seek amount, LEFT/RIGHT jumps forward/backward by the seek amount, and SELECT chooses the current preview image for the selected thumb image.</value>
+ </textarea>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="save_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Save</value>
+ </button>
+
+ </window>
+
+</mythuitheme>
diff --git a/abs/core/linhes-theme/mythnative-ui.xml b/abs/core/linhes-theme/mythnative-ui.xml
new file mode 100644
index 0000000..ba15724
--- /dev/null
+++ b/abs/core/linhes-theme/mythnative-ui.xml
@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+<!--
+
+MythTV Archive GUI theme
+
+-->
+<mythuitheme>
+
+ <!--
+ The export native wizard
+ -->
+
+ <window name="exportnative">
+ <area>0,0,1280,720</area>
+
+ <textarea name="heading" from="base_heading">
+ <value>Archive Items</value>
+ </textarea>
+
+ <shape name="add-backdrop" from="base_backdrop">
+ <area>115,36,1050,498</area>
+ </shape>
+
+ <shape name="add-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,496</area>
+ </shape>
+
+ <shape name="add-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-line" from="base_highlight_line">
+ <area>117,531,1046,2</area>
+ </shape>
+
+ <shape name="add-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="add-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="add-seperator-first-line" from="base_line">
+ <area>138,137,1004,2</area>
+ </shape>
+
+ <shape name="add-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1112,534,50,11</area>
+ </shape>
+
+ <shape name="add-bottom-backdrop" from="base_backdrop">
+ <area>115,545,1050,140</area>
+ </shape>
+
+ <shape name="add-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,546,1048,138</area>
+ </shape>
+
+ <shape name="add-bottom-top-line" from="base_highlight_line">
+ <area>117,547,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="add-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="add-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="add-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <button name="addrecording_button" from="base_small_button">
+ <position>165,67</position>
+ <value>Add Recording</value>
+ </button>
+
+ <button name="addvideo_button" from="base_small_button">
+ <position>915,67</position>
+ <value>Add Video</value>
+ </button>
+
+ <buttonlist name="archivelist" from="base_list">
+ <area>123,169,1034,368</area>
+ <scrollstyle>center</scrollstyle>
+ <arrange>Fixed</arrange>
+ <wrapstyle>selection</wrapstyle>
+ <statetype name="buttonitem">
+ <area>0,0,1034,283</area>
+ <state name="active">
+ <area>0,0,1034,64</area>
+ <textarea name="buttontext" from="basetextarea">
+ <area>8,2,433,30</area>
+ <font>basesmall</font>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,1034,64</area>
+ <textarea name="buttontext" from="basetextarea">
+ <area>0,2,1,30</area>
+ <font>basesmallyellow</font>
+ <align>left,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="active">
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>997,367</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>1017,367</position>
+ </statetype>
+ </buttonlist>
+
+ <textarea name="nofiles" from="basetextarea">
+ <area>150,169,980,32</area>
+ <align>allcenter</align>
+ <value>Add a recording or video to archive.</value>
+ </textarea>
+
+ <textarea name="progtitle" from="basetextarea">
+ <area>131,305,413,30</area>
+ <font>basesmallyellow</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="progdescription" from="progtitle">
+ <area>131,335,858,30</area>
+ <font>basesmalleryellow</font>
+ </textarea>
+
+ <textarea name="progdatetime">
+ <area>999,345,150,20</area>
+ <font>baseextrasmall</font>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="filesize" from="basetextarea">
+ <area>1077,303,72,30</area>
+ <font>baseextrasmallverylightgrey</font>
+ <cutdown>no</cutdown>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <progressbar name="size_bar" from="baseprogressbar">
+ <position>372,590</position>
+ </progressbar>
+
+ <textarea name="maxsize" from="basetextarea">
+ <area>798,560,100,30</area>
+ <font>basesmall</font>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="minsize" from="maxsize">
+ <area>383,560,100,30</area>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="currentsize" from="maxsize">
+ <area>372,560,536,30</area>
+ <align>allcenter</align>
+ </textarea>
+
+ <textarea name="currentsize_error" from="currentsize">
+ <font>basesmallred</font>
+ </textarea>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_small_button">
+ <position>722,631</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="next_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Finish</value>
+ </button>
+
+ </window>
+
+ <!--
+ Archive File Selector
+ -->
+
+ <window name="archivefile_selector">
+ <area>0,0,1280,720</area>
+
+ <textarea name="title" from="base_heading">
+ <value>XML File to Import</value>
+ </textarea>
+
+ <shape name="fullpath-backdrop" from="base_backdrop">
+ <area>0,37,1280,44</area>
+ <type>box</type>
+ </shape>
+
+ <shape name="fullpath-top-line" from="base_line">
+ <area>0,38,1280,2</area>
+ </shape>
+
+ <shape name="fullpath-bottom-line" from="base_line">
+ <area>0,77,1280,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-backdrop" from="base_backdrop">
+ <area>20,92,615,592</area>
+ </shape>
+
+ <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line">
+ <area>21,93,613,590</area>
+ </shape>
+
+ <shape name="file-browser-preview-top-line" from="base_highlight_line">
+ <area>22,94,611,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-bottom-line" from="base_highlight_line">
+ <area>22,680,611,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line">
+ <area>22,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line">
+ <area>631,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-line" from="base_backdrop_line">
+ <area>42,158,571,324</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-top-line" from="base_highlight_line">
+ <area>43,159,569,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line">
+ <area>43,479,569,2</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line">
+ <area>43,161,2,318</area>
+ </shape>
+
+ <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line">
+ <area>610,161,2,318</area>
+ </shape>
+
+ <shape name="file-browser-backdrop" from="base_backdrop">
+ <area>645,92,615,592</area>
+ </shape>
+
+ <shape name="file-browser-backdrop-line" from="base_backdrop_line">
+ <area>646,93,613,590</area>
+ </shape>
+
+ <shape name="file-browser-top-line" from="base_highlight_line">
+ <area>647,94,611,2</area>
+ </shape>
+
+ <shape name="file-browser-bottom-line" from="base_highlight_line">
+ <area>647,680,611,2</area>
+ </shape>
+
+ <shape name="file-browser-left-line" from="base_highlight_vertical_line">
+ <area>647,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-right-line" from="base_highlight_vertical_line">
+ <area>1256,96,2,584</area>
+ </shape>
+
+ <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop">
+ <area>1207,684,50,10</area>
+ </shape>
+
+ <buttonlist name="filelist" from="base_list">
+ <area>653,100,599,578</area>
+ <statetype name="buttonitem">
+ <state name="active">
+ <area>0,0,599,54</area>
+ <statetype name="buttoncheck">
+ <area>4,17,20,20</area>
+ </statetype>
+ <imagetype name="buttonimage">
+ <area>28,2,77,50</area>
+ <filename>images/file_browser_no_preview.png</filename>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+ <textarea name="buttontext">
+ <area>115,0,382,54</area>
+ <font>basesmaller</font>
+ <multiline>yes</multiline>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="size" from="buttontext">
+ <area>497,0,100,54</area>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedactive">
+ <area>0,0,599,112</area>
+ <statetype name="buttoncheck">
+ <area>10,46,20,20</area>
+ </statetype>
+ <imagetype name="buttonimage">
+ <area>38,4,138,104</area>
+ <filename>images/file_browser_no_preview.png</filename>
+ <preserveaspect>true</preserveaspect>
+ </imagetype>
+ <textarea name="buttontext">
+ <area>186,0,307,112</area>
+ <font>basesmallyellow</font>
+ <multiline>yes</multiline>
+ <align>left,vcenter</align>
+ </textarea>
+ <textarea name="size" from="buttontext">
+ <area>493,0,100,112</area>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+ <state name="selectedinactive" from="selectedactive">
+ <shape name="buttonbackground" from="base_select_bar_selectedinactive">
+ <area>0,0,100%,100%</area>
+ </shape>
+ </state>
+ </statetype>
+ <statetype name="upscrollarrow">
+ <position>561,585</position>
+ </statetype>
+ <statetype name="downscrollarrow">
+ <position>581,585</position>
+ </statetype>
+ </buttonlist>
+
+ <textedit name="location_edit" from="base_wide_textedit">
+ <area>40,107,575,40</area>
+ </textedit>
+
+ <button name="back_button" from="base_button">
+ <position>252,493</position>
+ <value>Up Level</value>
+ </button>
+
+ <button name="home_button" from="base_button">
+ <position>252,540</position>
+ <value>Home</value>
+ </button>
+
+ <textarea name="label1" from="basetextarea">
+ <area>40,260,160,40</area>
+ <font>basesmall</font>
+ <value>Title:</value>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="label2" from="label1">
+ <area>40,300,160,40</area>
+ <value>Subtitle:</value>
+ </textarea>
+
+ <textarea name="label3" from="label1">
+ <area>40,340,160,40</area>
+ <value>Start Time:</value>
+ </textarea>
+
+ <textarea name="title_text" from="basetextarea">
+ <area>215,260,388,40</area>
+ <font>basesmall</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="subtitle_text" from="title_text">
+ <area>215,300,388,40</area>
+ </textarea>
+
+ <textarea name="starttime_text" from="title_text">
+ <area>215,340,388,40</area>
+ </textarea>
+
+ <button name="cancel_button" from="base_button">
+ <position>52,634</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_button">
+ <position>252,634</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="next_button" from="base_button">
+ <position>452,634</position>
+ <value>Next</value>
+ </button>
+
+ </window>
+
+ <!--
+ Import Archive
+ -->
+
+ <window name="importnative">
+ <area>0,0,1280,720</area>
+
+ <textarea name="title1" from="base_heading">
+ <value>Associate Channel</value>
+ </textarea>
+
+ <shape name="destination-backdrop" from="base_backdrop">
+ <area>115,36,1050,649</area>
+ </shape>
+
+ <shape name="destination-backdrop-line" from="base_backdrop_line">
+ <area>116,37,1048,506</area>
+ </shape>
+
+ <shape name="destination-top-line" from="base_highlight_line">
+ <area>117,38,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-line" from="base_highlight_line">
+ <area>117,540,1046,2</area>
+ </shape>
+
+ <shape name="destination-left-line" from="base_highlight_vertical_line">
+ <area>117,40,2,500</area>
+ </shape>
+
+ <shape name="destination-right-line" from="base_highlight_vertical_line">
+ <area>1161,40,2,500</area>
+ </shape>
+
+ <shape name="destination-seperator-first-line" from="base_line">
+ <area>138,245,1004,2</area>
+ </shape>
+
+ <shape name="destination-seperator-second-line" from="base_line">
+ <area>138,392,1004,2</area>
+ </shape>
+
+ <shape name="destination-bottom-backdrop-line" from="base_backdrop_line">
+ <area>116,547,1048,137</area>
+ </shape>
+
+ <shape name="destination-bottom-top-line" from="base_highlight_line">
+ <area>117,548,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-bottom-line" from="base_highlight_line">
+ <area>117,681,1046,2</area>
+ </shape>
+
+ <shape name="destination-bottom-left-line" from="base_highlight_vertical_line">
+ <area>117,550,2,131</area>
+ </shape>
+
+ <shape name="destination-bottom-right-line" from="base_highlight_vertical_line">
+ <area>1161,550,2,131</area>
+ </shape>
+
+ <shape name="destination-bottom-seperator-first-line" from="base_line">
+ <area>138,620,1004,2</area>
+ </shape>
+
+ <shape name="coverart-border">
+ <area>144,66,104,155</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#AAAAAA" alpha="100" width="2" />
+ <cornerradius>6</cornerradius>
+ </shape>
+
+ <textarea name="progtitle" from="basetextarea">
+ <area>264,70,632,30</area>
+ <font>basemediumyellow</font>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="progdatetime" from="basetextarea">
+ <area>906,70,226,30</area>
+ <font>basesmallyellow</font>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="progdescription" from="basetextarea">
+ <area>264,100,868,120</area>
+ <multiline>yes</multiline>
+ </textarea>
+
+ <imagetype name="preview_image">
+ <area>148,70,96,147</area>
+ <filename>images/no_coverart.png</filename>
+ <mask>images/masks/watchrecordings_coverart_mask.png</mask>
+ <preserveaspect>false</preserveaspect>
+ <alpha>255</alpha>
+ </imagetype>
+
+ <textarea name="label1" from="basetextarea">
+ <area>138,264,1004,30</area>
+ <font>basemediumyellow</font>
+ <align>allcenter</align>
+ <value>Archived Channel</value>
+ </textarea>
+
+ <textarea name="label2" from="basetextarea">
+ <area>148,304,335,30</area>
+ <font>basesmall</font>
+ <value>Channel ID:</value>
+ <align>right,vcenter</align>
+ </textarea>
+
+ <textarea name="chanid" from="basetextarea">
+ <area>493,304,147,30</area>
+ <align>left,vcenter</align>
+ </textarea>
+
+ <textarea name="label3" from="label2">
+ <area>148,344,335,30</area>
+ <value>Channel Number:</value>
+ </textarea>
+
+ <textarea name="channo" from="chanid">
+ <area>493,344,147,30</area>
+ </textarea>
+
+ <textarea name="label4" from="label2">
+ <area>640,304,147,30</area>
+ <value>Callsign:</value>
+ </textarea>
+
+ <textarea name="callsign" from="chanid">
+ <area>797,304,147,30</area>
+ </textarea>
+
+ <textarea name="label5" from="label2">
+ <area>640,344,147,30</area>
+ <value>Name:</value>
+ </textarea>
+
+ <textarea name="name" from="chanid">
+ <area>797,344,147,30</area>
+ </textarea>
+
+ <!--
+ local file channel
+ -->
+
+ <textarea name="label6" from="label1">
+ <area>138,411,1004,30</area>
+ <value>Local Channel</value>
+ </textarea>
+
+ <textarea name="label7" from="label2">
+ <area>148,441,295,30</area>
+ <value>Channel ID:</value>
+ </textarea>
+
+ <textarea name="local_chanid" from="chanid">
+ <area>493,441,147,30</area>
+ </textarea>
+
+ <button name="searchchanid_button" from="base_searchbutton">
+ <area>453,441,30,30</area>
+ </button>
+
+ <textarea name="labe8" from="label2">
+ <area>148,481,295,30</area>
+ <value>Channel Number:</value>
+ </textarea>
+
+ <textarea name="local_channo" from="chanid">
+ <area>493,481,147,30</area>
+ </textarea>
+
+ <button name="searchchanno_button" from="searchchanid_button">
+ <position>453,481</position>
+ <value>Search Channel</value>
+ </button>
+
+ <textarea name="label9" from="label2">
+ <area>640,441,147,30</area>
+ <value>Callsign:</value>
+ </textarea>
+
+ <textarea name="local_callsign" from="chanid">
+ <area>837,441,147,30</area>
+ </textarea>
+
+ <button name="searchcallsign_button" from="searchchanid_button">
+ <position>797,441</position>
+ <value>Search Callsign</value>
+ </button>
+
+ <textarea name="label10" from="label2">
+ <area>640,481,147,30</area>
+ <value>Name:</value>
+ </textarea>
+
+ <textarea name="local_name" from="chanid">
+ <area>837,481,147,30</area>
+ </textarea>
+
+ <button name="searchname_button" from="searchchanid_button">
+ <position>797,481</position>
+ <value>Search Name</value>
+ </button>
+
+ <button name="cancel_button" from="base_small_button">
+ <position>138,631</position>
+ <value>Cancel</value>
+ </button>
+
+ <button name="prev_button" from="base_small_button">
+ <position>722,631</position>
+ <value>Previous</value>
+ </button>
+
+ <button name="finish_button" from="base_small_button">
+ <position>942,631</position>
+ <value>Finish</value>
+ </button>
+
+ </window>
+
+</mythuitheme>
--
cgit v0.12
From 28f520da7edd5e40c254c8db73a8ffe7accfda05 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 22 Jan 2014 20:43:05 +0000
Subject: xymon: login_notify.sh: remove old alerts that didn't get removed.
closes #955
---
abs/core/xymon/PKGBUILD | 4 ++--
abs/core/xymon/login_notify.sh | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 8163f32..7293814 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=55
+pkgrel=56
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
@@ -148,7 +148,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'0469d775db9fdd18ea95dd41937ada82'
'0757294eec13771f8e63da23cf066796'
'270e13da6cbc9d49079d994edaa71e64'
- '4bc37b700146e4f4206a729c835903b0'
+ '22d4c9065fd959efe82f121dcb511305'
'9af2ad60ac4c3cb653754618f603e311'
'b8eb10070f2ad6a245d3da15091694ba'
'b4e8641e97e6b689dbc634af785e6799'
diff --git a/abs/core/xymon/login_notify.sh b/abs/core/xymon/login_notify.sh
index 8c17342..be81fea 100644
--- a/abs/core/xymon/login_notify.sh
+++ b/abs/core/xymon/login_notify.sh
@@ -57,8 +57,8 @@ else
echo "HOST: $BBHOSTNAME" >> $NOTICE_DIR/$BBHOSTSVC
echo "ACKCODE: $ACKCODE" >> $NOTICE_DIR/$BBHOSTSVC
echo "COLOR: $BBCOLORLEVEL" >> $NOTICE_DIR/$BBHOSTSVC
- echo "MSG $BBALPHAMSG" >> $NOTICE_DIR/$BBHOSTSVC
+ echo "MSG $BBALPHAMSG" >> $NOTICE_DIR/$BBHOSTSVC
fi
-
-
+#remove old alerts that didn't recover
+find $NOTICE_DIR -mmin +4 -type f -exec rm -f {} \;
--
cgit v0.12
From 8f9b5c2f840849607e2a737f84c9cbad66286338 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 22 Jan 2014 22:06:28 +0000
Subject: LinHES-system: system.install pre_upgrade stop msg_daemon so it
doesn't hang around
add_storage.py: add to help msg
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/add_storage.py | 4 +++-
abs/core/LinHES-system/add_storage.readme | 2 +-
abs/core/LinHES-system/system.install | 3 ++-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 94b1604..1edffb8 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=12
+pkgrel=13
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -95,7 +95,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'bc69a520add58ede9b060c73e67ace13'
'2e5e1b3187f75154366bffe806ff8ae9'
'47e093e8cfe4b5b96602358e1f540832'
- '4d6a6e88b519caf917ebe6c85c32c45b'
+ '63bbc62240f46a9997eaae4a84b09b76'
'2c005d95312018bef80092136f80f254'
'6519d209e151cdc39ae7e1091d189c3e'
'ca63946920ba33de1f15abda83e74e40'
@@ -133,6 +133,6 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'474d5c6883fcfffae4f199aceb3b1356'
'36bdfa8d877cea20ca3870faf08e08d5'
'59d0602bac7e06f11abba1894acc8bb0'
- 'da432d68962e109e09beb2b71c8c8571'
+ 'b12bbf3e028f51b08acef2799a5708bc'
'366ccb097d1c221389709485c3b2d159'
'bdd37627c9effd745a051fd2d279975b')
diff --git a/abs/core/LinHES-system/add_storage.py b/abs/core/LinHES-system/add_storage.py
index 61ce0ea..2518927 100755
--- a/abs/core/LinHES-system/add_storage.py
+++ b/abs/core/LinHES-system/add_storage.py
@@ -960,7 +960,9 @@ def usage():
--new_init: Erase the list of known disks and rescan.
--no_destruction: Will not partition or format the disk.
All other normal operations will be performed.
- Can be used to import disks from other systems.
+ Can be used to import disks from other systems
+ however, add_storage.py only works with the first
+ partition on a disk and ignores all others.
--no_mount: Do not mount the disk.
All other normal operations will be performed.
--reconstruct: Recreate mount point, /myth symlink, fstab entry,
diff --git a/abs/core/LinHES-system/add_storage.readme b/abs/core/LinHES-system/add_storage.readme
index 226b14d..d4435d5 100644
--- a/abs/core/LinHES-system/add_storage.readme
+++ b/abs/core/LinHES-system/add_storage.readme
@@ -1,3 +1,3 @@
Files here are autogenerated by add_storage.py.
-They will be used by systemconfig to generate nfs,smb and mountpoint recovery.
+They will be used by systemconfig to generate nfs, smb and mountpoint recovery.
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index 880ea02..9f8aa45 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -19,7 +19,8 @@ post_install() {
# arg 1: the new package version
# arg 2: the old package version
pre_upgrade() {
- /bin/true
+ msg_client.py --kill
+ sv stop msg_daemon
}
# arg 1: the new package version
--
cgit v0.12
From f5906329df4c8974cd83021969671e9c76c31101 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 16:06:00 +0000
Subject: graphite: initial inclusion. dep of harfbuzz. harfbuzz is dep of
google-chrome
---
abs/extra/graphite/PKGBUILD | 63 ++++++++++++++++++++++
abs/extra/graphite/graphite2-1.2.0-cmakepath.patch | 9 ++++
2 files changed, 72 insertions(+)
create mode 100644 abs/extra/graphite/PKGBUILD
create mode 100644 abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
diff --git a/abs/extra/graphite/PKGBUILD b/abs/extra/graphite/PKGBUILD
new file mode 100644
index 0000000..0d8cc87
--- /dev/null
+++ b/abs/extra/graphite/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=graphite
+pkgver=1.2.4
+pkgrel=1
+epoch=1
+arch=('i686' 'x86_64')
+url="http://projects.palaso.org/projects/graphitedev"
+pkgdesc='reimplementation of the SIL Graphite text processing engine'
+license=('LGPL' 'GPL' 'custom')
+depends=('gcc-libs')
+makedepends=('cmake' 'freetype2' 'python2')
+ # - only for docs - target doesn't install properly
+ # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
+ graphite2-1.2.0-cmakepath.patch)
+md5sums=('2ef839348fe28e3b923bf8cced440227'
+ '00353b67941dbc30b76a43253760769e')
+
+build() {
+ cd "${srcdir}"
+
+ # python2 fixes
+ sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
+
+ # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware
+ pushd graphite2-${pkgver}
+ patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
+ popd
+
+ mkdir build
+ cd build
+ cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DGRAPHITE2_COMPARE_RENDERER=OFF \
+ #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed
+
+ # fix unwanted -O3 cflag (taken form Debian)
+ find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
+
+ make
+ #make docs
+}
+
+check() {
+ cd "${srcdir}"/build
+ sed -i "s:python:python2:g" tests/CTestTestfile.cmake
+ ctest
+}
+
+package() {
+ cd "${srcdir}"/build
+ # FIXME: all target doesn't install the docs target files
+ make DESTDIR="$pkgdir/" install
+
+ # licenses
+ mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+ install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
diff --git a/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch b/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
new file mode 100644
index 0000000..ee71cd6
--- /dev/null
+++ b/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530
++++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+
+
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)
--
cgit v0.12
From 12db07e30c0c7a8b138d422efdace19dc2d5a423 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 18:26:16 +0000
Subject: harfbuzz: initial inclusion. dep of google-chrome
---
abs/extra/harfbuzz/PKGBUILD | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 abs/extra/harfbuzz/PKGBUILD
diff --git a/abs/extra/harfbuzz/PKGBUILD b/abs/extra/harfbuzz/PKGBUILD
new file mode 100644
index 0000000..c9f550f
--- /dev/null
+++ b/abs/extra/harfbuzz/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=(harfbuzz)
+pkgname=(harfbuzz harfbuzz-icu)
+pkgver=0.9.19
+pkgrel=1
+pkgdesc="OpenType text shaping engine"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+license=(MIT)
+makedepends=(glib2 freetype2 graphite cairo icu)
+options=(!libtool)
+source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35')
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr \
+ --with-glib --with-freetype --with-cairo --with-icu --with-graphite2
+ make
+}
+
+package_harfbuzz() {
+ depends=(glib2 freetype2 graphite)
+ optdepends=('cairo: hb-view program')
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
+
+# Split harfbuzz-icu
+ mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu
+ mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib
+ mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig
+ mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
+}
+
+package_harfbuzz-icu(){
+ pkgdesc="$pkgdesc (ICU integration)"
+ depends=(harfbuzz icu)
+
+ mv hb-icu/* "$pkgdir"
+
+ install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
+}
--
cgit v0.12
From 9e5f101fba179afe5c45bd0f782a56ea32c71d15 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 18:30:52 +0000
Subject: opus: initial inclusion. dep of google-chrome
---
abs/extra/opus/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 abs/extra/opus/PKGBUILD
diff --git a/abs/extra/opus/PKGBUILD b/abs/extra/opus/PKGBUILD
new file mode 100644
index 0000000..f858a1a
--- /dev/null
+++ b/abs/extra/opus/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
+# Contributor: pumbur
+
+pkgname=opus
+pkgver=1.1
+pkgrel=1
+pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
+arch=(i686 x86_64)
+url="http://www.opus-codec.org/"
+license=(BSD)
+depends=(glibc)
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('c5a8cf7c0b066759542bc4ca46817ac6')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --enable-custom-modes --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
--
cgit v0.12
From 6c79776d89c3708886adfb9a78ba58f1ae6be3bd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 19:03:23 +0000
Subject: snappy: initial inclusion. dep of google-chrome
---
abs/extra/snappy/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 abs/extra/snappy/PKGBUILD
diff --git a/abs/extra/snappy/PKGBUILD b/abs/extra/snappy/PKGBUILD
new file mode 100644
index 0000000..3912d35
--- /dev/null
+++ b/abs/extra/snappy/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Antony Male <antony dot male at geemail dot com>>
+
+pkgname=snappy
+pkgver=1.1.1
+pkgrel=1
+pkgdesc='A fast compressor/decompressor library'
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/snappy/"
+license=('BSD')
+depends=('glibc' 'gcc-libs')
+checkdepends=('zlib')
+source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('8887e3b7253b22a31f5486bca3cbc1c2')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # compile without assertions
+ CXXFLAGS+=\ -DNDEBUG
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ # compile without assertions
+ CXXFLAGS+=\ -DNDEBUG
+
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From a5869b47aa0abac068f9d314d03e9f04df7e80a9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 19:15:59 +0000
Subject: speech-dispatcher: initial inclusion. dep of google-chrome
---
abs/extra/speech-dispatcher/PKGBUILD | 61 ++++++++++++++++++++++
abs/extra/speech-dispatcher/__changelog | 1 +
.../speech-dispatcher/speech-dispatcher.install | 22 ++++++++
.../speech-dispatcher/speech-dispatcherd.service | 10 ++++
4 files changed, 94 insertions(+)
create mode 100644 abs/extra/speech-dispatcher/PKGBUILD
create mode 100644 abs/extra/speech-dispatcher/__changelog
create mode 100644 abs/extra/speech-dispatcher/speech-dispatcher.install
create mode 100644 abs/extra/speech-dispatcher/speech-dispatcherd.service
diff --git a/abs/extra/speech-dispatcher/PKGBUILD b/abs/extra/speech-dispatcher/PKGBUILD
new file mode 100644
index 0000000..4c26348
--- /dev/null
+++ b/abs/extra/speech-dispatcher/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Steve Holmes <steve.holmes88@gmail.com>
+# Contributor: Alexander Jenisch <nt@divzero.at>
+# Contributor: Chris Brannon <cmbrannon@cox.net>
+# Contributor: Andreas Messer <andi@bupfen.de>
+
+pkgname=speech-dispatcher
+pkgver=0.8
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="High-level device independent layer for speech synthesis interface"
+url="http://www.freebsoft.org/speechd"
+license=('GPL2' 'FDL')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf')
+makedepends=('intltool')
+optdepends=('festival: Speech output using Festival'
+ 'espeak: Speech output using ESpeak'
+ 'pulseaudio: PulseAudio support')
+provides=("speechd=${pkgver}")
+options=('!libtool')
+backup=(etc/speech-dispatcher/clients/gnome-speech.conf
+ etc/speech-dispatcher/clients/emacs.conf
+ etc/speech-dispatcher/modules/ibmtts.conf
+ etc/speech-dispatcher/modules/espeak-generic.conf
+ etc/speech-dispatcher/modules/espeak.conf
+ etc/speech-dispatcher/modules/swift-generic.conf
+ etc/speech-dispatcher/modules/festival.conf
+ etc/speech-dispatcher/modules/cicero.conf
+ etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
+ etc/speech-dispatcher/modules/dtk-generic.conf
+ etc/speech-dispatcher/modules/llia_phon-generic.conf
+ etc/speech-dispatcher/modules/ivona.conf
+ etc/speech-dispatcher/modules/epos-generic.conf
+ etc/speech-dispatcher/modules/flite.conf
+ etc/speech-dispatcher/speechd.conf)
+install="${pkgname}.install"
+source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
+ 'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+ 'd26f52e2e95a30eaa83560f0e63faca5')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --without-flite \
+ --without-espeak \
+ --without-pulse
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+ install -d "${pkgdir}/var/log/speech-dispatcher"
+}
diff --git a/abs/extra/speech-dispatcher/__changelog b/abs/extra/speech-dispatcher/__changelog
new file mode 100644
index 0000000..15dba69
--- /dev/null
+++ b/abs/extra/speech-dispatcher/__changelog
@@ -0,0 +1 @@
+remove libpulse and espeak
diff --git a/abs/extra/speech-dispatcher/speech-dispatcher.install b/abs/extra/speech-dispatcher/speech-dispatcher.install
new file mode 100644
index 0000000..1565d3a
--- /dev/null
+++ b/abs/extra/speech-dispatcher/speech-dispatcher.install
@@ -0,0 +1,22 @@
+info_dir=usr/share/info
+info_files=('speech-dispatcher.info'
+ 'ssip.info'
+ 'spd-say.info')
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
diff --git a/abs/extra/speech-dispatcher/speech-dispatcherd.service b/abs/extra/speech-dispatcher/speech-dispatcherd.service
new file mode 100644
index 0000000..ce21c56
--- /dev/null
+++ b/abs/extra/speech-dispatcher/speech-dispatcherd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/speech-dispatcher -d
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 7f16211683cf2cefe014013e0e221fe7caa94f2f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Jan 2014 19:50:45 +0000
Subject: google-chrome: update to 32.0.1700.77
---
abs/extra/google-chrome/PKGBUILD | 14 ++++++--------
abs/extra/google-chrome/__changelog | 3 ++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 9127569..6a477c2 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,13 +5,14 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=31.0.1650.63
+pkgver=32.0.1700.77
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
url="https://www.google.com/chrome"
license=('custom:chrome')
-depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libxss' 'libxtst' 'nss' 'ttf-font' 'xdg-utils')
+depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu'
+ 'libgcrypt' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=$pkgver")
@@ -24,7 +25,7 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
'https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='83c6ddb1c281da8243aba0b5f2e3763f'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='5eda4b45f5482e526252a819ed5e78a3'
#PKGEXT='.pkg.tar'
@@ -33,9 +34,6 @@ package() {
bsdtar -xf data.tar.lzma -C "$pkgdir/"
msg2 "Moving stuff in place"
- # Desktop
- mv "$pkgdir"/opt/google/chrome/google-chrome.desktop "$pkgdir"/usr/share/applications/
-
# Icons
for i in 16 22 24 32 48 64 128 256; do
install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i}.png "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
@@ -50,12 +48,12 @@ package() {
msg2 "Symlinking missing Udev lib"
ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
- msg2 "Removing the Debian-intended cron job and duplicated images"
+ msg2 "Removing unnecessities (e.g. Debian Cron job)"
rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
rm "$pkgdir"/opt/google/chrome/product_logo_*.png
msg2 "Rename google-chrome-stable to google-chrome"
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
-md5sums=('83c6ddb1c281da8243aba0b5f2e3763f'
+md5sums=('5eda4b45f5482e526252a819ed5e78a3'
'6d57da7476a4b1b7a81821d9c036425c')
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
index c280aef..45a69e8 100644
--- a/abs/extra/google-chrome/__changelog
+++ b/abs/extra/google-chrome/__changelog
@@ -1,6 +1,7 @@
-8/25/13
+1/23/14
Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
- PKGBUILD: comment out PKGEXT so we compress the pkg
- PKGBUILD: add replaces chromium
- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
- Rename google-chrome-stable to google-chrome"
+- Change dep libgcrypt15 to libgcrypt
--
cgit v0.12
From 08620753cd7146acbbcd9ed3c71ee550d49c11bd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 27 Jan 2014 20:18:50 +0000
Subject: linhes-theme: update to pull in updates from upstream.
refs #940. change version number of theme to reflect pkgbuild pkgver and pkgrel. Pull git src in prepare instead of pkgbuild source git as it wasn't updating
---
abs/core/linhes-theme/PKGBUILD | 52 +++++++++++++++++----------
abs/core/linhes-theme/base.xml.patch | 9 -----
abs/core/linhes-theme/music-ui.xml.patch | 11 ------
abs/core/linhes-theme/recordings-ui.xml.patch | 18 ----------
abs/core/linhes-theme/themeinfo.xml | 4 +--
5 files changed, 35 insertions(+), 59 deletions(-)
delete mode 100644 abs/core/linhes-theme/music-ui.xml.patch
delete mode 100644 abs/core/linhes-theme/recordings-ui.xml.patch
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 6145f7e..1335945 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,20 +1,36 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=21
+pkgrel=22
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://linhes.org/"
-patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'music-ui.xml.patch'
- 'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'qtlook.txt.patch')
+patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
+ 'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.39 by Harley Peters
-source=("git+https://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
- `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
+#The LinHES theme is based on TintedGlass 4.41 by Harley Peters
+source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
- 'LHLogoAndText.png'
- 'game-ui.xml' 'mytharchive-ui.xml' 'mythburn-ui.xml' 'mythnative-ui.xml')
+ 'LHLogoAndText.png')
+
+prepare() {
+ _gitroot="https://github.com/MythTV-Themes/TintedGlass.git"
+ _gitname="TintedGlass"
+ _gitbranch="fixes/0.27"
+
+ cd $srcdir
+ if [ -d $_gitname ]
+ then
+ cd $_gitname
+ git checkout $_gitbranch
+ git pull
+ msg "TintedGlass local files updated."
+ else
+ git clone -b $_gitbranch $_gitroot
+ msg "TintedGlass git checkout done."
+ fi
+}
package() {
THEMEROOT=usr/share/mythtv/themes
@@ -54,22 +70,20 @@ package() {
grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g"
#blue
grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+
+ msg "Updating themeinfo.xml version number"
+ IFS="." read -a array <<< "$pkgver"
+ sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
+ sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
-md5sums=('SKIP'
- '95478bd9bab15e9e4365c1048757c225'
+md5sums=('95478bd9bab15e9e4365c1048757c225'
'ed4f8baf431e20babc345e4e2602426f'
- 'f52ad93730ae53ea0e1ac5d3c599133c'
- '90476c9d03c734a4177954b5b0a4e864'
+ 'cb8c0d63392f6c8c2d8219243fbf47c6'
'ec11d601d47cd4b2954e1609262a571b'
- '4ad8bc893412eeeb890f0b1f1f1bd541'
'9fe3371a8b964a7028126405cfaa330b'
- '7d7bc458a8f4af408700609f3e1f412e'
+ '5a8fb2a5f0e657d52be6f0a6a006ce72'
'a0201e0aa1608eeab27ee754e4d2c1de'
'12d26a786fde397348653128a6d7676a'
'4b1c27297bb5f8d9d7bbaf72b35130b5'
'2bd09b8049aaf5ba21db5baf3a0ce077'
- '09ad14842f828b7a8d24070ec8214fe5'
- '8933e2c7c3569091bebc9d086e574ffe'
- '8151dcda813a9a01b989d45f3d17eedd'
- 'a0f423ab4089a2e8d65def7777169cd4'
- '8bd8e94068b03fea2138423acb170559')
+ '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index f2487c3..588ce42 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -9,12 +9,3 @@
</shape>
<!-- Base definition of a heading group -->
-@@ -2140,7 +2140,7 @@
-
- <button name="ok" from="base_button">
- <position>252,634</position>
-- <value>Ok</value>
-+ <value>OK</value>
- </button>
-
- <textarea name="info_label" from="basetextarea">
diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch
deleted file mode 100644
index 61fe4be..0000000
--- a/abs/core/linhes-theme/music-ui.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- music-ui.xml.orig 2014-01-13 21:56:30.959750358 +0000
-+++ music-ui.xml 2014-01-13 21:56:47.534325378 +0000
-@@ -1972,7 +1972,7 @@
- <group name="heading-backdrop" from="base_heading_group" />
-
- <textarea name="heading" from="base_heading">
-- <value>Edit Track Information</value>
-+ <value>Edit Track Information</value>
- </textarea>
-
- <shape name="edit-metadata-backdrop" from="base_backdrop">
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
deleted file mode 100644
index 0f97dbc..0000000
--- a/abs/core/linhes-theme/recordings-ui.xml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- recordings-ui.xml.orig 2014-01-02 22:23:26.659072294 +0000
-+++ recordings-ui.xml 2014-01-02 22:32:08.212500575 +0000
-@@ -579,13 +579,13 @@
- <align>allcenter</align>
- </textarea>
- <textarea name="s00e00" from="base_text_font_state_extrasmall">
-- <area>510,42,60,20</area>
-+ <area>500,42,70,20</area>
- <font state="normal">baseextrasmall</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- </textarea>
- <textarea name="syndicatedepisode" from="base_text_font_state_extrasmall" depends="!s00e00">
-- <area>510,42,60,20</area>
-+ <area>500,42,70,20</area>
- <font state="normal">baseextrasmall</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
diff --git a/abs/core/linhes-theme/themeinfo.xml b/abs/core/linhes-theme/themeinfo.xml
index 3deae2c..dbd0e16 100644
--- a/abs/core/linhes-theme/themeinfo.xml
+++ b/abs/core/linhes-theme/themeinfo.xml
@@ -33,10 +33,10 @@
<version>
<!-- Major version changes mean the theme is no longer
compatible with earlier versions of mythtv -->
- <major>8</major>
+ <major>MAJ_VER</major>
<!-- Minor version changes are backwards compatible -->
- <minor>1</minor>
+ <minor>MIN_VER</minor>
</version>
<!-- Theme Details (Required) -->
--
cgit v0.12
From 3d6b409b2067f33475fca5332a5b9d69f1dbaccb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 27 Jan 2014 21:00:09 +0000
Subject: google-chrome: update to 32.0.1700.102
---
abs/extra/google-chrome/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 6a477c2..e47a6e0 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=32.0.1700.77
+pkgver=32.0.1700.102
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
'https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='5eda4b45f5482e526252a819ed5e78a3'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='3f2cdc746980c7b9ac476ec013c80dfc'
#PKGEXT='.pkg.tar'
@@ -55,5 +55,5 @@ package() {
msg2 "Rename google-chrome-stable to google-chrome"
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
-md5sums=('5eda4b45f5482e526252a819ed5e78a3'
+md5sums=('3f2cdc746980c7b9ac476ec013c80dfc'
'6d57da7476a4b1b7a81821d9c036425c')
--
cgit v0.12
From 0fc8cbbd572a62abddb430a1ddc47c8039b514ec Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 27 Jan 2014 21:47:40 +0000
Subject: system-templates: add Technisat_TTS35 remote. closes #956
---
abs/core/system-templates/PKGBUILD | 8 +-
.../ATI/snapstream_firefly_all/lircrc-snapstrm.txt | 0
.../templates/remotes/favorites/MX880-jams/lircrc | 0
.../templates/remotes/favorites/streamzap/lircrc | 0
.../hauppauge/hauppauge-black/lircd-haupblack.conf | 0
.../hauppauge-black/lircrc-haupblack.conf | 0
.../hauppauge-blaster/lircrc-haupgrey-g3.txt | 0
.../remotes/other/Kworld_110/lircd-kworld110.conf | 0
.../remotes/other/Kworld_110/lircrc-kworld110.txt | 0
.../remotes/other/Kworld_310/lircd-kworld310.conf | 0
.../remotes/other/Kworld_310/lircrc-kworld310.txt | 0
.../other/Leadtek_2000XP/lircd-leadtek2000xp.conf | 0
.../other/Leadtek_2000XP/lircrc-leadtek2000xp.txt | 0
.../other/Leadtek_PVR/lircd-leadtekPVR.conf | 0
.../other/Leadtek_PVR/lircrc-leadtekPVR.txt | 0
.../remotes/other/Medion_RF/lircd-medion-rf.conf | 0
.../remotes/other/Medion_RF/lircrc-medion-rf.txt | 0
.../Medion_X10_8080/lircd-medionx10-8080.conf | 0
.../Medion_X10_8080/lircrc-medionx10-8080.txt | 0
.../remotes/other/Nebula/lircd-nebula.conf | 0
.../remotes/other/Nebula/lircrc-nebula.txt | 0
.../remotes/other/Nova_500/lircd-nova500.conf | 0
.../remotes/other/Nova_500/lircrc-nova500.txt | 0
.../remotes/other/Nova_T/lircd-novat.conf | 0
.../remotes/other/Nova_T/lircrc-novat.txt | 0
.../remotes/other/Nova_T_USB2/lircd-novatusb2.conf | 0
.../remotes/other/Nova_T_USB2/lircrc-novatusb2.txt | 0
.../remotes/other/Nvidia/lircd-nvidia.conf | 0
.../remotes/other/Nvidia/lircrc-nvidia.txt | 0
.../remotes/other/Nvidia_X10/lircd-nvidiax10.conf | 0
.../remotes/other/Nvidia_X10/lircrc-nvidiax10.txt | 0
.../remotes/other/One4All/lircd-one4all.conf | 0
.../remotes/other/One4All/lircrc-one4all.txt | 0
.../other/One4All_6131/lircd-one4all6131.conf | 0
.../other/One4All_6131/lircrc-one4all6131.txt | 0
.../other/One4All_7544/lircd-one4all7544.conf | 0
.../other/One4All_7544/lircrc-one4all7544.txt | 0
.../remotes/other/Packard_bell/lircd-packard.conf | 0
.../remotes/other/Packard_bell/lircrc-packard.txt | 0
.../remotes/other/Pinnacle/lircd-pinnacle.conf | 0
.../remotes/other/Pinnacle/lircrc-pinnacle.txt | 0
.../remotes/other/Technisat/lircd-technisat.conf | 0
.../remotes/other/Technisat/lircrc-technisat.txt | 0
.../other/Technisat_TTS35/Technisat TTS35 Keys.png | Bin 0 -> 349957 bytes
.../other/Technisat_TTS35/lircd-technisat.conf | 59 +++
.../other/Technisat_TTS35/lircrc-technisat.txt | 548 +++++++++++++++++++++
.../remotes/other/Technisat_TTS35/preview.jpg | Bin 0 -> 213045 bytes
.../remotes/other/Technisat_TTS35/remote.run | 8 +
.../remotes/other/Twinhan/lircd-twinhan.conf | 0
.../remotes/other/Twinhan/lircrc-twinhan.txt | 0
.../remotes/other/X10_Lola/lircd-x10lola.conf | 0
.../remotes/other/X10_Lola/lircrc-x10lola.txt | 0
.../remotes/other/imon-mce/lircd.conf.imon | 0
.../templates/remotes/other/imon-mce/lircrc | 0
.../templates/remotes/other/imon-mce/remote.run | 0
.../templates/remotes/other/imon/remote.run | 0
56 files changed, 619 insertions(+), 4 deletions(-)
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/favorites/MX880-jams/lircrc
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircd-haupblack.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircrc-haupblack.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircrc-haupgrey-g3.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Kworld_110/lircd-kworld110.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Kworld_110/lircrc-kworld110.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Kworld_310/lircd-kworld310.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Kworld_310/lircrc-kworld310.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircd-leadtek2000xp.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircrc-leadtek2000xp.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircd-leadtekPVR.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircrc-leadtekPVR.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Medion_RF/lircd-medion-rf.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Medion_RF/lircrc-medion-rf.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircd-medionx10-8080.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircrc-medionx10-8080.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nebula/lircd-nebula.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nebula/lircrc-nebula.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_500/lircd-nova500.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_500/lircrc-nova500.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_T/lircd-novat.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_T/lircrc-novat.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircd-novatusb2.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircrc-novatusb2.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nvidia/lircd-nvidia.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nvidia/lircrc-nvidia.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircd-nvidiax10.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircrc-nvidiax10.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All/lircd-one4all.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All/lircrc-one4all.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All_6131/lircd-one4all6131.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All_6131/lircrc-one4all6131.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All_7544/lircd-one4all7544.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/One4All_7544/lircrc-one4all7544.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Packard_bell/lircd-packard.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Packard_bell/lircrc-packard.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Pinnacle/lircd-pinnacle.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Pinnacle/lircrc-pinnacle.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Technisat/lircd-technisat.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Technisat/lircrc-technisat.txt
create mode 100644 abs/core/system-templates/templates/remotes/other/Technisat_TTS35/Technisat TTS35 Keys.png
create mode 100644 abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircd-technisat.conf
create mode 100644 abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircrc-technisat.txt
create mode 100644 abs/core/system-templates/templates/remotes/other/Technisat_TTS35/preview.jpg
create mode 100644 abs/core/system-templates/templates/remotes/other/Technisat_TTS35/remote.run
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Twinhan/lircd-twinhan.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/Twinhan/lircrc-twinhan.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/X10_Lola/lircd-x10lola.conf
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/X10_Lola/lircrc-x10lola.txt
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/imon-mce/lircd.conf.imon
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/imon-mce/lircrc
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/imon-mce/remote.run
mode change 100755 => 100644 abs/core/system-templates/templates/remotes/other/imon/remote.run
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 0c1dbeb..9dab574 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,16 +1,16 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=25
+pkgrel=26
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
arch=('i686' 'x86_64')
source=()
-build() {
- MVDIR=$startdir/pkg/usr/MythVantage
+package() {
+ MVDIR=$pkgdir/usr/MythVantage
mkdir -p $MVDIR/templates
-#copy in all the installer specific stuff
+ #copy in all the installer specific stuff
rsync -r --exclude=.svn ../templates $MVDIR/
}
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/favorites/MX880-jams/lircrc b/abs/core/system-templates/templates/remotes/favorites/MX880-jams/lircrc
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircd-haupblack.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircd-haupblack.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircrc-haupblack.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircrc-haupblack.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircrc-haupgrey-g3.txt b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircrc-haupgrey-g3.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Kworld_110/lircd-kworld110.conf b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircd-kworld110.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Kworld_110/lircrc-kworld110.txt b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircrc-kworld110.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Kworld_310/lircd-kworld310.conf b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircd-kworld310.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Kworld_310/lircrc-kworld310.txt b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircrc-kworld310.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircd-leadtek2000xp.conf b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircd-leadtek2000xp.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircrc-leadtek2000xp.txt b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircrc-leadtek2000xp.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircd-leadtekPVR.conf b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircd-leadtekPVR.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircrc-leadtekPVR.txt b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircrc-leadtekPVR.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Medion_RF/lircd-medion-rf.conf b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircd-medion-rf.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Medion_RF/lircrc-medion-rf.txt b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircrc-medion-rf.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircd-medionx10-8080.conf b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircd-medionx10-8080.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircrc-medionx10-8080.txt b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircrc-medionx10-8080.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nebula/lircd-nebula.conf b/abs/core/system-templates/templates/remotes/other/Nebula/lircd-nebula.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nebula/lircrc-nebula.txt b/abs/core/system-templates/templates/remotes/other/Nebula/lircrc-nebula.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_500/lircd-nova500.conf b/abs/core/system-templates/templates/remotes/other/Nova_500/lircd-nova500.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_500/lircrc-nova500.txt b/abs/core/system-templates/templates/remotes/other/Nova_500/lircrc-nova500.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_T/lircd-novat.conf b/abs/core/system-templates/templates/remotes/other/Nova_T/lircd-novat.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_T/lircrc-novat.txt b/abs/core/system-templates/templates/remotes/other/Nova_T/lircrc-novat.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircd-novatusb2.conf b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircd-novatusb2.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircrc-novatusb2.txt b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircrc-novatusb2.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nvidia/lircd-nvidia.conf b/abs/core/system-templates/templates/remotes/other/Nvidia/lircd-nvidia.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nvidia/lircrc-nvidia.txt b/abs/core/system-templates/templates/remotes/other/Nvidia/lircrc-nvidia.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircd-nvidiax10.conf b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircd-nvidiax10.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircrc-nvidiax10.txt b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircrc-nvidiax10.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All/lircd-one4all.conf b/abs/core/system-templates/templates/remotes/other/One4All/lircd-one4all.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All/lircrc-one4all.txt b/abs/core/system-templates/templates/remotes/other/One4All/lircrc-one4all.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All_6131/lircd-one4all6131.conf b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircd-one4all6131.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All_6131/lircrc-one4all6131.txt b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircrc-one4all6131.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All_7544/lircd-one4all7544.conf b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircd-one4all7544.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/One4All_7544/lircrc-one4all7544.txt b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircrc-one4all7544.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Packard_bell/lircd-packard.conf b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircd-packard.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Packard_bell/lircrc-packard.txt b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircrc-packard.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Pinnacle/lircd-pinnacle.conf b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircd-pinnacle.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Pinnacle/lircrc-pinnacle.txt b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircrc-pinnacle.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat/lircd-technisat.conf b/abs/core/system-templates/templates/remotes/other/Technisat/lircd-technisat.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat/lircrc-technisat.txt b/abs/core/system-templates/templates/remotes/other/Technisat/lircrc-technisat.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/Technisat TTS35 Keys.png b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/Technisat TTS35 Keys.png
new file mode 100644
index 0000000..cc01370
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/Technisat TTS35 Keys.png differ
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircd-technisat.conf b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircd-technisat.conf
new file mode 100644
index 0000000..d92f182
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircd-technisat.conf
@@ -0,0 +1,59 @@
+# brand: Technisat
+# model no. of remote control: TTS35AI
+# devices being controlled by this remote: Skystar2 / Airstar2
+#
+# Note: The codes for PROG+, PROG-, VOL+ and VOL- are double assigned
+# These codes also appear by pressing UP, DOWN, LEFT or RIGHT
+
+begin remote
+
+ name TTS35AI
+ bits 32
+ eps 30
+ aeps 100
+
+ one 0 0
+ zero 0 0
+ gap 107965
+ toggle_bit 0
+
+
+ begin codes
+ MUTE 0x80010032
+ 1 0x80010002
+ 2 0x80010003
+ 3 0x80010004
+ 4 0x80010005
+ 5 0x80010006
+ 6 0x80010007
+ 7 0x80010008
+ 8 0x80010009
+ 9 0x8001000A
+ 0 0x8001000B
+ -/-- 0x80010013
+ A/B 0x8001001F
+ RED 0x8001003F
+ GREEN 0x80010040
+ YELLOW 0x80010041
+ BLUE 0x80010042
+ UP 0x80010067
+ RIGHT 0x8001006A
+ DOWN 0x8001006C
+ LEFT 0x80010069
+ OK 0x8001001C
+ SFI 0x80010012
+ EXIT 0x80010021
+ INFO 0x80010017
+# PROG+ 0x80010067
+# PROG- 0x8001006C
+ TV/RADIO 0x80010043
+ MENU 0x8001003C
+# VOL+ 0x8001006A
+# VOL- 0x80010069
+ HELP 0x80010017
+ TXT 0x80010014
+ STOP 0x80010019
+ EXT 0x8001002F
+ end codes
+end remote
+
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircrc-technisat.txt b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircrc-technisat.txt
new file mode 100644
index 0000000..48ee086
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/lircrc-technisat.txt
@@ -0,0 +1,548 @@
+# ~/.mythtv/lircrc
+#
+# LIRC config file for Technisat TTS35AI USB Remote
+#
+#
+
+# Mythtv configuration
+
+# Up Arrow
+begin
+ prog = mythtv
+ button = UP
+ repeat = 0
+ config = Up
+end
+
+# Down Arrow
+begin
+ prog = mythtv
+ button = DOWN
+ repeat = 0
+ config = Down
+end
+
+# Left Arrow
+begin
+ prog = mythtv
+ button = LEFT
+ repeat = 0
+ config = Left
+end
+
+# Right Arrow
+begin
+ prog = mythtv
+ button = RIGHT
+ repeat = 0
+ config = Right
+end
+
+# Mute
+begin
+ prog = mythtv
+ button = MUTE
+ repeat = 0
+ config = F9
+end
+
+# 1
+begin
+ prog = mythtv
+ button = 1
+ repeat = 0
+ config = 1
+end
+
+# 2
+begin
+ prog = mythtv
+ button = 2
+ repeat = 0
+ config = 2
+end
+
+# 3
+begin
+ prog = mythtv
+ button = 3
+ repeat = 0
+ config = 3
+end
+
+# 4
+begin
+ prog = mythtv
+ button = 4
+ repeat = 0
+ config = 4
+end
+
+# 5
+begin
+ prog = mythtv
+ button = 5
+ repeat = 0
+ config = 5
+end
+
+# 6
+begin
+ prog = mythtv
+ button = 6
+ repeat = 0
+ config = 6
+end
+
+# 7
+begin
+ prog = mythtv
+ button = 7
+ repeat = 0
+ config = 7
+end
+
+# 8
+begin
+ prog = mythtv
+ button = 8
+ repeat = 0
+ config = 8
+end
+
+# 9
+begin
+ prog = mythtv
+ button = 9
+ repeat = 0
+ config = 9
+end
+
+# 0
+begin
+ prog = mythtv
+ button = 0
+ repeat = 0
+ config = 0
+end
+
+# -/-- jump backward
+begin
+ prog = mythtv
+ button = -/--
+ repeat = 0
+ config = <
+end
+
+# A/B jump forward
+begin
+ prog = mythtv
+ button = A/B
+ repeat = 0
+ config = >
+end
+
+# Red button - Escape
+begin
+ prog = mythtv
+ button = RED
+ repeat = 1
+ config = Esc
+end
+
+# Green button - Browse
+begin
+ prog = mythtv
+ button = GREEN
+ repeat = 0
+ config = O
+end
+
+# Green button - Jump to Previous Commercial Marker
+begin
+ prog = mythtv
+ button = GREEN
+ repeat = 0
+ config = Q
+end
+
+# Blue button - jump to Next Commercial marker / Load Comercial Marking List
+begin
+ prog = mythtv
+ button = BLUE
+ repeat = 0
+ config = Z
+end
+
+# OK
+begin
+ prog = mythtv
+ button = OK
+ repeat = 0
+ config = Space
+end
+
+# SFI - Switch to channel in EPG
+begin
+ prog = mythtv
+ button = SFI
+ repeat = 0
+ config = X
+end
+
+# Exit - Pause/Play
+begin
+ prog = mythtv
+ button = EXIT
+ repeat = 0
+ config = p
+end
+
+# INFO - Info on program/show/...
+begin
+ prog = mythtv
+ button = INFO
+ repeat = 0
+ config = I
+end
+
+# TV/RADIO - Recording on/off
+begin
+ prog = mythtv
+ button = TV/RADIO
+ repeat = 0
+ config = R
+end
+
+# MENU - Menu/EPG
+begin
+ prog = mythtv
+ button = MENU
+ repeat = 0
+ config = M
+end
+
+# TXT - PageUp, Jump forward
+begin
+ prog = mythtv
+ button = TXT
+ repeat = 0
+ config = PgUp
+end
+
+# STOP - PageDown, Jump backward
+begin
+ prog = mythtv
+ button = STOP
+ repeat = 0
+ config = PgDown
+end
+
+# EXT - Delete
+begin
+ prog = mythtv
+ button = EXT
+ repeat = 0
+ config = D
+end
+
+###############################################
+#
+# Mythwelcome
+
+# Up Arrow
+begin
+ prog = mythwelcome
+ button = UP
+ repeat = 0
+ config = Up
+end
+
+# Down Arrow
+begin
+ prog = mythwelcome
+ button = DOWN
+ repeat = 0
+ config = Down
+end
+
+# Left Arrow
+begin
+ prog = mythwelcome
+ button = LEFT
+ repeat = 0
+ config = Left
+end
+
+# Right Arrow
+begin
+ prog = mythwelcome
+ button = RIGHT
+ repeat = 0
+ config = Right
+end
+
+# MENU - Menu
+begin
+ prog = mythwelcome
+ button = MENU
+ repeat = 0
+ config = M
+end
+
+# INFO - Info on settings
+begin
+ prog = mythwelcome
+ button = INFO
+ repeat = 0
+ config = I
+end
+
+
+#####################################################
+#
+# mplayer
+#
+
+# Up Arrow - Next Chapter
+begin
+ prog = mplayer
+ button = UP
+ repeat = 0
+ config = seek_chapter +1
+end
+
+# Down Arrow
+begin
+ prog = mplayer
+ button = DOWN
+ repeat = 0
+ config = seek_chapter -1
+end
+
+# Left Arrow
+begin
+ prog = mplayer
+ button = LEFT
+ repeat = 0
+ config = seek -10
+end
+
+# Right Arrow
+begin
+ prog = mplayer
+ button = RIGHT
+ repeat = 0
+ config = seek +10
+end
+
+# Mute
+begin
+ prog = mplayer
+ button = MUTE
+ repeat = 0
+ config = mute
+end
+
+# 1 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 1
+ repeat = 0
+ config = 1
+end
+
+# 2 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 2
+ repeat = 0
+ config = 2
+end
+
+# 3 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 3
+ repeat = 0
+ config = 3
+end
+
+# 4 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 4
+ repeat = 0
+ config = 4
+end
+
+# 5 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 5
+ repeat = 0
+ config = 5
+end
+
+# 6 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 6
+ repeat = 0
+ config = 6
+end
+
+# 7 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 7
+ repeat = 0
+ config = 7
+end
+
+# 8 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 8
+ repeat = 0
+ config = 8
+end
+
+# 9 UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = 9
+ repeat = 0
+ config = 9
+end
+
+# 0
+begin
+ prog = mplayer
+ button = 0
+ repeat = 0
+ config = 0
+end
+
+# -/-- jump backward
+begin
+ prog = mplayer
+ button = -/--
+ repeat = 0
+ config = seek -100
+end
+
+# A/B jump forward
+begin
+ prog = mplayer
+ button = A/B
+ repeat = 0
+ config = seek +100
+end
+
+# Red button - Escape/quit
+begin
+ prog = mplayer
+ button = RED
+ repeat = 1
+ config = quit
+end
+
+# Green button - Browse UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = GREEN
+ repeat = 0
+ config =
+end
+
+# Green button - Jump to Previous Commercial Marker UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = GREEN
+ repeat = 0
+ config = Q
+end
+
+# Blue button - jump to Next Commercial marker / Load Comercial Marking List UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = BLUE
+ repeat = 0
+ config = Z
+end
+
+# OK UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = OK
+ repeat = 0
+ config = Enter
+end
+
+# SFI - Switch to channel in EPG UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = SFI
+ repeat = 0
+ config = X
+end
+
+# Exit - Pause/Play
+begin
+ prog = mplayer
+ button = EXIT
+ repeat = 0
+ config = pause
+end
+
+# INFO - Info on program/show/...
+begin
+ prog = mplayer
+ button = INFO
+ repeat = 0
+ config = get_time_pos
+ config = get_time_length
+ config = get_meta_title
+ config = get_meta_artist
+end
+
+# TV/RADIO - Recording on/off UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = TV/RADIO
+ repeat = 0
+ config = R
+end
+
+# MENU - Menu/EPG
+begin
+ prog = mplayer
+ button = MENU
+ repeat = 0
+ config = menu
+end
+
+# TXT - PageUp, Jump forward
+begin
+ prog = mplayer
+ button = TXT
+ repeat = 0
+ config = seek +300
+end
+
+# STOP - PageDown, Jump backward
+begin
+ prog = mplayer
+ button = STOP
+ repeat = 0
+ config = seek -300
+end
+
+# EXT - Delete UNIMPLEMENTED
+begin
+ prog = mplayer
+ button = EXT
+ repeat = 0
+ config = D
+end
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/preview.jpg b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/preview.jpg
new file mode 100644
index 0000000..413bd09
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/remote.run b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/remote.run
new file mode 100644
index 0000000..4e2f47a
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/Technisat_TTS35/remote.run
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# lirc start for Technisat TT35 remote
+
+LIRC_DRIVER="dev/input"
+LIRC_DEVICE="name=USB IR Receiver USB IR Receiver"
+/usr/sbin/lircd -r -n -d "$LIRC_DEVICE" --driver=$LIRC_DRIVER --output=/dev/lircd /etc/lircd.conf
+
diff --git a/abs/core/system-templates/templates/remotes/other/Twinhan/lircd-twinhan.conf b/abs/core/system-templates/templates/remotes/other/Twinhan/lircd-twinhan.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/Twinhan/lircrc-twinhan.txt b/abs/core/system-templates/templates/remotes/other/Twinhan/lircrc-twinhan.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/X10_Lola/lircd-x10lola.conf b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircd-x10lola.conf
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/X10_Lola/lircrc-x10lola.txt b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircrc-x10lola.txt
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/imon-mce/lircd.conf.imon b/abs/core/system-templates/templates/remotes/other/imon-mce/lircd.conf.imon
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/imon-mce/lircrc b/abs/core/system-templates/templates/remotes/other/imon-mce/lircrc
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/imon-mce/remote.run b/abs/core/system-templates/templates/remotes/other/imon-mce/remote.run
old mode 100755
new mode 100644
diff --git a/abs/core/system-templates/templates/remotes/other/imon/remote.run b/abs/core/system-templates/templates/remotes/other/imon/remote.run
old mode 100755
new mode 100644
--
cgit v0.12
From dcaa0d05f36fb2f67fe245804ca7a6c3c7e12a5c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 5 Feb 2014 19:16:04 +0000
Subject: LinHES-system: add idle.py to replace idle.sh. refs #958
update myth_mtc.py to use idle.py. update mythwelcome-config.py to update the db to use idle.py and run mythwelcome-config.py on install
---
abs/core/LinHES-system/PKGBUILD | 10 +-
abs/core/LinHES-system/idle.py | 310 +++++++++++++++++++++++++++
abs/core/LinHES-system/myth_mtc.py | 107 +--------
abs/core/LinHES-system/mythwelcome-config.py | 2 +-
abs/core/LinHES-system/system.install | 3 +
5 files changed, 322 insertions(+), 110 deletions(-)
create mode 100755 abs/core/LinHES-system/idle.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 1edffb8..8bb0e76 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=13
+pkgrel=14
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -23,7 +23,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh stop_xss.sh
- be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
+ be_check.py checkXFSfrag.sh find_orphans.py idle.py xwin_find.sh
linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
@@ -79,7 +79,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'de32a1c50101265dd7f6ca5037f7a26a'
'301884fb60521627fffd1160b2cf5181'
'76b2637cac0452b3acdbeeb4e8a5474b'
- '22807bd1e37d2a07bc0bd3f2a9fd2bb4'
+ '6d473cfc5c8e2ffedbd894807824d56f'
'dc3eef2a624754e16805d72bbe488b67'
'617af86b901538817ebdcaf646248dc5'
'542e670e78d117657f93141e9689f54d'
@@ -117,14 +117,14 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
- 'c3ada01d3a739abe3f920b02d4ea3f6e'
+ '1118e7982ba77cb5be9b2391b7cdfd38'
'a94fe6d980f4b810f2e2ae5352084b39'
'2c56266a79d058bf01f0de19c2cd042a'
'c27d3fdf59b211f9d3cd76a81f6257dc'
'503df99218373dfc75e7e7f5e449a44e'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
- '92950f0ffb1faf1ed64c6be2b8fbc3f6'
+ '20dd97b614cab2454794416a3601c497'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
'eb879fee9603a05d5420d4ce8ed9e450'
diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py
new file mode 100755
index 0000000..40bbb16
--- /dev/null
+++ b/abs/core/LinHES-system/idle.py
@@ -0,0 +1,310 @@
+#!/usr/bin/python2
+
+import argparse, os, re, subprocess, sys, time
+from datetime import datetime, date, timedelta
+
+def msg(cmdargs,msg):
+ if cmdargs.silent is False:
+ print "%s" %msg
+
+def mythshutdownlock_check(cmdargs,cursor):
+ if (cmdargs.lock):
+ msg(cmdargs," Checking mythshutdown for lock...")
+ try:
+ cursor.execute("select data from settings where value = 'MythShutdownLock'")
+ results=cursor.fetchone()
+ except:
+ return True
+ lock=results[0]
+ if int(lock) == 0 :
+ msg(cmdargs," mythshutdown is NOT locked.")
+ return True
+ else:
+ msg(cmdargs," mythshutdown is locked.")
+ return False
+ else:
+ return True
+
+def dailywake_check(cmdargs,cursor):
+ if (cmdargs.daily):
+ msg(cmdargs," Checking if in a daily wake period...")
+ dailyWake=False
+ today = date.today()
+ now = datetime.now()
+ try:
+ cursor.execute("select data from settings where value = 'DailyWakeupStartPeriod1'")
+ results=cursor.fetchone()
+ p1Start=datetime.strptime(' '.join([str(today), results[0]]), "%Y-%m-%d %H:%M")
+ cursor.execute("select data from settings where value = 'DailyWakeupEndPeriod1'")
+ results=cursor.fetchone()
+ p1End=datetime.strptime(' '.join([str(today), results[0]]), "%Y-%m-%d %H:%M")
+ cursor.execute("select data from settings where value = 'DailyWakeupStartPeriod2'")
+ results=cursor.fetchone()
+ p2Start=datetime.strptime(' '.join([str(today), results[0]]), "%Y-%m-%d %H:%M")
+ cursor.execute("select data from settings where value = 'DailyWakeupEndPeriod2'")
+ results=cursor.fetchone()
+ p2End=datetime.strptime(' '.join([str(today), results[0]]), "%Y-%m-%d %H:%M")
+ except:
+ print "error"
+ return True
+
+ # Check for time periods that cross midnight
+ if (p1End < p1Start):
+ if (now > p1End):
+ p1End = p1End + timedelta(days=1)
+ else:
+ p1Start = p1Start + timedelta(days=-1)
+ if (p2End < p2Start):
+ if (now > p2End):
+ p2End = p2End + timedelta(days=1)
+ else:
+ p2Start = p2Start + timedelta(days=-1)
+
+ #Check for one of the daily wakeup periods
+ if (p1Start != p1End):
+ if (now >= p1Start and now <= p1End):
+ msg(cmdargs," Currently in daily wake period 1.")
+ return False
+ if (p2Start != p2End):
+ if (now >= p2Start and now <= p2End):
+ msg(cmdargs," Currently in daily wake period 2.")
+ return False
+
+ #Are we about to start a daily wakeup period using the -t TIME var
+ if (p1Start != p1End):
+ delta=p1Start-now
+ if (delta.seconds >= 0 and delta.seconds <= cmdargs.time * 60):
+ msg(cmdargs," Daily wake period 1 will start in less than %s minutes." %cmdargs.time)
+ return False
+ if (p2Start != p2End):
+ delta=p2Start-now
+ if (delta.seconds >= 0 and delta.seconds <= cmdargs.time * 60):
+ msg(cmdargs," Daily wake period 2 will start in less than %s minutes." %cmdargs.time)
+ return False
+
+ msg(cmdargs," Currently NOT in a daily wake period.")
+ return True
+ else:
+ return True
+
+def schemalock_check(cmdargs,cursor):
+ msg(cmdargs," Checking if the schema is locked...")
+ try:
+ cursor.execute("select count(*) from schemalock")
+ results=cursor.fetchone()
+ except:
+ return True
+ schemalock=results[0]
+ if schemalock == 0:
+ msg(cmdargs," The schema is NOT locked.")
+ return True
+ else:
+ msg(cmdargs," The schema is locked.")
+ return False
+
+def in_use(cmdargs,cursor):
+ msg(cmdargs," Checking if programs are in use...")
+ try:
+ cursor.execute("select count(*) from inuseprograms")
+ results=cursor.fetchone()
+ except:
+ return True
+ prginuse=results[0]
+ if prginuse == 0 :
+ msg(cmdargs," Programs are NOT in use.")
+ return True
+ else:
+ msg(cmdargs," Programs are in use.")
+ return False
+
+def job_check(cmdargs,cursor):
+ msg(cmdargs," Checking jobqueue for active jobs...")
+ try:
+ cursor.execute("select count(*) from jobqueue where status between 2 and 5")
+ results=cursor.fetchone()
+ except:
+ return True
+ jobs=results[0]
+ if jobs == 0 :
+ msg(cmdargs," No jobs are active.")
+ return True
+ else:
+ msg(cmdargs," Jobs are active.")
+ return False
+
+def upcoming_check(cmdargs,mythBE):
+ msg(cmdargs," Checking for recordings in the next %s minutes..." %cmdargs.time)
+ try:
+ upcoming = mythBE.getUpcomingRecordings()
+ except:
+ msg(cmdargs," Could not get upcoming recordings.")
+ return True
+ time_diff=10000
+ r=0
+ for i in upcoming:
+ r += 1
+ if r > 1:
+ break
+ show=str(i)
+ show=show.strip()
+ showtime=re.split("[-+]\d\d:\d\d",str(i.starttime))[0]
+ now=time.time()
+ rec_time=time.strptime( showtime ,"%Y-%m-%d %H:%M:%S" )
+ r=time.mktime(rec_time)
+ time_diff = ( r - now ) / 60
+
+ if ( time_diff > cmdargs.time) :
+ msg(cmdargs," No recordings starting in %s minutes." %cmdargs.time)
+ return True
+ else:
+ msg(cmdargs," A recording is starting in %s minutes." %int(time_diff))
+ return False
+
+def mfd_check(cmdargs):
+ msg(cmdargs," Checking if mythfilldatabase is running...")
+ with open(os.devnull, "w") as fnull:
+ mythfilldatabase_ret = subprocess.call(["pidof", "mythfilldatabase"], stdout=fnull)
+ if mythfilldatabase_ret == 0 :
+ msg(cmdargs," mythfilldatabase is running.")
+ return False
+ else:
+ msg(cmdargs," mythfilldatabase is NOT running.")
+ return True
+
+def mythtvsetup_check(cmdargs):
+ msg(cmdargs," Checking if mythtv-setup is running...")
+ with open(os.devnull, "w") as fnull:
+ mythsetup_ret = subprocess.call(["pidof", "mythtv-setup"], stdout=fnull)
+ if mythsetup_ret == 0 :
+ msg(cmdargs," mythtv-setup is running.")
+ return False
+ else:
+ msg(cmdargs," mythtv-setup is NOT running.")
+ return True
+
+def mythfe_check(cmdargs,cursor,mythDB):
+ if ( cmdargs.runningfe ):
+ msg(cmdargs," Checking for running and playing mythfrontends...")
+ else:
+ msg(cmdargs," Checking for playing mythfrontends...")
+ try:
+ #frontends = mythDB.getFrontends() #use cursor instead so it doesn't test connection
+ cursor.execute("select hostname from settings where value = 'FrontendIdleTimeout'")
+ frontends=cursor.fetchall()
+ except:
+ return True
+
+ for i in frontends:
+ try:
+ msg(cmdargs," Checking %s's mythfrontend status..." %i)
+ frontend = mythDB.getFrontend(''.join(i))
+ if ( cmdargs.runningfe ):
+ msg(cmdargs," %s's mythfrontend is RUNNING." %i)
+ return False
+ location = frontend.sendQuery('Location')
+ if ( location.startswith('Playback ') ):
+ msg(cmdargs," %s's mythfrontend is PLAYING." %i)
+ return False
+ else:
+ msg(cmdargs," %s's mythfrontend is NOT playing." %i)
+ except:
+ msg(cmdargs," Could not connect to %s's mythfrontend." %i)
+
+ if ( cmdargs.runningfe ):
+ msg(cmdargs," No mythfrontends are running or playing.")
+ else:
+ msg(cmdargs," No mythfrontends are playing.")
+
+ return True
+
+def usage():
+ line = '''
+ idle.py checks if the system is idle.
+ Use idle.py -h to see options.
+
+ idle.py checks these parts of the system in this order to
+ determine if it is idle:
+ - (option -l) mythshutdown is locked return busy
+ - (option -d) In a daily wake period or
+ about to start a daily wake period return busy
+ checks the next 15 minutes. -t TIME changes time
+ - schema is locked return busy
+ - There are in use programs return busy
+ - There are active jobs in the job queue return busy
+ - mythfilldatabase is running return busy
+ - mythtv-setup is running return busy
+ - There are upcoming recordings return busy
+ checks the next 15 minutes. -t TIME changes time
+ - mythfrontends playing back a recording or video
+ - (option -r) mythfrontends running
+
+ idle.py stops checking and returns false (busy) when the first busy is found.
+ '''
+ print line
+ sys.exit(0)
+
+def main(args=[False]):
+ parser = argparse.ArgumentParser()
+ parser.add_argument('-d', '--daily', action='store_true', help='Include daily wake & about to start wake in system busy. (default: daily wake & about to start wake is system idle)')
+ parser.add_argument('-l', '--lock', action='store_true', help='Include mythshutdown lock in system busy. (default: mythshutdown lock is system idle)')
+ parser.add_argument('-r', '--runningfe', action='store_true', help='Include running mythfrontends in system busy. (default: running mythfrontends are system idle)')
+ parser.add_argument('-s', '--silent', action='store_true', help='Run without printing output. Recommended for use in cron jobs or scripts.')
+ parser.add_argument('-t', '--time', type=int, default=15, help='Minutes of idle time needed to return idle for upcoming recordings and daily wake.')
+ parser.add_argument('-u', '--usage', action='store_true', help='Print usage instructions.')
+ if args[0] is False:
+ cmdargs = parser.parse_args()
+ else:
+ cmdargs = parser.parse_args(args)
+
+ if cmdargs.usage:
+ usage()
+ idle=True
+ msg(cmdargs,"Checking system idle...")
+
+ try:
+ from MythTV import MythDB
+ mythDB = MythDB()
+ cursor = mythDB.cursor()
+ db_conn=True
+ except:
+ msg(cmdargs,"Couldn't connect to MythTV database.")
+ db_conn=False
+
+ try:
+ from MythTV import MythBE
+ mythBE = MythBE()
+ be_conn=True
+ except:
+ msg(cmdargs,"Couldn't connect to MythTV backend.")
+ be_conn=False
+
+ if ( db_conn ):
+ if (mythshutdownlock_check(cmdargs,cursor) and dailywake_check(cmdargs,cursor) and schemalock_check(cmdargs,cursor) and in_use(cmdargs,cursor) and job_check(cmdargs,cursor)):
+ idle=True
+ else:
+ idle=False
+
+ if ( be_conn and idle ):
+ if (mfd_check(cmdargs) and mythtvsetup_check(cmdargs) and upcoming_check(cmdargs,mythBE)):
+ idle=True
+ else:
+ idle=False
+
+ if ( db_conn and idle ):
+ if ( mythfe_check(cmdargs,cursor,mythDB) ):
+ idle=True
+ else:
+ idle=False
+
+ if ( idle ):
+ msg(cmdargs,"System is idle.")
+ else:
+ msg(cmdargs,"System is busy.")
+ return idle
+
+if __name__ == "__main__":
+ idle=main()
+ if ( idle ):
+ exit(0)
+ else:
+ exit(1)
diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py
index 7847313..c33a888 100755
--- a/abs/core/LinHES-system/myth_mtc.py
+++ b/abs/core/LinHES-system/myth_mtc.py
@@ -6,6 +6,7 @@ import socket
import os
import datetime,time
import shlex
+import idle
try:
from MythTV import MythBE
@@ -21,9 +22,7 @@ def get_timestamp():
date = (now.strftime('%Y-%m-%d %H:%M'))
return date
-
def optimize():
-
try:
cursor = mythtv.db.cursor()
cursor.execute("SHOW tables")
@@ -39,96 +38,6 @@ def optimize():
cmd= "%s table %s" %(op,ctable)
cursor.execute(cmd)
-
-def upcoming_check():
- print " Checking for upcoming shows"
- try:
- upcoming = mythtv.getUpcomingRecordings()
- except:
- return True
- try:
- show=str(upcoming[0])
- show=show.strip()
- showtime=show.partition("(")[2].strip(")")
- now=time.time()
- rec_time=time.strptime( showtime ,"%Y-%m-%d %H:%M:%S" )
- r=time.mktime(rec_time)
- time_diff= ( r - now ) / 60
- except:
- time_diff=100
- show="No show"
- if ( time_diff > 30) :
- return True
- else:
- print " %s is upcoming in %s" %(show,time_diff)
- return False
-
-
-def schemalock_check():
- print " Checking if schema is locked"
- try:
- c = mythtv.db.cursor()
- c.execute("select count(*) from schemalock")
- results=c.fetchone()
- schemalock=results[0]
- except:
- return True
-
- if schemalock == 0:
- return True
- else:
- print " schema is locked"
- return False
-
-def job_check():
- print " Checking jobqueue"
- try:
- c = mythtv.db.cursor()
- c.execute("select count(*) from jobqueue where status = 4")
- results=c.fetchone()
- except:
- return True
- jobs= results[0]
- if jobs == 0 :
- return True
- else:
- print " jobs are running"
- return False
-
-
-def in_use():
- print " Checking if programs are in use"
- try:
- c = mythtv.db.cursor()
- c.execute("select count(*) from inuseprograms")
- results=c.fetchone()
- except:
- return True
- prginuse=results[0]
- if prginuse == 0 :
- return True
- else:
- print " Programs in use"
- return False
-
-def mfd_check():
- print " Checking is mythfilldatabase is running"
- ps = subprocess.Popen("ps ax -o pid= -o args= ", shell=True, stdout=subprocess.PIPE)
- ps_pid = ps.pid
- output = ps.stdout.read()
- ps.stdout.close()
- ps.wait()
- proc_name="mythfilldatabase"
- for line in output.split("\n"):
- res = re.findall("(\d+) (.*)", line)
- if res:
- pid = int(res[0][0])
- if proc_name in res[0][1] and pid != os.getpid() and pid != ps_pid:
- print " mythfilldatabase is running"
- return False
-
- return True
-
def bail_if_another_is_running():
cmd = shlex.split("pgrep -u {} -f {}".format(os.getuid(), __file__))
pids = subprocess.check_output(cmd).strip().split('\n')
@@ -138,19 +47,9 @@ def bail_if_another_is_running():
__file__, " ".join(pids))
raise SystemExit(1)
-
-def idle_check():
- print "\n%s Checking Idle" %(get_timestamp())
- if ( upcoming_check() and schemalock_check() and job_check() and in_use() and mfd_check() ):
- idle=True
- print "\n%s Myth is idle" %(get_timestamp())
- else:
- idle=False
- print "\n%s Myth is NOT idle" %(get_timestamp())
- return idle
-
def run_stuff():
- if idle_check():
+ print "\n%s" %get_timestamp()
+ if idle.main():
print "\n#######################################"
print "\n%s Running Optimize" %(get_timestamp())
optimize()
diff --git a/abs/core/LinHES-system/mythwelcome-config.py b/abs/core/LinHES-system/mythwelcome-config.py
index 5ab24b0..8cf78c2 100755
--- a/abs/core/LinHES-system/mythwelcome-config.py
+++ b/abs/core/LinHES-system/mythwelcome-config.py
@@ -24,4 +24,4 @@ if mythdb.settings[localhostname].idleTimeoutSecs == u'0':
mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'
mythdb.settings.NULL.ServerHaltCommand = u'/usr/bin/mythshutdown --shutdown'
-mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -m -r'
+mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.py -s -d -l -r'
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index 9f8aa45..6975070 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -13,6 +13,9 @@ post_install() {
rm -f /etc/cron.daily/myth_mtc
fi
+ #run mythwelcome-config.py to update shutdown check to use idle.py
+ /usr/LH/bin/mythwelcome-config.py
+
sv restart msg_daemon
}
--
cgit v0.12
From bfce2e0f5e5fe03890c9cbf0521200a93ba00426 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 5 Feb 2014 21:27:05 +0000
Subject: update to pull 64 bit deb. closes #957
---
abs/extra/huludesktop/PKGBUILD | 29 +++++++++++++++--------------
abs/extra/huludesktop/huludesktop | 10 +++++-----
abs/extra/huludesktop/huludesktop.install | 2 ++
abs/extra/huludesktop/huludesktop_is.conf | 11 ++++++-----
4 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD
index d47f165..c896f7e 100644
--- a/abs/extra/huludesktop/PKGBUILD
+++ b/abs/extra/huludesktop/PKGBUILD
@@ -1,30 +1,31 @@
pkgname=huludesktop
-pkgver=0.2
-pkgrel=6
+pkgver=0.9.8
+pkgrel=1
pkgdesc="Hulu Desktop for Linux"
-arch=(i686 'x86_64')
+arch=('x86_64')
url="http://www.hulu.com/labs/hulu-desktop-linux"
-license=('unknown')
-makedepends=('deb2targz')
-depends=('glib2' 'gtk2' 'lirc' 'flashplugin' 'linhes-scripts>=7-29' )
+license=('custom')
+depends=('glib2' 'gtk2' 'lirc' 'flashplugin')
backup=('home/mythtv/.huludesktop')
install=huludesktop.install
options=('')
-source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop' 'huludesktop.sh' 'huludesktop_is.conf')
+source=('http://download.hulu.com/huludesktop_amd64.deb' 'huludesktop' 'huludesktop.sh' 'huludesktop_is.conf')
. /usr/MythVantage/bin/install_functions.sh
home_check
-build() {
- cd $startdir/src
- deb2targz huludesktop_i386.deb
- tar -xzvf huludesktop_i386.tar.gz -C $pkgdir
+
+package() {
+ cd $srcdir
+ ar p huludesktop_amd64.deb data.tar.gz | (cd $pkgdir; bsdtar xf -)
mkdir -p $pkgdir/$MYTHHOME
mkdir -p $pkgdir/usr/LH/bin
cp huludesktop $pkgdir/$MYTHHOME/.huludesktop
install -D -m755 huludesktop.sh ${pkgdir}/usr/LH/bin
+
#add in file for gen_is.xml
install -D -m0744 ${srcdir}/huludesktop_is.conf ${pkgdir}/etc/gen_is_xml.d/huludesktop_is.conf
}
-md5sums=('d9b27d1837ab86526100964e80c3cdd1'
- '935d923b90abaa4b1838a5e6b23e704e'
+
+md5sums=('bccc94d7f327989dab2653d254f40869'
+ '77b7241a4ec8402ba37f1f1811336ea3'
'8f7dbf19d6168bc3a5b0c1da1c878693'
- '36fb8d9af1ff8a0b8634e7dbddaf975f')
+ '224ed61a3ecfd6aa37d27d1c71426a3c')
diff --git a/abs/extra/huludesktop/huludesktop b/abs/extra/huludesktop/huludesktop
index c3fc9a5..dee8778 100644
--- a/abs/extra/huludesktop/huludesktop
+++ b/abs/extra/huludesktop/huludesktop
@@ -1,9 +1,9 @@
[display]
fullscreen = TRUE
-width = 1024
-height = 576
-pos_x = 201
-pos_y = 179
+width = 1920
+height = 1080
+pos_x = 0
+pos_y = 0
[remote]
lirc_device = /var/run/lirc/lircd
@@ -22,4 +22,4 @@ flash_location = /usr/lib/mozilla/plugins/libflashplayer.so
[version]
latest = (null)
-eula_version = 0
+eula_version = 1
diff --git a/abs/extra/huludesktop/huludesktop.install b/abs/extra/huludesktop/huludesktop.install
index e567a48..abe069f 100644
--- a/abs/extra/huludesktop/huludesktop.install
+++ b/abs/extra/huludesktop/huludesktop.install
@@ -2,11 +2,13 @@
post_install() {
gen_is_xml.py
chown mythtv.mythtv $MYTHHOME/.huludesktop
+ echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
gen_is_xml.py
+ echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
}
post_remove() {
gen_is_xml.py
diff --git a/abs/extra/huludesktop/huludesktop_is.conf b/abs/extra/huludesktop/huludesktop_is.conf
index dba4076..2a83db7 100644
--- a/abs/extra/huludesktop/huludesktop_is.conf
+++ b/abs/extra/huludesktop/huludesktop_is.conf
@@ -1,8 +1,9 @@
<!--#Hulu-->
- <button>
- <type>STREAM</type>
- <text>Hulu Desktop</text>
- <action>EXEC huludesktop.sh</action>
- </button>
+ <button>
+ <type>STREAM</type>
+ <text>Hulu Desktop</text>
+ <description>Open Hulu Desktop</description>
+ <action>EXEC huludesktop.sh</action>
+ </button>
<!--#Hulu-->
--
cgit v0.12
From 73e217800ce2ebd6e64ae54db7f54c386f047cff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 5 Feb 2014 22:08:53 +0000
Subject: poweroff-scripts: shutdown.script: fix wall syntax to use stdin.
---
abs/core/poweroff-scripts/PKGBUILD | 6 +++---
abs/core/poweroff-scripts/shutdown.script | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/poweroff-scripts/PKGBUILD b/abs/core/poweroff-scripts/PKGBUILD
index 9bcfee1..ff32494 100644
--- a/abs/core/poweroff-scripts/PKGBUILD
+++ b/abs/core/poweroff-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=poweroff-scripts
pkgver=1.1
-pkgrel=3
+pkgrel=4
pkgdesc="replacement scripts to work with sysvinit and runit"
license=('GPL')
depends=('sysvinit>=2.88' 'runit>=2.1.1-6')
@@ -12,7 +12,7 @@ install=poweroff-scripts.install
source=(halt.script reboot.script poweroff.script shutdown.script)
arch=('i686' 'x86_64')
-build() {
+package() {
install -d $pkgdir/sbin/
install -m0755 $srcdir/reboot.script $pkgdir/sbin/reboot
install -m0755 $srcdir/halt.script $pkgdir/sbin/halt
@@ -24,4 +24,4 @@ build() {
md5sums=('68ac5d7d5784e9559c9752d94a4943d5'
'3e042113f8715bc5bfd365d2486d0108'
'3ec5f3013dcbd60b6b957d17ba220585'
- '16bb393e9ae7b5fa744ca91970f350cc')
+ '1dccfcd2283d4ed193511535b0b220fc')
diff --git a/abs/core/poweroff-scripts/shutdown.script b/abs/core/poweroff-scripts/shutdown.script
index 31881e8..978f7a2 100644
--- a/abs/core/poweroff-scripts/shutdown.script
+++ b/abs/core/poweroff-scripts/shutdown.script
@@ -29,14 +29,14 @@ then
if [ x$reboot = x1 ]
then
- wall "System will reboot in $delay seconds"
+ echo "System will reboot in $delay seconds" | wall
sleep $delay
/sbin/runit-init 6
fi
if [ x$halt = x1 ]
then
- wall "System will poweroff in $delay seconds"
+ echo "System will poweroff in $delay seconds" | wall
sleep $delay
/sbin/runit-init 0
fi
--
cgit v0.12
From dd0d1371a1ef3b0a5a71b32721b9cef2277d7caa Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 11 Feb 2014 21:31:51 +0000
Subject: LinHES-system: myth2mkv: use jobqueue_helper.py for myth db access.
refs #958
jobqueue_helper.py: initial inclusion.
---
abs/core/LinHES-system/PKGBUILD | 7 +-
abs/core/LinHES-system/jobqueue_helper.py | 63 ++++++++++++++++++
abs/core/LinHES-system/myth2mkv | 105 ++++++++++++++++++++----------
3 files changed, 136 insertions(+), 39 deletions(-)
create mode 100755 abs/core/LinHES-system/jobqueue_helper.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 8bb0e76..97d7fa0 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=14
+pkgrel=15
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -21,7 +21,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
create_media_dirs.sh msg_client.py msg_daemon.py
gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
- misc_upcoming_recordings.pl misc_which_recorder.pl
+ misc_upcoming_recordings.pl misc_which_recorder.pl jobqueue_helper.py
change_channel.sh change_channel_wrapper.sh stop_xss.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.py xwin_find.sh
linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
@@ -111,6 +111,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'3300ea8b02e4fb8bd3409df348de6e16'
'145b1da6ce501b3ce38ea415a576bf2d'
'b51c93ad9f3717a616d92899f6bfde76'
+ 'd8f30983055dcfe2f53197d0f9a62158'
'17f678d37187be0f12d67f64e40429c6'
'bacc813b48bafcc6fe906e5969930501'
'8e02efe1ad0df9a179075147eebb05b9'
@@ -121,7 +122,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'a94fe6d980f4b810f2e2ae5352084b39'
'2c56266a79d058bf01f0de19c2cd042a'
'c27d3fdf59b211f9d3cd76a81f6257dc'
- '503df99218373dfc75e7e7f5e449a44e'
+ '28f29578e5b3ba84fdf2aa57cf475bcf'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
'20dd97b614cab2454794416a3601c497'
diff --git a/abs/core/LinHES-system/jobqueue_helper.py b/abs/core/LinHES-system/jobqueue_helper.py
new file mode 100755
index 0000000..d27e693
--- /dev/null
+++ b/abs/core/LinHES-system/jobqueue_helper.py
@@ -0,0 +1,63 @@
+#!/usr/bin/python2
+
+import argparse, os, re, subprocess, sys, time
+from MythTV import MythDB, Job
+
+mythDB = MythDB()
+cursor = mythDB.cursor()
+
+def set_cmds(cmdargs,job):
+ #print "Setting cmds on job %s to %s" %(cmdargs.jobid,cmdargs.cmd)
+ cursor.execute("update jobqueue set cmds = '%s' where id = '%s'" %(cmdargs.cmd,cmdargs.jobid))
+
+def set_comment(cmdargs,job):
+ #print "Setting comment on job %s to %s" %(cmdargs.jobid,cmdargs.comment)
+ job.setComment("%s" %cmdargs.comment)
+
+def set_status(cmdargs,job):
+ #print "Setting status on job %s to %s" %(cmdargs.jobid,cmdargs.status)
+ job.setStatus("%s" %cmdargs.status)
+
+def run_cursor(cmdargs):
+ cursor.execute("%s" %cmdargs.man_cursor)
+ results=cursor.fetchone()
+ print results[0]
+
+def usage():
+ line = '''
+ jobqueue_helper.py provides MythTV job queue functions
+ using python bindings for bash scripts.
+ Use jobqueue_helper.py -h to see options.
+ '''
+ print line
+ sys.exit(0)
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+ parser.add_argument('-cs', '--comment_set', action='store', dest='comment', help='Set the comment of the jobid')
+ parser.add_argument('-cmds', '--cmd_set', type=int, default=77777, action='store', dest='cmd', help='Set the cmd of the jobid')
+ parser.add_argument('-ss', '--status_set', type=int, action='store', dest='status', help='Set the status of the jobid')
+ action = parser.add_mutually_exclusive_group(required=True)
+ action.add_argument('-j', '--jobid', type=int, help='jobid of the job to control')
+ action.add_argument('-m', '--man_cursor', action='store', dest='man_cursor', help='Manual mysql cursor command')
+ action.add_argument('-u', '--usage', action='store_true', help='Print usage instructions.')
+
+ cmdargs = parser.parse_args()
+
+ if cmdargs.usage:
+ usage()
+
+ if cmdargs.jobid:
+ job = Job(cmdargs.jobid)
+
+ if cmdargs.comment:
+ set_comment(cmdargs, job)
+
+ if cmdargs.status:
+ set_status(cmdargs, job)
+
+ if cmdargs.cmd != 77777:
+ set_cmds(cmdargs, job)
+
+ if cmdargs.man_cursor:
+ run_cursor(cmdargs)
diff --git a/abs/core/LinHES-system/myth2mkv b/abs/core/LinHES-system/myth2mkv
index aedccff..1352476 100644
--- a/abs/core/LinHES-system/myth2mkv
+++ b/abs/core/LinHES-system/myth2mkv
@@ -2,13 +2,14 @@
#
# Convert video to AVC-1 / h264
#
-# version 0.25-004
+# version 0.27-001
#
# Prerequisites:
-# - mythtv >= 0.25
+# - mythtv >= 0.27
# - handbrake-cli
# - mplayer
# - mkvtoolnix
+# - jobqueue_helper.py
#
# Arguments
# $1 must be the directory/file of the recording
@@ -20,7 +21,9 @@
# $7 must be quality of encode
#
# As a MythTV user job:
-# myth2mkv "%DIR%/%FILE%" "%CHANID%" "%STARTTIME%" "%TITLE%" "%SUBTITLE%" "%JOBID%" HQ|MQ|LQ
+# myth2mkv "%DIR%/%FILE%" "%CHANID%" "%STARTTIME%" "%TITLE%" "%SUBTITLE%" "%JOBID%" "HP|HQ|MQ|LQ"
+# Select only 1 quality setting
+# HP is similar to the HandBrake built-in preset High Profile
########################
# #
@@ -47,12 +50,13 @@ TUNING=""
# Crop 160 pixels off the left and right for 4:3 image in 1280x720 frame
# <T:B:L:R>
# i.e. 0:0:240:240
-# Default: In HQ: CROP="0:0:0:0" (no cropping).
+# Default: In HP and HQ: CROP="0:0:0:0" (no cropping).
# IN MQ and LQ: autocrop.
CROP=""
# Force custom output resolution.
# Default: Keep same resolution as input file (less any cropping).
+# The HP quality setting always keeps the same resolution as the input file.
WIDTH=""
HEIGHT=""
@@ -69,15 +73,6 @@ DEINT="G"
# #
############################
-if [[ -e $HOME/.mythtv/mysql.txt ]] ; then
- . $HOME/.mythtv/mysql.txt
-else
- DBHostName=${DBHostName:-"localhost"}
- DBUserName=${DBUserName:-"mythtv"}
- DBPassword=${DBPassword:-"mythtv"}
- DBName=${DBName:-"mythconverg"}
-fi
-
if [[ ! -d ${TMPDIR} ]] ; then
mkdir -p ${TMPDIR}
fi
@@ -91,8 +86,7 @@ update_comment()
# Arg_1 = COMMENT
{
if [ ${NO_JOBID} -eq 0 ]; then
- SQL_CMD="update jobqueue set comment=\"${1}\" where id=\"${JOBID}\";"
- `${MYSQLCMD} "${SQL_CMD}"`
+ `jobqueue_helper.py -j ${JOBID} -cs "${1}"`
fi
}
@@ -101,17 +95,16 @@ check_background_progress()
{
while [ `tail -2 ${STATUSFILE} | grep -c "^HandBrake has exited"` = 0 ]
do
- sleep 10
+ sleep 15
check_myth_jobcmds
- pass=`tail -1 ${STATUSFILE} | egrep -o -e 'task [0-9]' | tail -1 | sed 's/task\ //g'`
+ pass=`tail -1 ${STATUSFILE} | egrep -o -e 'task [0-9] of [0-9], ' | tail -1 | sed 's/task\ /Pass\ /g'`
prog_percent=`tail -1 ${STATUSFILE} | egrep -o -e '[0-9]*\.[0-9]. %' | tail -1 | sed 's/\ %//g'`
current_FPS=`tail -1 ${STATUSFILE} | egrep -o -e 'avg [0-9.]*\.[0-9]* fps' | tail -1 | sed -e 's/avg\ //g' -e 's/\ fps//g'`
current_ETA=`tail -1 ${STATUSFILE} | egrep -o -e 'ETA [0-9.][0-9.]h[0-9.][0-9.]m[0-9.][0-9.]s' | tail -1`
if [ -n "$prog_percent" ]; then
- echo "Pass ${pass}, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
- update_comment "Pass ${pass} of 2, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
+ echo "${pass}${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
+ update_comment "${pass}${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
fi
- sleep 10
done
}
@@ -119,24 +112,24 @@ check_myth_jobcmds()
# check the myth database for stop pause or resume commands
{
if [[ ${NO_JOBID} -eq 0 ]] ; then
- CURRENT_CMD=`${MYSQLCMD} "select cmds from jobqueue where id = \"${JOBID}\";"`
+ CURRENT_CMD=`jobqueue_helper.py -m "select cmds from jobqueue where id = ${JOBID}"`
case "${CURRENT_CMD}" in
# JOB_RUN
0) ;;
# JOB_PAUSE
- 1) `${MYSQLCMD} "update jobqueue set status=\"6\" where id=\"${JOBID}\";"`
+ 1) `jobqueue_helper.py -j ${JOBID} -ss 6`
kill -s STOP ${handbrake_pid} ;;
# JOB_RESUME
- 2) `${MYSQLCMD} "update jobqueue set status=\"4\" where id=\"${JOBID}\";"`
- `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
+ 2) `jobqueue_helper.py -j ${JOBID} -ss 4`
+ `jobqueue_helper.py -j ${JOBID} -cmds 0`
kill -s CONT ${handbrake_pid} ;;
# JOB_STOP
- 4) `${MYSQLCMD} "update jobqueue set status=\"5\" where id=\"${JOBID}\";"`
- `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
+ 4) `jobqueue_helper.py -j ${JOBID} -ss 5`
+ `jobqueue_helper.py -j ${JOBID} -cmds 0`
kill -9 ${handbrake_pid} ${command_pid}
clean_up_files
echo "Encode Cancelled" >> ${LOGFILE}
- `${MYSQLCMD} "update jobqueue set status=\"320\" where id=\"${JOBID}\";"`
+ `jobqueue_helper.py -j ${JOBID} -ss 320`
exit ;;
esac
fi
@@ -200,7 +193,14 @@ if [[ -n ${HEIGHT} ]] ; then
HEIGHT="-l ${HEIGHT} -Y ${HEIGHT}"
fi
-if [[ ${QUALITY} = HQ ]] ; then
+if [[ ${QUALITY} = HP ]] ; then
+ if [[ -n ${CROP} ]] ; then
+ CROP="--crop ${CROP}"
+ else
+ CROP="--crop 0:0:0:0 --strict-anamorphic"
+ fi
+ HB_OPTS="-o ${TMPFILE} -e x264 ${TUNING} -q 20.0 -a 1,1 -E copy:ac3,faac -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 -f mkv --decomb --loose-anamorphic --modulus 2 -m --x264-preset medium --h264-profile high --h264-level 4.1 ${CROP} -s 1"
+elif [[ ${QUALITY} = HQ ]] ; then
if [[ -n ${CROP} ]] ; then
CROP="--crop ${CROP}"
else
@@ -260,10 +260,18 @@ echo " <Simple>" >> "${TAG_FILE}"
echo " <Name>DATE_RELEASED</Name>" >> "${TAG_FILE}"
echo " <String>${OAD}</String>" >> "${TAG_FILE}"
echo " </Simple>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>SEASON</Name>" >> "${TAG_FILE}"
+echo " <String>${SEASON}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>EPISODE</Name>" >> "${TAG_FILE}"
+echo " <String>${EPISODE}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
echo " </Simple>" >> "${TAG_FILE}"
echo " </Simple>" >> "${TAG_FILE}"
echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>ENCODER</Name>" >> "${TAG_FILE}"
+echo " <Name>ENCODED_BY</Name>" >> "${TAG_FILE}"
echo " <String>HandBrakeCLI ${HBCLIVER}</String>" >> "${TAG_FILE}"
echo " </Simple>" >> "${TAG_FILE}"
echo " <Simple>" >> "${TAG_FILE}"
@@ -308,9 +316,12 @@ STATUSFILE=/tmp/${TMPNAME}-status.log
HB_RETURN_CODE=/tmp/${TMPNAME}-hb_return_code
IDFILE=/tmp/${TMPNAME}-id.txt
TAG_FILE=/tmp/${TMPNAME}.xml
-MYSQLCMD="mysql -B --skip-column-names -u ${DBUserName} -p${DBPassword} -h ${DBHostName} -D ${DBName} -e"
-OAD=`${MYSQLCMD} "select originalairdate from recorded where basename LIKE '${BASE}';"`
-DESCR=`${MYSQLCMD} "select description from recorded where basename LIKE '${BASE}';" | sed 's/\&/and/g'`
+SEASON=`jobqueue_helper.py -m "select season from recorded where basename LIKE '${BASE}'"`
+SEASON=`printf "%02d" $SEASON`
+EPISODE=`jobqueue_helper.py -m "select episode from recorded where basename LIKE '${BASE}'"`
+EPISODE=`printf "%02d" $EPISODE`
+OAD=`jobqueue_helper.py -m "select originalairdate from recorded where basename LIKE '${BASE}'"`
+DESCR=`jobqueue_helper.py -m "select description from recorded where basename LIKE '${BASE}'" | sed 's/\&/and/g'`
USER=`whoami`
# check if %JOBID% is passed from command line
@@ -392,7 +403,11 @@ fi
# make output filename unique and do not clobber an existing file
# Build a final file name
-FILE=$( echo "${TITLE,,} ${OAD} ${SUBTITLE,,}" | tr -d [:punct:] | tr [:blank:] "_" | tr -s "_" )
+if [[ $SEASON != "00" && $EPISODE != "00" ]]; then
+ FILE=$( echo "${TITLE,,} s${SEASON}e${EPISODE} ${SUBTITLE,,}" | tr -d [:punct:] | tr [:blank:] "_" | tr -s "_" )
+else
+ FILE=$( echo "${TITLE,,} ${OAD} ${SUBTITLE,,}" | tr -d [:punct:] | tr [:blank:] "_" | tr -s "_" )
+fi
OUTPUTFILE="${OUTDIR}/${FILE}.mkv"
i=1
while [ -e "${OUTPUTFILE}" ]
@@ -422,9 +437,27 @@ if [ ${ERROR} -eq 0 ]; then
seconds=$((seconds % 3600))
minutes=$((seconds / 60))
seconds=$((seconds % 60))
- echo "Encoding took ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\) @ ${current_FPS} fps." >> ${LOGFILE}
- `${MYSQLCMD} "update jobqueue set status = \"272\" where id = \"${JOBID}\";"`
- update_comment "Encode Successful. Encoding Time: ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\)"
+ if [ $hours -eq 0 ]; then
+ hours=""
+ elif [ $hours -eq 1 ]; then
+ hours=" $hours hour"
+ else
+ hours=" $hours hours"
+ fi
+ if [ $minutes -eq 1 ]; then
+ minutes="$minutes minute"
+ else
+ minutes="$minutes minutes"
+ fi
+ if [ $seconds -eq 1 ]; then
+ seconds="$seconds second"
+ else
+ seconds="$seconds seconds"
+ fi
+
+ echo "Encoding took${hours} ${minutes} ${seconds} @ ${current_FPS} fps." >> ${LOGFILE}
+ `jobqueue_helper.py -j ${JOBID} -ss 272`
+ update_comment "Encode Successful. Encoding Time:${hours} ${minutes} ${seconds}"
else
echo "ERROR: ${ERROR}" >> ${LOGFILE}
fi
--
cgit v0.12
From cb543bd7f1548f89e3c2805040ad4ba32a37cb92 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 11 Feb 2014 21:40:10 +0000
Subject: LinHES-system: mythvidexport.py: initial inclusion
---
abs/core/LinHES-system/PKGBUILD | 5 +-
abs/core/LinHES-system/mythvidexport.py | 439 ++++++++++++++++++++++++++++++++
2 files changed, 442 insertions(+), 2 deletions(-)
create mode 100755 abs/core/LinHES-system/mythvidexport.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 97d7fa0..387793b 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=15
+pkgrel=16
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -18,7 +18,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
lh_system_backup lh_system_backup_job lh_system_restore_job
lh_system_host_update lh_system_all_host_update
add_storage.py diskspace.sh cacheclean lh_backend_control.sh
- create_media_dirs.sh msg_client.py msg_daemon.py
+ create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.py
gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
misc_upcoming_recordings.pl misc_which_recorder.pl jobqueue_helper.py
@@ -102,6 +102,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'7f7c49d859abdaa0b5fca399241d4998'
'3e60b17892e5b8214d47dcfddf5215a4'
'57ec994cc3964a10c00580e89ebcae35'
+ '7ba5e774bfebc3ec2469c9fe9a76e2ce'
'0c3509b48f11af0dc1bf989721fe9ca7'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/mythvidexport.py b/abs/core/LinHES-system/mythvidexport.py
new file mode 100755
index 0000000..5fdfb6d
--- /dev/null
+++ b/abs/core/LinHES-system/mythvidexport.py
@@ -0,0 +1,439 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+#---------------------------
+# Name: mythvidexport.py
+# Python Script
+# Author: Raymond Wagner
+# Purpose
+# This python script is intended to function as a user job, run through
+# mythjobqueue, capable of exporting recordings into MythVideo.
+# https://github.com/wagnerrp/mythtv-scripts/blob/master/python/mythvidexport.py
+# http://www.mythtv.org/wiki/Mythvidexport.py
+#---------------------------
+__title__ = "MythVidExport"
+__author__ = "Raymond Wagner"
+__version__= "v0.7.5"
+
+from MythTV import MythDB, Job, Recorded, Video, VideoGrabber,\
+ MythLog, MythError, static, MythBE
+from optparse import OptionParser, OptionGroup
+from socket import gethostname
+
+import os
+import re
+import sys
+import time
+import hashlib
+
+def create_dummy_video(db=None):
+ db = MythDB(db)
+
+def hashfile(fd):
+ hasher = hashlib.sha1()
+ while True:
+ buff = fd.read(2**16)
+ if len(buff) == 0:
+ break
+ hasher.update(buff)
+ return hasher.hexdigest()
+
+class VIDEO:
+ def __init__(self, opts, jobid=None):
+ if jobid:
+ self.job = Job(jobid)
+ self.chanid = self.job.chanid
+ self.starttime = self.job.starttime
+ self.job.update(status=Job.STARTING)
+ else:
+ self.job = None
+ self.chanid = opts.chanid
+ self.starttime = opts.starttime
+
+ self.opts = opts
+ self.db = MythDB()
+ self.log = MythLog(module='mythvidexport.py', db=self.db)
+
+ # load setting strings
+ self.get_format()
+
+ # prep objects
+ self.rec = Recorded((self.chanid,self.starttime), db=self.db)
+ self.log(MythLog.GENERAL, MythLog.INFO, 'Using recording',
+ '%s - %s' % (self.rec.title.encode('utf-8'),
+ self.rec.subtitle.encode('utf-8')))
+ self.vid = Video(db=self.db).create({'title':'', 'filename':'',
+ 'host':gethostname()})
+
+ # process data
+ self.get_meta()
+ self.get_dest()
+ # bug fix to work around limitation in the bindings where DBDataRef classes
+ # are mapped to the filename at time of Video element creation. since the
+ # filename is specified as blank when the video is created, the markup
+ # handler is not properly initialized
+ self.vid.markup._refdat = (self.vid.filename,)
+
+ # save file
+ self.copy()
+ if opts.seekdata:
+ self.copy_seek()
+ if opts.skiplist:
+ self.copy_markup(static.MARKUP.MARK_COMM_START,
+ static.MARKUP.MARK_COMM_END)
+ if opts.cutlist:
+ self.copy_markup(static.MARKUP.MARK_CUT_START,
+ static.MARKUP.MARK_CUT_END)
+ self.vid.update()
+
+ # delete old file
+ if opts.delete:
+ self.rec.delete()
+
+ def get_format(self):
+ host = self.db.gethostname()
+ # TV Format
+ if self.opts.tformat:
+ self.tfmt = self.opts.tformat
+ elif self.db.settings[host]['mythvideo.TVexportfmt']:
+ self.tfmt = self.db.settings[host]['mythvideo.TVexportfmt']
+ else:
+ self.tfmt = 'Television/%TITLE%/Season %SEASON%/'+\
+ '%TITLE% - S%SEASON%E%EPISODEPAD% - %SUBTITLE%'
+
+ # Movie Format
+ if self.opts.mformat:
+ self.mfmt = self.opts.mformat
+ elif self.db.settings[host]['mythvideo.MOVIEexportfmt']:
+ self.mfmt = self.db.settings[host]['mythvideo.MOVIEexportfmt']
+ else:
+ self.mfmt = 'Movies/%TITLE%'
+
+ # Generic Format
+ if self.opts.gformat:
+ self.gfmt = self.opts.gformat
+ elif self.db.settings[host]['mythvideo.GENERICexportfmt']:
+ self.gfmt = self.db.settings[host]['mythvideo.GENERICexportfmt']
+ else:
+ self.gfmt = 'Videos/%TITLE%'
+
+ def get_meta(self):
+ self.vid.hostname = self.db.gethostname()
+ if self.rec.inetref:
+ # good data is available, use it
+ if self.rec.season > 0 or self.rec.episode > 0:
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Performing TV export with local data.')
+ self.type = 'TV'
+ grab = VideoGrabber(self.type)
+ metadata = grab.grabInetref(self.rec.inetref, self.rec.season, self.rec.episode)
+ else:
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Performing Movie export with local data.')
+ self.type = 'MOVIE'
+ grab = VideoGrabber(self.type)
+ metadata = grab.grabInetref(self.rec.inetref)
+ elif self.opts.listingonly:
+ # force use of local data
+ if self.rec.subtitle:
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Forcing TV export with local data.')
+ self.type = 'TV'
+ else:
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Forcing Movie export with local data.')
+ self.type = 'MOVIE'
+ metadata = self.rec.exportMetadata()
+ else:
+ if self.rec.subtitle:
+ # subtitle exists, assume tv show
+ self.type = 'TV'
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Attempting TV export.')
+ grab = VideoGrabber(self.type)
+ match = grab.sortedSearch(self.rec.title, self.rec.subtitle)
+ else: # assume movie
+ self.type = 'MOVIE'
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Attempting Movie export.')
+ grab = VideoGrabber(self.type)
+ match = grab.sortedSearch(self.rec.title)
+
+ if len(match) == 0:
+ # no match found
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Falling back to generic export.')
+ self.type = 'GENERIC'
+ metadata = self.rec.exportMetadata()
+ elif (len(match) > 1) & (match[0].levenshtein > 0):
+ # multiple matches found, and closest is not exact
+ self.vid.delete()
+ raise MythError('Multiple metadata matches found: '\
+ +self.rec.title)
+ else:
+ self.log(self.log.GENERAL, self.log.INFO,
+ 'Importing content from', match[0].inetref)
+ metadata = grab.grabInetref(match[0])
+
+ self.vid.importMetadata(metadata)
+ self.log(self.log.GENERAL, self.log.INFO, 'Import complete')
+
+ def get_dest(self):
+ if self.type == 'TV':
+ self.vid.filename = self.process_fmt(self.tfmt)
+ elif self.type == 'MOVIE':
+ self.vid.filename = self.process_fmt(self.mfmt)
+ elif self.type == 'GENERIC':
+ self.vid.filename = self.process_fmt(self.gfmt)
+
+ def process_fmt(self, fmt):
+ # replace fields from viddata
+ #print self.vid.data
+ ext = '.'+self.rec.basename.rsplit('.',1)[1]
+ rep = ( ('%TITLE%','title','%s'), ('%SUBTITLE%','subtitle','%s'),
+ ('%SEASON%','season','%d'), ('%SEASONPAD%','season','%02d'),
+ ('%EPISODE%','episode','%d'), ('%EPISODEPAD%','episode','%02d'),
+ ('%YEAR%','year','%s'), ('%DIRECTOR%','director','%s'))
+ for tag, data, format in rep:
+ if self.vid[data]:
+ fmt = fmt.replace(tag,format % self.vid[data])
+ else:
+ fmt = fmt.replace(tag,'')
+
+ # replace fields from program data
+ rep = ( ('%HOSTNAME%', 'hostname', '%s'),
+ ('%STORAGEGROUP%','storagegroup','%s'))
+ for tag, data, format in rep:
+ data = getattr(self.rec, data)
+ fmt = fmt.replace(tag,format % data)
+
+# fmt = fmt.replace('%CARDID%',self.rec.cardid)
+# fmt = fmt.replace('%CARDNAME%',self.rec.cardid)
+# fmt = fmt.replace('%SOURCEID%',self.rec.cardid)
+# fmt = fmt.replace('%SOURCENAME%',self.rec.cardid)
+# fmt = fmt.replace('%CHANNUM%',self.rec.channum)
+# fmt = fmt.replace('%CHANNAME%',self.rec.cardid)
+
+ if len(self.vid.genre):
+ fmt = fmt.replace('%GENRE%',self.vid.genre[0].genre)
+ else:
+ fmt = fmt.replace('%GENRE%','')
+# if len(self.country):
+# fmt = fmt.replace('%COUNTRY%',self.country[0])
+# else:
+# fmt = fmt.replace('%COUNTRY%','')
+ return fmt+ext
+
+ def copy(self):
+ stime = time.time()
+ srcsize = self.rec.filesize
+ htime = [stime,stime,stime,stime]
+
+ self.log(MythLog.GENERAL|MythLog.FILE, MythLog.INFO, "Copying myth://%s@%s/%s"\
+ % (self.rec.storagegroup, self.rec.hostname, self.rec.basename)\
+ +" to myth://Videos@%s/%s"\
+ % (self.vid.host, self.vid.filename))
+ srcfp = self.rec.open('r')
+ dstfp = self.vid.open('w', nooverwrite=True)
+
+
+ if self.job:
+ self.job.setStatus(Job.RUNNING)
+ tsize = 2**24
+ while tsize == 2**24:
+ tsize = min(tsize, srcsize - dstfp.tell())
+ dstfp.write(srcfp.read(tsize))
+ htime.append(time.time())
+ rate = float(tsize*4)/(time.time()-htime.pop(0))
+ remt = (srcsize-dstfp.tell())/rate
+ if self.job:
+ self.job.setComment("%02d%% complete - %d seconds remaining" %\
+ (dstfp.tell()*100/srcsize, remt))
+ srcfp.close()
+ dstfp.close()
+
+ self.vid.hash = self.vid.getHash()
+
+ self.log(MythLog.GENERAL|MythLog.FILE, MythLog.INFO, "Transfer Complete",
+ "%d seconds elapsed" % int(time.time()-stime))
+
+ if self.opts.reallysafe:
+ if self.job:
+ self.job.setComment("Checking file hashes")
+ self.log(MythLog.GENERAL|MythLog.FILE, MythLog.INFO, "Checking file hashes.")
+ srchash = hashfile(self.rec.open('r'))
+ dsthash = hashfile(self.vid.open('r'))
+ if srchash != dsthash:
+ raise MythError('Source hash (%s) does not match destination hash (%s)' \
+ % (srchash, dsthash))
+ elif self.opts.safe:
+ self.log(MythLog.GENERAL|MythLog.FILE, MythLog.INFO, "Checking file sizes.")
+ be = MythBE(db=self.vid._db)
+ try:
+ srcsize = be.getSGFile(self.rec.hostname, self.rec.storagegroup, \
+ self.rec.basename)[1]
+ dstsize = be.getSGFile(self.vid.host, 'Videos', self.vid.filename)[1]
+ except:
+ raise MythError('Could not query file size from backend')
+ if srcsize != dstsize:
+ raise MythError('Source size (%d) does not match destination size (%d)' \
+ % (srcsize, dstsize))
+
+ if self.job:
+ self.job.setComment("Complete - %d seconds elapsed" % \
+ (int(time.time()-stime)))
+ self.job.setStatus(Job.FINISHED)
+
+ def copy_seek(self):
+ for seek in self.rec.seek:
+ self.vid.markup.add(seek.mark, seek.offset, seek.type)
+
+ def copy_markup(self, start, stop):
+ for mark in self.rec.markup:
+ if mark.type in (start, stop):
+ self.vid.markup.add(mark.mark, 0, mark.type)
+
+def usage_format():
+ usagestr = """The default strings are:
+ Television: Television/%TITLE%/Season %SEASON%/%TITLE% - S%SEASON%E%EPISODEPAD% - %SUBTITLE%
+ Movie: Movies/%TITLE%
+ Generic: Videos/%TITLE%
+
+Available strings:
+ %TITLE%: series title
+ %SUBTITLE%: episode title
+ %SEASON%: season number
+ %SEASONPAD%: season number, padded to 2 digits
+ %EPISODE%: episode number
+ %EPISODEPAD%: episode number, padded to 2 digits
+ %YEAR%: year
+ %DIRECTOR%: director
+ %HOSTNAME%: backend used to record show
+ %STORAGEGROUP%: storage group containing recorded show
+ %GENRE%: first genre listed for recording
+"""
+# %CARDID%: ID of tuner card used to record show
+# %CARDNAME%: name of tuner card used to record show
+# %SOURCEID%: ID of video source used to record show
+# %SOURCENAME%: name of video source used to record show
+# %CHANNUM%: ID of channel used to record show
+# %CHANNAME%: name of channel used to record show
+# %COUNTRY%: first country listed for recording
+ print usagestr
+
+def print_format():
+ db = MythDB()
+ host = gethostname()
+ tfmt = db.settings[host]['mythvideo.TVexportfmt']
+ if not tfmt:
+ tfmt = 'Television/%TITLE%/Season %SEASON%/%TITLE% - S%SEASON%E%EPISODEPAD% - %SUBTITLE%'
+ mfmt = db.settings[host]['mythvideo.MOVIEexportfmt']
+ if not mfmt:
+ mfmt = 'Movies/%TITLE%'
+ gfmt = db.settings[host]['mythvideo.GENERICexportfmt']
+ if not gfmt:
+ gfmt = 'Videos/%TITLE%'
+ print "Current output formats:"
+ print " TV: "+tfmt
+ print " Movies: "+mfmt
+ print " Generic: "+gfmt
+
+def main():
+ parser = OptionParser(usage="usage: %prog [options] [jobid]")
+
+ formatgroup = OptionGroup(parser, "Formatting Options",
+ "These options are used to display and manipulate the output file formats.")
+ formatgroup.add_option("-f", "--helpformat", action="store_true", default=False, dest="fmthelp",
+ help="Print explination of file format string.")
+ formatgroup.add_option("-p", "--printformat", action="store_true", default=False, dest="fmtprint",
+ help="Print current file format string.")
+ formatgroup.add_option("--tformat", action="store", type="string", dest="tformat",
+ help="Use TV format for current task. If no task, store in database.")
+ formatgroup.add_option("--mformat", action="store", type="string", dest="mformat",
+ help="Use Movie format for current task. If no task, store in database.")
+ formatgroup.add_option("--gformat", action="store", type="string", dest="gformat",
+ help="Use Generic format for current task. If no task, store in database.")
+ formatgroup.add_option("--listingonly", action="store_true", default=False, dest="listingonly",
+ help="Use data from listing provider, rather than grabber")
+ parser.add_option_group(formatgroup)
+
+ sourcegroup = OptionGroup(parser, "Source Definition",
+ "These options can be used to manually specify a recording to operate on "+\
+ "in place of the job id.")
+ sourcegroup.add_option("--chanid", action="store", type="int", dest="chanid",
+ help="Use chanid for manual operation")
+ sourcegroup.add_option("--starttime", action="store", type="string", dest="starttime",
+ help="Use starttime for manual operation")
+ parser.add_option_group(sourcegroup)
+
+ actiongroup = OptionGroup(parser, "Additional Actions",
+ "These options perform additional actions after the recording has been exported.")
+ actiongroup.add_option('--safe', action='store_true', default=False, dest='safe',
+ help='Perform quick sanity check of exported file using file size.')
+ actiongroup.add_option('--really-safe', action='store_true', default=False, dest='reallysafe',
+ help='Perform slow sanity check of exported file using SHA1 hash.')
+ actiongroup.add_option("--delete", action="store_true", default=False,
+ help="Delete source recording after successful export. Enforces use of --safe.")
+ parser.add_option_group(actiongroup)
+
+ othergroup = OptionGroup(parser, "Other Data",
+ "These options copy additional information from the source recording.")
+ othergroup.add_option("--seekdata", action="store_true", default=False, dest="seekdata",
+ help="Copy seekdata from source recording.")
+ othergroup.add_option("--skiplist", action="store_true", default=False, dest="skiplist",
+ help="Copy commercial detection from source recording.")
+ othergroup.add_option("--cutlist", action="store_true", default=False, dest="cutlist",
+ help="Copy manual commercial cuts from source recording.")
+ parser.add_option_group(othergroup)
+
+ MythLog.loadOptParse(parser)
+
+ opts, args = parser.parse_args()
+
+ if opts.verbose:
+ if opts.verbose == 'help':
+ print MythLog.helptext
+ sys.exit(0)
+ MythLog._setlevel(opts.verbose)
+
+ if opts.fmthelp:
+ usage_format()
+ sys.exit(0)
+
+ if opts.fmtprint:
+ print_format()
+ sys.exit(0)
+
+ if opts.delete:
+ opts.safe = True
+
+ if opts.chanid and opts.starttime:
+ export = VIDEO(opts)
+ elif len(args) == 1:
+ try:
+ export = VIDEO(opts,int(args[0]))
+ except Exception, e:
+ Job(int(args[0])).update({'status':Job.ERRORED,
+ 'comment':'ERROR: '+e.args[0]})
+ MythLog(module='mythvidexport.py').logTB(MythLog.GENERAL)
+ sys.exit(1)
+ else:
+ if opts.tformat or opts.mformat or opts.gformat:
+ db = MythDB()
+ host = gethostname()
+ if opts.tformat:
+ print "Changing TV format to: "+opts.tformat
+ db.settings[host]['mythvideo.TVexportfmt'] = opts.tformat
+ if opts.mformat:
+ print "Changing Movie format to: "+opts.mformat
+ db.settings[host]['mythvideo.MOVIEexportfmt'] = opts.mformat
+ if opts.gformat:
+ print "Changing Generic format to: "+opts.gformat
+ db.settings[host]['mythvideo.GENERICexportfmt'] = opts.gformat
+ sys.exit(0)
+ else:
+ parser.print_help()
+ sys.exit(2)
+
+if __name__ == "__main__":
+ main()
+
--
cgit v0.12
From 215fbfb801eb609acb4244dcb38e6e36b11a4f36 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 12 Feb 2014 00:09:07 +0000
Subject: mythtv mythplugins mythinstall: update to latest fixes
mytharchive: patch menu files with descriptions
---
abs/core/mythinstall/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 10 +++++--
.../stable-0.27/mythplugins/archivemenu.xml.patch | 32 ++++++++++++++++++++++
.../stable-0.27/mythplugins/archiveutils.xml.patch | 27 ++++++++++++++++++
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
6 files changed, 69 insertions(+), 6 deletions(-)
create mode 100644 abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch
create mode 100644 abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 5a64034..a161985 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=7
+pkgrel=8
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 76debbd..bb4009e 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-7f548de029ed84870538c87193b8b9f650cf0c5a
+9bf1070d86ab4ca515830f4d330f7b720830463c
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 8a651cd..b7a5006 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=9
+pkgrel=10
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
@@ -19,7 +19,7 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi
'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python-imaging'
'python-pycurl' 'zlib')
-source=('mythburn.py-aspectratio.patch')
+source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch')
build() {
if [ -e ${srcdir}/mythplugins ]
@@ -49,6 +49,8 @@ package_mytharchive() {
'python-imaging')
cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive"
patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1
+ patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1
+ patch theme/menus/archiveutils.xml < $srcdir/archiveutils.xml.patch || return 1
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -113,4 +115,6 @@ package_mythzoneminder() {
make INSTALL_ROOT="${pkgdir}" install || return 1
}
-md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2')
+md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2'
+ '0364d2613f22943f3d4c9d5ee43c1982'
+ '1063cf62878cd341476f28f63cb12782')
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch b/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch
new file mode 100644
index 0000000..f53e9d0
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/archivemenu.xml.patch
@@ -0,0 +1,32 @@
+--- archivemenu.xml.orig 2014-02-11 23:01:41.292364208 +0000
++++ archivemenu.xml 2014-02-11 23:02:13.544892518 +0000
+@@ -3,12 +3,14 @@
+ <button>
+ <type>ARCHIVE_CREATE_DVD</type>
+ <text>Create DVD</text>
++ <description>Save recordings and videos to video DVD</description>
+ <action>ARCHIVE_CREATE_DVD</action>
+ </button>
+
+ <button>
+ <type>ARCHIVE_CREATE_ARCHIVE</type>
+ <text>Create Archive</text>
++ <description>Save recordings and videos to a native archive</description>
+ <action>ARCHIVE_CREATE_ARCHIVE</action>
+ </button>
+
+@@ -22,12 +24,14 @@
+ <button>
+ <type>ARCHIVE_IMPORT_VIDEO</type>
+ <text>Import Archive</text>
++ <description>Import recordings from a native archive</description>
+ <action>ARCHIVE_IMPORT_VIDEO</action>
+ </button>
+
+ <button>
+ <type>ARCHIVE_UTILITIES</type>
+ <text>Archive Utilities</text>
++ <description>Utilities for MythArchive</description>
+ <action>MENU archiveutils.xml</action>
+ </button>
+
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch b/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch
new file mode 100644
index 0000000..9c17678
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/archiveutils.xml.patch
@@ -0,0 +1,27 @@
+--- archiveutils.xml.orig 2014-02-11 23:01:41.292364208 +0000
++++ archiveutils.xml 2014-02-11 23:02:13.544892518 +0000
+@@ -2,19 +2,22 @@
+
+ <button>
+ <type>ARCHIVE_LAST_LOG</type>
+- <text>Show Log Viewer</text>
++ <text>Log Viewer</text>
++ <description>Show the Archive Log Viewer</description>
+ <action>ARCHIVE_LAST_LOG</action>
+ </button>
+
+ <button>
+ <type>ARCHIVE_TEST_DVD</type>
+ <text>Play Created DVD</text>
++ <description>Play the last created archive DVD</description>
+ <action>ARCHIVE_TEST_DVD</action>
+ </button>
+
+ <button>
+ <type>ARCHIVE_BURN_DVD</type>
+- <text>Burn DVD</text>
++ <text>Burn Created DVD</text>
++ <description>Burn the last created archive to DVD</description>
+ <action>ARCHIVE_BURN_DVD</action>
+ </button>
+
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 973fed4..4500705 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=9
+pkgrel=10
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 8565905f38cc3c1f59c1bcc4bec9e3ac21a39313 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 13 Feb 2014 20:52:19 +0000
Subject: mythinstall: Add Notify option to Automatic Updates. refs #959
---
abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp | 3 ++-
abs/core/mythinstall/PKGBUILD | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp
index 43f360a..2914630 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp
@@ -22,9 +22,10 @@ static HostComboBox *Hostupdateplan()
HostComboBox *gc = new HostComboBox("Hostupdateplan");
gc->setLabel(QObject::tr("Automatic Updates"));
gc->addSelection("None");
+ gc->addSelection("Notify");
gc->addSelection("Myth_only");
gc->addSelection("All");
- gc->setHelpText("None: Do not install updates automatically.\nMyth_only: Automatically installs updates for MythTV only.\nAll: Automatically installs all updates for LinHES.");
+ gc->setHelpText("None: Do not install updates automatically. Notify: Check for updates and notify in the Service Menu and LinHES theme. Myth_only: Automatically install updates for MythTV only. All: Automatically install all updates for LinHES.");
return gc;
}
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index a161985..19bdf68 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=8
+pkgrel=9
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From b8f425e3dff10f18eb019157bbf553074e3fcc51 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 13 Feb 2014 21:18:16 +0000
Subject: LinHES-system: lh_system_host_update: add Notify option that calls
linhes_update.sh. refs #959
linhes_update.sh: add -s option to silence OSD. Add sed to show and hide message in LH theme.
linhes_update2.sh: add sed to hide message in LH theme.
---
abs/core/LinHES-system/PKGBUILD | 10 ++---
abs/core/LinHES-system/lh_system_host_update | 13 ++++--
abs/core/LinHES-system/linhes_update.sh | 67 ++++++++++++++++++++++------
abs/core/LinHES-system/linhes_update2.sh | 10 ++++-
abs/core/LinHES-system/myth_mtc.py | 1 +
5 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 387793b..82df8b0 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=16
+pkgrel=17
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -79,7 +79,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'de32a1c50101265dd7f6ca5037f7a26a'
'301884fb60521627fffd1160b2cf5181'
'76b2637cac0452b3acdbeeb4e8a5474b'
- '6d473cfc5c8e2ffedbd894807824d56f'
+ '8dcdd10f5551a45d6e8681800fafe7e0'
'dc3eef2a624754e16805d72bbe488b67'
'617af86b901538817ebdcaf646248dc5'
'542e670e78d117657f93141e9689f54d'
@@ -93,7 +93,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'3edef50a49a47694bf8add39cc160add'
'b376c30f95892b8682fad84f81685f75'
'bc69a520add58ede9b060c73e67ace13'
- '2e5e1b3187f75154366bffe806ff8ae9'
+ '74e17d6f7453c52d56fecaed5c3f6ad5'
'47e093e8cfe4b5b96602358e1f540832'
'63bbc62240f46a9997eaae4a84b09b76'
'2c005d95312018bef80092136f80f254'
@@ -121,8 +121,8 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'34fc1f58ad1eabf4eff4979d420760c0'
'1118e7982ba77cb5be9b2391b7cdfd38'
'a94fe6d980f4b810f2e2ae5352084b39'
- '2c56266a79d058bf01f0de19c2cd042a'
- 'c27d3fdf59b211f9d3cd76a81f6257dc'
+ '24b18dd43b983748359f472ee70fe139'
+ '96b9e14b063e251fc3c2fe9f5b42a22e'
'28f29578e5b3ba84fdf2aa57cf475bcf'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
diff --git a/abs/core/LinHES-system/lh_system_host_update b/abs/core/LinHES-system/lh_system_host_update
index ca6aeff..0a63e0a 100644
--- a/abs/core/LinHES-system/lh_system_host_update
+++ b/abs/core/LinHES-system/lh_system_host_update
@@ -37,17 +37,22 @@ case $Hostupdateplan in
echo "$pkg is up to date"
fi
done
- ;;
+ ;;
"All")
- echo ""
+ echo ""
echo "Updating ALL packages"
pacman -Sy
pacman --noconfirm -Su --force
- ;;
+ ;;
"None")
echo ""
echo "Updating NO packages"
- ;;
+ ;;
+ "Notify")
+ echo ""
+ echo "Notify if there are updates"
+ /usr/LH/bin/linhes_update.sh -s
+ ;;
*) echo ""
echo "Unknown $Hostupdateplan, skipping updates"
;;
diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh
index afaf6d5..21dfb6c 100644
--- a/abs/core/LinHES-system/linhes_update.sh
+++ b/abs/core/LinHES-system/linhes_update.sh
@@ -1,27 +1,49 @@
#!/bin/bash
#Called from LinHES Service Menu Check for Updates Menu
+usage () {
+ echo "Usage: $0 [-h] [-s]"
+ echo
+ echo "-h - Print this help/usage message and quit"
+ echo "-s - Run silently, no OSD messages"
+ exit $1
+}
+
dsply () {
- if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
+ if grep -q "Updates Available" /usr/share/mythtv/themes/defaultmenu/linhes.xml
then
- msg_client.py --clear --tag "checkUpdates"
- msg_client.py --kill
- msg_client.py --msg "Updates available!\nGo to the Service Menu to install the updates.|middle"
+ if [ "$1" = false ]; then
+ msg_client.py --clear --tag "checkUpdates"
+ msg_client.py --kill
+ msg_client.py --msg "Updates available!\nGo to the Service Menu to install the updates.|middle"
+ fi
+ echo " Updates available!"
+ pkill -USR1 mythfrontend
exit
else
- msg_client.py --msg "Checking for updates...|middle" --timeout 600 --tag "checkUpdates"
+ [ "$1" = false ] && { msg_client.py --msg "Checking for updates...|middle" --timeout 600 --tag "checkUpdates"; }
+ echo " Checking for updates..."
fi
}
chck () {
sudo pacman -Sy
+ [ -f /tmp/to_be_upgraded ] && sudo rm /tmp/to_be_upgraded
sudo pacman -Qu > /tmp/to_be_upgraded
if [[ ! -s /tmp/to_be_upgraded ]]
then
- msg_client.py --clear --tag "checkUpdates"
- msg_client.py --kill
- msg_client.py --msg "No updates available.\nReturning to Main Menu.|middle"
+ #hide LinHES update message on main menu
+ echo " Hiding update message in LinHES theme."
+ sudo sed -i '/LinHES UPDATE MESSAGE/c\ <!--LinHES UPDATE MESSAGE' /usr/share/mythtv/themes/LinHES/menu-ui.xml
+
+ if [ "$1" = false ]; then
+ msg_client.py --clear --tag "checkUpdates"
+ msg_client.py --kill
+ msg_client.py --msg "No updates available.\nReturning to Main Menu.|middle"
+ fi
+ echo " No updates available."
else
+ echo " Update menu to show Updates Available."
mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
@@ -38,7 +60,7 @@ chck () {
mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
echo "<mythmenu name=\"LH_UPDATE\">" > /tmp/update3.xml.tmp
-
+
#check for kernel update and warn reboot is required
if grep linux /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
then
@@ -50,7 +72,7 @@ chck () {
echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
echo " </button>" >> /tmp/update3.xml.tmp
fi
-
+
#create menu items for each pkg to be upgraded
while read line; do
echo "" >> /tmp/update3.xml.tmp
@@ -63,9 +85,28 @@ chck () {
done < "/tmp/to_be_upgraded"
echo "</mythmenu>" >> /tmp/update3.xml.tmp
mv /tmp/update3.xml.tmp /usr/share/mythtv/themes/defaultmenu/update3.xml
- dsply
+
+ #show LinHES update message on main menu
+ echo " Showing update message in LinHES theme."
+ sudo sed -i '/LinHES UPDATE MESSAGE/c\ <!--LinHES UPDATE MESSAGE-->' /usr/share/mythtv/themes/LinHES/menu-ui.xml
+
+ dsply $1
fi
}
-dsply
-chck
+# Command line argument handling
+SILENT=false
+while getopts "hs" OPT ; do
+ case $OPT in
+ h) usage 0 ;;
+ s) SILENT=true ;;
+ *) usage 1 ;;
+ esac
+done
+# Check for extra cruft on the command line...
+shift $(($OPTIND - 1))
+[ -n "$*" ] && usage 1
+
+dsply $SILENT
+chck $SILENT
+pkill -USR1 mythfrontend
diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh
index 6087729..d1913d0 100644
--- a/abs/core/LinHES-system/linhes_update2.sh
+++ b/abs/core/LinHES-system/linhes_update2.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-
+#Called from LinHES Service Menu Updates Available Menu
if [[ "$1" = "install" ]]
then
@@ -16,7 +16,7 @@ else
msg_client.py --msg "Updates canceled.|middle"
fi
-rm -fr /tmp/to_be_upgraded
+sudo rm -fr /tmp/to_be_upgraded
if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
then
@@ -36,3 +36,9 @@ then
echo "</mythmenu>" >> /tmp/linhes.xml.tmp
mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
fi
+
+#hide LinHES update message on main menu
+sudo sed -i '/LinHES UPDATE MESSAGE/c\ <!--LinHES UPDATE MESSAGE' /usr/share/mythtv/themes/LinHES/menu-ui.xml
+
+#reload theme
+pkill -USR1 mythfrontend
diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py
index c33a888..db6b42a 100755
--- a/abs/core/LinHES-system/myth_mtc.py
+++ b/abs/core/LinHES-system/myth_mtc.py
@@ -6,6 +6,7 @@ import socket
import os
import datetime,time
import shlex
+sys.dont_write_bytecode = True
import idle
try:
--
cgit v0.12
From 6c08ad9abe517022061180ebf3d086edc3808b58 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 13 Feb 2014 21:24:53 +0000
Subject: linhes-theme: menu-ui-vert.xml.patch: add LinHES update message. refs
#959
---
abs/core/linhes-theme/PKGBUILD | 4 ++--
abs/core/linhes-theme/menu-ui-vert.xml.patch | 21 +++++++++++++++++----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 1335945..bd61ff0 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=22
+pkgrel=23
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -79,7 +79,7 @@ package() {
md5sums=('95478bd9bab15e9e4365c1048757c225'
'ed4f8baf431e20babc345e4e2602426f'
'cb8c0d63392f6c8c2d8219243fbf47c6'
- 'ec11d601d47cd4b2954e1609262a571b'
+ '6a75b0bd0327d25f0e87578c880338b9'
'9fe3371a8b964a7028126405cfaa330b'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
'a0201e0aa1608eeab27ee754e4d2c1de'
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index 4cfd697..812b2be 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,6 +1,6 @@
--- menu-ui-vert.xml.orig 2014-01-02 20:22:20.736627009 +0000
-+++ menu-ui-vert.xml 2014-01-03 20:45:31.091048579 +0000
-@@ -18,6 +18,24 @@
++++ menu-ui-vert.xml 2014-02-13 21:20:47.574951302 +0000
+@@ -18,6 +18,37 @@
<area>394,0,2,720</area>
</shape>
@@ -22,10 +22,23 @@
+ <filename>images/LHLogoAndText.png</filename> <!--851x277 3.072-->
+ </imagetype>
+
++ <!--LinHES UPDATE MESSAGE
++ <shape name="update_box" from="base_backdrop">
++ <area>519,593,638,64</area>
++ <type>roundbox</type>
++ <line color="#666666" alpha="200" width="2" />
++ <cornerradius>5</cornerradius>
++ </shape>
++ <textarea name="update_text" from="description">
++ <area>529,593,628,64</area>
++ <value>Updates available in the Service Menu</value>
++ </textarea>
++ -->
++
<statetype name="titles">
<state name="MAIN">
<textarea name="heading">
-@@ -123,6 +141,41 @@
+@@ -123,6 +154,41 @@
<value>Archive Utilities</value>
</textarea>
</state>
@@ -67,7 +80,7 @@
</statetype>
<buttonlist name="menu">
-@@ -162,21 +215,6 @@
+@@ -162,21 +228,6 @@
<cutdown>yes</cutdown>
<case>upper</case>
</textarea>
--
cgit v0.12
From 64de605c2bbf7fea4c80fe803bb229593d9fafbf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 17 Feb 2014 23:54:00 +0000
Subject: mythinstall: Audio Settings cleanups. HDMI is detected as Digital.
refs #960
LinHES-config: systemconfig.py: remove tinker from audio config
soundconfig.sh: fix aplay cmd flag for testing audio. Add asound.conf and mplayer.conf creation using the seleted default devices.
---
abs/core/LinHES-config/PKGBUILD | 6 +-
abs/core/LinHES-config/soundconfig.sh | 220 +++++++++------------
abs/core/LinHES-config/systemconfig.py | 26 ++-
.../mythinstall/installsettings.cpp | 73 ++++---
abs/core/mythinstall/PKGBUILD | 2 +-
5 files changed, 160 insertions(+), 167 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a47d7ea..9b0f11a 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=11
+pkgrel=12
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -146,7 +146,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'b596d2e3779a434435bc0f0277b1ba3e'
'5012fbd31d205a6d6b0a1d8caf3eba8f'
'157e73d0f90d7b306aba8f5921aeedd3'
- 'a805504b6593eaa416fe5f32cd4d1b9e'
+ 'f8f803cb5738ce0021cd37c1ab514c45'
'952af1c0a44579c04a405ffce9aed264'
'5f890ea9bda6aef652d2560ca19dac07'
'ab2aa42c2947148c2b1cac0ade6d1d55'
@@ -171,7 +171,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
'781f161a79c3188a31c8615b8258b241'
- '70749be12c98d4b8fd283bd5dd9182bb'
+ '18370d92ba6b467bcc4996c377e1fa1f'
'2596460462cf6c889cf8f95485537b20'
'dc3c5270691a62600475705f4cb78b56'
'4804aa93aaad3dfcfff08cd9ffd68836'
diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh
index f682465..38687a4 100755
--- a/abs/core/LinHES-config/soundconfig.sh
+++ b/abs/core/LinHES-config/soundconfig.sh
@@ -17,9 +17,7 @@ echo "---------------------------------------"
function testaudio () {
-
-ossplay -d$AUDIODEVICE $TESTFILE
-
+ ossplay -d$AUDIODEVICE $TESTFILE
}
function load_alsa() {
@@ -29,7 +27,7 @@ function load_alsa() {
cd /lib/modules/$KER/
echo " uncompressing ALSA modules"
tar -xf sound-preoss.tar.bz2
-# echo " installing alsa-lib"
+ #echo " installing alsa-lib"
#pacman -S --force --noconfirm alsa-lib
echo " uninstalling oss"
@@ -50,7 +48,7 @@ function load_alsa() {
function unload_alsa () {
echo "unloading ALSA ..."
-#kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
+ #kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
sv stop alsa-utils
remove_service.sh alsa-utils
rm -rf /dev/adsp*
@@ -81,13 +79,11 @@ function installOSS {
add_service.sh oss
echo "blacklist soundcore" > $BLACKLIST
echo "install soundcore /bin/false" >> $BLACKLIST
-
-
}
function SYNCXINE {
-echo "modify xine config file"
+ echo "modify xine config file"
if [ -f $MYTHHOME/.xine/config ]
then
cp -f $MYTHHOME/.xine/config $TEMPLATES/xine.config
@@ -106,85 +102,82 @@ echo "modify xine config file"
else
cp $TEMPLATES/xine.config $MYTHHOME/.xine/config
fi
-
}
function SYNCMPLAYER {
-echo "modify mplayer not implmented yet"
+ echo "modify mplayer config file"
+ if [ -f /etc/mplayer/mplayer.conf ]
+ then
+ backdate=`date +%b-%d-%Y-%H:%M:%S`
+ mv /etc/mplayer/mplayer.conf /etc/mplayer/mplayer.conf-$backdate
+ fi
+ if [ x$AUDIOTYPE = xALSA -o x$AUDIOTYPE = xalsa ]
+ then
+ MPLAYERDEVICE=`echo $AUDIODEVICE | tr : = | tr , .`
+ echo "ao=alsa:device=$MPLAYERDEVICE" > /etc/mplayer/mplayer.conf
+ echo "ac=hwac3,hwdts," >> /etc/mplayer/mplayer.conf
+ else
+ echo "ao=oss:$AUDIODEVICE" > /etc/mplayer/mplayer.conf
+ fi
}
-function SYNCMYTHMUSIC {
-echo "sync mythmusic"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICMYTH
-}
+function checkOSSinstalled () {
+ echo "Checking if OSS is installed"
+ ossinfo |grep Version |grep -q OSS >/dev/null
+ resultcode=$?
-function SYNCMYTHFRONTEND {
-echo "sync mythfrontend"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT
+ if [ $resultcode = 0 ]
+ then
+ OSSinstalled='true'
+ echo " OSS is loaded"
+ else
+ OSSinstalled='false'
+ echo " OSS is NOT loaded"
+ fi
}
-
-function checkOSSinstalled () {
- echo "Checking if OSS is installed"
- ossinfo |grep Version |grep -q OSS >/dev/null
- resultcode=$?
-
- if [ $resultcode = 0 ]
- then
- OSSinstalled='true'
- echo " OSS is loaded"
- else
- OSSinstalled='false'
- echo " OSS is NOT loaded"
- fi
+function write_asound {
+ echo "writing asound.conf file"
+ if [ -f /etc/asound.conf ]
+ then
+ backdate=`date +%b-%d-%Y-%H:%M:%S`
+ mv /etc/asound.conf /etc/asound.conf-$backdate
+ fi
+ echo 'pcm.!default "'"$AUDIODEVICE"'"' > /etc/asound.conf
}
function sound_config_system {
-
- SYNCMYTHFRONTEND
+ if [ x$AUDIOTYPE = xALSA -o x$AUDIOTYPE = xalsa ]
+ then
+ write_asound
+ fi
+ SYNCMPLAYER
# if [ x$syncXine = x1 ]
# then
# SYNCXINE
# fi
-# if [ x$syncMplayer = x1 ]
-# then
-# SYNCMPLAYER
-# fi
-# if [ x$syncMythMusic = x1 ]
-# then
-# SYNCMYTHMUSIC
-# fi
-# if [ x$syncMythFrontend = x1 ]
-# then
-# SYNCMYTHFRONTEND
-# fi
-
}
function loadsound (){
- checkOSSinstalled
- if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ]
+ checkOSSinstalled
+ if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ]
+ then
+ while [ $OSSinstalled = "false" ]
+ do
+ unload_alsa
+ if [ -e /tmp/.alsatest ]
then
- while [ $OSSinstalled = "false" ]
- do
- unload_alsa
- if [ -e /tmp/.alsatest ]
- then
- rm /tmp/.alsatest
- fi
- installOSS
- checkOSSinstalled
- done
- # fi
- else
- touch /tmp/.alsatest
- unload_oss
- load_alsa
- #load_alsa
- rm /tmp/.alsatest
-
- fi
-
+ rm /tmp/.alsatest
+ fi
+ installOSS
+ checkOSSinstalled
+ done
+ else
+ touch /tmp/.alsatest
+ unload_oss
+ load_alsa
+ rm /tmp/.alsatest
+ fi
}
@@ -209,67 +202,50 @@ fi
while getopts "$OPTSTRING" SWITCH
do
case $SWITCH in
- \?) echo "unknown option"
- exit 11 ;;
- i) #echo "$SWITCH" "$OPTARG"
- AUDIOTYPE="$OPTARG"
- ;;
- d) #echo "$SWITCH" "$OPTARG"
- AUDIODEVICE=$OPTARG
- ;;
- t) #echo "$SWITCH" "$OPTARG"
- SOUNDOPTYPE="$OPTARG"
- if [ x"$OPTARG" = xtest ]
- then
- TEST=true
- else
- TEST=false
- fi
-
-
- ;;
-
- esac
+ \?) echo "unknown option"
+ exit 11
+ ;;
+ i) #echo "$SWITCH" "$OPTARG"
+ AUDIOTYPE="$OPTARG"
+ ;;
+ d) #echo "$SWITCH" "$OPTARG"
+ AUDIODEVICE=$OPTARG
+ ;;
+ t) #echo "$SWITCH" "$OPTARG"
+ SOUNDOPTYPE="$OPTARG"
+ if [ x"$OPTARG" = xtest ]
+ then
+ TEST=true
+ else
+ TEST=false
+ fi
+ ;;
+ esac
done
-
case $SOUNDOPTYPE in
REAL|real )
- # loadsound
- sound_config_system
- ;;
+ #loadsound
+ sound_config_system
+ ;;
test|TEST)
- echo $@ > /tmp/audio.test
- #loadsound
- if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ]
- then
- echo "testing OSS $AUDIODEVICE "
- ossplay -d$AUDIODEVICE $TESTFILE
- else
- echo "testing ALSA $AUDIODEVICE "
- echo aplay --device=$AUDIODEVICE $TESTFILE
- aplay -d=$AUDIODEVICE $TESTFILE
- fi
-
- ;;
-
+ echo $@ > /tmp/audio.test
+ #loadsound
+ if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ]
+ then
+ echo "testing OSS $AUDIODEVICE "
+ ossplay -d$AUDIODEVICE $TESTFILE
+ else
+ echo "testing ALSA $AUDIODEVICE "
+ echo aplay --device=$AUDIODEVICE $TESTFILE
+ aplay --device=$AUDIODEVICE $TESTFILE
+ fi
+ ;;
LOAD|load)
- loadsound
- ;;
- esac
-
+ loadsound
+ ;;
+esac
exit 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index 1af9daf..ed19675 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -296,21 +296,17 @@ def main(argv):
logging.info("____Skipping of Audio, config disabled____")
else:
logging.debug("______Start of Audio Configuration______")
- if not systemconfig.get("Audiotype") == "tinker":
- if cmdmodule["this_is_install"]:
- if systemconfig.get("Audiotype") == "OSS":
- mv_common.pacinstall("oss")
- mv_common.add_service("oss")
-
- cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,
- systemconfig.get("Audiotype"),
- systemconfig["SoundDevice"])
- mv_common.runcmd(cmd)
-
- mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd)
- else:
- logging.debug(" Tinker mode(audio), not changing configuration")
- logging.debug("__End of audio")
+ if cmdmodule["this_is_install"]:
+ if systemconfig.get("Audiotype") == "OSS":
+ mv_common.pacinstall("oss")
+ mv_common.add_service("oss")
+
+ cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,
+ systemconfig.get("Audiotype"),
+ systemconfig["SoundDevice"])
+ mv_common.runcmd(cmd)
+ mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd)
+ logging.debug("__End of audio")
if cmdmodule["misc"]:
if mv_common.read_config(mv_common.module_config,"misc") == False :
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
index 2e505f1..fb5f841 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
@@ -2800,9 +2800,8 @@ SoundSettings::SoundSettings():
HostAudiotype->setLabel(QObject::tr("Sound Card Driver"));
HostAudiotype->addSelection("OSS");
HostAudiotype->addSelection("ALSA");
- HostAudiotype->addSelection("tinker");
- HostAudiotype->setHelpText(QObject::tr("Select the sound driver, OSS or ALSA." ) );
+ HostAudiotype->setHelpText(QObject::tr("Select the sound driver, ALSA or OSS." ) );
addChild(HostAudiotype);
setTrigger(HostAudiotype);
@@ -2835,34 +2834,32 @@ SoundSettings::SoundSettings():
HorizontalConfigurationGroup *lpalsa = new HorizontalConfigurationGroup(false, false, true, true);
TransButtonSetting *LoadOSSbutton = new TransButtonSetting();
- LoadOSSbutton->setLabel(tr("Load OSS driver"));
+ LoadOSSbutton->setLabel(tr("Load OSS Driver"));
TransButtonSetting *LoadALSAbutton = new TransButtonSetting();
- LoadALSAbutton->setLabel(tr("Load ALSA driver"));
+ LoadALSAbutton->setLabel(tr("Load ALSA Driver"));
TransButtonSetting *TestAudiobutton = new TransButtonSetting();
- TestAudiobutton->setLabel(tr("Test Audio Settings"));
+ TestAudiobutton->setLabel(tr("Test Device"));
+ TestAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device."));
lp->addChild(TestAudiobutton);
lp->addChild(LoadOSSbutton);
TransButtonSetting *TestALSAAudiobutton = new TransButtonSetting();
- TestALSAAudiobutton->setLabel(tr("Test ALSA Audio Settings"));
+ TestALSAAudiobutton->setLabel(tr("Test Device"));
+ TestALSAAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device."));
lpalsa->addChild(TestALSAAudiobutton);
lpalsa->addChild(LoadALSAbutton);
TransLabelSetting *osslabel = new TransLabelSetting();
- osslabel->setValue("The original OSS! More information can be found at:");
-
- TransLabelSetting *osslabel1 = new TransLabelSetting();
- osslabel1->setValue("http://www.opensound.com \n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n");
+ osslabel->setValue("OSS- Open Sound System\nhttp://opensound.com\n\nTo configure sound for MythTV go to:\nService Menu --> MythTV Settings --> Setup --> Audio\n");
TransLabelSetting *AlsaLabel = new TransLabelSetting();
- AlsaLabel->setValue("ALSA, the alternative to OSS\n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n");
+ AlsaLabel->setValue("ALSA - Advanced Linux Sound Architecture\nhttp://alsa-project.org\n\nTo configure sound for MythTV go to:\nService Menu --> MythTV Settings --> Setup --> Audio\n");
// OSS GROUP
SoundOSSsettings *OSS = new SoundOSSsettings ;
ConfigurationGroup* osssettings = new VerticalConfigurationGroup(false);
osssettings->addChild(osslabel);
- osssettings->addChild(osslabel1);
osssettings->addChild(OSS);
// osssettings->addChild(syncboxes);
osssettings->addChild(lp);
@@ -2889,7 +2886,6 @@ SoundSettings::SoundSettings():
ALSA, SLOT(loadalsadriver()));
addTarget("ALSA", alsasettings);
addTarget("OSS", osssettings);
- addTarget("tinker", new VerticalConfigurationGroup(false));
};
@@ -2898,13 +2894,17 @@ SoundOSSsettings::SoundOSSsettings():
{
SetVertical(true);
HostSoundTypeout = new HostComboBox("HostSoundTypeout");
- HostSoundTypeout->setLabel(QObject::tr("Type"));
+ HostSoundTypeout->setLabel(QObject::tr("Audio Type"));
HostSoundTypeout->addSelection("Analog");
HostSoundTypeout->addSelection("Digital");
- HostSoundTypeout->setHelpText(QObject::tr(""));
+ HostSoundTypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital."));
HostSoundOssAnalog = new HostComboBox("HostSoundOssAnalog");
+ HostSoundOssAnalog->setLabel(QObject::tr("Default Device"));
+ HostSoundOssAnalog->setHelpText(QObject::tr("Select the default audio output device for the system."));
HostSoundOssDigital = new HostComboBox("HostSoundOssDigital");
+ HostSoundOssDigital->setLabel(QObject::tr("Default Device"));
+ HostSoundOssDigital->setHelpText(QObject::tr("Select the default audio output device for the system."));
fillossselection();
int findossanalog=HostSoundOssAnalog->findSelection(hostparm.OLDHostSoundOSSAnalog );
int findossdigital=HostSoundOssDigital->findSelection(hostparm.OLDHostSoundOSSDigital );
@@ -2921,13 +2921,17 @@ SoundALSAsettings::SoundALSAsettings():
{
SetVertical(true);
HostSoundALSATypeout = new HostComboBox("HostSoundALSATypeout");
- HostSoundALSATypeout->setLabel(QObject::tr("Type"));
+ HostSoundALSATypeout->setLabel(QObject::tr("Audio Type"));
HostSoundALSATypeout->addSelection("Analog");
HostSoundALSATypeout->addSelection("Digital");
- HostSoundALSATypeout->setHelpText(QObject::tr(""));
+ HostSoundALSATypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital."));
HostSoundALSAAnalog = new HostComboBox("HostSoundALSAAnalog");
+ HostSoundALSAAnalog->setLabel(QObject::tr("Default Device"));
+ HostSoundALSAAnalog->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device."));
HostSoundALSADigital = new HostComboBox("HostSoundALSADigital");
+ HostSoundALSADigital->setLabel(QObject::tr("Default Device"));
+ HostSoundALSADigital->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device."));
fillALSAselection();
int findalsaanalog=HostSoundALSAAnalog->findSelection(hostparm.OLDHostSoundALSAAnalog );
int findalsadigital=HostSoundALSADigital->findSelection(hostparm.OLDHostSoundALSADigital );
@@ -3143,10 +3147,10 @@ void SoundALSAsettings::fillALSAselection()
break;
}
//card 0: I82801DBICH4:q [Intel 82801DB-ICH4], device 0: Intel ICH [Intel 82801DB-ICH4]
- alsadescription=line.section( "," , 0 ,0 );
+ alsadescription=line.section( ", " , 0 ,0 );
alsadescription=alsadescription.section(":",1,1);
- alsadescription2=line.section( "," , 1 ,1 );
+ alsadescription2=line.section( ", " , 1 ,1 );
//alsadescription2=alsadescription.section(":",0,0);
hwdevice=line.section( ":" , 0 ,0 );
@@ -3157,16 +3161,33 @@ void SoundALSAsettings::fillALSAselection()
temphwdevice=temphwdevice.section(" ",-1,-1 );
hwdevice.append(",");
hwdevice.append(temphwdevice);
- simpleitem=alsadescription2 + "(hw:" + hwdevice + ")";
- if (line.contains("IEC958") || line.contains("Digital"))
+ simpleitem=alsadescription2 + "(plughw:" + hwdevice + ")";
+ if (line.contains("IEC958") || line.contains("Digital") || line.contains("PCM") || line.contains("HDMI"))
HostSoundALSADigital->addSelection(simpleitem);
else
HostSoundALSAAnalog->addSelection(simpleitem);
}
}
}
+ myth_system("aplay -L > /tmp/alsapcm");
+ currentfile = "/tmp/alsapcm";
+ QFile file1(currentfile);
+ if ( file1.open(QIODevice::ReadOnly | QIODevice::Text) )
+ {
+ Q3TextStream t( &file1 ); // use a text stream
+ while ( !t.eof() )
+ {
+ line = t.readLine();
+ if (line.startsWith("iec958:") )
+ {
+ alsadescription=line;
+ simpleitem=alsadescription + "(plug:iec958)";
+ HostSoundALSADigital->addSelection(simpleitem);
+ break;
+ }
+ }
+ }
return ;
-
}
void SoundSettings::soundossgathersettings_1 (void)
@@ -3215,7 +3236,7 @@ void SoundOSSsettings::soundossgathersettings(void)
cmdtxt.append("bin/soundconfig.sh -t test -i OSS -d " + hostparm.ThisHostSoundDevice + "&");
system(cmdtxt);
int return_code = 0;
- QString msgtext = "Playing sample audio" ;
+ QString msgtext = "Playing Test Audio" ;
MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy");
@@ -3293,10 +3314,10 @@ void SoundALSAsettings::soundalsagathersettings(void)
// Add info popup right here
QString cmdtxt;
cmdtxt=MV_ROOT ;
- cmdtxt.append("bin/soundconfig.sh -t test -i ALSA -d " + hostparm.ThisHostSoundDevice + "&");
+ cmdtxt.append("bin/soundconfig.sh -t test -i ALSA -d " + hostparm.ThisHostSoundDevice + "&");
system(cmdtxt);
int return_code = 0;
- QString msgtext = "Playing sample audio" ;
+ QString msgtext = "Playing Test Audio" ;
MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy");
if (busyPopup->Create())
@@ -3521,7 +3542,7 @@ void run_systemconfig(QString modulelist, bool restart, QString dbcommand)
cmdtxt.append("bin/systemconfig.sh " + modulelist + " &");
myth_system(cmdtxt);
int return_code = 0;
- QString msgtext = "Please wait while " ;
+ QString msgtext = "Please wait while " ;
msgtext.append(gCoreContext->GetSetting("HostMyhostname"));
msgtext.append(" is configured");
MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 19bdf68..c851516 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=9
+pkgrel=10
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From 83169ccfc4ef74057bcd3310c105a6ff2190b442 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 18 Feb 2014 17:09:20 +0000
Subject: default to Notify update plan. refs #959.
add default user jobs. refs #958.
---
abs/core/mythdb-initial/PKGBUILD | 4 ++--
abs/core/mythdb-initial/custom.sql | 30 ++++++++++++++++++++++--------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD
index d1566a5..15bdda4 100755
--- a/abs/core/mythdb-initial/PKGBUILD
+++ b/abs/core/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythdb-initial
pkgver=8.1
-pkgrel=1
+pkgrel=2
pkgdesc="setup the initial mythtv database for linhes"
url=""
license=""
@@ -22,4 +22,4 @@ package() {
md5sums=('366c1fe7668739d2d5c1123f9f4ee110'
'ad0e57ac5e7c3677808a670e16634bba'
- '8c5aa22be114fc20298891d37928cd2e')
+ 'ab918fe2b583364d3cbd476234b45c80')
diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql
index 99a0452..98a9b33 100644
--- a/abs/core/mythdb-initial/custom.sql
+++ b/abs/core/mythdb-initial/custom.sql
@@ -4,26 +4,26 @@ DELETE FROM `settings` where `value`='HostMyhostname';
INSERT INTO `settings` (`value`,`data`,`hostname`) VALUES ('HostMyhostname','type_hostname_here','apheleia');
--
+-- set default settings for mythinstall/systemconfig
INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
('Hostpluginmytharchive','1','apheleia'),
('Hostpluginmythbrowser','1','apheleia'),
('Hostpluginmythcontrols','1','apheleia'),
- ('Hostpluginmythflix','1','apheleia'),
('Hostpluginmythgallery','1','apheleia'),
('Hostpluginmythgame','1','apheleia'),
+ ('HostpluginmythgameROMDB','0','apheleia'),
('HostpluginmythgameFceu','1','apheleia'),
('HostpluginmythgameMame','1','apheleia'),
('HostpluginmythgameZsnes','1','apheleia'),
- ('Hostpluginmythmovietime','1','apheleia'),
('Hostpluginmythmusic','1','apheleia'),
('Hostpluginmythnews','1','apheleia'),
('Hostpluginmythphone','1','apheleia'),
- ('Hostpluginmythsmolt','1','apheleia'),
('Hostpluginmythvideo','1','apheleia'),
('Hostpluginmythvideo_dvdcss','0','apheleia'),
('Hostpluginmythweather','1','apheleia'),
('Hostpluginmythappletrailers','1','apheleia'),
('HostBEWait','1','apheleia'),
+ ('Hostupdateplan','Notify','apheleia'),
('HostAudiotype','ALSA','apheleia');
-- Clear out old values because mysql is mysql
@@ -120,13 +120,30 @@ DELETE FROM `settings` where value in
('JobAllowUserJob1',
'JobAllowUserJob2',
'JobAllowUserJob3',
- 'JobAllowUserJob4');
+ 'JobAllowUserJob4',
+ 'UserJob1',
+ 'UserJob2',
+ 'UserJob3',
+ 'UserJob4',
+ 'UserJobDesc1',
+ 'UserJobDesc2',
+ 'UserJobDesc3',
+ 'UserJobDesc4');
+
INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
('JobAllowUserJob1','1','apheleia'),
('JobAllowUserJob2','1','apheleia'),
('JobAllowUserJob3','1','apheleia'),
- ('JobAllowUserJob4','1','apheleia');
+ ('JobAllowUserJob4','0','apheleia'),
+ ('UserJob1','/usr/LH/bin/mythvidexport.py %JOBID%','apheleia'),
+ ('UserJob2','/usr/LH/bin/myth2mkv "%DIR%/%FILE%" "%CHANID%" "%STARTTIME%" "%TITLE%" "%SUBTITLE%" "%JOBID%" "HP"','apheleia'),
+ ('UserJob3','/usr/LH/bin/myth2mp3 "%DIR%/%FILE%" "%TITLE% - %SUBTITLE%" "%CHANID%" "%STARTTIME%"','apheleia'),
+ ('UserJob4','','apheleia'),
+ ('UserJobDesc1','Copy to Videos','apheleia'),
+ ('UserJobDesc2','Encode to x264 mkv','apheleia'),
+ ('UserJobDesc3','Encode Audio to mp3','apheleia'),
+ ('UserJobDesc4','','apheleia');
--
@@ -164,6 +181,3 @@ INSERT INTO `videosource` (`name`, `xmltvgrabber`) VALUES
INSERT INTO `cardinput` (`cardid`,`sourceid`,`inputname`) VALUES
('1','1','MPEG2TS');
-
-
-
--
cgit v0.12
From e2c4e80011acea4e42b19d3f7ba0f5db5e984817 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 18 Feb 2014 19:41:05 +0000
Subject: mythtv-initial: fix some plugin names and remove a few more unneeded
ones.
---
abs/core/mythdb-initial/PKGBUILD | 4 ++--
abs/core/mythdb-initial/custom.sql | 14 +++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD
index 15bdda4..c39f828 100755
--- a/abs/core/mythdb-initial/PKGBUILD
+++ b/abs/core/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythdb-initial
pkgver=8.1
-pkgrel=2
+pkgrel=3
pkgdesc="setup the initial mythtv database for linhes"
url=""
license=""
@@ -22,4 +22,4 @@ package() {
md5sums=('366c1fe7668739d2d5c1123f9f4ee110'
'ad0e57ac5e7c3677808a670e16634bba'
- 'ab918fe2b583364d3cbd476234b45c80')
+ 'a09c102545192d8ef090c7cd4377731d')
diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql
index 98a9b33..36ffdaf 100644
--- a/abs/core/mythdb-initial/custom.sql
+++ b/abs/core/mythdb-initial/custom.sql
@@ -4,23 +4,27 @@ DELETE FROM `settings` where `value`='HostMyhostname';
INSERT INTO `settings` (`value`,`data`,`hostname`) VALUES ('HostMyhostname','type_hostname_here','apheleia');
--
--- set default settings for mythinstall/systemconfig
+-- set default settings for mythinstall/systemconfig programs
INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
('Hostpluginmytharchive','1','apheleia'),
('Hostpluginmythbrowser','1','apheleia'),
('Hostpluginmythcontrols','1','apheleia'),
+ ('Hostpluginmythnetvision','0','apheleia'),
('Hostpluginmythgallery','1','apheleia'),
('Hostpluginmythgame','1','apheleia'),
('HostpluginmythgameROMDB','0','apheleia'),
- ('HostpluginmythgameFceu','1','apheleia'),
+ ('Hostpluginmythgamefceux','0','apheleia'),
+ ('Hostpluginmythgamesnes9x','0','apheleia'),
('HostpluginmythgameMame','1','apheleia'),
- ('HostpluginmythgameZsnes','1','apheleia'),
+ ('HostpluginmythgameDolphin','0','apheleia'),
+ ('HostpluginmythgameXe','0','apheleia'),
+ ('HostpluginmythgameMednafen','0','apheleia'),
+ ('HostpluginmythgameMupen64','0','apheleia'),
('Hostpluginmythmusic','1','apheleia'),
('Hostpluginmythnews','1','apheleia'),
- ('Hostpluginmythphone','1','apheleia'),
- ('Hostpluginmythvideo','1','apheleia'),
('Hostpluginmythvideo_dvdcss','0','apheleia'),
('Hostpluginmythweather','1','apheleia'),
+ ('Hostpluginmythzoneminder','0','apheleia'),
('Hostpluginmythappletrailers','1','apheleia'),
('HostBEWait','1','apheleia'),
('Hostupdateplan','Notify','apheleia'),
--
cgit v0.12
From 62d36fb73362e85acb8649099dbc62030931d225 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 19 Feb 2014 17:00:30 +0000
Subject: LinHES-config: Update/remove old pkgs for install/configure.
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_common.py | 2 +-
abs/core/LinHES-config/mv_hostype.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 9b0f11a..961de74 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=12
+pkgrel=13
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -157,7 +157,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'e959df98947eb0d2ea64ff616b61aab5'
'2506860a416e1988934225d80d501c2c'
'c0549457750c4f8e8038d904a0f3012a'
- '075fe16ef92621ce31f41df5c5577daf'
+ 'b2d227d8ccb933b444c023d0c0e8da92'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'6356c271bf6639002d4c59406250a1f6'
'8b7dce4a3a0a281fa6656aa8781a648e'
@@ -166,7 +166,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'fe5e31b833cc6707209e9d656b6eb53c'
'3eec99951c01d1a1abf7ecfeb33f922b'
'087a0ef743bc8af915503f8773536ce4'
- '183a11aa06d60065106472ed9f72cc4a'
+ '6721f0283850db684a61773bc95d18c5'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index ff2ee9f..34d8a58 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -195,7 +195,7 @@ def pkg_blacklist_check(pkg):
return False
def pkg_installed_check(pkg):
- logging.debug(" Checking if %sis installed",pkg)
+ logging.debug(" Checking if %s is installed",pkg)
cmd = "pacman -Q %s " %pkg
rc = runcmd(cmd)
if rc == 0:
diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index ba9551f..df0ec1a 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -248,7 +248,7 @@ def hostypeprint(systemconfig):
restart_mbe = True
- install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" , "udevil"]
+ install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "supplemental-web", "udevil"]
daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon", "udevil"]
@@ -265,7 +265,7 @@ def hostypeprint(systemconfig):
logging.info("Master backend system being configured")
setup_ntp(False,"null")
setup_avahi(systemconfig.get("TEMPLATES"))
- install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" ,"udevil"]
+ install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "supplemental-web", "udevil"]
daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon" ,"udevil" ]
EnableNetwork = True
run_mysqlnetwork = True
--
cgit v0.12
From f99abb5ee4b218cc375dd891f7a2e35ccb044afa Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 15 Feb 2014 14:27:03 -0600
Subject: poweroff-scripts: update for systemd
---
abs/core/pacman/PKGBUILD | 8 ++++----
abs/extra/rtmpdump/PKGBUILD | 26 ++++++++++++++------------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 63ee374..56424d7 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -22,10 +22,6 @@ options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf.x86_64
makepkg.conf)
-md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
- '4959b8d00056398195f4e549e7bdd346'
- 'de74a13618347f08ae4a9637f74471c4'
- '2ea6f0a5badef735ec7d30a372f5e9c6')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -75,3 +71,7 @@ package() {
install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
+md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
+ 'SKIP'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '2ea6f0a5badef735ec7d30a372f5e9c6')
diff --git a/abs/extra/rtmpdump/PKGBUILD b/abs/extra/rtmpdump/PKGBUILD
index b1e933a..e7432cb 100644
--- a/abs/extra/rtmpdump/PKGBUILD
+++ b/abs/extra/rtmpdump/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 134127 2011-08-02 03:47:07Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 202973 2013-12-29 17:17:31Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: xduugu
# Contributor: Elis Hughes <elishughes@googlemail.com>
pkgname=rtmpdump
-pkgver=2.4
+pkgver=20131205
pkgrel=1
-pkgdesc="A tool to download rtmp streams"
+pkgdesc='Tool to download rtmp streams'
arch=('i686' 'x86_64')
-url="http://rtmpdump.mplayerhq.hu/"
+url='http://rtmpdump.mplayerhq.hu/'
license=('GPL2' 'LGPL2.1')
depends=('openssl')
-#source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c3b76d46d56180176ef099b8ad50a1608bef1dac35d8cb0b21ceac31b5c0656')
+makedepends=('git')
+options=('!makeflags')
+source=(git://git.ffmpeg.org/rtmpdump#commit=dc76f0a8)
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d -m755 "${pkgdir}/usr/lib"
- make prefix=/usr mandir=/usr/share/man DESTDIR="${pkgdir}" install
+ cd $pkgname
+ make prefix=/usr sbindir=/usr/bin \
+ mandir=/usr/share/man DESTDIR="$pkgdir" \
+ install
}
+md5sums=('SKIP')
--
cgit v0.12
From 1c44c63f6f89eaeb5b1f9fc16c7d21120bd13ab5 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 13:30:15 -0600
Subject: acpid:2.0.20
---
abs/core/acpid/PKGBUILD | 38 ++++++++++-------------
abs/core/acpid/__changelog | 5 +--
abs/core/acpid/acpid.conf | 5 ---
abs/core/acpid/acpid.rc | 40 ------------------------
abs/core/acpid/acpid.service | 3 +-
abs/core/acpid/acpid.socket | 2 +-
abs/core/acpid/handler.sh | 21 +++++--------
abs/core/acpid/handler.sh.runit | 68 -----------------------------------------
8 files changed, 28 insertions(+), 154 deletions(-)
delete mode 100644 abs/core/acpid/acpid.conf
delete mode 100644 abs/core/acpid/acpid.rc
mode change 100644 => 100755 abs/core/acpid/handler.sh
delete mode 100644 abs/core/acpid/handler.sh.runit
diff --git a/abs/core/acpid/PKGBUILD b/abs/core/acpid/PKGBUILD
index a4d931a..8cd7875 100644
--- a/abs/core/acpid/PKGBUILD
+++ b/abs/core/acpid/PKGBUILD
@@ -1,38 +1,29 @@
-# $Id: PKGBUILD 71877 2012-06-02 17:57:44Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 97250 2013-09-15 20:35:17Z seblu $
+# Maintainer: Sébastien Luttringer
# Contributor: xduugu
# Contributor: Manolis Tzanidakis
# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
pkgname=acpid
-pkgver=2.0.16
-pkgrel=3
+pkgver=2.0.20
+pkgrel=1
pkgdesc='A daemon for delivering ACPI power management events with netlink support'
arch=('i686' 'x86_64')
-url='http://tedfelix.com/linux/acpid-netlink.html'
+url='http://sourceforge.net/projects/acpid2/'
license=('GPL')
depends=('bash')
optdepends=('perl: use perl based examples')
replaces=('acpid2')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
- 'acpid.rc'
- 'acpid.conf'
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
+source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"
'acpid.socket'
'acpid.service'
'anything'
'handler.sh')
-md5sums=('d59fc02c9c34f0d5c137495302e2c074'
- '077475c75fbdd9de75f9a397130ccd91'
- '929c6d2e91295c22ed9ec6212d7eabef'
- 'ee6cb99e50e580c50331a73045412ae9'
- '7f545754db5be7296d2dd97c049062ee'
- '2d37b98d6e74bab815604b8b48c6cfd4'
- '74ee3c33714ff5cb44f30c9a0dceeef0')
build() {
cd $pkgname-$pkgver
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
@@ -45,14 +36,17 @@ package() {
install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
- # initscripts
- install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid"
- install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid"
+ # systemd
install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
# fix acpid rights
- chmod 755 "$pkgdir/usr/sbin/acpid"
+ chmod 755 "$pkgdir/usr/bin/acpid"
}
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
+md5sums=('1b740e6419cf45aaeb2bd78d589f27f9'
+ 'd11700eb136e0489835ddaf977a7905b'
+ '79cc7a9dceacdeffd51f070c2ba5f023'
+ '2d37b98d6e74bab815604b8b48c6cfd4'
+ 'e97277eb1937c7ffe92a95fa60c073e4')
diff --git a/abs/core/acpid/__changelog b/abs/core/acpid/__changelog
index 9802b2b..f5b621c 100644
--- a/abs/core/acpid/__changelog
+++ b/abs/core/acpid/__changelog
@@ -1,2 +1,3 @@
-Modify handler.sh to use runit-init.
-update to 1.0.10 and change handler.sh to handler.sh.runit
+Added this to PBTN in handler
+/usr/bin/runit-init 0
+/usr/bin/poweroff
diff --git a/abs/core/acpid/acpid.conf b/abs/core/acpid/acpid.conf
deleted file mode 100644
index b60103a..0000000
--- a/abs/core/acpid/acpid.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
diff --git a/abs/core/acpid/acpid.rc b/abs/core/acpid/acpid.rc
deleted file mode 100644
index 674f462..0000000
--- a/abs/core/acpid/acpid.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
-
-PID=$(pidof -o %PPID /usr/sbin/acpid)
-case "$1" in
- start)
- stat_busy "Starting acpid"
- [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon acpid
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping acpid"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon acpid
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/abs/core/acpid/acpid.service b/abs/core/acpid/acpid.service
index 4c0e073..022f72a 100644
--- a/abs/core/acpid/acpid.service
+++ b/abs/core/acpid/acpid.service
@@ -3,8 +3,7 @@ Description=ACPI event daemon
Requires=acpid.socket
[Service]
-EnvironmentFile=/etc/conf.d/acpid
-ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
+ExecStart=/usr/bin/acpid -f
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/acpid/acpid.socket b/abs/core/acpid/acpid.socket
index 1e5365b..1b23f87 100644
--- a/abs/core/acpid/acpid.socket
+++ b/abs/core/acpid/acpid.socket
@@ -2,7 +2,7 @@
Description=ACPID Listen Socket
[Socket]
-ListenStream=/run/acpid.socket
+ListenStream=/var/run/acpid.socket
[Install]
WantedBy=sockets.target
diff --git a/abs/core/acpid/handler.sh b/abs/core/acpid/handler.sh
old mode 100644
new mode 100755
index b5a548f..206d656
--- a/abs/core/acpid/handler.sh
+++ b/abs/core/acpid/handler.sh
@@ -1,18 +1,13 @@
-#!/bin/sh
+#!/bin/bash
# Default acpi script that takes an entry for all actions
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-
-set $*
-
case "$1" in
button/power)
case "$2" in
PBTN|PWRF)
- logger "PowerButton pressed: $2"
- poweroff
+ logger 'PowerButton pressed'
+ /usr/bin/runit-init 0
+ /usr/bin/poweroff
;;
*)
logger "ACPI action undefined: $2"
@@ -22,7 +17,7 @@ case "$1" in
button/sleep)
case "$2" in
SLPB|SBTN)
- echo -n mem >/sys/power/state
+ logger 'SleepButton pressed'
;;
*)
logger "ACPI action undefined: $2"
@@ -34,12 +29,10 @@ case "$1" in
AC|ACAD|ADP0)
case "$4" in
00000000)
- echo -n $minspeed >$setspeed
- #/etc/laptop-mode/laptop-mode start
+ logger 'AC unpluged'
;;
00000001)
- echo -n $maxspeed >$setspeed
- #/etc/laptop-mode/laptop-mode stop
+ logger 'AC pluged'
;;
esac
;;
diff --git a/abs/core/acpid/handler.sh.runit b/abs/core/acpid/handler.sh.runit
deleted file mode 100644
index 9fb2593..0000000
--- a/abs/core/acpid/handler.sh.runit
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Default acpi script that takes an entry for all actions
-
-# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to
-# modify it to not use /sys
-
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-
-set $*
-
-case "$1" in
- button/power)
- #echo "PowerButton pressed!">/dev/tty5
- case "$2" in
- PWRF) logger "PowerButton pressed: $2"
- /sbin/runit-init 0
- /sbin/poweroff
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/sleep)
- case "$2" in
- SLPB) echo -n mem >/sys/power/state ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- ac_adapter)
- case "$2" in
- AC)
- case "$4" in
- 00000000)
- echo -n $minspeed >$setspeed
- #/etc/laptop-mode/laptop-mode start
- ;;
- 00000001)
- echo -n $maxspeed >$setspeed
- #/etc/laptop-mode/laptop-mode stop
- ;;
- esac
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- battery)
- case "$2" in
- BAT0)
- case "$4" in
- 00000000) #echo "offline" >/dev/tty5
- ;;
- 00000001) #echo "online" >/dev/tty5
- ;;
- esac
- ;;
- CPU0)
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/lid)
- #echo "LID switched!">/dev/tty5
- ;;
- *)
- logger "ACPI group/action undefined: $1 / $2"
- ;;
-esac
--
cgit v0.12
From 1baec8c263936163c041813cfb2aa7fd18d1d094 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 13:30:37 -0600
Subject: alsa : 1.0.27
---
abs/core/alsa-lib/PKGBUILD | 7 ++---
abs/core/alsa-utils/PKGBUILD | 24 ++++++++--------
abs/core/alsa-utils/alsa | 62 -----------------------------------------
abs/core/alsa-utils/alsa.conf.d | 15 ----------
4 files changed, 15 insertions(+), 93 deletions(-)
delete mode 100755 abs/core/alsa-utils/alsa
delete mode 100644 abs/core/alsa-utils/alsa.conf.d
diff --git a/abs/core/alsa-lib/PKGBUILD b/abs/core/alsa-lib/PKGBUILD
index b04e7ef..072433d 100644
--- a/abs/core/alsa-lib/PKGBUILD
+++ b/abs/core/alsa-lib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $
+# $Id: PKGBUILD 197852 2013-10-30 11:15:49Z allan $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=alsa-lib
-pkgver=1.0.25
+pkgver=1.0.27.2
pkgrel=1
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
@@ -11,7 +11,6 @@ depends=('glibc')
optdepends=('python2: for python smixer plugin')
makedepends=('python2')
license=('GPL')
-options=(!libtool)
source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2)
build() {
@@ -24,4 +23,4 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums=('06fe5819020c6684b991dcffc5471304')
+md5sums=('69129a7c37697f81ac092335e9fa452b')
diff --git a/abs/core/alsa-utils/PKGBUILD b/abs/core/alsa-utils/PKGBUILD
index 918a84d..0ee6995 100644
--- a/abs/core/alsa-utils/PKGBUILD
+++ b/abs/core/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $
+# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-utils
-pkgver=1.0.25
-pkgrel=3
+pkgver=1.0.27.2
+pkgrel=1
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
url="http://www.alsa-project.org"
@@ -13,30 +13,30 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate
makedepends=('xmlto' 'docbook-xsl')
license=('GPL')
source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
- alsa
- alsa.conf.d
90alsa)
-backup=(etc/conf.d/alsa)
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --disable-alsaconf \
+ ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \
--with-udev-rules-dir=/usr/lib/udev/rules.d \
--with-systemdsystemunitdir=/usr/lib/systemd/system
make
+ # fix udev rules genaration
+ cd alsactl
+ make 90-alsa-restore.rules
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa
- install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa
install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa
+ # install alsa udev rule file
+ install -D -m644 alsactl/90-alsa-restore.rules \
+ ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules
+
# dir where to save ALSA state
install -d ${pkgdir}/var/lib/alsa
}
-md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9'
- '2ba1a1cbf653bf1a69f8a720fd6549da'
- '4c8ae9f976c7df5e271a4cb91ccc7767'
+md5sums=('b65e9a04181bd7c9db7667a4566f8dc3'
'529216f6a46e61a546640e08ea7a0879')
diff --git a/abs/core/alsa-utils/alsa b/abs/core/alsa-utils/alsa
deleted file mode 100755
index 1e7b57f..0000000
--- a/abs/core/alsa-utils/alsa
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/alsa
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Restoring ALSA Levels"
- if [[ ! -e /var/lib/alsa/asound.state ]]; then
- /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
- fi
- if /usr/sbin/alsactl $ALSA_ARGS restore; then
- stat_done
- add_daemon alsa
- else
- stat_fail
- exit 1
- fi
-
- POWERSAVE=${POWERSAVE:-0}
- if [[ -e /sys/module/snd_ac97_codec/parameters/power_save ]] \
- && (( $POWERSAVE )); then
- echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save
- [[ -c /dev/dsp ]] && echo 1 > /dev/dsp
- fi
- if [[ -e /sys/module/snd_hda_intel/parameters/power_save ]] \
- && (( $POWERSAVE )); then
- echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save
- [[ -c /dev/dsp ]] && echo 1 > /dev/dsp
- fi
- ;;
- stop)
- SAVE_VOLUME=${SAVE_VOLUME:-yes}
- if [[ "$SAVE_VOLUME" = "yes" ]]; then
- stat_busy "Saving ALSA Levels"
- /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
- else
- stat_busy "Stopping ALSA"
- fi
- if [ "$MUTE_VOLUME" == "yes" ]; then
- /usr/bin/amixer -q set Master 0 mute || { stat_fail; exit 1; }
- fi
- stat_done
- rm_daemon alsa
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- force-restart)
- stat_busy "Trying to TERM or KILL processes that are blocking ALSA..."
- FILES="$(ls -1 /dev/snd/* | grep -vi control)"
- fuser -k -SIGTERM $FILES
- fuser -k $FILES
- stat_done
- $0 restart
- ;;
- *)
- echo "usage: $0 {start|stop|restart|force-restart}"
-esac
diff --git a/abs/core/alsa-utils/alsa.conf.d b/abs/core/alsa-utils/alsa.conf.d
deleted file mode 100644
index bd50dcc..0000000
--- a/abs/core/alsa-utils/alsa.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Arguments for alsactl
-# example: ALSA_ARGS="--file /var/lib/alsa/asound.state"
-ALSA_ARGS="--file /var/lib/alsa/asound.state"
-
-# Enables powersaving mode for AC97 and hda_intel audio chips.
-# Set to 1 to enable powersaving.
-# Set to 0 to disable powersaving (default).
-POWERSAVE=0
-
-# Whether to save volume levels when stopped ("yes" or "no").
-SAVE_VOLUME="yes"
-
-# Whether to mute the master volume when stopped ("yes" or "no").
-# Useful for bad audio cards which make a noise on system poweroff.
-MUTE_VOLUME="no"
--
cgit v0.12
From 0c4c167e2147686b8386fdc63ae8344b5a62bd72 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:36:30 -0600
Subject: avahi: change location of binaries to /usr/bin
---
abs/core/avahi/PKGBUILD | 3 ++-
abs/core/avahi/__changelog | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD
index 424bf2c..7b247cb 100644
--- a/abs/core/avahi/PKGBUILD
+++ b/abs/core/avahi/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=avahi
pkgver=0.6.31
-pkgrel=3
+pkgrel=4
pkgdesc='Multicast/unicast DNS-SD framework'
url='http://www.avahi.org/'
license=('LGPL')
@@ -53,6 +53,7 @@ build() {
--localstatedir=/var \
--disable-static \
--disable-monodoc \
+ --sbindir=/usr/bin \
--enable-compat-libdns_sd \
--enable-compat-howl \
--with-distro=archlinux \
diff --git a/abs/core/avahi/__changelog b/abs/core/avahi/__changelog
index 07b29bb..ecb5358 100644
--- a/abs/core/avahi/__changelog
+++ b/abs/core/avahi/__changelog
@@ -1 +1,2 @@
removed php
+changed location of sbin
--
cgit v0.12
From 04e5bb0a24fe11091d7966d7260604c91de7bc74 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:36:53 -0600
Subject: balance: binary move to /usr/bin
---
abs/core/balance/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/balance/PKGBUILD b/abs/core/balance/PKGBUILD
index dca8733..227d01a 100644
--- a/abs/core/balance/PKGBUILD
+++ b/abs/core/balance/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=balance
pkgver=3.54
-pkgrel=1
+pkgrel=2
pkgdesc="Balance is our (still) suprisingly successful load balancing solution being a simple but powerful generic tcp proxy with round robin load balancing and failover "
arch=('i686' 'x86_64')
url="http://www.inlab.de/balance.html"
@@ -10,7 +10,7 @@ source=(http://www.inlab.de/$pkgname-$pkgver.tar.gz)
build() {
cd $srcdir/$pkgname-$pkgver
make
- install -o root -g root -Dm755 balance ${pkgdir}/usr/sbin/balance
+ install -o root -g root -Dm755 balance ${pkgdir}/usr/bin/balance
# install -o root -g root -Dm755 balance.1 ${pkgdir}/usr/share/man/man1/balance1
}
md5sums=('99854615cc58ceb2c5bbf29e35d18018')
--
cgit v0.12
From 88f8abd60dcd395d859e53c3161134c371eb4c9e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:39:08 -0600
Subject: bash: update binary path refs #961
---
abs/core/bash/PKGBUILD | 122 +++++++++++----------
...2-do-not-use-memcpy-on-overlapping-memory.patch | 12 ++
abs/core/bash/bash.install | 6 +-
3 files changed, 77 insertions(+), 63 deletions(-)
create mode 100644 abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD
index 09a93e9..c6f692a 100644
--- a/abs/core/bash/PKGBUILD
+++ b/abs/core/bash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $
+# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,7 +6,7 @@ pkgname=bash
_basever=4.2
_patchlevel=045 #prepare for some patches
pkgver=$_basever.$_patchlevel
-pkgrel=2
+pkgrel=5
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
@@ -21,29 +21,36 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
dot.bash_profile
dot.bash_logout
system.bashrc
- system.bash_logout)
+ system.bash_logout
+ bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
if [ $_patchlevel -gt 000 ]; then
for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
done
fi
-build() {
+prepare() {
cd ${srcdir}/${pkgname}-$_basever
+
for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
- patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+ patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
done
+
+ patch -p1 -i $srcdir/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
- _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
- -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
+ _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
+ -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
-DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
./configure --prefix=/usr --with-curses --enable-readline \
- --without-bash-malloc --with-installed-readline \
- --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
+ --without-bash-malloc --with-installed-readline
make
}
@@ -56,9 +63,7 @@ package() {
cd ${srcdir}/${pkgname}-$_basever
make DESTDIR=${pkgdir} install
- # for now, bash is our default /bin/sh
- cd ${pkgdir}/bin
- ln -s bash sh
+ ln -s bash ${pkgdir}/usr/bin/sh
install -dm755 ${pkgdir}/etc/skel/
@@ -73,99 +78,100 @@ package() {
}
md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
- '8d37a3f97a48c1e56e1a4ded877ed944'
+ 'SKIP'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
'3546099a1b2f667adc9794f52e78e35b'
'472f536d7c9e8250dc4568ec4cfaf294'
+ '9e55d01f2d9dda4a0c96031b25d19f45'
'1100bc1dda2cdc06ac44d7e5d17864a3'
- 'a7184b76eb4a079f10174a0a8f574819'
+ 'SKIP'
'30e7948079921d3261efcc6a40722135'
- 'c4d45307f7e69fe508ce347c4cec1955'
+ 'SKIP'
'9ea06decec43a198f3d7cf29acc602f8'
- '74bddae6eeb9227a04a467d42597a34d'
+ 'SKIP'
'fb48f6134d7b013135929476aa0c250c'
- '3e6a18226b16c773229246abd07a1f5e'
+ 'SKIP'
'e70e45de33426b38153b390be0dbbcd4'
- 'e667dc9348ebc3e0e14bfdd87f4b6ff2'
+ 'SKIP'
'ce4e5c484993705b27daa151eca242c2'
- '41cbd8e57589bc081a546a014ddb12f8'
+ 'SKIP'
'88d1f96db29461767602e2546803bda7'
- 'b8b781520f4c7493a2a1ac3010a44a44'
+ 'SKIP'
'24c574bf6d6a581e300823d9c1276af6'
- '354a0899a7c4b446454c52546562b55b'
+ 'SKIP'
'4c5835f2fbab36c4292bb334977e5b6d'
- 'ff4547ca7b508d52101729d61f5b77b6'
+ 'SKIP'
'0a51602b535ef661ee707be6c8bdb373'
- 'cec7c92a4d8052ea4b29216365d16566'
+ 'SKIP'
'58deacf3d57cbd75575444ff6a3b0806'
- '9ed2a08e549c3c17745f19e8413cfb31'
+ 'SKIP'
'72d5059820015231483bb7415d09e9db'
- '45b04b41a4230f469d3e47ab9952c2df'
+ 'SKIP'
'608336ebe215984ef126e3c29d2d3409'
- '623f63025d155a84977b62531e260ee2'
+ 'SKIP'
'ed19da878e3f630834c62b9d9dcc6fce'
- 'eef2dd4a0e4505dc8f8e664b40c6cd66'
+ 'SKIP'
'2d07daba0b8ca8f876d2aa052ff594b4'
- '0cb823a44e6dc1cde7ac97ae5c8163c9'
+ 'SKIP'
'53d246537e1fffd1aaa02ba5c056211c'
- '60f983a1dded5f0b28040ff4b3f1e9b5'
+ 'SKIP'
'304fd129a58fee2d8a34f8b4704db0aa'
- '9df4bf4f46aaadc436f430187741f815'
+ 'SKIP'
'6921a0b4228fe89b6537a5c29f027c89'
- '4ef0e2a2cbfbdd53346f927000b7e112'
+ 'SKIP'
'1195d85447f3d048d2c9bcd075fa765c'
- 'b0f3a651ce29a1feee687d93177870f1'
+ 'SKIP'
'b09000bba08da6ac753124593850cdf7'
- '204bb5054d1f8bafe2b446d4e5d0d99a'
+ 'SKIP'
'09d3f96a16b881334cfaee0cf320b47e'
- 'aab415350bcc2bb0c29943b413499d96'
+ 'SKIP'
'597bf71a2aac6feb510b7505cdd3d4f7'
- 'b0db384bdedecafbdd70c8d22c56af5f'
+ 'SKIP'
'3fab459b4e09daea529cacad025b13b3'
- 'bab99835ad6198cb1109fac89a085262'
+ 'SKIP'
'4ad8d11e72afc6090e701073ff034cf4'
- '5658ef10c9d0d804126ec1ce700e4e2c'
+ 'SKIP'
'c7d2493e44490f01dd20bdc8feb0a6a7'
- 'e4855dbc4b743618b54d408bd5878637'
+ 'SKIP'
'9f19c199dd8d1fa9254eebe738759272'
- '600c8e90c2fb13cdbc7aa3f18566df03'
+ 'SKIP'
'a6ed82daf034587aee2f2581ba5fe829'
- '821620a0389df723644911c56796ca8c'
+ 'SKIP'
'da9265aa2527fd4a7481baa3e0550287'
- '0043f8b75f46f43608a67b863e300fe8'
+ 'SKIP'
'ec444d229e8899fbaaf6fc7de2d82ae6'
- 'b632fca3a4943825bfaf3bd29df6b27d'
+ 'SKIP'
'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
- '2ffa9a802bbd57540021715f84cc76f4'
+ 'SKIP'
'89390ff6a3c2ef7e09dd4b8b097a8e56'
- '3e9b529ef3726b75d125d678de76977f'
+ 'SKIP'
'eee08003395c417f677d1a4bf8c548ee'
- 'f670f7672b11d0df8c31885dbf15f390'
+ 'SKIP'
'2fe070dd6d75d8ff16f269184a16e9c4'
- '5018b6b7737808141043b57cf4eb842d'
+ 'SKIP'
'4e610506c1711bf3483b965800ac3d5d'
- 'cb65e541f9b60a8cb1fe58404f264b73'
+ 'SKIP'
'7cd9bfdf7cbfd45274d07620ee94c8d9'
- 'a7d2eace0da5fd236c93dbfd93458838'
+ 'SKIP'
'9c3142956064d175a880bcb186e51ef9'
- 'a1a87649853f20fe99572ddc02b0c67f'
+ 'SKIP'
'c10692f447d4966c879f8fb8d7c8ebc9'
- '1bf5e34ad46566bc2d0eb7560ff8968e'
+ 'SKIP'
'9ef3c308cde413e95866c1266cfb4e98'
- 'afbb94e04dab29bd4ce92199892f2b5e'
+ 'SKIP'
'cd48f57a404498d4e5c73a3501c4b1a5'
- 'd2693a2728b5a0448947d23ce47cb4b3'
+ 'SKIP'
'00a2371b6c05acbfce6bc850c6d982f8'
- '72744ac844a1dfd15dddbba7f73ec45c'
+ 'SKIP'
'7bc4942a66ca4024ee964db7ede07896'
- '7e97f02d9dd1436eed278f2732542ecf'
+ 'SKIP'
'1cf7701017ebfc8e129de92c8f8b798c'
- '4ef8b5af440bf7b939b7955ce68b4dc7'
+ 'SKIP'
'9e61168fca692d8d1a733c389a63712e'
- '665861582049ba270cc726b7a6e0324d'
+ 'SKIP'
'b4b11d64b45ea9ec50dcc74c6c3861f6'
- '233031ccf9cbb1265be30753e0fa41f4'
+ 'SKIP'
'1661bcc83c4715f54368877452ff2247'
- '302c5516e469171b5187118024fca2a7')
+ 'SKIP')
diff --git a/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
new file mode 100644
index 0000000..c621f0a
--- /dev/null
+++ b/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
@@ -0,0 +1,12 @@
+diff -Naur bash-4.2-orig/general.c bash-4.2/general.c
+--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000
++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000
+@@ -766,7 +766,7 @@
+ *nbeg++ = '.';
+
+ nlen = nend - ntail;
+- memcpy (nbeg, ntail, nlen);
++ memmove (nbeg, ntail, nlen);
+ nbeg[nlen] = '\0';
+
+ return name;
diff --git a/abs/core/bash/bash.install b/abs/core/bash/bash.install
index bc75e9b..a10e6e9 100644
--- a/abs/core/bash/bash.install
+++ b/abs/core/bash/bash.install
@@ -1,17 +1,13 @@
info_dir=usr/share/info
info_files=(bash.info)
-post_install() {
+post_upgrade() {
[ -x usr/bin/install-info ] || return 0
for f in ${info_files[@]}; do
usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
done
}
-post_upgrade() {
- post_install $1
-}
-
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for f in ${info_files[@]}; do
--
cgit v0.12
From 9c149788e5f610c2f3ec61d9a08a4aabf383db5a Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:39:40 -0600
Subject: btrfs-prog: update to 3.1.2
---
abs/core/btrfs-progs/PKGBUILD | 34 +++++++++++++++++------------
abs/core/btrfs-progs/btrfs-progs.install | 9 ++++++++
abs/core/btrfs-progs/initcpio-install-btrfs | 6 +++--
3 files changed, 33 insertions(+), 16 deletions(-)
create mode 100644 abs/core/btrfs-progs/btrfs-progs.install
diff --git a/abs/core/btrfs-progs/PKGBUILD b/abs/core/btrfs-progs/PKGBUILD
index 8b3f37e..47d6884 100644
--- a/abs/core/btrfs-progs/PKGBUILD
+++ b/abs/core/btrfs-progs/PKGBUILD
@@ -1,37 +1,40 @@
-# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $
+# $Id: PKGBUILD 202441 2013-12-21 23:13:17Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=3
+pkgver=3.12
+pkgrel=1
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
+depends=('glibc' 'e2fsprogs' 'lzo2')
+makedepends=('git')
url="http://btrfs.wiki.kernel.org/"
replaces=('btrfs-progs-unstable')
conflicts=('btrfs-progs-unstable')
provides=('btrfs-progs-unstable')
license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
- initcpio-install-btrfs
- initcpio-hook-btrfs)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
- '3eae9bf1541e297fa72aa40ebf7320c6'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
+ initcpio-install-btrfs
+ initcpio-hook-btrfs)
+install=btrfs-progs.install
+options=(!staticlibs)
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname
make CFLAGS="$CFLAGS"
+ make CFLAGS="$CFLAGS" btrfs-select-super
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname
+
make prefix=$pkgdir/usr install
+ install -Dm755 btrfs-select-super $pkgdir/usr/bin
+
# fix manpage
mkdir -p $pkgdir/usr/share/
mv $pkgdir/usr/man $pkgdir/usr/share/man
- mkdir -p ${pkgdir}/sbin
- ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
# install mkinitcpio hooks
install -Dm644 "$srcdir/initcpio-install-btrfs" \
@@ -39,3 +42,6 @@ package() {
install -Dm644 "$srcdir/initcpio-hook-btrfs" \
"$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
diff --git a/abs/core/btrfs-progs/btrfs-progs.install b/abs/core/btrfs-progs/btrfs-progs.install
new file mode 100644
index 0000000..d6c0698
--- /dev/null
+++ b/abs/core/btrfs-progs/btrfs-progs.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+ if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
+ echo "btrfs multi-device support now relies on linux 3.6 or later"
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/btrfs-progs/initcpio-install-btrfs b/abs/core/btrfs-progs/initcpio-install-btrfs
index a70a324..f7b0285 100644
--- a/abs/core/btrfs-progs/initcpio-install-btrfs
+++ b/abs/core/btrfs-progs/initcpio-install-btrfs
@@ -1,14 +1,16 @@
#!/bin/bash
build() {
- add_all_modules btrfs
+ add_module btrfs
add_binary btrfs
+ add_binary btrfsck
add_runscript
}
help() {
cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes.
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
HELPEOF
}
--
cgit v0.12
From 48f14cc4f095c90129022fcd1d005d29d549f778 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:40:14 -0600
Subject: ca-certificates 20130906 refs #961
---
abs/core/ca-certificates/PKGBUILD | 17 +++++++++++------
abs/core/ca-certificates/ca-certificates.install | 6 +++---
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD
index 4b35562..7409989 100644
--- a/abs/core/ca-certificates/PKGBUILD
+++ b/abs/core/ca-certificates/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162841 2012-07-01 11:43:58Z pierre $
+# $Id: PKGBUILD 195211 2013-09-27 20:33:15Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=ca-certificates
-pkgver=20120623
+pkgver=20130906
pkgrel=1
pkgdesc='Common CA certificates'
arch=('any')
@@ -13,19 +13,24 @@ depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
makedepends=('python2')
install='ca-certificates.install'
backup=('etc/ca-certificates.conf')
-sha256sums=('878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9')
+sha256sums=('dd10520091d469e95e11e5fafb7422d3be0a66071984d09009ed3e0232cb277d')
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+prepare() {
+ cd ${srcdir}/${pkgname}
sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
sed 's|python|python2|g' -i mozilla/Makefile
+}
+
+build() {
+ cd ${srcdir}/${pkgname}
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}
install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
make install DESTDIR=${pkgdir}
+ mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
(
diff --git a/abs/core/ca-certificates/ca-certificates.install b/abs/core/ca-certificates/ca-certificates.install
index 3d8b87d..4e90c2e 100644
--- a/abs/core/ca-certificates/ca-certificates.install
+++ b/abs/core/ca-certificates/ca-certificates.install
@@ -1,14 +1,14 @@
export LC_ALL=C
post_install() {
- usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
}
post_upgrade() {
if [ $(vercmp $2 20110421-1) -lt 0 ]; then
echo 'Updating certificates. This might take a while...'
fi
- usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
}
pre_remove() {
@@ -16,7 +16,7 @@ pre_remove() {
local _backup=$(mktemp)
mv etc/ca-certificates.conf ${_backup}
echo > etc/ca-certificates.conf
- usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+ usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
mv ${_backup} etc/ca-certificates.conf
}
--
cgit v0.12
From a57674f5022cb29e88afd9efd7bbfd8a1b57b5ed Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:40:49 -0600
Subject: cdrkit: update binary path to /usr/bin refs #961
---
abs/core/cdrkit/PKGBUILD | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/abs/core/cdrkit/PKGBUILD b/abs/core/cdrkit/PKGBUILD
index 569f179..8eee4be 100644
--- a/abs/core/cdrkit/PKGBUILD
+++ b/abs/core/cdrkit/PKGBUILD
@@ -1,18 +1,24 @@
-# $Id: PKGBUILD 138030 2011-09-14 23:20:33Z dreisner $
+# $Id: PKGBUILD 187052 2013-06-03 11:16:15Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=cdrkit
pkgver=1.1.11
-pkgrel=2
+pkgrel=3
pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
arch=('i686' 'x86_64')
url="http://cdrkit.org/"
license=('GPL2')
-depends=('file' 'bzip2' 'perl')
+depends=('file' 'bzip2')
+optdepends=('perl: for dirsplit')
makedepends=('cmake')
source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz)
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i "s#sbin#bin#" netscsid/CMakeLists.txt
+}
+
build() {
cd "$srcdir/$pkgname-$pkgver"
make
--
cgit v0.12
From aa69c60af899a4ffa7243216537c048ac0e2c2f0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:41:55 -0600
Subject: ceton_infinitv: recompiled for 3.12
---
abs/core/ceton_infinitv/PKGBUILD | 10 +++++-----
abs/core/ceton_infinitv/ceton.install | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD
index bc37ba9..9e5b125 100755
--- a/abs/core/ceton_infinitv/PKGBUILD
+++ b/abs/core/ceton_infinitv/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Cecil Watson<knoppmyth@gmail.com>
pkgname=ceton_infinitv
-_kernver=3.6.7-1-ARCH
-pkgver=2012_1116_1219
-pkgrel=3
+_kernver=3.12.6-1-ARCH
+pkgver=2013_0326_2226
+pkgrel=2
usb_pkgver=0.1.0
pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb "
arch=('i686' 'x86_64')
license=('GPL2')
url="http://linuxtv.org/"
-depends=('linux' 'libgusb' 'libnl1')
+depends=('linux' 'libgusb' 'libnl1' 'ctntad')
makedepends=(linux-headers)
install=ceton.install
source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pkgver.tar.gz"
@@ -40,7 +40,7 @@ package() {
install -Dm755 ${srcdir}/ifctn.sh ${pkgdir}/usr/LH/bin/
install -m755 ${srcdir}/reset_network.py ${pkgdir}/usr/bin/infinitv_reset_network.py
}
-md5sums=('7c56167bfa89d228bf170962bc42ac01'
+md5sums=('7ae02309e86ee642b13aeb2f446462bb'
'554f2c1bcc5d7169659f0ad3d8a513a5'
'b5db78e2b9cccd65d6ea4c88dd028ace'
'9f95a08bdd8c2a9e8d62e7daf52a90f6'
diff --git a/abs/core/ceton_infinitv/ceton.install b/abs/core/ceton_infinitv/ceton.install
index a0008f6..f37a5fd 100644
--- a/abs/core/ceton_infinitv/ceton.install
+++ b/abs/core/ceton_infinitv/ceton.install
@@ -1,5 +1,5 @@
# arg 1: the new package version
-KERNEL_VERSION=3.6.7-1-ARCH
+KERNEL_VERSION=3.12.6-1-ARCH
post_install() {
depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
}
--
cgit v0.12
From e2f0b8987788218b27e9434942d8d3a19afcea00 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:42:26 -0600
Subject: cmake: 2.8.12
---
abs/core/cmake/PKGBUILD | 35 +++++++++++++++++++----------------
abs/core/cmake/findfreetype.patch | 26 ++++++++++++++++++++++++++
abs/core/cmake/fix-pkg-config.patch | 31 -------------------------------
3 files changed, 45 insertions(+), 47 deletions(-)
create mode 100644 abs/core/cmake/findfreetype.patch
delete mode 100644 abs/core/cmake/fix-pkg-config.patch
diff --git a/abs/core/cmake/PKGBUILD b/abs/core/cmake/PKGBUILD
index 5600a7a..eb20157 100644
--- a/abs/core/cmake/PKGBUILD
+++ b/abs/core/cmake/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 157165 2012-04-25 06:58:42Z andrea $
+# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
-pkgver=2.8.8
-pkgrel=2
+pkgver=2.8.12.1
+pkgrel=3
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64')
url="http://www.cmake.org/"
license=('custom')
depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt')
+makedepends=('qt' 'emacs')
optdepends=('qt: cmake-gui')
install="${pkgname}.install"
source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
- 'fix-pkg-config.patch')
-md5sums=('ba74b22c788a0c8547976b880cd02b17'
- '32c6a4360a2ba12dc77b6a840fa7672b')
+ "findfreetype.patch")
+md5sums=('9d38cd4e2c94c3cea97d0e2924814acc'
+ '90321de1d9d46cd8d6609d0509dbd7b0')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
- # FS#29545
- patch -p1 -i "${srcdir}"/fix-pkg-config.patch
+ patch -Np1 < ${srcdir}/findfreetype.patch
./bootstrap --prefix=/usr \
--mandir=/share/man \
@@ -34,13 +33,17 @@ build() {
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- vimpath="$pkgdir/usr/share/vim/vimfiles"
- install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
- install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
- install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+ vimpath="${pkgdir}/usr/share/vim/vimfiles"
+ install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
+ install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
- install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 Docs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+ emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/abs/core/cmake/findfreetype.patch b/abs/core/cmake/findfreetype.patch
new file mode 100644
index 0000000..454b591
--- /dev/null
+++ b/abs/core/cmake/findfreetype.patch
@@ -0,0 +1,26 @@
+diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
+index 179dc00..0f5a2b4 100644
+--- a/Modules/FindFreetype.cmake
++++ b/Modules/FindFreetype.cmake
+@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+- PATH_SUFFIXES include/freetype2 include
++ PATH_SUFFIXES include/freetype2 include/freetype include
+ )
+
+-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+- PATH_SUFFIXES include/freetype2 include
++ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype
+ )
+
+ find_library(FREETYPE_LIBRARY
diff --git a/abs/core/cmake/fix-pkg-config.patch b/abs/core/cmake/fix-pkg-config.patch
deleted file mode 100644
index c9390ae..0000000
--- a/abs/core/cmake/fix-pkg-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 5d93ab1..39d3a76 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -13,11 +13,10 @@
- # When the 'QUIET' argument is set, no status messages will be printed.
- #
- # It sets the following variables:
--# PKG_CONFIG_FOUND ... true if pkg-config works on the system
-+# PKG_CONFIG_FOUND ... if pkg-config executable was found
- # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
- # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
- # (since CMake 2.8.8)
--# PKG_CONFIG_FOUND ... if pkg-config executable was found
- #
- # For the following variables two sets of values exist; first one is the
- # common one and has the given PREFIX. The second set contains flags
-@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
- REQUIRED_VARS PKG_CONFIG_EXECUTABLE
- VERSION_VAR PKG_CONFIG_VERSION_STRING)
-
-+# This is needed because the module name is "PkgConfig" but the name of
-+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-+# handled by FPHSA.
-+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
-+
- # Unsets the given variables
- macro(_pkgconfig_unset var)
- set(${var} "" CACHE INTERNAL "")
--
cgit v0.12
From b352e8cff3e4d9a43711cfdc828bee0a2f1c4ad5 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:42:46 -0600
Subject: coreutils: 8.22 update binary path to /usr/bin refs #961
---
abs/core/coreutils/PKGBUILD | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/abs/core/coreutils/PKGBUILD b/abs/core/coreutils/PKGBUILD
index 82fb6be..d38de6e 100644
--- a/abs/core/coreutils/PKGBUILD
+++ b/abs/core/coreutils/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 169689 2012-10-26 01:40:04Z allan $
+# $Id: PKGBUILD 201684 2013-12-18 05:22:31Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
-pkgver=8.20
-pkgrel=1
+pkgver=8.22
+pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.gnu.org/software/coreutils"
groups=('base')
-depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
+depends=('glibc' 'pam' 'acl' 'gmp' 'libcap' 'openssl')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('3d69af8f561fce512538a9fe85f147ff'
- '7e6076e4e0961d24c38cf8685efca35b')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --libexecdir=/usr/lib \
- --enable-no-install-program=groups,hostname,kill,uptime \
- --enable-pam
+ ./configure --prefix=/usr --libexecdir=/usr/lib --with-openssl \
+ --enable-no-install-program=groups,hostname,kill,uptime
make
}
@@ -33,15 +29,6 @@ check() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- cd ${pkgdir}/usr/bin
- install -dm755 ${pkgdir}/bin
-
- # binaries required by FHS
- _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
- 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
- 'true' 'uname')
- for i in ${_fhs[@]}; do
- ln -s ../usr/bin/$i ${pkgdir}/bin/$i
- done
}
+md5sums=('8fb0ae2267aa6e728958adc38f8163a2'
+ 'SKIP')
--
cgit v0.12
From 0c22271a585e48d1e9cea35f3b0a962dd15b72b0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:43:13 -0600
Subject: cracklib: 2.9.0 update binary path to /usr/bin refs #961
---
abs/core/cracklib/PKGBUILD | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/abs/core/cracklib/PKGBUILD b/abs/core/cracklib/PKGBUILD
index d25d26a..a93db6d 100644
--- a/abs/core/cracklib/PKGBUILD
+++ b/abs/core/cracklib/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $
+# $Id: PKGBUILD 197804 2013-10-30 11:02:40Z allan $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
pkgname=cracklib
-pkgver=2.8.18
+pkgver=2.9.0
pkgrel=2
pkgdesc="Password Checking Library"
arch=('i686' 'x86_64')
license=('GPL')
url="http://sourceforge.net/projects/cracklib"
depends=('glibc' 'zlib')
-options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('79053ad8bc714a44cd660cb12116211b')
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --without-python
+ ./configure --prefix=/usr --sbindir=/usr/bin --without-python
make
}
@@ -28,7 +26,10 @@ check() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
- install -Dm644 dicts/cracklib-small $pkgdir/usr/share/dict/cracklib-small
+ # symlink cracklib-small #34778
+ mkdir -p $pkgdir/usr/share/dict
+ ln -sf /usr/share/cracklib/cracklib-small $pkgdir/usr/share/dict/cracklib-small
sh ./util/cracklib-format dicts/cracklib-small \
| sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict
}
+md5sums=('e0f94ac2138fd33c7e77b19c1e9a9390')
--
cgit v0.12
From 798be4135a1867350244b32359bf7fbd9ae1f091 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:43:39 -0600
Subject: cryptsetup: 1.6.3 update binary path to /usr/bin refs #961
---
abs/core/cryptsetup/PKGBUILD | 28 ++++++++++++++++-----------
abs/core/cryptsetup/encrypt_hook | 11 ++++++-----
abs/core/cryptsetup/sd-encrypt | 42 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 16 deletions(-)
create mode 100644 abs/core/cryptsetup/sd-encrypt
diff --git a/abs/core/cryptsetup/PKGBUILD b/abs/core/cryptsetup/PKGBUILD
index 4ec9997..8ea5bfa 100644
--- a/abs/core/cryptsetup/PKGBUILD
+++ b/abs/core/cryptsetup/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 162744 2012-06-29 11:46:09Z thomas $
+# $Id: PKGBUILD 202619 2013-12-22 13:44:39Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
-pkgver=1.4.3
+pkgver=1.6.3
pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64)
license=('GPL')
url="http://code.google.com/p/cryptsetup/"
groups=('base')
-depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux')
-conflicts=('mkinitcpio<0.7')
-options=('!libtool' '!emptydirs')
+depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
+options=('!emptydirs')
source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
encrypt_hook
- encrypt_install)
-sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a'
- 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a'
- 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316'
- 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae')
+ encrypt_install
+ sd-encrypt)
build() {
cd "${srcdir}"/$pkgname-${pkgver}
- ./configure --prefix=/usr --disable-static
+ ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
make
}
@@ -32,4 +28,14 @@ package() {
# install hook
install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
+ install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin bin
}
+md5sums=('a7aeb549a543eeac433eadfb6bc67837'
+ 'SKIP'
+ 'c279d86d6dc18322c054d2272ebb9e90'
+ '21c45f9cab3e0b5165f68358884fbd0f'
+ '6cf7e170ecd13e42fe829209628fdb4d')
diff --git a/abs/core/cryptsetup/encrypt_hook b/abs/core/cryptsetup/encrypt_hook
index 372b7ba..819c4cf 100644
--- a/abs/core/cryptsetup/encrypt_hook
+++ b/abs/core/cryptsetup/encrypt_hook
@@ -11,7 +11,9 @@ run_hook() {
$cryptkey
EOF
- if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
+ if [ "$ckdev" = "rootfs" ]; then
+ ckeyfile=$ckarg1
+ elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
case ${ckarg1} in
*[!0-9]*)
# Use a file on the device
@@ -50,7 +52,6 @@ EOF
for cryptopt in ${cryptoptions//,/ }; do
case ${cryptopt} in
allow-discards)
- echo "Enabling TRIM/discard support."
cryptargs="${cryptargs} --allow-discards"
;;
*)
@@ -65,7 +66,7 @@ EOF
dopassphrase=1
# If keyfile exists, try to use that
if [ -f ${ckeyfile} ]; then
- if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
+ if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
dopassphrase=0
else
echo "Invalid keyfile. Reverting to passphrase."
@@ -77,7 +78,7 @@ EOF
echo "A password is required to access the ${cryptname} volume:"
#loop until we get a real password
- while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
+ while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
sleep 2;
done
fi
@@ -97,7 +98,7 @@ EOF
err "Non-LUKS decryption not attempted..."
return 1
fi
- exe="cryptsetup create $cryptname $resolved $cryptargs"
+ exe="cryptsetup open --type plain $resolved $cryptname $cryptargs"
IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
$crypto
EOF
diff --git a/abs/core/cryptsetup/sd-encrypt b/abs/core/cryptsetup/sd-encrypt
new file mode 100644
index 0000000..c18fd2f
--- /dev/null
+++ b/abs/core/cryptsetup/sd-encrypt
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+build() {
+ local mod
+
+ add_module dm-crypt
+ if [[ $CRYPTO_MODULES ]]; then
+ for mod in $CRYPTO_MODULES; do
+ add_module "$mod"
+ done
+ else
+ add_all_modules '/crypto/'
+ fi
+
+ add_binary "dmsetup"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_systemd_unit cryptsetup.target
+ add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator
+ add_binary /usr/lib/systemd/systemd-cryptsetup
+
+ add_systemd_unit systemd-ask-password-console.path
+ add_systemd_unit systemd-ask-password-console.service
+
+ [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+}
+
+help() {
+ cat <<HELPEOF
+This hook allows for an encrypted root device with systemd initramfs.
+
+See the manpage of systemd-cryptsetup-generator(8) for available kernel
+command line options. Alternatively, if the file /etc/crypttab.initramfs
+exists, it will be added to the initramfs as /etc/crypttab. See the
+crypttab(5) manpage for more information on crypttab syntax.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
--
cgit v0.12
From c50e43346a227bd2f968fa4b2b0dbe33180e6021 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:44:04 -0600
Subject: ctntad: first inclusion
refs #954
---
abs/core/ctntad/PKGBUILD | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 abs/core/ctntad/PKGBUILD
diff --git a/abs/core/ctntad/PKGBUILD b/abs/core/ctntad/PKGBUILD
new file mode 100644
index 0000000..9135dae
--- /dev/null
+++ b/abs/core/ctntad/PKGBUILD
@@ -0,0 +1,28 @@
+#6 Maintainer: Jameson Pugh <imntreal@gmail.com>
+pkgname=ctntad
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="Ceton InfiniTV Tunning Adapter Driver"
+arch=('i686' 'x86_64')
+url="http://cetoncorp.com/infinitv_support/linux_drivers/"
+license=('GPL')
+depends=('gupnp' 'libgusb')
+source=("http://cetoncorp.com/downloads/$pkgname-$pkgver.tar.gz")
+sha256sums=('7929eb2e69868cc2969a95f8c93320bcf003c5276ef4e7c49a63b8df7f3855d9')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix undefined reference to symbol 'g_thread_init'
+ sed -i "s|g_thread_init(NULL);|/*g_thread_init(NULL);*/|" src/main.c
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 3a430da97a860979e44178957b26df7fa5f2fd53 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:44:43 -0600
Subject: curl: 7.34
---
...-all-addresses-in-first-connection-attemp.patch | 47 ++++++++++++++++++++++
abs/core/curl/PKGBUILD | 43 +++++++++++---------
2 files changed, 72 insertions(+), 18 deletions(-)
create mode 100644 abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
diff --git a/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch b/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
new file mode 100644
index 0000000..f3428c7
--- /dev/null
+++ b/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
@@ -0,0 +1,47 @@
+From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
+Date: Sat, 28 Dec 2013 13:42:57 +0100
+Subject: [PATCH] connect: Try all addresses in first connection attempt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes a bug when all addresses in the first family fail immediately, due
+to "Network unreachable" for example, curl would hang and never try the
+next address family.
+
+Iterate through all address families when to trying establish the first
+connection attempt.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1315
+Reported-by: Michal Górny and Anthony G. Basile
+---
+ lib/connect.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 4b6ee00..588ac28 100644
+--- a/lib/connect.c
++++ b/lib/connect.c
+@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
+ conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2;
+
+ /* start connecting to first IP */
+- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
+- while(res != CURLE_OK &&
+- conn->tempaddr[0] &&
+- conn->tempaddr[0]->ai_next &&
+- conn->tempsock[0] == CURL_SOCKET_BAD)
+- res = trynextip(conn, FIRSTSOCKET, 0);
++ while(conn->tempaddr[0]) {
++ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0]));
++ if(res == CURLE_OK)
++ break;
++ conn->tempaddr[0] = conn->tempaddr[0]->ai_next;
++ }
+
+ if(conn->tempsock[0] == CURL_SOCKET_BAD)
+ return res;
+--
+1.8.5.2
+
diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD
index f318660..d2f7f52 100644
--- a/abs/core/curl/PKGBUILD
+++ b/abs/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160000 2012-05-27 15:59:46Z dreisner $
+# $Id: PKGBUILD 203041 2014-01-02 14:43:46Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,28 +6,24 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=curl
-pkgver=7.26.0
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
+pkgver=7.34.0
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
arch=('i686' 'x86_64')
url="http://curl.haxx.se"
license=('MIT')
depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-options=('!libtool')
+provides=('libcurl.so')
+options=('strip' 'debug')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+ 0001-connect-Try-all-addresses-in-first-connection-attemp.patch
curlbuild.h)
-md5sums=('3fa4d5236f2a36ca5c3af6715e837691'
- '61b594830d5acba3c99e4af0ba39a14e'
- '751bd433ede935c8fae727377625a8ae')
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
- 8) _curlbuild=curlbuild-64.h ;;
- 4) _curlbuild=curlbuild-32.h ;;
- *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
- exit 1
- ;;
-esac
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
+}
build() {
cd "$pkgname-$pkgver"
@@ -35,7 +31,6 @@ build() {
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
- --disable-dependency-tracking \
--disable-ldap \
--disable-ldaps \
--enable-ipv6 \
@@ -54,11 +49,23 @@ package() {
make DESTDIR="$pkgdir" install
+ local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+ case $ptrsize in
+ 8) _curlbuild=curlbuild-64.h ;;
+ 4) _curlbuild=curlbuild-32.h ;;
+ *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+ exit 1
+ ;;
+ esac
+
# license
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
# devel
- install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
}
+md5sums=('d5b7edccbd1793e3549842e01331da20'
+ 'SKIP'
+ 'ee755b0e886207fc1e8154e426c46ca7'
+ '751bd433ede935c8fae727377625a8ae')
--
cgit v0.12
From 49b76b6cbfd0c4ecfc645cb7ae779dfdbc57e503 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:44:59 -0600
Subject: dcron: update binary path to /usr/bin refs #961
---
abs/core/dcron/PKGBUILD | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/abs/core/dcron/PKGBUILD b/abs/core/dcron/PKGBUILD
index 19f31f6..5a0b4a8 100644
--- a/abs/core/dcron/PKGBUILD
+++ b/abs/core/dcron/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=dcron
pkgver=4.5
-pkgrel=3
+pkgrel=4
pkgdesc="dillon's lightweight cron daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -12,7 +12,6 @@ depends=('bash' 'postfix')
provides=('cron')
conflicts=('cron')
source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('078833f3281f96944fc30392b1888326')
optdepends=('smtp-server: sending cron job output via email')
install=$pkgname.install
@@ -41,4 +40,8 @@ package() {
install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
+ #mv sbin->bin
+ mv $pkgdir/usr/sbin/* $pkgdir/usr/bin
+ rmdir $pkgdir/usr/sbin
}
+md5sums=('078833f3281f96944fc30392b1888326')
--
cgit v0.12
From c4243584e2cc38bca40a9a209bd4582ebdb843f1 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:45:14 -0600
Subject: dhcpcd: 6.1 update binary path to /usr/bin refs #961
---
abs/core/dhcpcd/PKGBUILD | 38 +++++++++++++++++++++++---------------
abs/core/dhcpcd/dhcpcd.service | 13 +++++++++++++
abs/core/dhcpcd/dhcpcd_.service | 15 +++++++++++++++
3 files changed, 51 insertions(+), 15 deletions(-)
create mode 100644 abs/core/dhcpcd/dhcpcd.service
create mode 100644 abs/core/dhcpcd/dhcpcd_.service
diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD
index 4600940..82a42e8 100644
--- a/abs/core/dhcpcd/PKGBUILD
+++ b/abs/core/dhcpcd/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $
+# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=5.5.6
+pkgver=6.1.0
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/dhcpcd/"
+url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
license=('BSD')
groups=('base')
depends=('glibc' 'sh')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
+provides=('dhcp-client')
+backup=('etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
- 'dhcpcd.conf.d')
+source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 'dhcpcd_.service'
+ 'dhcpcd.service'
+ 'dhcpcd.conf.d' )
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
- --rundir=/run
+ ./configure \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/dhcpcd \
+ --dbdir=/var/lib/dhcpcd \
+ --rundir=/run
# Build
make
@@ -32,20 +38,22 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- # Create Binary Symlink
- install -d ${pkgdir}/usr/sbin
- ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
# Install Configuration File used in /etc/rc.d/network
install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
# Install License
install -d $pkgdir/usr/share/licenses/$pkgname
- awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
- >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ sed 26q "$srcdir/$pkgname-$pkgver/control.h" \
+ >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# Set Options in /etc/dhcpcd.conf
echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
+
+ # install systemd files
+ install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
+ install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543
}
-md5sums=('a5c0e43b4e836cfc003437329f6b7982'
+md5sums=('6070040c57492925af9ac6aed980de2a'
+ '98cfea55077ba1680c2e902d669585b3'
+ '75bd063ad699609eb84f09b843f0971f'
'1579b1b17306570078d2d4edfc867983')
diff --git a/abs/core/dhcpcd/dhcpcd.service b/abs/core/dhcpcd/dhcpcd.service
new file mode 100644
index 0000000..489023d
--- /dev/null
+++ b/abs/core/dhcpcd/dhcpcd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=dhcpcd on all interfaces
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd.pid
+ExecStart=/bin/dhcpcd -q -b
+ExecStop=/bin/dhcpcd -x
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/core/dhcpcd/dhcpcd_.service b/abs/core/dhcpcd/dhcpcd_.service
new file mode 100644
index 0000000..e7bc5ca
--- /dev/null
+++ b/abs/core/dhcpcd/dhcpcd_.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=dhcpcd on %I
+Wants=network.target
+Before=network.target
+BindsTo=sys-subsystem-net-devices-%i.device
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/usr/bin/dhcpcd -q -w %I
+ExecStop=/usr/bin/dhcpcd -x %I
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 3a08e3dda29ad3aa8f2a4e82312dac3161e7bf6c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:45:35 -0600
Subject: dmraid: update binary path to /usr/bin refs #961
---
abs/core/dmraid/PKGBUILD | 16 ++++++++--------
abs/core/dmraid/dmraid.service | 3 +--
abs/core/dmraid/dmraid_install | 2 ++
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/abs/core/dmraid/PKGBUILD b/abs/core/dmraid/PKGBUILD
index 39f3672..c5bc12d 100644
--- a/abs/core/dmraid/PKGBUILD
+++ b/abs/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $
+# $Id: PKGBUILD 197790 2013-10-30 08:14:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
pkgname=dmraid
pkgver=1.0.0.rc16.3
-pkgrel=7
+pkgrel=12
pkgdesc="Device mapper RAID interface"
url="http://people.redhat.com/~heinzm/sw/dmraid/"
conflicts=('mkinitcpio<0.7')
@@ -18,11 +18,6 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
dmraid_tmpfiles
dmraid.service)
install=dmraid.install
-md5sums=('819338fcef98e8e25819f0516722beeb'
- '2297d23cee1aef23ec6ad8d6d1870356'
- 'faec669dc85f87187b45b5d3968efe2c'
- '56a8bb0ece8d206cd8efb504ee072ddd'
- 'de0af1fdb9ed4c109b8119160167d2e9')
build() {
cd "$pkgname/1.0.0.rc16-3/$pkgname"
@@ -32,7 +27,7 @@ build() {
package() {
cd "$pkgname/1.0.0.rc16-3/$pkgname"
- make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
+ make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
@@ -42,3 +37,8 @@ package() {
install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
}
+md5sums=('819338fcef98e8e25819f0516722beeb'
+ '7a040ebcba305aba1e47dfe6ca8323b5'
+ 'faec669dc85f87187b45b5d3968efe2c'
+ '56a8bb0ece8d206cd8efb504ee072ddd'
+ 'ea6d280fc6f63fb799abcd882bca53c8')
diff --git a/abs/core/dmraid/dmraid.service b/abs/core/dmraid/dmraid.service
index 1fd142f..c5d3d53 100644
--- a/abs/core/dmraid/dmraid.service
+++ b/abs/core/dmraid/dmraid.service
@@ -7,9 +7,8 @@ Before=basic.target shutdown.target
Conflicts=shutdown.target
[Service]
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
Type=oneshot
-TimeoutSec=0
+ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z
RemainAfterExit=true
[Install]
diff --git a/abs/core/dmraid/dmraid_install b/abs/core/dmraid/dmraid_install
index d3238c1..acbc43d 100644
--- a/abs/core/dmraid/dmraid_install
+++ b/abs/core/dmraid/dmraid_install
@@ -6,9 +6,11 @@ build() {
add_binary 'dmraid'
add_binary 'dmsetup'
+ add_file "/usr/lib/device-mapper/libdmraid-events-isw.so"
add_file "/usr/lib/udev/rules.d/10-dm.rules"
add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
add_runscript
}
--
cgit v0.12
From e73f19da7f26b80ea114e08cfe9665ae808c8271 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:45:56 -0600
Subject: dosfstools: 3.0.24 update binary path to /usr/bin refs #961
---
abs/core/dosfstools/PKGBUILD | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/abs/core/dosfstools/PKGBUILD b/abs/core/dosfstools/PKGBUILD
index a2555b3..04a2321 100644
--- a/abs/core/dosfstools/PKGBUILD
+++ b/abs/core/dosfstools/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 143546 2011-11-26 09:49:37Z tpowa $
+# $Id: PKGBUILD 200725 2013-12-03 16:03:02Z tpowa $
# Maintainer: dorphell <dorphell@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=dosfstools
-pkgver=3.0.12
+pkgver=3.0.24
pkgrel=1
pkgdesc="DOS filesystem utilities"
arch=(i686 x86_64)
depends=('glibc')
-source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.bz2)
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
url="http://www.daniel-baumann.ch/software/dosfstools/"
license=('GPL2')
@@ -18,6 +18,7 @@ build() {
package () {
cd $srcdir/$pkgname-$pkgver
- make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
+ make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install
}
-md5sums=('5c7c2adac9eae4afbe1f16443142b566')
+md5sums=('41931f36ebee6e79e9dafe85cc916f2b'
+ 'SKIP')
--
cgit v0.12
From 562e9876c5bb04dc1dcb2f71773d779c3b5258d4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:46:26 -0600
Subject: e2fsprogs: update binary path to /usr/bin refs #961
---
abs/core/e2fsprogs/PKGBUILD | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/abs/core/e2fsprogs/PKGBUILD b/abs/core/e2fsprogs/PKGBUILD
index 96afe85..c20e5e7 100644
--- a/abs/core/e2fsprogs/PKGBUILD
+++ b/abs/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=e2fsprogs
-pkgver=1.42.4
-pkgrel=1
+pkgver=1.42.8
+pkgrel=2
pkgdesc="Ext2/3/4 filesystem utilities"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'MIT')
@@ -15,8 +15,9 @@ makedepends=('bc')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'MIT-LICENSE')
backup=('etc/mke2fs.conf')
+options=('staticlibs')
install=${pkgname}.install
-sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9'
+sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897'
'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
build() {
@@ -26,7 +27,7 @@ build() {
sed -i '/init\.d/s|^|#|' misc/Makefile.in
./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
- --enable-elf-shlibs --disable-fsck --disable-uuidd \
+ --sbindir=/usr/bin --enable-elf-shlibs --disable-fsck --disable-uuidd \
--disable-libuuid --disable-libblkid
make
@@ -37,11 +38,14 @@ package() {
make DESTDIR="${pkgdir}" install install-libs
sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
-
+
# remove references to build directory
sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
+ # remove static libraries with a shared counterpart
+ rm ${pkgdir}/usr/lib/lib{com_err,e2p,ext2fs,ss}.a
+
# install MIT license
install -Dm644 "${srcdir}/MIT-LICENSE" \
"${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
--
cgit v0.12
From 1a1a281c4c9e1b8ad80ebb2f115e95210246f3a0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:46:53 -0600
Subject: fping: 3.8 update binary path to /usr/bin refs #961
---
abs/core/fping/PKGBUILD | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/abs/core/fping/PKGBUILD b/abs/core/fping/PKGBUILD
index e2de78e..b2414a5 100644
--- a/abs/core/fping/PKGBUILD
+++ b/abs/core/fping/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 130929 2011-07-09 05:53:00Z giovanni $
+# $Id: PKGBUILD 200236 2013-11-23 17:36:41Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=fping
-pkgver=2.4b2
-pkgrel=5
+pkgver=3.8
+pkgrel=2
pkgdesc="A utility to ping multiple hosts at once"
arch=('i686' 'x86_64')
-url="http://www.fping.com/"
+url="http://www.fping.org/"
license=('custom')
depends=('glibc')
-source=("http://fping.sourceforge.net/download/${pkgname}.tar.gz")
-md5sums=('d5e8be59e307cef76bc479e1684df705')
+source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
build() {
- cd $srcdir/$pkgname-$pkgver\_to
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
- --mandir=/usr/share/man
+ --sbindir=/usr/bin \
+ --mandir=/usr/share/man \
+ --enable-ipv4 \
+ --enable-ipv6
make
}
package() {
- cd $srcdir/$pkgname-$pkgver\_to
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="${pkgdir}" install
# install license
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
- chmod 4755 ${pkgdir}/usr/sbin/fping
+ chmod 4555 ${pkgdir}/usr/bin/fping
+ chmod 4555 ${pkgdir}/usr/bin/fping6
}
+md5sums=('1e36467cc96a4ca959925ac167ea19af')
--
cgit v0.12
From 1c975aea312ffdcc6b580bbe87318424b1f6b6c2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:47:07 -0600
Subject: fuse: 2.9.3 update binary path to /usr/bin refs #961
---
abs/core/fuse/PKGBUILD | 23 +++++++++++++----------
abs/core/fuse/fuse.rc.d | 49 -------------------------------------------------
2 files changed, 13 insertions(+), 59 deletions(-)
delete mode 100755 abs/core/fuse/fuse.rc.d
diff --git a/abs/core/fuse/PKGBUILD b/abs/core/fuse/PKGBUILD
index c16e6d7..fcfb387 100644
--- a/abs/core/fuse/PKGBUILD
+++ b/abs/core/fuse/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $
+# $Id: PKGBUILD 197300 2013-10-25 01:41:17Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Mark Rosenstand <mark@archlinux.org>
pkgname=fuse
-pkgver=2.9.0
-pkgrel=1
+pkgver=2.9.3
+pkgrel=2
pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
arch=('i686' 'x86_64')
url="http://fuse.sourceforge.net/"
@@ -15,18 +15,22 @@ makedepends=('pkg-config')
backup=(etc/fuse.conf)
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
'fuse.conf')
-options=(!libtool)
-sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d'
+sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e'
'3b42e37a741d4651099225987dc40e7f02a716ad')
-build() {
+prepare() {
cd "$pkgname-$pkgver"
# fix building with glibc-2.14
- sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+ sed -i '1i#define _GNU_SOURCE' util/fusermount.c
+
+ sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure
+}
- ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \
- --enable-util --bindir=/bin
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --libdir=/usr/lib \
+ --enable-lib --enable-util
make
}
@@ -38,7 +42,6 @@ package() {
# Remove init script in wrong path
# Don't add our own for now, as fusectl fs oopses on 2.6.18
rm -rf ${pkgdir}/etc/init.d
- #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse
# install sample config file
install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf
diff --git a/abs/core/fuse/fuse.rc.d b/abs/core/fuse/fuse.rc.d
deleted file mode 100755
index 768da5b..0000000
--- a/abs/core/fuse/fuse.rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# fuse Init script for Filesystem in Userspace
-# Based on the script by Miklos Szeredi <miklos@szeredi.hu>
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-FUSECTL=/sys/fs/fuse/connections
-
-case "$1" in
- start)
- stat_busy "Starting fuse"
- if ! grep -qw fuse /proc/filesystems; then
- modprobe fuse >/dev/null 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- fi
- fi
- if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then
- mount -t fusectl none $FUSECTL >/dev/null 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- fi
- fi
- add_daemon fuse
- stat_done
- ;;
- stop)
- stat_busy "Stopping fuse"
- umount $FUSECTL >/dev/null 2>&1
- rmmod fuse >/dev/null 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon fuse
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
--
cgit v0.12
From 4a9cb8b966e09bb71d1efaa34fe17027d3424b4b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:47:34 -0600
Subject: gawk: 4.1 update binary path to /usr/bin refs #961
---
abs/core/gawk/PKGBUILD | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/abs/core/gawk/PKGBUILD b/abs/core/gawk/PKGBUILD
index 9bf1c91..e2a39ed 100644
--- a/abs/core/gawk/PKGBUILD
+++ b/abs/core/gawk/PKGBUILD
@@ -1,41 +1,38 @@
-# $Id: PKGBUILD 155835 2012-04-07 08:07:16Z allan $
+# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gawk
-pkgver=4.0.1
-pkgrel=1
+pkgver=4.1.0
+pkgrel=2
pkgdesc="GNU version of awk"
arch=('i686' 'x86_64')
-url="http://www.gnu.org/directory/GNU/gawk.html"
+url="http://www.gnu.org/software/gawk/"
license=('GPL')
-groups=('base')
-depends=('sh' 'glibc')
+groups=('base' 'base-devel')
+depends=('sh' 'glibc' 'mpfr')
provides=('awk')
install=gawk.install
source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('bab2bda483e9f32be65b43b8dab39fa5'
- '7cf4e4896509c655dd00ecd4ca9098ef')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --libexecdir=/usr/lib
+ ./configure --prefix=/usr --libexecdir=/usr/lib --without-libsigsegv
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
-
make check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
-
make DESTDIR=${pkgdir} install
- install -dm755 ${pkgdir}/bin
- ln -sf /usr/bin/gawk ${pkgdir}/bin/
- ln -sf gawk ${pkgdir}/bin/awk
+ #install -dm755 ${pkgdir}/bin
+ #ln -sf /usr/bin/gawk ${pkgdir}/bin/
+ #ln -sf gawk ${pkgdir}/bin/awk
}
+md5sums=('13e02513105417818a31ef375f9f9f42'
+ 'SKIP')
--
cgit v0.12
From bf2f4dd3098203b922ed0bf3fa75b7d2b2fde722 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:48:01 -0600
Subject: gnupg: update binary path to /usr/bin refs #961
---
abs/core/gnupg/PKGBUILD | 36 ++++++++++++++++++++++++-----------
abs/core/gnupg/protect-tool-env.patch | 28 +++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 11 deletions(-)
create mode 100644 abs/core/gnupg/protect-tool-env.patch
diff --git a/abs/core/gnupg/PKGBUILD b/abs/core/gnupg/PKGBUILD
index cfc51b0..9ac8772 100644
--- a/abs/core/gnupg/PKGBUILD
+++ b/abs/core/gnupg/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 156582 2012-04-21 09:42:46Z bisson $
+# $Id: PKGBUILD 195927 2013-10-05 17:40:59Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=gnupg
-pkgver=2.0.19
-pkgrel=2
+pkgver=2.0.22
+pkgrel=1
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
license=('GPL')
arch=('i686' 'x86_64')
optdepends=('curl: gpg2keys_curl'
'libldap: gpg2keys_ldap'
- 'libusb-compat: scdaemon'
- 'texinfo: documentation')
-makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+ 'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
- 'f6e6830610a8629b0aad69d789373bf8ca481733')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+ 'protect-tool-env.patch')
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
+ '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
install=install
@@ -27,9 +27,22 @@ conflicts=('gnupg2')
provides=("gnupg2=${pkgver}")
replaces=('gnupg2')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/gnupg \
+ --enable-maintainer-mode \
+ --enable-symcryptrun \
+ --enable-gpgtar \
+
make
}
@@ -42,6 +55,7 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
ln -s gpg2 "${pkgdir}"/usr/bin/gpg
- ln -s gpg2 "${pkgdir}"/usr/bin/gpgv
+ ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+ rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
}
diff --git a/abs/core/gnupg/protect-tool-env.patch b/abs/core/gnupg/protect-tool-env.patch
new file mode 100644
index 0000000..132791f
--- /dev/null
+++ b/abs/core/gnupg/protect-tool-env.patch
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c 2012-12-08 13:53:17.067611957 +1100
++++ new/agent/protect-tool.c 2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program;
++static session_env_t opt_session_env;
+
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+
+ opt_homedir = default_homedir ();
+
++ opt_session_env = session_env_new ();
+
+ pargs.argc = &argc;
+ pargs.argv = &argv;
+@@ -1091,7 +1093,7 @@
+ opt.verbose,
+ opt_homedir,
+ opt_agent_program,
+- NULL, NULL, NULL);
++ NULL, NULL, opt_session_env);
+
+ if (opt_prompt)
+ opt_prompt = percent_plus_unescape (opt_prompt, 0);
--
cgit v0.12
From dbddb42f18c42d9a280215be4031d2b2dd3ae98b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:48:18 -0600
Subject: gpm: 1.20.7 update binary path to /usr/bin refs #961
---
abs/core/gpm/PKGBUILD | 22 +++++++++-------------
abs/core/gpm/gpm | 41 -----------------------------------------
abs/core/gpm/gpm.conf.d | 4 ----
abs/core/gpm/gpm.service | 2 +-
4 files changed, 10 insertions(+), 59 deletions(-)
delete mode 100755 abs/core/gpm/gpm
delete mode 100644 abs/core/gpm/gpm.conf.d
diff --git a/abs/core/gpm/PKGBUILD b/abs/core/gpm/PKGBUILD
index eae4b2a..cb2cd9b 100644
--- a/abs/core/gpm/PKGBUILD
+++ b/abs/core/gpm/PKGBUILD
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD 163618 2012-07-17 05:32:49Z eric $
+# $Id: PKGBUILD 197717 2013-10-28 22:26:50Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gpm
-pkgver=1.20.6
-pkgrel=10
+pkgver=1.20.7
+pkgrel=4
pkgdesc="A mouse server for the console and xterm"
arch=('i686' 'x86_64')
url="http://www.nico.schottelius.org/software/gpm/"
license=('GPL')
-depends=('ncurses' 'bash')
-backup=('etc/conf.d/gpm')
+depends=('bash')
options=('!makeflags')
install=gpm.install
source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
- gpm gpm.conf.d gpm.sh gpm.service)
-sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c'
- '19e1feb1493373512a77801699df012d186336ea'
- '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
+ gpm.sh gpm.service)
+sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
'88fe5ff10916c68a87abc8418a56eb0073f69fa9'
- '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
+ 'f9bde96eb9c78da9f225bcf40822647f6592cf23')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm"
- install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm"
install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
diff --git a/abs/core/gpm/gpm b/abs/core/gpm/gpm
deleted file mode 100755
index 7b5213d..0000000
--- a/abs/core/gpm/gpm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-GPM_ARGS=
-[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/gpm)
-case "$1" in
- start)
- stat_busy "Starting GPM Daemon"
- [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS}
- PID=$(pidof -o %PPID /usr/sbin/gpm)
- if [ -z "$PID" ]; then
- stat_fail
- else
- add_daemon gpm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping GPM Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon gpm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/gpm/gpm.conf.d b/abs/core/gpm/gpm.conf.d
deleted file mode 100644
index ab43bb7..0000000
--- a/abs/core/gpm/gpm.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to gpm
-#
-GPM_ARGS="-m /dev/input/mice -t imps2"
diff --git a/abs/core/gpm/gpm.service b/abs/core/gpm/gpm.service
index 59e837d..510ee9f 100644
--- a/abs/core/gpm/gpm.service
+++ b/abs/core/gpm/gpm.service
@@ -3,7 +3,7 @@ Description=Virtual console mouse server
[Service]
Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
+ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2
[Install]
WantedBy=multi-user.target
--
cgit v0.12
From 9720d2935915447130e4a9f1ad43f66f72a34a02 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:48:34 -0600
Subject: grub update binary path to /usr/bin refs #961
---
abs/core/grub/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/grub/PKGBUILD b/abs/core/grub/PKGBUILD
index 1bf094b..460935d 100644
--- a/abs/core/grub/PKGBUILD
+++ b/abs/core/grub/PKGBUILD
@@ -8,7 +8,7 @@ _grub_915_ver=9
pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
pkgbase=grub
pkgver=2.00
-pkgrel=1
+pkgrel=2
url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -89,7 +89,7 @@ _build_grub-common_and_bios() {
--enable-grub-mount \
--prefix="/usr" \
--bindir="/usr/bin" \
- --sbindir="/usr/sbin" \
+ --sbindir="/usr/bin" \
--mandir="/usr/share/man" \
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
@@ -134,7 +134,7 @@ _build_grub-efi-i386() {
--enable-grub-mount \
--prefix="/usr" \
--bindir="/usr/bin" \
- --sbindir="/usr/sbin" \
+ --sbindir="/usr/bin" \
--mandir="/usr/share/man" \
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
--
cgit v0.12
From 454839cd73d339fb79e3b2a9dce6e9f07a2106aa Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:49:07 -0600
Subject: gssdp, gnpnp: first inclusion
---
abs/core/gssdp/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
abs/core/gupnp/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 abs/core/gssdp/PKGBUILD
create mode 100644 abs/core/gupnp/PKGBUILD
diff --git a/abs/core/gssdp/PKGBUILD b/abs/core/gssdp/PKGBUILD
new file mode 100644
index 0000000..5dd71a1
--- /dev/null
+++ b/abs/core/gssdp/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 198636 2013-10-31 15:44:36Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=gssdp
+pkgver=0.14.6
+pkgrel=1
+pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
+arch=(i686 x86_64)
+url="http://gupnp.org/"
+license=(LGPL)
+depends=(libsoup)
+makedepends=(gobject-introspection gtk3 gtk-doc vala)
+optdepends=('gtk3: gssdp-device-sniffer')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9acfdeb99080b165c34ea7c65fb909ea356b4550937972a73df5b69b419eeacd')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/abs/core/gupnp/PKGBUILD b/abs/core/gupnp/PKGBUILD
new file mode 100644
index 0000000..4f56654
--- /dev/null
+++ b/abs/core/gupnp/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 201545 2013-12-14 15:50:45Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: György Balló <ballogy@freestart.hu>
+
+pkgname=gupnp
+pkgver=0.20.9
+pkgrel=1
+pkgdesc="An object-oriented UPNP framework"
+arch=(i686 x86_64)
+url="http://gupnp.org/"
+license=(LGPL)
+depends=(gssdp util-linux)
+makedepends=(gobject-introspection gtk-doc vala)
+optdepends=('python2: gupnp-binding-tool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('61650a3be46979973b82c79eab5c3baf16a4ad3a051d8a710e5d1c376cf32c6e')
+
+build() {
+ cd $pkgname-$pkgver
+ sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static --with-context-manager=linux
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
--
cgit v0.12
From ab291b2d47373ee4c015df5d754b057815875536 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:49:28 -0600
Subject: hdparm 9.4.3 update binary path to /usr/bin refs #961
---
abs/core/hdparm/PKGBUILD | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/abs/core/hdparm/PKGBUILD b/abs/core/hdparm/PKGBUILD
index 5f79d6c..044ae24 100644
--- a/abs/core/hdparm/PKGBUILD
+++ b/abs/core/hdparm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150217 2012-02-15 07:27:04Z tpowa $
+# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgname=hdparm
-pkgver=9.39
-pkgrel=1
+pkgver=9.43
+pkgrel=2
pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
arch=(i686 x86_64)
depends=('glibc')
@@ -14,29 +14,31 @@ license=('BSD')
url="http://sourceforge.net/projects/hdparm/"
optdepends=('bash: for wiper.sh script')
options=('emptydirs')
-md5sums=('2bc17b72403885d4faf959682944243b'
- '74e368f384166a7710b447573cda120a')
-build() {
+prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
# Fix Range input/output error when wiping Intel G2 and OCZ drives
patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-
- # build
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
# install
- mkdir -p ${pkgdir}/{usr,sbin}
- make DESTDIR=${pkgdir} install
- install -m755 contrib/idectl ${pkgdir}/sbin
- install -m755 contrib/ultrabayd ${pkgdir}/sbin
+ mkdir -p ${pkgdir}/usr/bin
+ make DESTDIR=${pkgdir} sbindir=/usr/bin install
+ install -m755 contrib/idectl ${pkgdir}/usr/bin
+ install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
- install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
+ install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
#install license file
install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
}
+md5sums=('f73233be118d86c779a8463d8b6a3cdb'
+ '74e368f384166a7710b447573cda120a')
--
cgit v0.12
From 559eefa8ae61fc0924ac62a91a813fc867593daf Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:50:05 -0600
Subject: inetutils: update binary path to /usr/bin refs #961
---
abs/core/inetutils/PKGBUILD | 79 +++++++++++++++++++++---------------
abs/core/inetutils/dnsdomainname | 3 --
abs/core/inetutils/ftpd.conf | 4 --
abs/core/inetutils/ftpd.rc | 37 -----------------
abs/core/inetutils/ftpd.service | 4 +-
abs/core/inetutils/inetutils.install | 2 +-
abs/core/inetutils/rlogin.pam | 13 ++++++
abs/core/inetutils/rlogin.socket | 9 ++++
abs/core/inetutils/rlogin.xinetd | 2 +-
abs/core/inetutils/rlogin@.service | 7 ++++
abs/core/inetutils/rsh.pam | 11 +++++
abs/core/inetutils/rsh.socket | 9 ++++
abs/core/inetutils/rsh.xinetd | 2 +-
abs/core/inetutils/rsh@.service | 7 ++++
abs/core/inetutils/talk.service | 12 ++++++
abs/core/inetutils/talk.socket | 9 ++++
abs/core/inetutils/talk.xinetd | 2 +-
abs/core/inetutils/telnet.socket | 10 +++++
abs/core/inetutils/telnet.xinetd | 2 +-
abs/core/inetutils/telnet@.service | 7 ++++
20 files changed, 149 insertions(+), 82 deletions(-)
delete mode 100644 abs/core/inetutils/dnsdomainname
delete mode 100644 abs/core/inetutils/ftpd.conf
delete mode 100644 abs/core/inetutils/ftpd.rc
create mode 100644 abs/core/inetutils/rlogin.pam
create mode 100644 abs/core/inetutils/rlogin.socket
create mode 100644 abs/core/inetutils/rlogin@.service
create mode 100644 abs/core/inetutils/rsh.pam
create mode 100644 abs/core/inetutils/rsh.socket
create mode 100644 abs/core/inetutils/rsh@.service
create mode 100644 abs/core/inetutils/talk.service
create mode 100644 abs/core/inetutils/talk.socket
create mode 100644 abs/core/inetutils/telnet.socket
create mode 100644 abs/core/inetutils/telnet@.service
diff --git a/abs/core/inetutils/PKGBUILD b/abs/core/inetutils/PKGBUILD
index 38c9cfc..fd85ed1 100644
--- a/abs/core/inetutils/PKGBUILD
+++ b/abs/core/inetutils/PKGBUILD
@@ -1,45 +1,54 @@
-# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $
+# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=inetutils
-pkgver=1.9.1
-pkgrel=4
+pkgver=1.9.1.341
+pkgrel=2
pkgdesc="A collection of common network programs"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/inetutils/"
license=('GPL3')
groups=('base')
-depends=('readline' 'ncurses' 'pam')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
- 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+depends=('pam')
+makedepends=('help2man')
+backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk'
+ 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh'
+ 'etc/pam.d/rlogin' 'etc/pam.d/rsh')
options=('!emptydirs')
install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
- ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
- ftpd.service dnsdomainname)
-sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
- 'ff0aad9946a38915580b094dadf67e790e8a2f87'
- '84dc802b5e57b5e04c847572225a3b9612017155'
- '68a590083b45997dfdb80e666b2de762f494ba74'
- 'bfad98a4a62f1fff8779f076c6019ed07f9111af'
- '27d99b910eec0fc26bd79ccc2c1de26608330298'
- '81f10b3b688e3952f793b35bcef63b5bf257a92b'
- '81f4a8da823cf0bb14284fc71ee6108849691eda'
- 'fb607dafe177f074e14891dd887ef9e9ab67a875'
- 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
+source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig}
+ ftpd.service rlogin.pam rlogin@.service rlogin.socket rlogin.xinetd
+ rsh.pam rsh@.service rsh.socket rsh.xinetd talk.service talk.socket talk.xinetd
+ telnet@.service telnet.socket telnet.xinetd)
+sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d'
+ 'SKIP'
+ 'aa4730d662398b6c33df2b6fc116ab6b5c3cd120'
+ '387b371cbaa3611b95d30f806c0dd08b621a584a'
+ '6f9a304391610a17b8ae3ad35b742c78c86aee16'
+ '0455126fa18d2a9422469d79b9e73dd928b15652'
+ 'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+ '556b5372cbab8794e931e110b896fa8a61628bb1'
+ '828da7bce49ffc4e9645288759b275a98a2fbc40'
+ '7071da32d42a133ead039197ed891b518bb0f773'
+ '26763ae31b8a5be256666a0ba55746941d75d6ee'
+ '4486c966d28736897bce1280d85d139bd10a5689'
+ 'd1813d42c5c9d2c60f03ebe33961de357a4b8b43'
+ 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+ '0917dc6b5a80d914bf550065b1733b7da2c776f3'
+ 'a7ac7bbe917ff80fd8cd4357fbc62fab50595c34'
+ '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
- ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
- --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --libexec=/usr/bin \
+ --localstatedir=/var --sysconfdir=/etc \
--without-wrap --with-pam \
--enable-ftp --enable-ftpd \
--enable-telnet --enable-telnetd \
--enable-talk --enable-talkd \
--enable-rlogin --enable-rlogind \
--enable-rsh --enable-rshd \
- --enable-rcp --enable-hostname \
+ --enable-rcp --enable-hostname --enable-dnsdomainname \
--disable-rexec --disable-rexecd \
--disable-tftp --disable-tftpd \
--disable-ping --disable-ping6 \
@@ -50,23 +59,29 @@ build() {
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/bin"
- ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
- install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
- echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
- install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
- install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
+
+ install -D -m644 "${srcdir}/rlogin.pam" "${pkgdir}/etc/pam.d/rlogin"
+ install -D -m644 "${srcdir}/rsh.pam" "${pkgdir}/etc/pam.d/rsh"
+
install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service"
+ install -D -m644 "${srcdir}/rlogin@.service" "${pkgdir}/usr/lib/systemd/system/rlogin@.service"
+ install -D -m644 "${srcdir}/rlogin.socket" "${pkgdir}/usr/lib/systemd/system/rlogin.socket"
+ install -D -m644 "${srcdir}/rsh@.service" "${pkgdir}/usr/lib/systemd/system/rsh@.service"
+ install -D -m644 "${srcdir}/rsh.socket" "${pkgdir}/usr/lib/systemd/system/rsh.socket"
+ install -D -m644 "${srcdir}/talk.service" "${pkgdir}/usr/lib/systemd/system/talk.service"
+ install -D -m644 "${srcdir}/talk.socket" "${pkgdir}/usr/lib/systemd/system/talk.socket"
+ install -D -m644 "${srcdir}/telnet@.service" "${pkgdir}/usr/lib/systemd/system/telnet@.service"
+ install -D -m644 "${srcdir}/telnet.socket" "${pkgdir}/usr/lib/systemd/system/telnet.socket"
}
diff --git a/abs/core/inetutils/dnsdomainname b/abs/core/inetutils/dnsdomainname
deleted file mode 100644
index a1b8a8c..0000000
--- a/abs/core/inetutils/dnsdomainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"
diff --git a/abs/core/inetutils/ftpd.conf b/abs/core/inetutils/ftpd.conf
deleted file mode 100644
index f660f00..0000000
--- a/abs/core/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/abs/core/inetutils/ftpd.rc b/abs/core/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d344..0000000
--- a/abs/core/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
- start)
- stat_busy "Starting ftpd"
- [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ftpd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/inetutils/ftpd.service b/abs/core/inetutils/ftpd.service
index 5708bdf..3020804 100644
--- a/abs/core/inetutils/ftpd.service
+++ b/abs/core/inetutils/ftpd.service
@@ -3,8 +3,10 @@ Description=FTPD Daemon
After=network.target
[Service]
-ExecStart=/usr/sbin/ftpd -D
Type=forking
+PIDFile=/run/ftpd.pid
+ExecStart=/usr/bin/ftpd -D
+ExecStopPost=/bin/rm -f /run/ftpd.pid
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/inetutils/inetutils.install b/abs/core/inetutils/inetutils.install
index b338fa4..bd2a283 100644
--- a/abs/core/inetutils/inetutils.install
+++ b/abs/core/inetutils/inetutils.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
filelist=(inetutils.info.gz)
post_install() {
diff --git a/abs/core/inetutils/rlogin.pam b/abs/core/inetutils/rlogin.pam
new file mode 100644
index 0000000..d92a5da
--- /dev/null
+++ b/abs/core/inetutils/rlogin.pam
@@ -0,0 +1,13 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rlogin" must be
+# listed in /etc/securetty.
+auth required pam_nologin.so
+auth required pam_securetty.so
+auth required pam_env.so
+auth sufficient pam_rhosts.so
+auth include system-auth
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_loginuid.so
+session include system-auth
diff --git a/abs/core/inetutils/rlogin.socket b/abs/core/inetutils/rlogin.socket
new file mode 100644
index 0000000..c8c276c
--- /dev/null
+++ b/abs/core/inetutils/rlogin.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Login Facilities Activation Socket
+
+[Socket]
+ListenStream=513
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/core/inetutils/rlogin.xinetd b/abs/core/inetutils/rlogin.xinetd
index 5c72f86..bffdb90 100644
--- a/abs/core/inetutils/rlogin.xinetd
+++ b/abs/core/inetutils/rlogin.xinetd
@@ -4,7 +4,7 @@ service login
socket_type = stream
wait = no
user = root
- server = /usr/sbin/rlogind
+ server = /usr/bin/rlogind
log_on_failure += USERID
disable = yes
}
diff --git a/abs/core/inetutils/rlogin@.service b/abs/core/inetutils/rlogin@.service
new file mode 100644
index 0000000..77c18ca
--- /dev/null
+++ b/abs/core/inetutils/rlogin@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Remote Login Facilities Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/rlogind
+StandardInput=socket
diff --git a/abs/core/inetutils/rsh.pam b/abs/core/inetutils/rsh.pam
new file mode 100644
index 0000000..3c04bc7
--- /dev/null
+++ b/abs/core/inetutils/rsh.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rsh" must be
+# listed in /etc/securetty.
+auth required pam_nologin.so
+auth required pam_securetty.so
+auth required pam_env.so
+auth required pam_rhosts.so
+account include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_loginuid.so
+session include system-auth
diff --git a/abs/core/inetutils/rsh.socket b/abs/core/inetutils/rsh.socket
new file mode 100644
index 0000000..4d44b99
--- /dev/null
+++ b/abs/core/inetutils/rsh.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Shell Facilities Activation Socket
+
+[Socket]
+ListenStream=514
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/core/inetutils/rsh.xinetd b/abs/core/inetutils/rsh.xinetd
index a13738c..c8848ce 100644
--- a/abs/core/inetutils/rsh.xinetd
+++ b/abs/core/inetutils/rsh.xinetd
@@ -4,7 +4,7 @@ service shell
socket_type = stream
wait = no
user = root
- server = /usr/sbin/rshd
+ server = /usr/bin/rshd
log_on_failure += USERID
disable = yes
}
diff --git a/abs/core/inetutils/rsh@.service b/abs/core/inetutils/rsh@.service
new file mode 100644
index 0000000..403754a
--- /dev/null
+++ b/abs/core/inetutils/rsh@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Remote Shell Facilities Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/rshd
+StandardInput=socket
diff --git a/abs/core/inetutils/talk.service b/abs/core/inetutils/talk.service
new file mode 100644
index 0000000..25eb673
--- /dev/null
+++ b/abs/core/inetutils/talk.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Talk Server
+Documentation=man:talkd(8) man:talk(1)
+
+[Service]
+User=nobody
+Group=tty
+ExecStart=/usr/bin/talkd
+StandardInput=socket
+
+[Install]
+Also=talk.socket
diff --git a/abs/core/inetutils/talk.socket b/abs/core/inetutils/talk.socket
new file mode 100644
index 0000000..b09e07c
--- /dev/null
+++ b/abs/core/inetutils/talk.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Talk Server Activation Socket
+Documentation=man:talkd(8) man:talk(1)
+
+[Socket]
+ListenDatagram=0.0.0.0:518
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/core/inetutils/talk.xinetd b/abs/core/inetutils/talk.xinetd
index 6abef35..b62e563 100644
--- a/abs/core/inetutils/talk.xinetd
+++ b/abs/core/inetutils/talk.xinetd
@@ -4,7 +4,7 @@ service ntalk
socket_type = dgram
wait = yes
user = root
- server = /usr/sbin/talkd
+ server = /usr/bin/talkd
log_on_failure += USERID
disable = yes
}
diff --git a/abs/core/inetutils/telnet.socket b/abs/core/inetutils/telnet.socket
new file mode 100644
index 0000000..811b672
--- /dev/null
+++ b/abs/core/inetutils/telnet.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Telnet Server Activation Socket
+Documentation=man:telnetd(8)
+
+[Socket]
+ListenStream=23
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/core/inetutils/telnet.xinetd b/abs/core/inetutils/telnet.xinetd
index bd3a5e4..c56f339 100644
--- a/abs/core/inetutils/telnet.xinetd
+++ b/abs/core/inetutils/telnet.xinetd
@@ -4,7 +4,7 @@ service telnet
socket_type = stream
wait = no
user = root
- server = /usr/sbin/telnetd
+ server = /usr/bin/telnetd
log_on_failure += USERID
disable = yes
}
diff --git a/abs/core/inetutils/telnet@.service b/abs/core/inetutils/telnet@.service
new file mode 100644
index 0000000..d92af37
--- /dev/null
+++ b/abs/core/inetutils/telnet@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Telnet Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/telnetd
+StandardInput=socket
--
cgit v0.12
From deede5e40d1a8d27388f25a90a1413f269d60a17 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:50:24 -0600
Subject: initscript: update binary path to /usr/bin refs #961
---
abs/core/initscripts/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index 3c336b3..14fa502 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=initscripts
pkgver=2012.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="System initialization/bootup scripts"
arch=('any')
url="http://www.archlinux.org"
@@ -28,5 +28,6 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
+ mv $pkgdir/usr/sbin $pkgdir/usr/bin
}
md5sums=('a4a747e73819b81f2218cf5b9bd53703')
--
cgit v0.12
From cdfb9e4bf2706feee766cae336e31ca21a1bd73f Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:50:45 -0600
Subject: iproute2, iptables, iputils: update binary path to /usr/bin refs #961
---
abs/core/iproute2/PKGBUILD | 41 ++++++++-----
abs/core/iproute2/unwanted-link-help.patch | 17 ++++++
abs/core/iptables/PKGBUILD | 47 ++++++---------
abs/core/iptables/ip6tables | 69 ----------------------
abs/core/iptables/ip6tables.service | 3 +-
abs/core/iptables/iptables | 68 ---------------------
abs/core/iptables/iptables-1.4.12-fixresore.patch | 28 +++++++++
abs/core/iptables/iptables.conf.d | 12 ----
abs/core/iptables/iptables.service | 3 +-
abs/core/iptables/simple_firewall.rules | 2 +-
abs/core/iputils/PKGBUILD | 39 +++++-------
.../iputils-20101006-ping-integer-overflow.patch | 11 ----
abs/core/iputils/iputils.install | 5 +-
13 files changed, 111 insertions(+), 234 deletions(-)
create mode 100644 abs/core/iproute2/unwanted-link-help.patch
delete mode 100755 abs/core/iptables/ip6tables
delete mode 100755 abs/core/iptables/iptables
create mode 100644 abs/core/iptables/iptables-1.4.12-fixresore.patch
delete mode 100644 abs/core/iptables/iptables.conf.d
delete mode 100644 abs/core/iputils/iputils-20101006-ping-integer-overflow.patch
diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD
index 471b91e..04ca6df 100644
--- a/abs/core/iproute2/PKGBUILD
+++ b/abs/core/iproute2/PKGBUILD
@@ -1,36 +1,48 @@
-# $Id: PKGBUILD 162200 2012-06-23 12:13:11Z ronald $
+# $Id: PKGBUILD 199763 2013-11-15 21:24:40Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.11.0
+pkgrel=1
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db')
+depends=('glibc' 'db' 'iptables')
makedepends=('linux-atm')
optdepends=('linux-atm: ATM support')
+groups=('base')
provides=('iproute')
conflicts=('iproute')
replaces=('iproute')
-options=('!makeflags')
+options=('staticlibs' '!makeflags')
backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
- iproute2-fhs.patch)
-sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527'
- '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+ iproute2-fhs.patch
+ unwanted-link-help.patch)
+sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c'
+ '3b1335f4025f657f388fbf4e5a740871e3129c2a')
-build() {
+prepare() {
cd $srcdir/$pkgname-$pkgver
# set correct fhs structure
patch -Np1 -i "$srcdir/iproute2-fhs.patch"
- ./configure
+ # allow operations on links called "h", "he", "hel", "help"
+ patch -Np1 -i "$srcdir/unwanted-link-help.patch"
+
+ # do not treat warnings as errors
+ sed -i 's/-Werror//' Makefile
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure
make
}
@@ -39,12 +51,11 @@ package() {
make DESTDIR="$pkgdir" install
- # allow loopback to be started before /usr is mounted, this may not be supported in the future
- mkdir -p "$pkgdir/sbin"
- mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
- ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
# libnetlink isn't installed, install it FS#19385
install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
}
diff --git a/abs/core/iproute2/unwanted-link-help.patch b/abs/core/iproute2/unwanted-link-help.patch
new file mode 100644
index 0000000..8abe9e3
--- /dev/null
+++ b/abs/core/iproute2/unwanted-link-help.patch
@@ -0,0 +1,17 @@
+diff -ru iproute2-3.10.0.orig/ip/iplink.c iproute2-3.10.0/ip/iplink.c
+--- iproute2-3.10.0.orig/ip/iplink.c 2013-08-08 13:53:33.000000000 -0700
++++ iproute2-3.10.0/ip/iplink.c 2013-08-08 13:55:03.179865309 -0700
+@@ -467,11 +467,11 @@
+ addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+ &numrxqueues, 4);
+ } else {
++ if (matches(*argv, "help") == 0)
++ usage();
+ if (strcmp(*argv, "dev") == 0) {
+ NEXT_ARG();
+ }
+- if (matches(*argv, "help") == 0)
+- usage();
+ if (*dev)
+ duparg2("dev", *argv);
+ *dev = *argv;
diff --git a/abs/core/iptables/PKGBUILD b/abs/core/iptables/PKGBUILD
index d2c859d..0c65bd1 100644
--- a/abs/core/iptables/PKGBUILD
+++ b/abs/core/iptables/PKGBUILD
@@ -1,47 +1,41 @@
-# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $
+# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.14
-pkgrel=2
+pkgver=1.4.20
+pkgrel=1
pkgdesc='Linux kernel packet control tool'
arch=('i686' 'x86_64')
license=('GPL2')
url='http://www.netfilter.org/projects/iptables/index.html'
depends=('glibc' 'bash')
makedepends=('linux-api-headers')
-options=('!libtool')
-source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
- iptables
- ip6tables
+backup=('etc/xtables/connlabel.conf')
+source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig}
empty.rules
simple_firewall.rules
- iptables.conf.d
empty-filter.rules
empty-mangle.rules
empty-nat.rules
empty-raw.rules
empty-security.rules
- 0503-extension_cppflags.patch
- iptables.service
- ip6tables.service
- iptables-flush)
-backup=(etc/conf.d/iptables)
-sha1sums=('daf2972b81e52f562a644798013e946c88319ea3'
- '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
- '2db68906b603e5268736f48c8e251f3a49da1d75'
+ 0503-extension_cppflags.patch
+ iptables.service
+ ip6tables.service
+ iptables-flush)
+sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
+ 'SKIP'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
- '9907f9e815592837abc7fa3264a401567b7606ab'
- 'cdb830137192bbe002c6d01058656bd053ed0ddd'
+ 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
'd9f9f06b46b4187648e860afa0552335aafe3ce4'
'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
'1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
'7db53bb882f62f6c677cc8559cff83d8bae2ef73'
'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
'44626980a52e49f345a0b1e1ca03060f3a35763c'
- '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
- 'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
+ '9306cba67dbeaa004af084a816f66920a6a10faf'
+ '38fa2ffe7965e63b494d333f69193029c1258c28'
'e7abda09c61142121b6695928d3b71ccd8fdf73a')
build() {
@@ -55,9 +49,8 @@ build() {
./configure --prefix=/usr \
--libexecdir=/usr/lib/iptables --sysconfdir=/etc \
--with-xtlibdir=/usr/lib/iptables \
- --enable-devel --enable-libipq \
- --enable-shared
-
+ --enable-devel --enable-shared \
+ --sbindir=/usr/bin
make
}
@@ -67,18 +60,16 @@ package() {
make DESTDIR="${pkgdir}" install
cd "${srcdir}"
- install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
- install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
- install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
- mkdir -p "${pkgdir}"/var/lib/iptables
+ mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/ip6tables
# install systemd files
install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
- install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
+ install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
}
diff --git a/abs/core/iptables/ip6tables b/abs/core/iptables/ip6tables
deleted file mode 100755
index 2d119e3..0000000
--- a/abs/core/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IP6TABLES_CONF" ]; then
- echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP6 Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
- echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
- fi
- if ck_daemon ip6tables; then
- /usr/sbin/ip6tables-restore < $IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP6 Tables"
- if ! ck_daemon ip6tables; then
- fail=0
- for table in $(cat /proc/net/ip6_tables_names); do
- ip6tables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon ip6tables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP6 Tables"
- /usr/sbin/ip6tables-save >$IP6TABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/abs/core/iptables/ip6tables.service b/abs/core/iptables/ip6tables.service
index 9a695f3..7a8d39c 100644
--- a/abs/core/iptables/ip6tables.service
+++ b/abs/core/iptables/ip6tables.service
@@ -3,7 +3,8 @@ Description=IPv6 Packet Filtering Framework
[Service]
Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
RemainAfterExit=yes
diff --git a/abs/core/iptables/iptables b/abs/core/iptables/iptables
deleted file mode 100755
index fbb02fa..0000000
--- a/abs/core/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- if [ ! -f "$IPTABLES_CONF" ]; then
- echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
- exit 1
- fi
- stat_busy "Starting IP Tables"
- if [ "$IPTABLES_FORWARD" = "1" ]; then
- echo 1 >/proc/sys/net/ipv4/ip_forward
- fi
- if ck_daemon iptables; then
- /usr/sbin/iptables-restore < $IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping IP Tables"
- if ! ck_daemon iptables; then
- fail=0
- for table in $(cat /proc/net/ip_tables_names); do
- iptables-restore < /var/lib/iptables/empty-$table.rules
- [ $? -gt 0 ] && fail=1
- done
- if [ $fail -gt 0 ]; then
- stat_fail
- else
- rm_daemon iptables
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- save)
- stat_busy "Saving IP Tables"
- /usr/sbin/iptables-save >$IPTABLES_CONF
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/abs/core/iptables/iptables-1.4.12-fixresore.patch b/abs/core/iptables/iptables-1.4.12-fixresore.patch
new file mode 100644
index 0000000..94358f7
--- /dev/null
+++ b/abs/core/iptables/iptables-1.4.12-fixresore.patch
@@ -0,0 +1,28 @@
+diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c
+--- iptables-1.4.12.2/iptables/ip6tables-restore.c 2012-01-03 02:19:09.000000000 +0900
++++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c 2012-03-01 10:56:10.000000000 +0900
+@@ -380,9 +380,9 @@
+ quote_open = 0;
+ escaped = 0;
+ param_len = 0;
++ char param_buffer[1024];
+
+ for (curchar = parsestart; *curchar; curchar++) {
+- char param_buffer[1024];
+
+ if (quote_open) {
+ if (escaped) {
+diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c
+--- iptables-1.4.12.2/iptables/iptables-restore.c 2012-01-03 02:19:09.000000000 +0900
++++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c 2012-03-01 10:56:00.000000000 +0900
+@@ -377,9 +377,9 @@
+ quote_open = 0;
+ escaped = 0;
+ param_len = 0;
++ char param_buffer[1024];
+
+ for (curchar = parsestart; *curchar; curchar++) {
+- char param_buffer[1024];
+
+ if (quote_open) {
+ if (escaped) {
diff --git a/abs/core/iptables/iptables.conf.d b/abs/core/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b..0000000
--- a/abs/core/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/abs/core/iptables/iptables.service b/abs/core/iptables/iptables.service
index 3084f53..5441e45 100644
--- a/abs/core/iptables/iptables.service
+++ b/abs/core/iptables/iptables.service
@@ -3,7 +3,8 @@ Description=Packet Filtering Framework
[Service]
Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules
ExecStop=/usr/lib/systemd/scripts/iptables-flush
RemainAfterExit=yes
diff --git a/abs/core/iptables/simple_firewall.rules b/abs/core/iptables/simple_firewall.rules
index e1604cc..63426b0 100644
--- a/abs/core/iptables/simple_firewall.rules
+++ b/abs/core/iptables/simple_firewall.rules
@@ -3,7 +3,7 @@
:FORWARD DROP [0:0]
:OUTPUT ACCEPT [0:0]
-A INPUT -p icmp -j ACCEPT
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-A INPUT -i lo -j ACCEPT
-A INPUT -p tcp -j REJECT --reject-with tcp-reset
-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD
index e72795d..9e017fa 100644
--- a/abs/core/iputils/PKGBUILD
+++ b/abs/core/iputils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
+# $Id: PKGBUILD 192554 2013-08-14 06:31:20Z tpowa $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
-pkgver=20101006
-pkgrel=4
-pkgdesc="IP Configuration Utilities (and Ping)"
+pkgver=20121221
+pkgrel=3
+pkgdesc="Network monitoring tools, including ping"
arch=('i686' 'x86_64')
license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
+url="http://www.skbuff.net/iputils/"
groups=('base')
depends=('openssl' 'sysfsutils' 'libcap')
optdepends=('xinetd: for tftpd')
@@ -18,22 +18,15 @@ conflicts=('netkit-base' 'arping' 'netkit-tftpd')
replaces=('netkit-base')
backup=(etc/xinetd.d/tftp)
install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
- iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
- 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
- 'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
+ tftp.xinetd)
+sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
build() {
cd "${srcdir}/${pkgname}-s${pkgver}"
- # Use our CFLAGS
- sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
- # FS#28897
- patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch
-
- make
+ make USE_GNUTLS=no CCOPTOPT="$CFLAGS"
cd doc
for file in *.sgml; do
@@ -47,16 +40,14 @@ build() {
package() {
cd "${srcdir}/${pkgname}-s${pkgver}"
- install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+ install -dm755 "${pkgdir}"/usr/bin
- install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
- "${pkgdir}"/usr/sbin/
+ install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/
install -m755 ping{,6} "${pkgdir}"/usr/bin/
- ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
- install -dm755 "${pkgdir}"/usr/share/man/man8
- install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
+ install -dm755 "${pkgdir}"/usr/share/man/man8
+ install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
"${pkgdir}"/usr/share/man/man8/
cd "${pkgdir}"/usr/share/man/man8
@@ -67,5 +58,3 @@ package() {
install -dm755 "${pkgdir}"/etc/xinetd.d/
install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch b/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch
deleted file mode 100644
index 720e5e8..0000000
--- a/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20101006/ping_common.c 2010-10-06 13:59:20.000000000 +0200
-+++ iputils-s20101006-patched/ping_common.c 2012-03-09 16:42:46.878151032 +0100
-@@ -590,7 +590,7 @@
-
- /* If we are here, recvmsg() is unable to wait for
- * required timeout. */
-- if (1000*next <= 1000000/(int)HZ) {
-+ if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) {
- /* Very short timeout... So, if we wait for
- * something, we sleep for MININTERVAL.
- * Otherwise, spin! */
diff --git a/abs/core/iputils/iputils.install b/abs/core/iputils/iputils.install
index 2481fb3..8e5159e 100644
--- a/abs/core/iputils/iputils.install
+++ b/abs/core/iputils/iputils.install
@@ -1,7 +1,6 @@
post_install() {
- setcap cap_net_raw=ep usr/bin/ping
- setcap cap_net_raw=ep usr/bin/ping6
- echo " >> Traceroute is now provided by core/traceroute"
+ setcap cap_net_raw=ep usr/bin/ping 2>/dev/null || chmod +s usr/bin/ping
+ setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
}
post_upgrade() {
--
cgit v0.12
From a71b2406b3d108ef1c127420da131fc2d529fa39 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:51:18 -0600
Subject: archlinux-xdg-menu: 0.7.6.2
---
abs/core/archlinux-xdg-menu/PKGBUILD | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/archlinux-xdg-menu/PKGBUILD b/abs/core/archlinux-xdg-menu/PKGBUILD
index 7d716b9..40d812a 100644
--- a/abs/core/archlinux-xdg-menu/PKGBUILD
+++ b/abs/core/archlinux-xdg-menu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 101139 2013-11-18 10:37:26Z spupykin $
# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
pkgname=archlinux-xdg-menu
-pkgver=0.7.5.4
-pkgrel=2
+pkgver=0.7.6.2
+pkgrel=1
pkgdesc="automatic generate WM menu from xdg files"
arch=('any')
url="http://wiki.archlinux.org/index.php/XdgMenu"
@@ -14,13 +14,12 @@ optdepends=('sux: for xdg_menu_su')
backup=("etc/update-menus.conf"
"etc/xdg/menus/arch-applications.menu")
source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.gz")
-md5sums=('f3efc444d1d1a20fa93fa53eff96ef1b')
-build() {
+package() {
cd $srcdir
install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu
install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su
- install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus
+ install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus
install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf
mkdir -p $pkgdir/usr/share/desktop-directories/
cp arch-desktop-directories/* $pkgdir/usr/share/desktop-directories/
@@ -28,3 +27,4 @@ build() {
cp arch-xdg-menu/* $pkgdir/etc/xdg/menus/
mkdir -p $pkgdir//var/cache/xdg-menu
}
+md5sums=('e4aadc2a05a8e8330c95c22548a4fcfb')
--
cgit v0.12
From eafdcf37bde62cdee3ebd7b0bcf0b6e36d5042ef Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:51:40 -0600
Subject: jfsutils: update binary path to /usr/bin refs #961
---
abs/core/jfsutils/PKGBUILD | 23 ++++++++++++++++-------
abs/core/jfsutils/inttypes.patch | 12 ++++++++++++
2 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 abs/core/jfsutils/inttypes.patch
diff --git a/abs/core/jfsutils/PKGBUILD b/abs/core/jfsutils/PKGBUILD
index fee4867..dc7ed30 100644
--- a/abs/core/jfsutils/PKGBUILD
+++ b/abs/core/jfsutils/PKGBUILD
@@ -1,21 +1,30 @@
-# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $
+# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=jfsutils
pkgver=1.1.15
-pkgrel=3
+pkgrel=4
pkgdesc='JFS filesystem utilities'
-arch=('i686' 'x86_64')
url='http://jfs.sourceforge.net'
+arch=('i686' 'x86_64')
license=('GPL')
+depends=('util-linux')
+source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
+ 'inttypes.patch')
+sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50'
+ '88551e7d8418bab0df4643dce248110d4c9b0a53')
+
groups=('base')
-depends=('util-linux-ng')
-source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../inttypes.patch
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --sbindir=/sbin
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
diff --git a/abs/core/jfsutils/inttypes.patch b/abs/core/jfsutils/inttypes.patch
new file mode 100644
index 0000000..2018bb8
--- /dev/null
+++ b/abs/core/jfsutils/inttypes.patch
@@ -0,0 +1,12 @@
+diff -Naur old/libfs/devices.h new/libfs/devices.h
+--- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100
++++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER 87
+ #define ERROR_DISK_FULL 112
+
++#include <inttypes.h>
++
+ struct stat;
+
+ int ujfs_get_dev_size(FILE *, int64_t * size);
--
cgit v0.12
From 50b81af15276b7136fef966b4c100d393b554190 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:52:06 -0600
Subject: keyutils: 1.5.8 update binary path to /usr/bin refs #961
---
abs/core/keyutils/PKGBUILD | 34 ++++++++++++++++++--------------
abs/core/keyutils/request-key.conf.patch | 21 ++++++++++++++++++++
2 files changed, 40 insertions(+), 15 deletions(-)
create mode 100644 abs/core/keyutils/request-key.conf.patch
diff --git a/abs/core/keyutils/PKGBUILD b/abs/core/keyutils/PKGBUILD
index 463df40..417e929 100644
--- a/abs/core/keyutils/PKGBUILD
+++ b/abs/core/keyutils/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 162664 2012-06-27 18:33:40Z tpowa $
+# $Id: PKGBUILD 198652 2013-11-01 13:53:34Z eric $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=keyutils
-pkgver=1.5.5
-pkgrel=3
+pkgver=1.5.8
+pkgrel=1
pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://www.kernel.org"
license=('GPL2' 'LGPL2.1')
depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d759680b2f23c99af95938f5026f25fb')
+backup=('etc/request-key.conf')
+source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ request-key.conf.patch)
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix paths of binaries in /etc/request-key.conf
+ patch -Np0 -i ../request-key.conf.patch
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ cd ${pkgname}-${pkgver}
+ make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin'
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install
- # add nfsidmap to config file #30396
- echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf
- echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \
- >> $pkgdir/etc/request-key.conf
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install
}
+md5sums=('3c7f463039b83833c12a9414c2fcb389'
+ '89a819a7e4e90936b210c9d5020d296d')
diff --git a/abs/core/keyutils/request-key.conf.patch b/abs/core/keyutils/request-key.conf.patch
new file mode 100644
index 0000000..9ab4796
--- /dev/null
+++ b/abs/core/keyutils/request-key.conf.patch
@@ -0,0 +1,21 @@
+--- request-key.conf.old 2013-05-28 15:34:10.966001242 +0200
++++ request-key.conf 2013-05-28 15:35:34.857969598 +0200
+@@ -31,11 +31,11 @@
+
+ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ...
+ #====== ======= =============== =============== ===============================
+-create dns_resolver * * /sbin/key.dns_resolver %k
+-create user debug:* negate /bin/keyctl negate %k 30 %S
+-create user debug:* rejected /bin/keyctl reject %k 30 %c %S
+-create user debug:* expired /bin/keyctl reject %k 30 %c %S
+-create user debug:* revoked /bin/keyctl reject %k 30 %c %S
+-create user debug:loop:* * |/bin/cat
++create dns_resolver * * /usr/bin/key.dns_resolver %k
++create user debug:* negate /usr/bin/keyctl negate %k 30 %S
++create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S
++create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S
++create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S
++create user debug:loop:* * |/usr/bin/cat
+ create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
+-negate * * * /bin/keyctl negate %k 30 %S
++negate * * * /usr/bin/keyctl negate %k 30 %S
--
cgit v0.12
From 57da00f1efeef15771c989ac7884d43aa903efea Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:52:22 -0600
Subject: kmod: 16 update binary path to /usr/bin refs #961
---
abs/core/kmod/PKGBUILD | 31 +++++++++++++------------------
abs/core/kmod/kmod.install | 9 ---------
2 files changed, 13 insertions(+), 27 deletions(-)
delete mode 100644 abs/core/kmod/kmod.install
diff --git a/abs/core/kmod/PKGBUILD b/abs/core/kmod/PKGBUILD
index 18c3ee0..9227ad1 100644
--- a/abs/core/kmod/PKGBUILD
+++ b/abs/core/kmod/PKGBUILD
@@ -1,51 +1,44 @@
-# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $
+# $Id: PKGBUILD 203021 2014-01-01 17:44:12Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=kmod
-pkgver=9
-pkgrel=2
+pkgver=16
+pkgrel=1
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64')
url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
license=('GPL2')
depends=('glibc' 'zlib')
-options=('!libtool')
-provides=('module-init-tools=3.16')
+makedepends=('gtk-doc')
+options=('strip' 'debug')
+provides=('module-init-tools=3.16' 'libkmod.so')
conflicts=('module-init-tools')
replaces=('module-init-tools')
-install=kmod.install
source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
"depmod-search.conf")
-md5sums=('c8ae2d2694fbca2b28e238b30543a0cd'
- 'dd62cbf62bd8f212f51ef8c43bec9a77')
build() {
cd "$pkgname-$pkgver"
./configure \
--sysconfdir=/etc \
- --with-zlib \
- --with-rootprefix=/usr
+ --enable-gtk-doc \
+ --with-zlib
make
}
check() {
- # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p
- make -C "$pkgname-$pkgver" check || :
+ make -C "$pkgname-$pkgver" check
}
package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
# extra directories
- install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
-
- # add symlinks to kmod
- ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
- ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
+ install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d
- for tool in {ins,ls,rm}mod modinfo; do
+ for tool in {ins,ls,rm,dep}mod mod{probe,info}; do
ln -s kmod "$pkgdir/usr/bin/$tool"
done
@@ -54,3 +47,5 @@ package() {
}
# vim: ft=sh syn=sh et
+md5sums=('3006a0287211212501cdfe1211b29f09'
+ 'dd62cbf62bd8f212f51ef8c43bec9a77')
diff --git a/abs/core/kmod/kmod.install b/abs/core/kmod/kmod.install
deleted file mode 100644
index 0a2e88d..0000000
--- a/abs/core/kmod/kmod.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
- if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then
- echo "==> Kernel modules are now only read from /usr/lib/modules, all custom"
- echo " built kernels and modules must be moved there before rebooting."
- fi
-}
-
--
cgit v0.12
From aeeb1750810cd85ef5a1373e97de811aba59a1e9 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:53:03 -0600
Subject: krb5, libatasmart, libcap, ligbusb, linl, libsasl, lighttpd: update
binary path to /usr/bin refs #961
---
abs/core/krb5/PKGBUILD | 3 +-
abs/core/libatasmart/PKGBUILD | 10 +-
abs/core/libcap/PKGBUILD | 31 ++-
abs/core/libcap/libcap-2.23-header.patch | 350 +++++++++++++++++++++++++++++++
abs/core/libgpg-error/PKGBUILD | 13 +-
abs/core/libgusb/PKGBUILD | 14 +-
abs/core/libnl/PKGBUILD | 11 +-
abs/core/libsasl/PKGBUILD | 43 ++--
abs/core/lighttpd/PKGBUILD | 3 +-
9 files changed, 420 insertions(+), 58 deletions(-)
create mode 100644 abs/core/libcap/libcap-2.23-header.patch
diff --git a/abs/core/krb5/PKGBUILD b/abs/core/krb5/PKGBUILD
index 7452e06..9fce5eb 100644
--- a/abs/core/krb5/PKGBUILD
+++ b/abs/core/krb5/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=krb5
pkgver=1.10.2
-pkgrel=2
+pkgrel=3
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64')
url="http://web.mit.edu/kerberos/"
@@ -49,6 +49,7 @@ build() {
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
export CPPFLAGS+=" -I/usr/include/et"
./configure --prefix=/usr \
+ --sbindir=/usr/bin \
--mandir=/usr/share/man \
--localstatedir=/var/lib \
--enable-shared \
diff --git a/abs/core/libatasmart/PKGBUILD b/abs/core/libatasmart/PKGBUILD
index 36c54c9..0d003c0 100644
--- a/abs/core/libatasmart/PKGBUILD
+++ b/abs/core/libatasmart/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 160363 2012-06-01 12:58:30Z dreisner $
+# $Id: PKGBUILD 198126 2013-10-30 12:56:47Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libatasmart
-pkgver=0.18
+pkgver=0.19
pkgrel=2
pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
arch=('i686' 'x86_64')
license=('LGPL')
depends=('udev')
url="http://0pointer.de/blog/projects/being-smart.html"
-options=('!libtool')
-source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz")
-md5sums=('dc22b7acda1c2230f55ae98737e8b159')
+source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz")
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --sbindir=/usr/bin \
--disable-static
make
}
@@ -26,3 +25,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
+md5sums=('53afe2b155c36f658e121fe6def33e77')
diff --git a/abs/core/libcap/PKGBUILD b/abs/core/libcap/PKGBUILD
index 99d938b..b6dbd5a 100644
--- a/abs/core/libcap/PKGBUILD
+++ b/abs/core/libcap/PKGBUILD
@@ -1,18 +1,30 @@
-#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $
+#$Id: PKGBUILD 203064 2014-01-03 09:18:41Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libcap
-pkgver=2.22
-pkgrel=3
+pkgver=2.23
+pkgrel=2
pkgdesc="POSIX 1003.1e capabilities"
arch=('i686' 'x86_64')
url="http://sites.google.com/site/fullycapable/"
license=('GPL2')
depends=('glibc' 'attr')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-md5sums=('b4896816b626bea445f0b3849bdd4077'
- '9d0983e25e5a251d098507f9561d2b27')
+options=('!staticlibs')
+source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.23.tar.xz
+ libcap-2.23-header.patch)
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # install into /usr/bin
+ sed -i "/SBINDIR/s#sbin#bin#" Make.Rules
+
+ # fix header path issues
+ patch -p1 -i $srcdir/libcap-2.23-header.patch
+ # and fix the build with that patch
+ sed -i "s#uapi/##" libcap/Makefile
+}
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -21,11 +33,10 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install
-
- chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver}
- rm ${pkgdir}/usr/lib/libcap.a
+ make prefix=/usr lib=/lib DESTDIR=${pkgdir} RAISE_SETFCAP=no install
install -Dm644 pam_cap/capability.conf \
$pkgdir/usr/share/doc/$pkgname/capability.conf.example
}
+md5sums=('09a185e4b0aa8a81a51c1e4d0eba7db0'
+ '945984c4bf5e601c24a7c80f001fb2c6')
diff --git a/abs/core/libcap/libcap-2.23-header.patch b/abs/core/libcap/libcap-2.23-header.patch
new file mode 100644
index 0000000..74c45e0
--- /dev/null
+++ b/abs/core/libcap/libcap-2.23-header.patch
@@ -0,0 +1,350 @@
+From c3290668646b767058e55b29f7b8f4be4af2e660 Mon Sep 17 00:00:00 2001
+From: Andrew G Morgan <morgan@kernel.org>
+Date: Thu, 02 Jan 2014 01:56:31 +0000
+Subject: Fix up the uapi/linux include scheme.
+
+In adopting this uapi header file (without kernel internals), I previously
+messed up on the apparent location of the files. Thanks to Tom Gundersen for
+the clarification. Also, delete the non-uapi copies of things since they
+are no longer needed to build the library and tools.
+
+Signed-off-by: Andrew G Morgan <morgan@kernel.org>
+---
+diff --git a/Make.Rules b/Make.Rules
+index 9ca6c89..5b58c59 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -45,8 +45,8 @@ MINOR=23
+
+ # Compilation specifics
+
+-KERNEL_HEADERS := $(topdir)/libcap/include
+-IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
++KERNEL_HEADERS := $(topdir)/libcap/include/uapi
++IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+
+ CC := gcc
+ CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
+deleted file mode 100644
+index a6ee1f9..0000000
+--- a/libcap/include/linux/capability.h
++++ /dev/null
+@@ -1,219 +0,0 @@
+-/*
+- * This is <linux/capability.h>
+- *
+- * Andrew G. Morgan <morgan@kernel.org>
+- * Alexander Kjeldaas <astor@guardian.no>
+- * with help from Aleph1, Roland Buresund and Andrew Main.
+- *
+- * See here for the libcap library ("POSIX draft" compliance):
+- *
+- * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+- */
+-#ifndef _LINUX_CAPABILITY_H
+-#define _LINUX_CAPABILITY_H
+-
+-#include <uapi/linux/capability.h>
+-
+-
+-#define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
+-#define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3
+-
+-extern int file_caps_enabled;
+-
+-typedef struct kernel_cap_struct {
+- __u32 cap[_KERNEL_CAPABILITY_U32S];
+-} kernel_cap_t;
+-
+-/* exact same as vfs_cap_data but in cpu endian and always filled completely */
+-struct cpu_vfs_cap_data {
+- __u32 magic_etc;
+- kernel_cap_t permitted;
+- kernel_cap_t inheritable;
+-};
+-
+-#define _USER_CAP_HEADER_SIZE (sizeof(struct __user_cap_header_struct))
+-#define _KERNEL_CAP_T_SIZE (sizeof(kernel_cap_t))
+-
+-
+-struct file;
+-struct inode;
+-struct dentry;
+-struct user_namespace;
+-
+-struct user_namespace *current_user_ns(void);
+-
+-extern const kernel_cap_t __cap_empty_set;
+-extern const kernel_cap_t __cap_init_eff_set;
+-
+-/*
+- * Internal kernel functions only
+- */
+-
+-#define CAP_FOR_EACH_U32(__capi) \
+- for (__capi = 0; __capi < _KERNEL_CAPABILITY_U32S; ++__capi)
+-
+-/*
+- * CAP_FS_MASK and CAP_NFSD_MASKS:
+- *
+- * The fs mask is all the privileges that fsuid==0 historically meant.
+- * At one time in the past, that included CAP_MKNOD and CAP_LINUX_IMMUTABLE.
+- *
+- * It has never meant setting security.* and trusted.* xattrs.
+- *
+- * We could also define fsmask as follows:
+- * 1. CAP_FS_MASK is the privilege to bypass all fs-related DAC permissions
+- * 2. The security.* and trusted.* xattrs are fs-related MAC permissions
+- */
+-
+-# define CAP_FS_MASK_B0 (CAP_TO_MASK(CAP_CHOWN) \
+- | CAP_TO_MASK(CAP_MKNOD) \
+- | CAP_TO_MASK(CAP_DAC_OVERRIDE) \
+- | CAP_TO_MASK(CAP_DAC_READ_SEARCH) \
+- | CAP_TO_MASK(CAP_FOWNER) \
+- | CAP_TO_MASK(CAP_FSETID))
+-
+-# define CAP_FS_MASK_B1 (CAP_TO_MASK(CAP_MAC_OVERRIDE))
+-
+-#if _KERNEL_CAPABILITY_U32S != 2
+-# error Fix up hand-coded capability macro initializers
+-#else /* HAND-CODED capability initializers */
+-
+-# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
+-# define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }})
+-# define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+- | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
+- CAP_FS_MASK_B1 } })
+-# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+- | CAP_TO_MASK(CAP_SYS_RESOURCE), \
+- CAP_FS_MASK_B1 } })
+-
+-#endif /* _KERNEL_CAPABILITY_U32S != 2 */
+-
+-# define cap_clear(c) do { (c) = __cap_empty_set; } while (0)
+-
+-#define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))
+-#define cap_lower(c, flag) ((c).cap[CAP_TO_INDEX(flag)] &= ~CAP_TO_MASK(flag))
+-#define cap_raised(c, flag) ((c).cap[CAP_TO_INDEX(flag)] & CAP_TO_MASK(flag))
+-
+-#define CAP_BOP_ALL(c, a, b, OP) \
+-do { \
+- unsigned __capi; \
+- CAP_FOR_EACH_U32(__capi) { \
+- c.cap[__capi] = a.cap[__capi] OP b.cap[__capi]; \
+- } \
+-} while (0)
+-
+-#define CAP_UOP_ALL(c, a, OP) \
+-do { \
+- unsigned __capi; \
+- CAP_FOR_EACH_U32(__capi) { \
+- c.cap[__capi] = OP a.cap[__capi]; \
+- } \
+-} while (0)
+-
+-static inline kernel_cap_t cap_combine(const kernel_cap_t a,
+- const kernel_cap_t b)
+-{
+- kernel_cap_t dest;
+- CAP_BOP_ALL(dest, a, b, |);
+- return dest;
+-}
+-
+-static inline kernel_cap_t cap_intersect(const kernel_cap_t a,
+- const kernel_cap_t b)
+-{
+- kernel_cap_t dest;
+- CAP_BOP_ALL(dest, a, b, &);
+- return dest;
+-}
+-
+-static inline kernel_cap_t cap_drop(const kernel_cap_t a,
+- const kernel_cap_t drop)
+-{
+- kernel_cap_t dest;
+- CAP_BOP_ALL(dest, a, drop, &~);
+- return dest;
+-}
+-
+-static inline kernel_cap_t cap_invert(const kernel_cap_t c)
+-{
+- kernel_cap_t dest;
+- CAP_UOP_ALL(dest, c, ~);
+- return dest;
+-}
+-
+-static inline int cap_isclear(const kernel_cap_t a)
+-{
+- unsigned __capi;
+- CAP_FOR_EACH_U32(__capi) {
+- if (a.cap[__capi] != 0)
+- return 0;
+- }
+- return 1;
+-}
+-
+-/*
+- * Check if "a" is a subset of "set".
+- * return 1 if ALL of the capabilities in "a" are also in "set"
+- * cap_issubset(0101, 1111) will return 1
+- * return 0 if ANY of the capabilities in "a" are not in "set"
+- * cap_issubset(1111, 0101) will return 0
+- */
+-static inline int cap_issubset(const kernel_cap_t a, const kernel_cap_t set)
+-{
+- kernel_cap_t dest;
+- dest = cap_drop(a, set);
+- return cap_isclear(dest);
+-}
+-
+-/* Used to decide between falling back on the old suser() or fsuser(). */
+-
+-static inline int cap_is_fs_cap(int cap)
+-{
+- const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+- return !!(CAP_TO_MASK(cap) & __cap_fs_set.cap[CAP_TO_INDEX(cap)]);
+-}
+-
+-static inline kernel_cap_t cap_drop_fs_set(const kernel_cap_t a)
+-{
+- const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+- return cap_drop(a, __cap_fs_set);
+-}
+-
+-static inline kernel_cap_t cap_raise_fs_set(const kernel_cap_t a,
+- const kernel_cap_t permitted)
+-{
+- const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+- return cap_combine(a,
+- cap_intersect(permitted, __cap_fs_set));
+-}
+-
+-static inline kernel_cap_t cap_drop_nfsd_set(const kernel_cap_t a)
+-{
+- const kernel_cap_t __cap_fs_set = CAP_NFSD_SET;
+- return cap_drop(a, __cap_fs_set);
+-}
+-
+-static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,
+- const kernel_cap_t permitted)
+-{
+- const kernel_cap_t __cap_nfsd_set = CAP_NFSD_SET;
+- return cap_combine(a,
+- cap_intersect(permitted, __cap_nfsd_set));
+-}
+-
+-extern bool has_capability(struct task_struct *t, int cap);
+-extern bool has_ns_capability(struct task_struct *t,
+- struct user_namespace *ns, int cap);
+-extern bool has_capability_noaudit(struct task_struct *t, int cap);
+-extern bool has_ns_capability_noaudit(struct task_struct *t,
+- struct user_namespace *ns, int cap);
+-extern bool capable(int cap);
+-extern bool ns_capable(struct user_namespace *ns, int cap);
+-extern bool inode_capable(const struct inode *inode, int cap);
+-extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
+-
+-/* audit system wants to get cap info from files as well */
+-extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
+-
+-#endif /* !_LINUX_CAPABILITY_H */
+diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
+index 56fc7fd..64ac50e 100644
+--- a/libcap/include/sys/capability.h
++++ b/libcap/include/sys/capability.h
+@@ -26,7 +26,7 @@ extern "C" {
+ #ifndef __user
+ #define __user
+ #endif
+-#include <uapi/linux/capability.h>
++#include <linux/capability.h>
+ #include <linux/xattr.h>
+
+ /*
+diff --git a/libcap/include/linux/prctl.h b/libcap/include/uapi/linux/prctl.h
+index a3baeb2..289760f 100644
+--- a/libcap/include/linux/prctl.h
++++ b/libcap/include/uapi/linux/prctl.h
+@@ -102,4 +102,51 @@
+
+ #define PR_MCE_KILL_GET 34
+
++/*
++ * Tune up process memory map specifics.
++ */
++#define PR_SET_MM 35
++# define PR_SET_MM_START_CODE 1
++# define PR_SET_MM_END_CODE 2
++# define PR_SET_MM_START_DATA 3
++# define PR_SET_MM_END_DATA 4
++# define PR_SET_MM_START_STACK 5
++# define PR_SET_MM_START_BRK 6
++# define PR_SET_MM_BRK 7
++# define PR_SET_MM_ARG_START 8
++# define PR_SET_MM_ARG_END 9
++# define PR_SET_MM_ENV_START 10
++# define PR_SET_MM_ENV_END 11
++# define PR_SET_MM_AUXV 12
++# define PR_SET_MM_EXE_FILE 13
++
++/*
++ * Set specific pid that is allowed to ptrace the current task.
++ * A value of 0 mean "no process".
++ */
++#define PR_SET_PTRACER 0x59616d61
++# define PR_SET_PTRACER_ANY ((unsigned long)-1)
++
++#define PR_SET_CHILD_SUBREAPER 36
++#define PR_GET_CHILD_SUBREAPER 37
++
++/*
++ * If no_new_privs is set, then operations that grant new privileges (i.e.
++ * execve) will either fail or not grant them. This affects suid/sgid,
++ * file capabilities, and LSMs.
++ *
++ * Operations that merely manipulate or drop existing privileges (setresuid,
++ * capset, etc.) will still work. Drop those privileges if you want them gone.
++ *
++ * Changing LSM security domain is considered a new privilege. So, for example,
++ * asking selinux for a specific new context (e.g. with runcon) will result
++ * in execve returning -EPERM.
++ *
++ * See Documentation/prctl/no_new_privs.txt for more details.
++ */
++#define PR_SET_NO_NEW_PRIVS 38
++#define PR_GET_NO_NEW_PRIVS 39
++
++#define PR_GET_TID_ADDRESS 40
++
+ #endif /* _LINUX_PRCTL_H */
+diff --git a/libcap/include/linux/securebits.h b/libcap/include/uapi/linux/securebits.h
+index 3340617..985aac9 100644
+--- a/libcap/include/linux/securebits.h
++++ b/libcap/include/uapi/linux/securebits.h
+@@ -1,14 +1,11 @@
+-#ifndef _LINUX_SECUREBITS_H
+-#define _LINUX_SECUREBITS_H 1
++#ifndef _UAPI_LINUX_SECUREBITS_H
++#define _UAPI_LINUX_SECUREBITS_H
+
+ /* Each securesetting is implemented using two bits. One bit specifies
+ whether the setting is on or off. The other bit specify whether the
+ setting is locked or not. A setting which is locked cannot be
+ changed from user-level. */
+ #define issecure_mask(X) (1 << (X))
+-#ifdef __KERNEL__
+-#define issecure(X) (issecure_mask(X) & current_cred_xxx(securebits))
+-#endif
+
+ #define SECUREBITS_DEFAULT 0x00000000
+
+@@ -51,4 +48,4 @@
+ issecure_mask(SECURE_KEEP_CAPS))
+ #define SECURE_ALL_LOCKS (SECURE_ALL_BITS << 1)
+
+-#endif /* !_LINUX_SECUREBITS_H */
++#endif /* _UAPI_LINUX_SECUREBITS_H */
+--
+cgit v0.9.2
diff --git a/abs/core/libgpg-error/PKGBUILD b/abs/core/libgpg-error/PKGBUILD
index c0cc77f..5f3d0bb 100644
--- a/abs/core/libgpg-error/PKGBUILD
+++ b/abs/core/libgpg-error/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $
+# $Id: PKGBUILD 197822 2013-10-30 11:04:47Z allan $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=libgpg-error
-pkgver=1.10
-pkgrel=2
+pkgver=1.12
+pkgrel=1
pkgdesc="Support library for libgcrypt"
arch=(i686 x86_64)
url="http://www.gnupg.org"
license=('LGPL')
depends=('glibc' 'sh')
-options=(!libtool)
-source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig})
#ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('736a03daa9dc5873047d4eb4a9c22a16')
-
+sha1sums=('259f359cd1440b21840c3a78e852afd549c709b8'
+ 'SKIP')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/abs/core/libgusb/PKGBUILD b/abs/core/libgusb/PKGBUILD
index ec1f261..4c38e81 100644
--- a/abs/core/libgusb/PKGBUILD
+++ b/abs/core/libgusb/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 144366 2011-12-05 11:59:52Z ibiru $
+# $Id: PKGBUILD 198178 2013-10-30 13:16:56Z allan $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=libgusb
-pkgver=0.1.3
+pkgver=0.1.6
pkgrel=1
pkgdesc="GLib wrapper around libusb1"
arch=('i686' 'x86_64')
url="https://gitorious.org/gusb/"
license=('LGPL2.1')
-depends=('udev')
+depends=('udev' 'libusbx')
+makedepends=('gobject-introspection')
source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6')
+sha256sums=('900103ff24a851ef8395b992236ced0aedb4c265ef2264f6ad8349300095198b')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --disable-static
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/abs/core/libnl/PKGBUILD b/abs/core/libnl/PKGBUILD
index da91aed..54273db 100644
--- a/abs/core/libnl/PKGBUILD
+++ b/abs/core/libnl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162745 2012-06-29 11:46:12Z thomas $
+# $Id: PKGBUILD 200720 2013-12-03 10:31:08Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=libnl
-pkgver=3.2.11
+pkgver=3.2.23
pkgrel=1
pkgdesc="Library for applications dealing with netlink sockets"
arch=(i686 x86_64)
@@ -10,12 +10,11 @@ url="http://www.infradead.org/~tgr/libnl/"
license=(GPL)
depends=(glibc)
backup=(etc/libnl/classid etc/libnl/pktloc)
-options=(!libtool)
source=("$url/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d')
+sha256sums=('8cc2cda9aa8cbbad384b9bb1ba0f6777ed9bf65e1cc3170d8c2ba5b3ee12f2b3')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -25,6 +24,6 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/abs/core/libsasl/PKGBUILD b/abs/core/libsasl/PKGBUILD
index e668cda..2d2de46 100644
--- a/abs/core/libsasl/PKGBUILD
+++ b/abs/core/libsasl/PKGBUILD
@@ -8,7 +8,7 @@
#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
pkgname=libsasl
pkgver=2.1.23
-pkgrel=9
+pkgrel=10
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/"
@@ -35,26 +35,6 @@ source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
0030-dont_use_la_files_for_opening_plugins.patch
saslauthd.conf.d
saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
- 'e27ddff076342e7a3041c4759817d04b'
- 'd7e6886e88af04d05f3dec7f0a59ccf7'
- '79b8a5e8689989e2afd4b7bda595a7b1'
- 'f4131b077ddb5240b375d749162f1b7a'
- 'c7ad2c70c1ef814eb4b119f316c064f2'
- 'caeeac3feba19cbbd36e7345cc805600'
- 'f45d8b60e8f74dd7f7c2ec1665fa602a'
- '9d93880514cb5ff5da969f1ceb64a661'
- 'dfdc052a7e678db9f687482c5d52f34e'
- '4a09f6b24b91f8450892a78e378860da'
- '213abe7c5dfe0d7f446992787da1e780'
- '5a0321177ad30cb5518c8b6812e3961a'
- '0c965748970eea29fa295524821d43f0'
- '62bf892fe4d1df41ff748e91a1afaf67'
- 'b7848957357e7c02d6490102be496bf9'
- 'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
- '8e7106f32e495e9ade69014fd1b3352a'
- '49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20')
build() {
cd "${srcdir}/cyrus-sasl-${pkgver}"
@@ -97,6 +77,7 @@ build() {
popd
./configure --prefix=/usr \
+ --sbin=/usr/bin \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-static \
@@ -200,3 +181,23 @@ package_cyrus-sasl-sql() {
install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
}
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+ 'e27ddff076342e7a3041c4759817d04b'
+ 'd7e6886e88af04d05f3dec7f0a59ccf7'
+ '79b8a5e8689989e2afd4b7bda595a7b1'
+ 'f4131b077ddb5240b375d749162f1b7a'
+ 'c7ad2c70c1ef814eb4b119f316c064f2'
+ 'caeeac3feba19cbbd36e7345cc805600'
+ 'f45d8b60e8f74dd7f7c2ec1665fa602a'
+ '9d93880514cb5ff5da969f1ceb64a661'
+ 'dfdc052a7e678db9f687482c5d52f34e'
+ '4a09f6b24b91f8450892a78e378860da'
+ '213abe7c5dfe0d7f446992787da1e780'
+ '5a0321177ad30cb5518c8b6812e3961a'
+ '0c965748970eea29fa295524821d43f0'
+ '62bf892fe4d1df41ff748e91a1afaf67'
+ 'b7848957357e7c02d6490102be496bf9'
+ 'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
+ '8e7106f32e495e9ade69014fd1b3352a'
+ '49219af5641150edec288a3fdb65e7c1'
+ '75542f613185d5a90520ad0d7d926a20')
diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index 5a4cb34..a29db8e 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=lighttpd
pkgver=1.4.32
-pkgrel=2
+pkgrel=3
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -24,6 +24,7 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr \
+ --sbindir=/usr/bin \
--libexecdir=/usr/lib/lighttpd/modules \
--sysconfdir=/etc/lighttpd \
--sharedstatedir=/usr/var \
--
cgit v0.12
From 46b1b65c62ea8424eb1a09e3052ab8a050a34505 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:53:40 -0600
Subject: linux kernel: update to 3.12
---
abs/core/linux-api-headers/PKGBUILD | 10 +-
abs/core/linux/3.12-btrfs-relocate-csums.patch | 63 +
abs/core/linux/PKGBUILD | 125 +-
.../linux/change-default-console-loglevel.patch | 6 +-
abs/core/linux/config | 1837 ++++++++++++--------
abs/core/linux/config.x86_64 | 1701 +++++++++++-------
abs/core/linux/config.x86_64.last | 1712 +++++++++++-------
abs/core/linux/criu-no-expert.patch | 22 +
abs/core/linux/irq_cfg_pointer-3.6.6.patch | 16 -
abs/core/linux/linux.install | 40 +-
abs/core/linux/linux.install.pkg | 31 +
abs/core/linux/module-init-wait-3.6.patch | 77 -
abs/core/linux/module-symbol-waiting-3.6.patch | 66 -
13 files changed, 3518 insertions(+), 2188 deletions(-)
create mode 100644 abs/core/linux/3.12-btrfs-relocate-csums.patch
create mode 100644 abs/core/linux/criu-no-expert.patch
delete mode 100644 abs/core/linux/irq_cfg_pointer-3.6.6.patch
create mode 100644 abs/core/linux/linux.install.pkg
delete mode 100644 abs/core/linux/module-init-wait-3.6.patch
delete mode 100644 abs/core/linux/module-symbol-waiting-3.6.patch
diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD
index 2af0c10..b0dea0b 100644
--- a/abs/core/linux-api-headers/PKGBUILD
+++ b/abs/core/linux-api-headers/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169772 2012-10-28 11:11:51Z allan $
+# $Id: PKGBUILD 201556 2013-12-15 06:41:30Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=linux-api-headers
-pkgver=3.6.3
-_basever=3.6
+pkgver=3.12.4
+_basever=3.12
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace"
arch=('i686' 'x86_64')
@@ -16,6 +16,8 @@ source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
# NOTE: signatures are not automatically verified by makepkg
#http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
+md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
+ '511b5a2f0de55b5e91fd293766ce182b')
build() {
cd ${srcdir}/linux-${_basever}
@@ -35,5 +37,3 @@ package() {
# clean-up unnecessary files generated during install
find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
}
-md5sums=('1a1760420eac802c541a20ab51a093d1'
- '96701113d37ef4f9b785206ab8bcc71e')
diff --git a/abs/core/linux/3.12-btrfs-relocate-csums.patch b/abs/core/linux/3.12-btrfs-relocate-csums.patch
new file mode 100644
index 0000000..7209276
--- /dev/null
+++ b/abs/core/linux/3.12-btrfs-relocate-csums.patch
@@ -0,0 +1,63 @@
+From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <jbacik@fusionio.com>
+Date: Fri, 27 Sep 2013 13:33:09 +0000
+Subject: Btrfs: relocate csums properly with prealloc extents
+
+A user reported a problem where they were getting csum errors when running a
+balance and running systemd's journal. This is because systemd is awesome and
+fallocate()'s its log space and writes into it. Unfortunately we assume that
+when we read in all the csums for an extent that they are sequential starting at
+the bytenr we care about. This obviously isn't the case for prealloc extents,
+where we could have written to the middle of the prealloc extent only, which
+means the csum would be for the bytenr in the middle of our range and not the
+front of our range. Fix this by offsetting the new bytenr we are logging to
+based on the original bytenr the csum was for. With this patch I no longer see
+the csum errors I was seeing. Thanks,
+
+Cc: stable@vger.kernel.org
+Reported-by: Chris Murphy <lists@colorremedies.com>
+Signed-off-by: Josef Bacik <jbacik@fusionio.com>
+Signed-off-by: Chris Mason <chris.mason@fusionio.com>
+---
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index dec4f5a..0359eec 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ struct btrfs_root *root = BTRFS_I(inode)->root;
+ int ret;
+ u64 disk_bytenr;
++ u64 new_bytenr;
+ LIST_HEAD(list);
+
+ ordered = btrfs_lookup_ordered_extent(inode, file_pos);
+@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ if (ret)
+ goto out;
+
+- disk_bytenr = ordered->start;
+ while (!list_empty(&list)) {
+ sums = list_entry(list.next, struct btrfs_ordered_sum, list);
+ list_del_init(&sums->list);
+
+- sums->bytenr = disk_bytenr;
+- disk_bytenr += sums->len;
++ /*
++ * We need to offset the new_bytenr based on where the csum is.
++ * We need to do this because we will read in entire prealloc
++ * extents but we may have written to say the middle of the
++ * prealloc extent, so we need to make sure the csum goes with
++ * the right disk offset.
++ *
++ * We can do this because the data reloc inode refers strictly
++ * to the on disk bytes, so we don't have to worry about
++ * disk_len vs real len like with real inodes since it's all
++ * disk length.
++ */
++ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
++ sums->bytenr = new_bytenr;
+
+ btrfs_add_ordered_sum(inode, ordered, sums);
+ }
+--
+cgit v0.9.2
diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD
index 0784623..478bc95 100644
--- a/abs/core/linux/PKGBUILD
+++ b/abs/core/linux/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
+# $Id: PKGBUILD 202755 2013-12-26 10:19:24Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
-_srcname=linux-3.6
-pkgver=3.6.7
+_srcname=linux-3.12
+pkgver=3.12.6
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
@@ -19,13 +19,24 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- 'module-symbol-waiting-3.6.patch'
- 'module-init-wait-3.6.patch'
- 'irq_cfg_pointer-3.6.6.patch')
+ 'criu-no-expert.patch')
+md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
+ '9e75be8b127e58f1a76c0015eabb12ae'
+ '5259c05d5791002e81cb6eca368caa60'
+ 'a884d449ea454a75e9d0b6165336734c'
+ 'eb14dcfd80c00852ef81ded6e826826a'
+ '98beb36f9b8cf16e58de2483ea9985e3'
+ 'd50c1ac47394e9aec637002ef3392bd1')
_kernelname=${pkgbase#linux}
-build() {
+# module.symbols md5sums
+# x86_64
+# 23ef8d9dae0c916c9e1a7a07b77f797d /lib/modules/3.12.6-1-ARCH/modules.symbols
+# i686
+# eadbff034e17f92ccb4a7737302f3dbd /lib/modules/3.12.6-1-ARCH/modules.symbols
+
+prepare() {
cd "${srcdir}/${_srcname}"
# add upstream patch
@@ -39,13 +50,9 @@ build() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix module initialisation
- # https://bugs.archlinux.org/task/32122
- patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
- patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
-
- # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
- patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+ # allow criu without expert option set
+ # patch from fedora
+ patch -Np1 -i "${srcdir}/criu-no-expert.patch"
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
@@ -63,6 +70,10 @@ build() {
# don't run depmod on 'make install'. We'll do this ourselves in packaging
sed -i '2iexit 0' scripts/depmod.sh
+}
+
+build() {
+ cd "${srcdir}/${_srcname}"
# get kernel version
make prepare
@@ -96,7 +107,7 @@ build() {
}
_package() {
- pkgdesc="The ${pkgbase} kernel and modules"
+ pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
[ "${pkgbase}" = "linux" ] && groups=('base')
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country')
@@ -115,6 +126,7 @@ _package() {
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
+ echo mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
@@ -122,14 +134,16 @@ _package() {
# add vmlinux
install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
- # install fallback mkinitcpio.conf file and preset file for kernel
- install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
# set correct depmod command for install
+ cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+ true && install=${install}.pkg
sed \
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
- -i "${startdir}/linux.install"
+ -i "${startdir}/${install}"
+
+ # install mkinitcpio preset file for kernel
+ install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
sed \
-e "1s|'linux.*'|'${pkgbase}'|" \
-e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
@@ -149,16 +163,15 @@ _package() {
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
- # Now we call depmod...
-
- echo depmod -b "$pkgdir" -F System.map "$_kernver"
# move module tree /lib -> /usr/lib
mv "$pkgdir/lib" "$pkgdir/usr"
-read a
+ # Now we call depmod...
+ depmod -b "$pkgdir" -F System.map "$_kernver"
+
}
_package-headers() {
- pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+ pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
provides=("kernel26${_kernelname}-headers=${pkgver}")
conflicts=("kernel26${_kernelname}-headers")
replaces=("kernel26${_kernelname}-headers")
@@ -178,8 +191,8 @@ _package-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
- for i in acpi asm-generic config crypto drm generated linux math-emu \
- media mtd net pcmcia scsi sound trace video xen; do
+ for i in acpi asm-generic config crypto drm generated keys linux math-emu \
+ media net pcmcia scsi sound trace uapi video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
@@ -206,13 +219,22 @@ _package-headers() {
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
# add headers for lirc package
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
- cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
- for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
- cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+ # pci
+ for i in bt8xx cx88 saa7134; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+ cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+ done
+ # usb
+ for i in cpia2 em28xx pwc sn9c102; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+ cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+ done
+ # i2c
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
+ cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+ for i in cx25840; do
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+ cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
done
# add docbook makefile
@@ -234,8 +256,8 @@ _package-headers() {
# add dvb headers for external modules
# in reference to:
# http://bugs.archlinux.org/task/9912
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
- cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
+ cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
# and...
# http://bugs.archlinux.org/task/11194
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
@@ -244,19 +266,19 @@ _package-headers() {
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
# in reference to:
# http://bugs.archlinux.org/task/13146
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
# add dvb headers
# in reference to:
# http://bugs.archlinux.org/task/20402
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
- cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
- cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
- cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
+ cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
+ cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
+ cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
# add xfs and shmem for aufs building
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
@@ -285,11 +307,11 @@ _package-headers() {
done
# remove unneeded architectures
- rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+ rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
}
_package-docs() {
- pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+ pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
provides=("kernel26${_kernelname}-docs=${pkgver}")
conflicts=("kernel26${_kernelname}-docs")
replaces=("kernel26${_kernelname}-docs")
@@ -313,12 +335,3 @@ for _p in ${pkgname[@]}; do
done
# vim:set ts=8 sts=2 sw=2 et:
-md5sums=('1a1760420eac802c541a20ab51a093d1'
- '134936c362d8812b5cafcf3c67afdce0'
- '65f7ff39775f20f65014383564d3cb65'
- '3adbfa45451c4bcf9dd7879bed033d77'
- 'eb14dcfd80c00852ef81ded6e826826a'
- '9d3c56a4b999c8bfbd4018089a62f662'
- '670931649c60fcb3ef2e0119ed532bd4'
- '8a71abc4224f575008f974a099b5cf6f'
- '4909a0271af4e5f373136b382826717f')
diff --git a/abs/core/linux/change-default-console-loglevel.patch b/abs/core/linux/change-default-console-loglevel.patch
index 63435d8..22cd69a 100644
--- a/abs/core/linux/change-default-console-loglevel.patch
+++ b/abs/core/linux/change-default-console-loglevel.patch
@@ -1,12 +1,12 @@
diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
+--- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/printk.c 2011-07-27 14:43:07.000000000 +0300
@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
/* We show everything that is MORE important than this.. */
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_WARNING */
DECLARE_WAIT_QUEUE_HEAD(log_wait);
diff --git a/abs/core/linux/config b/abs/core/linux/config
index 2bd1ccb..3e9e503 100644
--- a/abs/core/linux/config
+++ b/abs/core/linux/config
@@ -1,10 +1,9 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.6.3 Kernel Configuration
+# Linux/x86 3.12.0-1 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"
@@ -18,13 +17,10 @@ CONFIG_NEED_SG_DMA_LENGTH=y
CONFIG_GENERIC_ISA_DMA=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_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -32,6 +28,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
# CONFIG_ZONE_DMA32 is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -43,16 +41,15 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
-CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-ARCH"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
@@ -60,35 +57,29 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 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=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
#
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -108,24 +99,46 @@ CONFIG_GENERIC_CMOS_UPDATE=y
# Timers subsystem
#
CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
# RCU Subsystem
#
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_FANOUT=32
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -150,9 +163,12 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -162,20 +178,22 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
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_HAVE_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -184,6 +202,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
# CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y
@@ -193,11 +212,11 @@ CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_EVENTS=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_SLUB_CPU_PARTIAL=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -206,14 +225,18 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
@@ -225,6 +248,8 @@ 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_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -233,6 +258,13 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
#
# GCOV-based kernel profiling
@@ -248,6 +280,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
@@ -255,12 +288,14 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
@@ -278,6 +313,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
#
# IO Schedulers
@@ -292,35 +328,8 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
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_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -331,22 +340,22 @@ CONFIG_SMP=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_X86_32_IRIS=m
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
# CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG 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
@@ -373,14 +382,8 @@ CONFIG_M686=y
# CONFIG_MATOM is not set
CONFIG_X86_GENERIC=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
@@ -395,11 +398,9 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -422,6 +423,9 @@ CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_LIB=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_NOHIGHMEM is not set
@@ -429,8 +433,6 @@ CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -445,8 +447,10 @@ CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -465,6 +469,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -477,6 +484,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
@@ -495,6 +503,8 @@ CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -519,13 +529,14 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
@@ -538,15 +549,16 @@ CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
@@ -567,6 +579,7 @@ CONFIG_APM_DO_ENABLE=y
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -582,12 +595,15 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
# x86 CPU frequency scaling drivers
#
+CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K6=m
CONFIG_X86_POWERNOW_K7=m
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
CONFIG_X86_GX_SUSPMOD=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=m
@@ -603,7 +619,12 @@ CONFIG_X86_E_POWERSAVER=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -623,9 +644,8 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_OLPC=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
@@ -635,7 +655,6 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -647,6 +666,10 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
@@ -680,12 +703,11 @@ CONFIG_I82365=m
CONFIG_TCIC=m
CONFIG_PCMCIA_PROBE=y
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
+CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_COMPAQ=m
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -697,11 +719,16 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -709,17 +736,19 @@ CONFIG_RAPIDIO_TSI500=y
CONFIG_BINFMT_ELF=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_NET=y
#
# Networking options
#
CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
@@ -742,13 +771,13 @@ CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
@@ -760,8 +789,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -799,6 +828,7 @@ CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
@@ -825,6 +855,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@@ -844,7 +875,17 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -870,10 +911,12 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -885,9 +928,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
# Xtables matches
#
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -985,7 +1030,6 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -993,24 +1037,16 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
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
@@ -1039,9 +1075,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1068,7 +1108,7 @@ CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
#
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=y
@@ -1082,11 +1122,12 @@ CONFIG_IP_DCCP_TFRC_LIB=y
CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
@@ -1102,11 +1143,18 @@ CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_STP=m
+CONFIG_MRP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
CONFIG_LLC=m
CONFIG_LLC2=m
@@ -1120,10 +1168,8 @@ CONFIG_COPS_DAYNA=y
CONFIG_COPS_TANGENT=y
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
@@ -1153,6 +1199,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1189,13 +1236,24 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
#
# Network testing
@@ -1289,9 +1347,9 @@ CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1368,16 +1426,21 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
# CONFIG_NFC_SHDLC is not set
-# CONFIG_NFC_LLCP is not set
#
# Near Field Communication (NFC) devices
#
-CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
#
# Device Drivers
@@ -1392,17 +1455,22 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
+
+#
+# Bus devices
+#
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1411,13 +1479,13 @@ CONFIG_MTD_REDBOOT_PARTS=m
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_OF_PARTS=m
CONFIG_MTD_AR7_PARTS=m
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_BLOCK_RO=m
@@ -1486,6 +1554,9 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_PHRAM=m
CONFIG_MTD_MTDRAM=m
@@ -1496,32 +1567,10 @@ CONFIG_MTD_BLOCK2MTD=m
#
# Disk-On-Chip Device Drivers
#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
CONFIG_MTD_DOCG3=m
CONFIG_BCH_CONST_M=14
CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -1531,7 +1580,8 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_OF=y
@@ -1543,8 +1593,6 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
@@ -1553,8 +1601,8 @@ CONFIG_OF_MTD=y
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
@@ -1571,7 +1619,6 @@ CONFIG_ISAPNP=y
CONFIG_PNPACPI=y
CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
CONFIG_BLK_CPQ_DA=m
@@ -1589,7 +1636,6 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1601,6 +1647,7 @@ CONFIG_ATA_OVER_ETH=m
CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
#
# Misc devices
@@ -1608,13 +1655,15 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_CS5535_MFGPT=m
CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
@@ -1629,11 +1678,15 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
CONFIG_VMWARE_BALLOON=m
CONFIG_BMP085=y
CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
# CONFIG_PCH_PHUB is not set
CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -1641,9 +1694,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
# EEPROM support
#
CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1659,6 +1714,8 @@ CONFIG_SENSORS_LIS3_I2C=m
#
CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1687,7 +1744,7 @@ CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1742,6 +1799,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1750,7 +1808,12 @@ CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_FLASHPOINT is not set
@@ -1813,6 +1876,7 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
@@ -1832,6 +1896,7 @@ CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
CONFIG_SATA_PMP=y
#
@@ -1856,9 +1921,11 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
@@ -1936,17 +2003,24 @@ CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1958,6 +2032,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -1994,23 +2069,22 @@ CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
+CONFIG_MII=m
CONFIG_NET_CORE=y
CONFIG_BONDING=m
CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
# CONFIG_NET_FC is not set
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -2022,6 +2096,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
CONFIG_SUNGEM_PHY=m
# CONFIG_ARCNET is not set
CONFIG_ATM_DRIVERS=y
@@ -2062,10 +2137,23 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
CONFIG_EL3=m
CONFIG_3C515=m
CONFIG_PCMCIA_3C574=m
@@ -2081,14 +2169,19 @@ CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_LANCE=m
CONFIG_PCNET32=m
-CONFIG_DEPCA=m
CONFIG_PCMCIA_NMCLAN=m
CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
CONFIG_B44_PCI_AUTOSELECT=y
@@ -2098,6 +2191,7 @@ CONFIG_BNX2=m
CONFIG_CNIC=m
CONFIG_TIGON3=m
CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_BNA=m
CONFIG_NET_CALXEDA_XGMAC=m
@@ -2114,7 +2208,6 @@ CONFIG_NET_VENDOR_CISCO=y
CONFIG_ENIC=m
CONFIG_DNET=m
CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
CONFIG_NET_TULIP=y
CONFIG_DE2104X=m
CONFIG_DE2104X_DSL=0
@@ -2128,8 +2221,6 @@ CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
CONFIG_DL2K=m
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
@@ -2140,9 +2231,7 @@ CONFIG_S2IO=m
CONFIG_VXGE=m
# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
CONFIG_NET_VENDOR_HP=y
CONFIG_HP100=m
CONFIG_NET_VENDOR_INTEL=y
@@ -2150,27 +2239,20 @@ CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
-CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2180,10 +2262,14 @@ CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
@@ -2192,12 +2278,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
CONFIG_NS83820=m
CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
CONFIG_NE2000=m
CONFIG_NE2K_PCI=m
CONFIG_PCMCIA_PCNET=m
@@ -2207,7 +2288,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2215,9 +2295,9 @@ CONFIG_YELLOWFIN=m
CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_RACAL=y
CONFIG_NET_VENDOR_REALTEK=y
CONFIG_ATP=m
CONFIG_8139CP=m
@@ -2227,10 +2307,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
+CONFIG_SH_ETH=m
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
CONFIG_NET_VENDOR_SILAN=y
CONFIG_SC92031=m
CONFIG_NET_VENDOR_SIS=y
@@ -2244,6 +2324,8 @@ CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
@@ -2251,8 +2333,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
@@ -2282,6 +2362,7 @@ CONFIG_PHYLIB=m
#
# MII PHY device drivers
#
+CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
@@ -2298,9 +2379,12 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2327,12 +2411,16 @@ CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2379,6 +2467,7 @@ CONFIG_ADM8211=m
# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -2391,7 +2480,8 @@ CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2402,9 +2492,18 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2433,8 +2532,8 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2455,14 +2554,14 @@ CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2475,6 +2574,7 @@ CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_LIBERTAS_MESH=y
CONFIG_HERMES=m
@@ -2490,6 +2590,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
CONFIG_P54_LEDS=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
@@ -2505,9 +2606,12 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
CONFIG_RT2X00_LIB=m
@@ -2515,27 +2619,37 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX=m
CONFIG_WL18XX=m
CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
#
# WiMAX Wireless Broadband devices
@@ -2544,6 +2658,11 @@ CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
CONFIG_VMXNET3=m
CONFIG_HYPERV_NET=m
CONFIG_ISDN=y
@@ -2737,13 +2856,13 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 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_CYPRESS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -2753,6 +2872,7 @@ CONFIG_MOUSE_PS2_OLPC=y
CONFIG_MOUSE_SERIAL=y
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
CONFIG_MOUSE_INPORT=m
# CONFIG_MOUSE_ATIXL is not set
CONFIG_MOUSE_LOGIBM=m
@@ -2800,14 +2920,21 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -2829,6 +2956,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2857,12 +2985,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2880,14 +3010,19 @@ CONFIG_INPUT_KXTJ9=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_PWM_BEEPER is not set
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2902,6 +3037,9 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2911,6 +3049,7 @@ CONFIG_GAMEPORT_FM801=m
#
# Character devices
#
+CONFIG_TTY=y
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
@@ -2936,16 +3075,17 @@ CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
#
# Serial drivers
#
CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -2955,18 +3095,28 @@ CONFIG_SERIAL_8250_DW=m
#
# Non-8250 serial port support
#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
CONFIG_SERIAL_MFD_HSU=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_SCCNXP=m
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_SERIAL_PCH_UART=m
CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2985,6 +3135,7 @@ CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=m
CONFIG_DTLK=m
CONFIG_R3964=m
@@ -3007,9 +3158,11 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -3037,6 +3190,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
@@ -3054,11 +3208,11 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
CONFIG_I2C_PXA=m
@@ -3074,17 +3228,45 @@ CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
#
CONFIG_I2C_PCA_ISA=m
-# CONFIG_I2C_STUB is not set
CONFIG_SCx200_ACB=m
+# CONFIG_I2C_STUB is not set
# 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
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
# CONFIG_HSI is not set
#
@@ -3112,8 +3294,10 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3122,9 +3306,13 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_GRGPIO is not set
#
# I2C GPIO expanders:
@@ -3135,6 +3323,7 @@ CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
#
# PCI GPIO expanders:
@@ -3150,7 +3339,10 @@ CONFIG_GPIO_AMD8111=m
#
# SPI GPIO expanders:
#
+# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
#
# AC97 GPIO expanders:
@@ -3158,8 +3350,17 @@ CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3178,7 +3379,11 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3189,14 +3394,19 @@ CONFIG_HWMON_VID=m
#
CONFIG_SENSORS_ABITUGURU=m
CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
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_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
@@ -3215,10 +3425,12 @@ CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3226,6 +3438,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -3241,16 +3454,20 @@ CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6775=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m
@@ -3281,7 +3498,9 @@ CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
@@ -3311,6 +3530,20 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3319,6 +3552,7 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
@@ -3357,6 +3591,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
#
# ISA-based Watchdog Cards
@@ -3393,6 +3628,7 @@ CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
CONFIG_BCMA_POSSIBLE=y
#
@@ -3402,42 +3638,61 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
#
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
CONFIG_MFD_ARIZONA=y
CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
CONFIG_MFD_WM5102=y
CONFIG_MFD_WM5110=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3451,16 +3706,31 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
#
# Media drivers
#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
CONFIG_RC_MAP=m
CONFIG_RC_DECODERS=y
@@ -3486,247 +3756,185 @@ CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=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_MT2063=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_XC4000=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_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=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 is not set
-CONFIG_VIDEO_IR_I2C=m
+CONFIG_MEDIA_USB_SUPPORT=y
#
-# Encoders, decoders, sensors and other helper chips
+# Webcam devices
#
+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_JL2005BCD=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_SE401=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_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=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_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
#
-# Audio decoders, processors and mixers
+# Analog TV USB devices
#
-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_TLV320AIC23B=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_ADV7183=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_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=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
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
-# Flash devices
+# Analog/digital TV USB devices
#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_AS3645A=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
#
-# Video improvement chips
+# Digital TV USB devices
#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
+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_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_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
#
-# Miscelaneous helper chips
+# Webcam, TV (analog/digital) USB devices
#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
#
-# Webcam devices
+# Media capture support
#
-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_JL2005BCD=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_SE401=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_TOPRO=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_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_MEYE=m
#
-# Webcam and/or TV USB devices
+# Media capture/analog TV support
#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
#
-# TV USB devices
+# Media capture/analog/hybrid TV support
#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-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_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX23885=m
@@ -3737,32 +3945,55 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_RC=y
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7164=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_V4L_ISA_PARPORT_DRIVERS is not set
+
+#
+# Media digital TV PCI Adapters
+#
+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
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3774,6 +4005,7 @@ CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
@@ -3784,128 +4016,140 @@ CONFIG_RADIO_WL1273=m
#
CONFIG_RADIO_WL128X=m
# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
#
-# Supported SAA7146 based PCI Adapters
+# Supported FireWire (IEEE 1394) 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
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
#
-# Supported USB Adapters
+# common driver options
#
-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_PCTV452E=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_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
#
-# Siano module components
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
#
-# Supported FlexCopII (B2C2) Adapters
+# Audio decoders, processors and mixers
#
-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
+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_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
#
-# Supported BT878 Adapters
+# RDS decoders
#
-CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA6588=m
#
-# Supported Pluto2 Adapters
+# Video decoders
#
-CONFIG_DVB_PLUTO2=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_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
#
-# Supported SDMC DM1105 Adapters
+# Video and audio decoders
#
-CONFIG_DVB_DM1105=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
#
-# Supported FireWire (IEEE 1394) Adapters
+# Video encoders
#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
#
-# Supported Earthsoft PT1 Adapters
+# Camera sensor devices
#
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
#
-# Supported Mantis Adapters
+# Flash devices
#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
#
-# Supported nGene Adapters
+# Video improvement chips
#
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
#
-# Supported ddbridge ('Octopus') Adapters
+# Miscelaneous helper chips
#
-CONFIG_DVB_DDBRIDGE=m
+CONFIG_VIDEO_M52790=m
#
-# Supported DVB Frontends
+# Sensors used on soc_camera driver
#
+CONFIG_MEDIA_TUNER=m
+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_MT2063=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_XC4000=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_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
#
# Multistandard (satellite) frontends
@@ -3945,6 +4189,7 @@ CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
CONFIG_DVB_MB86A16=m
CONFIG_DVB_TDA10071=m
@@ -4056,21 +4301,24 @@ CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
#
# I2C encoder or helper chips
#
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4084,9 +4332,10 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_AST=m
CONFIG_DRM_MGAG200=m
CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=m
+CONFIG_DRM_QXL=m
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_DDC=m
@@ -4100,7 +4349,6 @@ CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
@@ -4155,26 +4403,47 @@ CONFIG_FB_VOODOO1=m
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SMSCUFX is not set
CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PROGEAR=m
+# CONFIG_BACKLIGHT_PWM is not set
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4186,19 +4455,8 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
+CONFIG_FB_SSD1307=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -4218,6 +4476,7 @@ CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4259,6 +4518,7 @@ CONFIG_SND_ALS100=m
CONFIG_SND_AZT1605=m
CONFIG_SND_AZT2316=m
CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
CONFIG_SND_CMI8330=m
CONFIG_SND_CS4231=m
CONFIG_SND_CS4236=m
@@ -4284,7 +4544,6 @@ CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m
CONFIG_SND_MSND_PINNACLE=m
CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4335,6 +4594,7 @@ CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
@@ -4347,14 +4607,15 @@ 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_I915=y
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -4382,6 +4643,7 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_UA101=m
@@ -4390,10 +4652,12 @@ CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -4416,6 +4680,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
@@ -4426,14 +4691,17 @@ CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
@@ -4458,12 +4726,14 @@ CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PRIMAX=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
CONFIG_HID_GREENASIA=m
CONFIG_GREENASIA_FF=y
@@ -4472,14 +4742,16 @@ CONFIG_HID_SMARTJOYPLUS=m
CONFIG_SMARTJOYPLUS_FF=y
CONFIG_HID_TIVO=m
CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
#
# USB HID support
@@ -4487,9 +4759,12 @@ CONFIG_HID_ZYDACRON=m
CONFIG_USB_HID=m
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4500,10 +4775,9 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
+CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4514,21 +4788,21 @@ CONFIG_USB_WUSB_CBAF=m
#
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_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# 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_U132_HCD=m
CONFIG_USB_SL811_HCD=m
@@ -4540,13 +4814,17 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4580,22 +4858,22 @@ 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 is not set
#
# USB Imaging devices
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_CHIPIDEA is not set
#
# USB port drivers
#
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4606,7 +4884,6 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
@@ -4637,17 +4914,14 @@ CONFIG_USB_SERIAL_METRO=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_TI=m
@@ -4657,8 +4931,9 @@ CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -4685,18 +4960,29 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_ISP1301=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -4708,10 +4994,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
# USB Peripheral Controller
#
CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
CONFIG_USB_MV_UDC=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
@@ -4720,8 +5008,18 @@ CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4734,9 +5032,7 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
@@ -4750,13 +5046,6 @@ CONFIG_USB_G_DBGP=m
# CONFIG_USB_G_DBGP_PRINTK is not set
CONFIG_USB_G_DBGP_SERIAL=y
CONFIG_USB_G_WEBCAM=m
-
-#
-# 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
@@ -4781,6 +5070,7 @@ CONFIG_SDIO_UART=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
@@ -4789,6 +5079,7 @@ CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -4797,6 +5088,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -4804,6 +5096,7 @@ CONFIG_MSPRO_BLOCK=m
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -4812,33 +5105,40 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -4846,14 +5146,11 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
# iptables trigger is under Netfilter config (LED target)
#
CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4877,6 +5174,7 @@ CONFIG_EDAC_I7300=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
@@ -4901,6 +5199,8 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
@@ -4916,6 +5216,16 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# SPI RTC drivers
#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
#
# Platform RTC drivers
@@ -4933,12 +5243,20 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_PCF50633=m
#
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4947,9 +5265,14 @@ CONFIG_DMADEVICES=y
#
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
#
# DMA Clients
@@ -4966,15 +5289,19 @@ CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_VFIO is not set
+# CONFIG_UIO_MF624 is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
#
# Virtio drivers
@@ -4989,6 +5316,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -5010,18 +5338,16 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_ISA_DRIVERS=y
-CONFIG_COMEDI_ACL7225B=m
CONFIG_COMEDI_PCL711=m
CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
CONFIG_COMEDI_PCL726=m
CONFIG_COMEDI_PCL730=m
CONFIG_COMEDI_PCL812=m
CONFIG_COMEDI_PCL816=m
CONFIG_COMEDI_PCL818=m
CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
CONFIG_COMEDI_AMPLC_DIO200_ISA=m
CONFIG_COMEDI_AMPLC_PC236_ISA=m
CONFIG_COMEDI_AMPLC_PC263_ISA=m
@@ -5040,9 +5366,11 @@ CONFIG_COMEDI_DT2815=m
CONFIG_COMEDI_DT2817=m
CONFIG_COMEDI_DT282X=m
CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_FL512=m
CONFIG_COMEDI_AIO_AIO12_8=m
CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_C6XDIGIO=m
CONFIG_COMEDI_MPC624=m
CONFIG_COMEDI_ADQ12B=m
@@ -5050,35 +5378,36 @@ CONFIG_COMEDI_NI_AT_A2150=m
CONFIG_COMEDI_NI_AT_AO=m
CONFIG_COMEDI_NI_ATMIO=m
CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
CONFIG_COMEDI_PCMAD=m
CONFIG_COMEDI_PCMDA12=m
CONFIG_COMEDI_PCMMIO=m
CONFIG_COMEDI_PCMUIO=m
CONFIG_COMEDI_MULTIQ3=m
CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
CONFIG_COMEDI_ADV_PCI_DIO=m
CONFIG_COMEDI_AMPLC_DIO200_PCI=m
CONFIG_COMEDI_AMPLC_PC236_PCI=m
@@ -5089,17 +5418,14 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_GSC_HPDI=m
CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_DAQBOARD2000=m
CONFIG_COMEDI_JR3_PCI=m
CONFIG_COMEDI_KE_COUNTER=m
CONFIG_COMEDI_CB_PCIDAS64=m
CONFIG_COMEDI_CB_PCIDAS=m
CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
# CONFIG_COMEDI_CB_PCIMDAS is not set
CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_ME4000=m
@@ -5108,13 +5434,11 @@ CONFIG_COMEDI_NI_6527=m
CONFIG_COMEDI_NI_65XX=m
CONFIG_COMEDI_NI_660X=m
CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -5135,11 +5459,11 @@ CONFIG_COMEDI_8255=m
CONFIG_COMEDI_FC=m
CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
CONFIG_COMEDI_NI_TIO=m
# CONFIG_FB_OLPC_DCON is not set
-CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@@ -5149,27 +5473,22 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
-CONFIG_ZSMALLOC=y
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
CONFIG_FB_SM7XX=m
@@ -5209,18 +5528,11 @@ CONFIG_DVB_CXD2099=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5231,18 +5543,13 @@ CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
#
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -5250,11 +5557,30 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
+# CONFIG_LTE_GDM724X is not set
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5299,6 +5625,9 @@ CONFIG_MXM_WMI=m
CONFIG_INTEL_OAKTRAIL=m
CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
#
# Hardware Spinlock drivers
@@ -5307,6 +5636,7 @@ CONFIG_CLKSRC_I8253=y
CONFIG_CLKEVT_I8253=y
CONFIG_I8253_LOCK=y
CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
CONFIG_OF_IOMMU=y
@@ -5316,25 +5646,39 @@ CONFIG_INTEL_IOMMU=y
CONFIG_INTEL_IOMMU_FLOPPY_WA=y
#
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
#
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
#
-CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
CONFIG_EXTCON=m
#
# Extcon Device Drivers
#
+CONFIG_OF_EXTCON=m
CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=m
CONFIG_MEMORY=y
# CONFIG_IIO is not set
+# CONFIG_NTB is not set
# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_IRQCHIP=y
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
#
# Firmware Drivers
@@ -5342,7 +5686,6 @@ CONFIG_MEMORY=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
@@ -5352,6 +5695,11 @@ CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
# File systems
#
CONFIG_DCACHE_WORD_ACCESS=y
@@ -5359,7 +5707,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# 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
@@ -5381,6 +5728,7 @@ CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -5393,6 +5741,9 @@ CONFIG_OCFS2_FS_STATS=y
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5401,7 +5752,7 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5461,13 +5812,15 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5514,6 +5867,12 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5521,16 +5880,24 @@ CONFIG_NFS_V2=m
CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
@@ -5538,9 +5905,12 @@ CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5548,10 +5918,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5568,6 +5939,7 @@ CONFIG_AFS_FSCACHE=y
CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
@@ -5626,83 +5998,112 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
CONFIG_PRINTK_TIME=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
CONFIG_LOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
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_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH 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_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
-# 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=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# 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=m
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5710,13 +6111,14 @@ 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_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING=y
@@ -5729,6 +6131,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5738,28 +6142,38 @@ CONFIG_KPROBE_EVENT=y
CONFIG_UPROBE_EVENT=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
# 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=m
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_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
@@ -5782,8 +6196,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
#
# Security options
@@ -5805,14 +6219,17 @@ CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -5821,8 +6238,6 @@ 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
#
@@ -5834,7 +6249,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5875,6 +6290,7 @@ CONFIG_CRYPTO_XTS=m
#
# Hash modes
#
+CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_HMAC=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m
@@ -5884,6 +6300,9 @@ CONFIG_CRYPTO_VMAC=m
#
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -5892,7 +6311,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -5901,7 +6320,7 @@ CONFIG_CRYPTO_WP512=m
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ANUBIS=m
@@ -5909,6 +6328,7 @@ CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_COMMON=m
CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_DES=m
@@ -5930,6 +6350,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
#
# Random Number Generation
@@ -5945,20 +6367,25 @@ 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_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
CONFIG_LGUEST=m
CONFIG_BINARY_PRINTF=y
@@ -5969,10 +6396,12 @@ CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -5988,9 +6417,12 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
@@ -6005,11 +6437,11 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_ENC8=y
CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
CONFIG_TEXTSEARCH=y
@@ -6027,5 +6459,22 @@ CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/abs/core/linux/config.x86_64 b/abs/core/linux/config.x86_64
index c4613ee..c960527 100644
--- a/abs/core/linux/config.x86_64
+++ b/abs/core/linux/config.x86_64
@@ -1,9 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.3 Kernel Configuration
+# Linux/x86 3.12.1-3 Kernel Configuration
#
CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
CONFIG_X86_64=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
@@ -19,13 +18,10 @@ CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=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_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -33,6 +29,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ZONE_DMA32=y
CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -44,16 +42,15 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
-CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-ARCH"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
@@ -61,35 +58,29 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 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=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
#
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -110,24 +101,52 @@ CONFIG_GENERIC_CMOS_UPDATE=y
# Timers subsystem
#
CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
# RCU Subsystem
#
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_RCU_USER_QS is not set
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -148,13 +167,16 @@ CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -164,20 +186,22 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
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_HAVE_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -186,6 +210,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
# CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y
@@ -195,11 +220,11 @@ CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_EVENTS=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_SLUB_CPU_PARTIAL=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -208,14 +233,18 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -226,6 +255,8 @@ 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_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -235,6 +266,13 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
#
# GCOV-based kernel profiling
@@ -250,18 +288,21 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
@@ -279,6 +320,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
CONFIG_BLOCK_COMPAT=y
#
@@ -294,35 +336,8 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
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_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -333,10 +348,13 @@ CONFIG_SMP=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -344,12 +362,10 @@ CONFIG_XEN_PVHVM=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_MK8 is not set
@@ -358,10 +374,7 @@ CONFIG_NO_BOOTMEM=y
# CONFIG_MATOM is not set
CONFIG_GENERIC_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
@@ -379,10 +392,9 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
CONFIG_SWIOTLB=y
CONFIG_IOMMU_HELPER=y
# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=128
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -401,6 +413,9 @@ CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_LIB=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -431,11 +446,14 @@ CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_PHYS_ADDR_T_64BIT=y
@@ -454,6 +472,10 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -464,6 +486,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
@@ -481,6 +504,8 @@ CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -508,13 +533,14 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
@@ -528,16 +554,17 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
@@ -551,6 +578,7 @@ CONFIG_SFI=y
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -566,9 +594,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
# x86 CPU frequency scaling drivers
#
+CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_P4_CLOCKMOD=m
@@ -576,7 +607,12 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -596,9 +632,8 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
@@ -608,7 +643,6 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -621,6 +655,10 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y
CONFIG_PCCARD=m
@@ -640,9 +678,8 @@ CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -654,11 +691,16 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -667,8 +709,10 @@ CONFIG_BINFMT_ELF=y
CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=m
CONFIG_X86_X32=y
@@ -676,7 +720,6 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -685,6 +728,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
# Networking options
#
CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
@@ -707,13 +751,13 @@ CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
@@ -725,8 +769,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -764,6 +808,7 @@ CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
@@ -790,6 +835,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@@ -809,7 +855,17 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -835,10 +891,12 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -850,9 +908,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
# Xtables matches
#
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -950,7 +1010,6 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -958,24 +1017,16 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
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
@@ -1004,9 +1055,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1033,7 +1088,7 @@ CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
#
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=y
@@ -1047,11 +1102,12 @@ CONFIG_IP_DCCP_TFRC_LIB=y
CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
@@ -1067,11 +1123,18 @@ CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_STP=m
+CONFIG_MRP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
CONFIG_LLC=m
CONFIG_LLC2=m
@@ -1081,10 +1144,8 @@ CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
@@ -1114,6 +1175,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1150,14 +1212,25 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
#
# Network testing
@@ -1246,9 +1319,9 @@ CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1325,16 +1398,21 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
# CONFIG_NFC_SHDLC is not set
-# CONFIG_NFC_LLCP is not set
#
# Near Field Communication (NFC) devices
#
-CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
CONFIG_HAVE_BPF_JIT=y
#
@@ -1350,16 +1428,22 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1368,12 +1452,12 @@ CONFIG_MTD_REDBOOT_PARTS=m
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_AR7_PARTS=m
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_BLOCK_RO=m
@@ -1441,6 +1525,9 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_PHRAM=m
CONFIG_MTD_MTDRAM=m
@@ -1451,31 +1538,10 @@ CONFIG_MTD_BLOCK2MTD=m
#
# Disk-On-Chip Device Drivers
#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
CONFIG_MTD_DOCG3=m
CONFIG_BCH_CONST_M=14
CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -1485,13 +1551,14 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI 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_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
@@ -1523,7 +1590,6 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1537,6 +1603,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
#
# Misc devices
@@ -1544,13 +1611,15 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_CS5535_MFGPT=m
CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
@@ -1565,11 +1634,15 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
CONFIG_VMWARE_BALLOON=m
CONFIG_BMP085=y
CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
CONFIG_PCH_PHUB=m
CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -1577,9 +1650,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
# EEPROM support
#
CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1595,6 +1670,8 @@ CONFIG_SENSORS_LIS3_I2C=m
#
CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1623,7 +1700,7 @@ CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1674,6 +1751,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1682,9 +1760,15 @@ CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
CONFIG_VMWARE_PVSCSI=m
CONFIG_HYPERV_STORAGE=m
CONFIG_LIBFC=m
@@ -1729,6 +1813,7 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
@@ -1747,6 +1832,7 @@ CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
CONFIG_SATA_PMP=y
#
@@ -1771,9 +1857,11 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
@@ -1847,17 +1935,24 @@ CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1869,6 +1964,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -1906,23 +2002,22 @@ CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
+CONFIG_MII=m
CONFIG_NET_CORE=y
CONFIG_BONDING=m
CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
# CONFIG_NET_FC is not set
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -1934,6 +2029,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
CONFIG_SUNGEM_PHY=m
# CONFIG_ARCNET is not set
CONFIG_ATM_DRIVERS=y
@@ -1974,6 +2070,20 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
@@ -1990,11 +2100,16 @@ CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
CONFIG_B44_PCI_AUTOSELECT=y
@@ -2004,6 +2119,7 @@ CONFIG_BNX2=m
CONFIG_CNIC=m
CONFIG_TIGON3=m
CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_BNA=m
CONFIG_NET_CALXEDA_XGMAC=m
@@ -2030,8 +2146,6 @@ CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
CONFIG_DL2K=m
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
@@ -2050,20 +2164,20 @@ CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2073,10 +2187,14 @@ CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
@@ -2092,7 +2210,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2100,6 +2217,7 @@ CONFIG_YELLOWFIN=m
CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
CONFIG_NET_VENDOR_REALTEK=y
@@ -2111,10 +2229,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
+CONFIG_SH_ETH=m
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
CONFIG_NET_VENDOR_SILAN=y
CONFIG_SC92031=m
CONFIG_NET_VENDOR_SIS=y
@@ -2127,6 +2245,8 @@ CONFIG_SFC_SRIOV=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
@@ -2134,8 +2254,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
@@ -2165,6 +2283,7 @@ CONFIG_PHYLIB=m
#
# MII PHY device drivers
#
+CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
@@ -2181,7 +2300,9 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MICREL_KS8995MA is not set
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2208,12 +2329,16 @@ CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2260,6 +2385,7 @@ CONFIG_ADM8211=m
# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -2272,7 +2398,8 @@ CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2283,9 +2410,18 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2314,8 +2450,8 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2336,14 +2472,14 @@ CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2356,6 +2492,7 @@ CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_LIBERTAS_MESH=y
CONFIG_HERMES=m
@@ -2371,6 +2508,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
CONFIG_P54_LEDS=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
@@ -2386,9 +2524,12 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
CONFIG_RT2X00_LIB=m
@@ -2396,27 +2537,37 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX=m
CONFIG_WL18XX=m
CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
#
# WiMAX Wireless Broadband devices
@@ -2425,6 +2576,11 @@ CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_VMXNET3=m
@@ -2604,13 +2760,13 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 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_CYPRESS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -2619,6 +2775,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_SERIAL=y
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOUSE_GPIO is not set
CONFIG_MOUSE_SYNAPTICS_I2C=m
@@ -2662,18 +2819,24 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
@@ -2690,6 +2853,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2718,12 +2882,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2740,15 +2906,19 @@ CONFIG_INPUT_KXTJ9=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2763,6 +2933,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2772,6 +2943,7 @@ CONFIG_GAMEPORT_FM801=m
#
# Character devices
#
+CONFIG_TTY=y
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
@@ -2797,35 +2969,46 @@ CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
#
# Serial drivers
#
CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
#
# Non-8250 serial port support
#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
CONFIG_SERIAL_MFD_HSU=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2846,6 +3029,7 @@ CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
@@ -2864,9 +3048,12 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -2894,6 +3081,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
@@ -2911,11 +3099,11 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PXA_PCI is not set
@@ -2930,6 +3118,7 @@ CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
@@ -2938,7 +3127,34 @@ CONFIG_I2C_TINY_USB=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
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX_DMA=y
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
# CONFIG_HSI is not set
#
@@ -2966,7 +3182,9 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -2975,9 +3193,12 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
#
# I2C GPIO expanders:
@@ -3002,7 +3223,10 @@ CONFIG_GPIO_LANGWELL=y
#
# SPI GPIO expanders:
#
+# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
#
# AC97 GPIO expanders:
@@ -3010,8 +3234,17 @@ CONFIG_GPIO_LANGWELL=y
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3029,7 +3262,10 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3040,14 +3276,19 @@ CONFIG_HWMON_VID=m
#
CONFIG_SENSORS_ABITUGURU=m
CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
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_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
@@ -3066,10 +3307,12 @@ CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3077,6 +3320,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -3092,15 +3336,20 @@ CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
@@ -3132,7 +3381,9 @@ CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
@@ -3162,6 +3413,20 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3170,6 +3435,7 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
@@ -3207,6 +3473,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
CONFIG_XEN_WDT=m
#
@@ -3237,6 +3504,7 @@ CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
CONFIG_BCMA_POSSIBLE=y
#
@@ -3246,42 +3514,61 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
#
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
CONFIG_MFD_ARIZONA=y
CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
CONFIG_MFD_WM5102=y
CONFIG_MFD_WM5110=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3295,16 +3582,31 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
#
# Media drivers
#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
CONFIG_RC_MAP=m
CONFIG_RC_DECODERS=y
@@ -3330,156 +3632,10 @@ CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=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_MT2063=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_XC4000=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_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=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 is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# 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_TLV320AIC23B=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_ADV7183=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_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=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
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_AS3645A=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
+CONFIG_MEDIA_USB_SUPPORT=y
#
# Webcam devices
@@ -3524,6 +3680,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3541,25 +3698,27 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
#
-# Webcam and/or TV USB devices
+# Analog TV USB devices
#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3567,10 +3726,91 @@ CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
+
+#
+# Digital TV USB devices
+#
+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_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_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX23885=m
@@ -3581,32 +3821,54 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_RC=y
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7164=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_V4L_ISA_PARPORT_DRIVERS is not set
+
+#
+# Media digital TV PCI Adapters
+#
+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
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3618,6 +3880,7 @@ CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
@@ -3627,128 +3890,140 @@ CONFIG_RADIO_WL1273=m
# Texas Instruments WL128x FM driver (ST based)
#
CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
#
-# Supported SAA7146 based PCI Adapters
+# Supported FireWire (IEEE 1394) 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
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
#
-# Supported USB Adapters
+# common driver options
#
-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_PCTV452E=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_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
#
-# Siano module components
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
#
-# Supported FlexCopII (B2C2) Adapters
+# Audio decoders, processors and mixers
#
-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
+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_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
#
-# Supported BT878 Adapters
+# RDS decoders
#
-CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA6588=m
#
-# Supported Pluto2 Adapters
+# Video decoders
#
-CONFIG_DVB_PLUTO2=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_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
#
-# Supported SDMC DM1105 Adapters
+# Video and audio decoders
#
-CONFIG_DVB_DM1105=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
#
-# Supported FireWire (IEEE 1394) Adapters
+# Video encoders
#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
#
-# Supported Earthsoft PT1 Adapters
+# Camera sensor devices
#
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
#
-# Supported Mantis Adapters
+# Flash devices
#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
#
-# Supported nGene Adapters
+# Video improvement chips
#
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
#
-# Supported ddbridge ('Octopus') Adapters
+# Miscelaneous helper chips
#
-CONFIG_DVB_DDBRIDGE=m
+CONFIG_VIDEO_M52790=m
#
-# Supported DVB Frontends
+# Sensors used on soc_camera driver
#
+CONFIG_MEDIA_TUNER=m
+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_MT2063=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_XC4000=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_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
#
# Multistandard (satellite) frontends
@@ -3788,6 +4063,7 @@ CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
CONFIG_DVB_MB86A16=m
CONFIG_DVB_TDA10071=m
@@ -3893,21 +4169,24 @@ CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
#
# I2C encoder or helper chips
#
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -3921,9 +4200,10 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_AST=m
CONFIG_DRM_MGAG200=m
CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=m
+CONFIG_DRM_QXL=m
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
@@ -3937,7 +4217,6 @@ CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
@@ -3984,32 +4263,51 @@ CONFIG_FB_VOODOO1=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
# CONFIG_FB_TMIO is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SMSCUFX is not set
CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
CONFIG_FB_VIRTUAL=m
CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4020,18 +4318,6 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4052,6 +4338,7 @@ CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4082,7 +4369,6 @@ 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_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4133,6 +4419,7 @@ CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
@@ -4145,14 +4432,15 @@ 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_I915=y
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -4179,6 +4467,7 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_UA101=m
@@ -4187,10 +4476,12 @@ CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -4213,6 +4504,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
@@ -4223,14 +4515,17 @@ CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
@@ -4255,12 +4550,14 @@ CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PRIMAX=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
CONFIG_HID_GREENASIA=m
CONFIG_GREENASIA_FF=y
@@ -4269,14 +4566,16 @@ CONFIG_HID_SMARTJOYPLUS=m
CONFIG_SMARTJOYPLUS_FF=y
CONFIG_HID_TIVO=m
CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
#
# USB HID support
@@ -4284,9 +4583,12 @@ CONFIG_HID_ZYDACRON=m
CONFIG_USB_HID=m
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4297,10 +4599,9 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
+CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4311,21 +4612,21 @@ CONFIG_USB_WUSB_CBAF=m
#
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_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# 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_U132_HCD=m
CONFIG_USB_SL811_HCD=m
@@ -4337,13 +4638,15 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4377,22 +4680,22 @@ 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 is not set
#
# USB Imaging devices
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_CHIPIDEA is not set
#
# USB port drivers
#
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4403,7 +4706,6 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
@@ -4434,17 +4736,14 @@ CONFIG_USB_SERIAL_METRO=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_TI=m
@@ -4454,8 +4753,9 @@ CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -4482,18 +4782,29 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_ISP1301=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -4504,10 +4815,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
#
# USB Peripheral Controller
#
+CONFIG_USB_FOTG210_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
CONFIG_USB_MV_UDC=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
@@ -4516,8 +4829,18 @@ CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4530,9 +4853,7 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
@@ -4546,13 +4867,6 @@ CONFIG_USB_G_DBGP=m
# CONFIG_USB_G_DBGP_PRINTK is not set
CONFIG_USB_G_DBGP_SERIAL=y
CONFIG_USB_G_WEBCAM=m
-
-#
-# 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
@@ -4577,14 +4891,17 @@ CONFIG_SDIO_UART=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -4593,6 +4910,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -4600,6 +4918,7 @@ CONFIG_MSPRO_BLOCK=m
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -4608,33 +4927,39 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -4642,14 +4967,11 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
# iptables trigger is under Netfilter config (LED target)
#
CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4671,6 +4993,7 @@ CONFIG_EDAC_SBRIDGE=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
@@ -4695,6 +5018,8 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
@@ -4710,6 +5035,16 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# SPI RTC drivers
#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
#
# Platform RTC drivers
@@ -4727,12 +5062,19 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_PCF50633=m
#
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_DRV_MOXART is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4741,9 +5083,13 @@ CONFIG_DMADEVICES=y
#
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
#
# DMA Clients
@@ -4760,15 +5106,19 @@ CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_VFIO is not set
+# CONFIG_UIO_MF624 is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
#
# Virtio drivers
@@ -4783,6 +5133,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
#
# Xen driver support
@@ -4800,11 +5151,12 @@ CONFIG_XEN_XENBUS_FRONTEND=y
CONFIG_XEN_GNTDEV=m
CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
+CONFIG_XEN_TMEM=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_ACPI_PROCESSOR=m
# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -4826,29 +5178,29 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
CONFIG_COMEDI_ADV_PCI_DIO=m
CONFIG_COMEDI_AMPLC_DIO200_PCI=m
CONFIG_COMEDI_AMPLC_PC236_PCI=m
@@ -4859,17 +5211,14 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_GSC_HPDI=m
CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_DAQBOARD2000=m
CONFIG_COMEDI_JR3_PCI=m
CONFIG_COMEDI_KE_COUNTER=m
CONFIG_COMEDI_CB_PCIDAS64=m
CONFIG_COMEDI_CB_PCIDAS=m
CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
CONFIG_COMEDI_CB_PCIMDAS=m
CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_ME4000=m
@@ -4878,13 +5227,11 @@ CONFIG_COMEDI_NI_6527=m
CONFIG_COMEDI_NI_65XX=m
CONFIG_COMEDI_NI_660X=m
CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -4905,10 +5252,9 @@ CONFIG_COMEDI_8255=m
CONFIG_COMEDI_FC=m
CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@@ -4918,27 +5264,22 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
-CONFIG_ZSMALLOC=y
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
CONFIG_FB_SM7XX=m
@@ -4978,18 +5319,11 @@ CONFIG_DVB_CXD2099=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5000,18 +5334,13 @@ CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
#
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -5019,11 +5348,30 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
+# CONFIG_LTE_GDM724X is not set
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5066,6 +5414,9 @@ CONFIG_MXM_WMI=m
CONFIG_INTEL_OAKTRAIL=m
CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
#
# Hardware Spinlock drivers
@@ -5073,6 +5424,7 @@ CONFIG_APPLE_GMUX=m
CONFIG_CLKEVT_I8253=y
CONFIG_I8253_LOCK=y
CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
CONFIG_AMD_IOMMU=y
@@ -5085,13 +5437,14 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
CONFIG_IRQ_REMAP=y
#
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
#
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
#
-CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
CONFIG_EXTCON=m
@@ -5099,11 +5452,20 @@ CONFIG_EXTCON=m
# Extcon Device Drivers
#
CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=m
CONFIG_MEMORY=y
# CONFIG_IIO is not set
+# CONFIG_NTB is not set
# CONFIG_VME_BUS is not set
# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
#
# Firmware Drivers
@@ -5111,7 +5473,6 @@ CONFIG_MEMORY=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
@@ -5121,6 +5482,11 @@ CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
# File systems
#
CONFIG_DCACHE_WORD_ACCESS=y
@@ -5128,7 +5494,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# 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
@@ -5150,6 +5515,7 @@ CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -5162,6 +5528,9 @@ CONFIG_OCFS2_FS_STATS=y
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5170,7 +5539,7 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5231,13 +5600,15 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5284,6 +5655,12 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5291,16 +5668,24 @@ CONFIG_NFS_V2=m
CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
@@ -5308,9 +5693,12 @@ CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5318,10 +5706,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5338,6 +5727,7 @@ CONFIG_AFS_FSCACHE=y
CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
@@ -5396,82 +5786,111 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
CONFIG_PRINTK_TIME=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
CONFIG_LOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
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_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH 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_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_KOBJECT 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=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# 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=m
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5479,13 +5898,15 @@ 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_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING=y
@@ -5498,6 +5919,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5507,33 +5930,44 @@ CONFIG_KPROBE_EVENT=y
CONFIG_UPROBE_EVENT=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
# 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=m
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_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
@@ -5551,8 +5985,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
#
# Security options
@@ -5574,14 +6008,17 @@ CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -5590,8 +6027,6 @@ 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
#
@@ -5603,7 +6038,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5644,6 +6079,7 @@ CONFIG_CRYPTO_XTS=m
#
# Hash modes
#
+CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_HMAC=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m
@@ -5653,6 +6089,10 @@ CONFIG_CRYPTO_VMAC=m
#
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -5661,8 +6101,10 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -5672,7 +6114,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_X86_64=m
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ANUBIS=m
@@ -5682,8 +6124,13 @@ CONFIG_CRYPTO_BLOWFISH_COMMON=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
@@ -5693,6 +6140,7 @@ CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5706,6 +6154,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
#
# Random Number Generation
@@ -5718,20 +6168,25 @@ CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
CONFIG_BINARY_PRINTF=y
#
@@ -5741,10 +6196,14 @@ CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -5759,9 +6218,12 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
@@ -5776,11 +6238,11 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_ENC8=y
CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
CONFIG_TEXTSEARCH=y
@@ -5798,5 +6260,22 @@ CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/abs/core/linux/config.x86_64.last b/abs/core/linux/config.x86_64.last
index 183ab0f..1412030 100644
--- a/abs/core/linux/config.x86_64.last
+++ b/abs/core/linux/config.x86_64.last
@@ -1,9 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.7-1 Kernel Configuration
+# Linux/x86 3.12.6-1 Kernel Configuration
#
CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
CONFIG_X86_64=y
CONFIG_X86=y
CONFIG_INSTRUCTION_DECODER=y
@@ -19,13 +18,10 @@ CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=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_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -33,6 +29,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ZONE_DMA32=y
CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -44,16 +42,15 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
-CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-ARCH"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
@@ -61,35 +58,29 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 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=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
#
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -110,24 +101,52 @@ CONFIG_GENERIC_CMOS_UPDATE=y
# Timers subsystem
#
CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
# RCU Subsystem
#
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_RCU_USER_QS is not set
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@@ -148,12 +167,14 @@ CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -165,20 +186,22 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
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_HAVE_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -187,6 +210,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
# CONFIG_EMBEDDED is not set
CONFIG_HAVE_PERF_EVENTS=y
@@ -196,11 +220,11 @@ CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_EVENTS=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_SLUB_CPU_PARTIAL=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_OPROFILE=m
@@ -209,14 +233,18 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -227,6 +255,8 @@ 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_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -236,6 +266,13 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
#
# GCOV-based kernel profiling
@@ -251,18 +288,21 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
@@ -280,6 +320,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
CONFIG_BLOCK_COMPAT=y
#
@@ -295,35 +336,8 @@ CONFIG_DEFAULT_CFQ=y
CONFIG_DEFAULT_IOSCHED="cfq"
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_ASN1=m
CONFIG_UNINLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# 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 is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_FREEZER=y
#
@@ -334,10 +348,13 @@ CONFIG_SMP=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -345,12 +362,10 @@ CONFIG_XEN_PVHVM=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_MK8 is not set
@@ -359,10 +374,7 @@ CONFIG_NO_BOOTMEM=y
# CONFIG_MATOM is not set
CONFIG_GENERIC_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
@@ -380,10 +392,9 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
CONFIG_SWIOTLB=y
CONFIG_IOMMU_HELPER=y
# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=128
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
@@ -402,6 +413,9 @@ CONFIG_MICROCODE=m
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_MICROCODE_INTEL_LIB=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -432,11 +446,14 @@ CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_PHYS_ADDR_T_64BIT=y
@@ -455,6 +472,10 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -465,6 +486,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
@@ -482,6 +504,8 @@ CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -509,13 +533,14 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
@@ -529,16 +554,17 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_SBS=m
CONFIG_ACPI_HED=y
CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=m
+CONFIG_ACPI_BGRT=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
@@ -552,6 +578,7 @@ CONFIG_SFI=y
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
@@ -567,9 +594,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
#
# x86 CPU frequency scaling drivers
#
+CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_P4_CLOCKMOD=m
@@ -577,7 +607,12 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
@@ -597,9 +632,8 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
@@ -609,7 +643,6 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -622,6 +655,10 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y
CONFIG_PCCARD=m
@@ -641,9 +678,8 @@ CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -655,11 +691,16 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -668,8 +709,10 @@ CONFIG_BINFMT_ELF=y
CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=m
CONFIG_X86_X32=y
@@ -677,7 +720,6 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -686,6 +728,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
# Networking options
#
CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
CONFIG_UNIX=y
CONFIG_UNIX_DIAG=m
CONFIG_XFRM=y
@@ -708,13 +751,13 @@ CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
@@ -726,8 +769,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -765,6 +808,7 @@ CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
@@ -791,6 +835,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@@ -810,7 +855,17 @@ CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -836,10 +891,12 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=m
CONFIG_NETFILTER_XT_TARGET_TEE=m
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -851,9 +908,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
# Xtables matches
#
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
@@ -951,7 +1010,6 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -959,24 +1017,16 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_IPV4=m
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
@@ -1005,9 +1055,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1034,7 +1088,7 @@ CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
#
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=y
@@ -1048,11 +1102,12 @@ CONFIG_IP_DCCP_TFRC_LIB=y
CONFIG_NET_DCCPPROBE=m
CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
@@ -1068,11 +1123,18 @@ CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_STP=m
+CONFIG_MRP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
CONFIG_LLC=m
CONFIG_LLC2=m
@@ -1082,10 +1144,8 @@ CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
CONFIG_PHONET=m
CONFIG_IEEE802154=m
CONFIG_IEEE802154_6LOWPAN=m
@@ -1115,6 +1175,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1151,14 +1212,25 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
#
# Network testing
@@ -1247,9 +1319,9 @@ CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1326,16 +1398,21 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
# CONFIG_NFC_SHDLC is not set
-# CONFIG_NFC_LLCP is not set
#
# Near Field Communication (NFC) devices
#
-CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
CONFIG_HAVE_BPF_JIT=y
#
@@ -1351,16 +1428,22 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
CONFIG_SYS_HYPERVISOR=y
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1369,12 +1452,12 @@ CONFIG_MTD_REDBOOT_PARTS=m
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_AR7_PARTS=m
#
# User Modules And Translation Layers
#
-CONFIG_MTD_CHAR=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_BLOCK_RO=m
@@ -1442,6 +1525,9 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_PHRAM=m
CONFIG_MTD_MTDRAM=m
@@ -1452,31 +1538,10 @@ CONFIG_MTD_BLOCK2MTD=m
#
# Disk-On-Chip Device Drivers
#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
CONFIG_MTD_DOCG3=m
CONFIG_BCH_CONST_M=14
CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -1486,13 +1551,14 @@ CONFIG_MTD_LPDDR=m
CONFIG_MTD_QINFO_PROBE=m
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI 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_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
@@ -1524,7 +1590,6 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1538,6 +1603,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_VIRTIO_BLK=m
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
#
# Misc devices
@@ -1545,13 +1611,15 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_CS5535_MFGPT=m
CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
@@ -1566,11 +1634,15 @@ CONFIG_SENSORS_BH1770=m
CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
CONFIG_VMWARE_BALLOON=m
CONFIG_BMP085=y
CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
CONFIG_PCH_PHUB=m
CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -1578,9 +1650,11 @@ CONFIG_C2PORT_DURAMAR_2150=m
# EEPROM support
#
CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
CONFIG_CB710_CORE=m
# CONFIG_CB710_DEBUG is not set
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -1596,6 +1670,8 @@ CONFIG_SENSORS_LIS3_I2C=m
#
CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1624,7 +1700,7 @@ CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1675,6 +1751,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1683,9 +1760,15 @@ CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
CONFIG_VMWARE_PVSCSI=m
CONFIG_HYPERV_STORAGE=m
CONFIG_LIBFC=m
@@ -1730,6 +1813,7 @@ CONFIG_SCSI_PM8001=m
CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
@@ -1748,6 +1832,7 @@ CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
CONFIG_SATA_PMP=y
#
@@ -1772,9 +1857,11 @@ CONFIG_ATA_BMDMA=y
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
@@ -1848,17 +1935,24 @@ CONFIG_MD_RAID0=m
CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
@@ -1870,6 +1964,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -1907,23 +2002,22 @@ CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
+CONFIG_MII=m
CONFIG_NET_CORE=y
CONFIG_BONDING=m
CONFIG_DUMMY=m
CONFIG_EQUALIZER=m
# CONFIG_NET_FC is not set
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
CONFIG_IFB=m
CONFIG_NET_TEAM=m
CONFIG_NET_TEAM_MODE_BROADCAST=m
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -1935,6 +2029,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
CONFIG_SUNGEM_PHY=m
# CONFIG_ARCNET is not set
CONFIG_ATM_DRIVERS=y
@@ -1975,6 +2070,20 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
CONFIG_ETHERNET=y
CONFIG_MDIO=m
CONFIG_NET_VENDOR_3COM=y
@@ -1991,11 +2100,16 @@ CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_B44=m
CONFIG_B44_PCI_AUTOSELECT=y
@@ -2005,6 +2119,7 @@ CONFIG_BNX2=m
CONFIG_CNIC=m
CONFIG_TIGON3=m
CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
CONFIG_NET_VENDOR_BROCADE=y
CONFIG_BNA=m
CONFIG_NET_CALXEDA_XGMAC=m
@@ -2031,8 +2146,6 @@ CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
CONFIG_DL2K=m
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
@@ -2051,20 +2164,20 @@ CONFIG_E100=m
CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2074,10 +2187,14 @@ CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
CONFIG_KS8851_MLL=m
CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
@@ -2093,7 +2210,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2101,6 +2217,7 @@ CONFIG_YELLOWFIN=m
CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
CONFIG_NET_VENDOR_REALTEK=y
@@ -2112,10 +2229,10 @@ CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
+CONFIG_SH_ETH=m
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
CONFIG_NET_VENDOR_SILAN=y
CONFIG_SC92031=m
CONFIG_NET_VENDOR_SIS=y
@@ -2128,6 +2245,8 @@ CONFIG_SFC_SRIOV=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
@@ -2135,8 +2254,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PCI=y
# CONFIG_STMMAC_DEBUG_FS is not set
# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
@@ -2166,6 +2283,7 @@ CONFIG_PHYLIB=m
#
# MII PHY device drivers
#
+CONFIG_AT803X_PHY=m
CONFIG_AMD_PHY=m
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
@@ -2182,7 +2300,9 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MICREL_KS8995MA is not set
CONFIG_PLIP=m
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2209,12 +2329,16 @@ CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2261,6 +2385,7 @@ CONFIG_ADM8211=m
# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -2273,7 +2398,8 @@ CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2284,9 +2410,18 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
-# CONFIG_B43_BCMA_EXTRA is not set
CONFIG_B43_SSB=y
CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2315,8 +2450,8 @@ CONFIG_BRCMUTIL=m
CONFIG_BRCMSMAC=m
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2337,14 +2472,14 @@ CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
CONFIG_IWLWIFI=m
CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2357,6 +2492,7 @@ CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_LIBERTAS_MESH=y
CONFIG_HERMES=m
@@ -2372,6 +2508,7 @@ CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
CONFIG_P54_LEDS=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
@@ -2387,9 +2524,12 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
CONFIG_RT2X00_LIB=m
@@ -2397,27 +2537,37 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX=m
CONFIG_WL18XX=m
CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
#
# WiMAX Wireless Broadband devices
@@ -2426,6 +2576,11 @@ CONFIG_WIMAX_I2400M=m
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_VMXNET3=m
@@ -2605,13 +2760,13 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 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_CYPRESS=y
CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -2620,6 +2775,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
CONFIG_MOUSE_SERIAL=y
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOUSE_GPIO is not set
CONFIG_MOUSE_SYNAPTICS_I2C=m
@@ -2663,18 +2819,24 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
CONFIG_TOUCHSCREEN_AD7879=m
CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
@@ -2691,6 +2853,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_PIXCIR=m
CONFIG_TOUCHSCREEN_WM97XX=m
@@ -2719,12 +2882,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_TPS6507X=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
CONFIG_INPUT_BMA150=m
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2741,15 +2906,19 @@ CONFIG_INPUT_KXTJ9=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2764,6 +2933,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2773,6 +2943,7 @@ CONFIG_GAMEPORT_FM801=m
#
# Character devices
#
+CONFIG_TTY=y
CONFIG_VT=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
@@ -2798,35 +2969,46 @@ CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
#
# Serial drivers
#
CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
#
# Non-8250 serial port support
#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
CONFIG_SERIAL_MFD_HSU=m
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_SERIAL_ALTERA_JTAGUART=m
CONFIG_SERIAL_ALTERA_UART=m
CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2847,6 +3029,7 @@ CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
@@ -2865,9 +3048,12 @@ CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -2895,6 +3081,7 @@ CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_NFORCE2=m
CONFIG_I2C_NFORCE2_S4985=m
@@ -2912,11 +3099,11 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PXA_PCI is not set
@@ -2931,6 +3118,7 @@ CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_TAOS_EVM=m
CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
@@ -2939,7 +3127,34 @@ CONFIG_I2C_TINY_USB=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
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX_DMA=y
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
# CONFIG_HSI is not set
#
@@ -2967,7 +3182,9 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -2976,9 +3193,12 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
#
# I2C GPIO expanders:
@@ -3003,7 +3223,10 @@ CONFIG_GPIO_LANGWELL=y
#
# SPI GPIO expanders:
#
+# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
#
# AC97 GPIO expanders:
@@ -3011,8 +3234,17 @@ CONFIG_GPIO_LANGWELL=y
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
# CONFIG_W1 is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -3030,7 +3262,10 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3041,14 +3276,19 @@ CONFIG_HWMON_VID=m
#
CONFIG_SENSORS_ABITUGURU=m
CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
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_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
CONFIG_SENSORS_ADT7411=m
CONFIG_SENSORS_ADT7462=m
CONFIG_SENSORS_ADT7470=m
@@ -3067,10 +3307,12 @@ CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3078,6 +3320,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
CONFIG_SENSORS_LM73=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -3093,15 +3336,20 @@ CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
@@ -3133,7 +3381,9 @@ CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_TMP102=m
@@ -3163,6 +3413,20 @@ CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_ATK0110=m
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3171,6 +3435,7 @@ CONFIG_WATCHDOG_CORE=y
# Watchdog Device Drivers
#
CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
@@ -3208,6 +3473,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
CONFIG_XEN_WDT=m
#
@@ -3238,6 +3504,7 @@ CONFIG_SSB_SDIOHOST=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
CONFIG_BCMA_POSSIBLE=y
#
@@ -3247,42 +3514,61 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
#
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
# CONFIG_TPS6105X is not set
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
CONFIG_MFD_ARIZONA=y
CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
CONFIG_MFD_WM5102=y
CONFIG_MFD_WM5110=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3296,16 +3582,31 @@ CONFIG_MEDIA_RADIO_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
#
# Media drivers
#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
CONFIG_RC_CORE=m
CONFIG_RC_MAP=m
CONFIG_RC_DECODERS=y
@@ -3331,156 +3632,10 @@ CONFIG_IR_REDRAT3=m
CONFIG_IR_STREAMZAP=m
CONFIG_IR_WINBOND_CIR=m
CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
CONFIG_RC_LOOPBACK=m
CONFIG_IR_GPIO_CIR=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_MT2063=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_XC4000=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_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=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 is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# 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_TLV320AIC23B=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_ADV7183=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_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=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
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_ADV7393=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_APTINA_PLL=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_VS6624=m
-CONFIG_VIDEO_MT9M032=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-CONFIG_VIDEO_AS3645A=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
+CONFIG_MEDIA_USB_SUPPORT=y
#
# Webcam devices
@@ -3525,6 +3680,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3542,25 +3698,27 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
#
-# Webcam and/or TV USB devices
+# Analog TV USB devices
#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-
-#
-# TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
CONFIG_VIDEO_CX231XX_ALSA=m
@@ -3568,10 +3726,91 @@ CONFIG_VIDEO_CX231XX_DVB=m
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_V4L_PCI_DRIVERS=y
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
+
+#
+# Digital TV USB devices
+#
+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_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_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX23885=m
@@ -3582,32 +3821,54 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_RC=y
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7164=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_V4L_ISA_PARPORT_DRIVERS is not set
+
+#
+# Media digital TV PCI Adapters
+#
+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
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
# CONFIG_V4L_PLATFORM_DRIVERS is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3619,6 +3880,7 @@ CONFIG_RADIO_SHARK2=m
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_SAA7706H=m
CONFIG_RADIO_TEF6862=m
@@ -3628,128 +3890,140 @@ CONFIG_RADIO_WL1273=m
# Texas Instruments WL128x FM driver (ST based)
#
CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
#
-# Supported SAA7146 based PCI Adapters
+# Supported FireWire (IEEE 1394) 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
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
#
-# Supported USB Adapters
+# common driver options
#
-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_PCTV452E=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_AZ6007=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
#
-# Siano module components
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
#
-# Supported FlexCopII (B2C2) Adapters
+# Audio decoders, processors and mixers
#
-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
+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_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
#
-# Supported BT878 Adapters
+# RDS decoders
#
-CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA6588=m
#
-# Supported Pluto2 Adapters
+# Video decoders
#
-CONFIG_DVB_PLUTO2=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_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
#
-# Supported SDMC DM1105 Adapters
+# Video and audio decoders
#
-CONFIG_DVB_DM1105=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
#
-# Supported FireWire (IEEE 1394) Adapters
+# Video encoders
#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
#
-# Supported Earthsoft PT1 Adapters
+# Camera sensor devices
#
-CONFIG_DVB_PT1=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
#
-# Supported Mantis Adapters
+# Flash devices
#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
#
-# Supported nGene Adapters
+# Video improvement chips
#
-CONFIG_DVB_NGENE=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
#
-# Supported ddbridge ('Octopus') Adapters
+# Miscelaneous helper chips
#
-CONFIG_DVB_DDBRIDGE=m
+CONFIG_VIDEO_M52790=m
#
-# Supported DVB Frontends
+# Sensors used on soc_camera driver
#
+CONFIG_MEDIA_TUNER=m
+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_MT2063=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_XC4000=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_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
#
# Multistandard (satellite) frontends
@@ -3789,6 +4063,7 @@ CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
CONFIG_DVB_MB86A16=m
CONFIG_DVB_TDA10071=m
@@ -3894,21 +4169,24 @@ CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
#
# I2C encoder or helper chips
#
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -3922,9 +4200,10 @@ CONFIG_DRM_UDL=m
CONFIG_DRM_AST=m
CONFIG_DRM_MGAG200=m
CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=m
+CONFIG_DRM_QXL=m
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
@@ -3938,7 +4217,6 @@ CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
@@ -3985,32 +4263,51 @@ CONFIG_FB_VOODOO1=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
# CONFIG_FB_TMIO is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SMSCUFX is not set
CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
CONFIG_FB_VIRTUAL=m
CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PROGEAR=m
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4021,18 +4318,6 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
@@ -4053,6 +4338,7 @@ CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4083,7 +4369,6 @@ 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_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4134,6 +4419,7 @@ CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
CONFIG_SND_HDA_PREALLOC_SIZE=4096
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
@@ -4146,14 +4432,15 @@ 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_I915=y
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
CONFIG_SND_HDA_CODEC_CA0110=y
CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
CONFIG_SND_HDA_CODEC_CMEDIA=y
CONFIG_SND_HDA_CODEC_SI3054=y
CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
@@ -4180,6 +4467,7 @@ CONFIG_SND_VIA82XX_MODEM=m
CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_UA101=m
@@ -4188,10 +4476,12 @@ CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
@@ -4214,6 +4504,7 @@ CONFIG_HID_A4TECH=m
CONFIG_HID_ACRUX=m
CONFIG_HID_ACRUX_FF=y
CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
@@ -4224,14 +4515,17 @@ CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=m
CONFIG_HID_LCPOWER=m
@@ -4256,12 +4550,14 @@ CONFIG_HID_PICOLCD_FB=y
CONFIG_HID_PICOLCD_BACKLIGHT=y
CONFIG_HID_PICOLCD_LCD=y
CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
CONFIG_HID_PRIMAX=m
CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
CONFIG_HID_GREENASIA=m
CONFIG_GREENASIA_FF=y
@@ -4270,14 +4566,16 @@ CONFIG_HID_SMARTJOYPLUS=m
CONFIG_SMARTJOYPLUS_FF=y
CONFIG_HID_TIVO=m
CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
#
# USB HID support
@@ -4285,9 +4583,12 @@ CONFIG_HID_ZYDACRON=m
CONFIG_USB_HID=m
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4298,10 +4599,9 @@ CONFIG_USB=m
#
# Miscellaneous USB options
#
+CONFIG_USB_DEFAULT_PERSIST=y
CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4312,21 +4612,21 @@ CONFIG_USB_WUSB_CBAF=m
#
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_EHCI_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# 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_U132_HCD=m
CONFIG_USB_SL811_HCD=m
@@ -4338,13 +4638,15 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
# CONFIG_USB_HCD_BCMA is not set
# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_RENESAS_USBHS=m
#
@@ -4378,22 +4680,22 @@ 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 is not set
#
# USB Imaging devices
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_CHIPIDEA is not set
#
# USB port drivers
#
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4404,7 +4706,6 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
@@ -4416,18 +4717,6 @@ CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
@@ -4435,17 +4724,14 @@ CONFIG_USB_SERIAL_METRO=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_TI=m
@@ -4455,8 +4741,9 @@ CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
# CONFIG_USB_SERIAL_DEBUG is not set
@@ -4483,18 +4770,29 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_ISP1301=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -4505,10 +4803,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
#
# USB Peripheral Controller
#
+CONFIG_USB_FOTG210_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
CONFIG_USB_MV_UDC=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
@@ -4517,8 +4817,18 @@ CONFIG_USB_NET2280=m
CONFIG_USB_GOKU=m
CONFIG_USB_EG20T=m
CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4531,9 +4841,7 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
@@ -4547,13 +4855,6 @@ CONFIG_USB_G_DBGP=m
# CONFIG_USB_G_DBGP_PRINTK is not set
CONFIG_USB_G_DBGP_SERIAL=y
CONFIG_USB_G_WEBCAM=m
-
-#
-# 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
@@ -4578,14 +4879,17 @@ CONFIG_SDIO_UART=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
CONFIG_MMC_SDRICOH_CS=m
CONFIG_MMC_CB710=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
@@ -4594,6 +4898,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -4601,6 +4906,7 @@ CONFIG_MSPRO_BLOCK=m
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -4609,33 +4915,39 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_LM3530=m
CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA9532_GPIO is not set
# CONFIG_LEDS_GPIO is not set
CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM3556=m
+CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
#
# LED Triggers
#
+CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
@@ -4643,14 +4955,11 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
# iptables trigger is under Netfilter config (LED target)
#
CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4672,6 +4981,7 @@ CONFIG_EDAC_SBRIDGE=m
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
@@ -4696,6 +5006,8 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
@@ -4711,6 +5023,16 @@ CONFIG_RTC_DRV_RV3029C2=m
#
# SPI RTC drivers
#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
#
# Platform RTC drivers
@@ -4728,12 +5050,19 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
CONFIG_RTC_DRV_PCF50633=m
#
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_DRV_MOXART is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
CONFIG_DMADEVICES=y
# CONFIG_DMADEVICES_DEBUG is not set
@@ -4742,9 +5071,13 @@ CONFIG_DMADEVICES=y
#
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
#
# DMA Clients
@@ -4761,15 +5094,19 @@ CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
-# CONFIG_VFIO is not set
+# CONFIG_UIO_MF624 is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
#
# Virtio drivers
@@ -4784,6 +5121,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
#
# Xen driver support
@@ -4801,11 +5139,12 @@ CONFIG_XEN_XENBUS_FRONTEND=y
CONFIG_XEN_GNTDEV=m
CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
+CONFIG_XEN_TMEM=m
CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_ACPI_PROCESSOR=m
# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -4827,29 +5166,29 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
CONFIG_COMEDI_ADL_PCI8164=m
CONFIG_COMEDI_ADL_PCI9111=m
CONFIG_COMEDI_ADL_PCI9118=m
CONFIG_COMEDI_ADV_PCI1710=m
CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
CONFIG_COMEDI_ADV_PCI_DIO=m
CONFIG_COMEDI_AMPLC_DIO200_PCI=m
CONFIG_COMEDI_AMPLC_PC236_PCI=m
@@ -4860,17 +5199,14 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_GSC_HPDI=m
CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_DAQBOARD2000=m
CONFIG_COMEDI_JR3_PCI=m
CONFIG_COMEDI_KE_COUNTER=m
CONFIG_COMEDI_CB_PCIDAS64=m
CONFIG_COMEDI_CB_PCIDAS=m
CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
CONFIG_COMEDI_CB_PCIMDAS=m
CONFIG_COMEDI_CB_PCIMDDA=m
CONFIG_COMEDI_ME4000=m
@@ -4879,13 +5215,11 @@ CONFIG_COMEDI_NI_6527=m
CONFIG_COMEDI_NI_65XX=m
CONFIG_COMEDI_NI_660X=m
CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -4906,10 +5240,9 @@ CONFIG_COMEDI_8255=m
CONFIG_COMEDI_FC=m
CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@@ -4919,27 +5252,22 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
CONFIG_VT6656=m
CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
CONFIG_ZRAM=m
# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=y
-CONFIG_ZSMALLOC=y
CONFIG_WLAGS49_H2=m
CONFIG_WLAGS49_H25=m
CONFIG_FB_SM7XX=m
@@ -4979,18 +5307,11 @@ CONFIG_DVB_CXD2099=m
CONFIG_VIDEO_DT3155=m
CONFIG_DT3155_CCIR=y
CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5001,18 +5322,13 @@ CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
#
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -5020,11 +5336,30 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
-CONFIG_CSR_WIFI=m
+# CONFIG_LTE_GDM724X is not set
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5067,6 +5402,9 @@ CONFIG_MXM_WMI=m
CONFIG_INTEL_OAKTRAIL=m
CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
#
# Hardware Spinlock drivers
@@ -5074,6 +5412,7 @@ CONFIG_APPLE_GMUX=m
CONFIG_CLKEVT_I8253=y
CONFIG_I8253_LOCK=y
CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
CONFIG_IOMMU_API=y
CONFIG_IOMMU_SUPPORT=y
CONFIG_AMD_IOMMU=y
@@ -5086,13 +5425,14 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
CONFIG_IRQ_REMAP=y
#
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
#
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
#
-CONFIG_VIRT_DRIVERS=y
# CONFIG_PM_DEVFREQ is not set
CONFIG_EXTCON=m
@@ -5100,11 +5440,20 @@ CONFIG_EXTCON=m
# Extcon Device Drivers
#
CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=m
CONFIG_MEMORY=y
# CONFIG_IIO is not set
+# CONFIG_NTB is not set
# CONFIG_VME_BUS is not set
# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
#
# Firmware Drivers
@@ -5112,7 +5461,6 @@ CONFIG_MEMORY=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
CONFIG_DMIID=y
@@ -5122,6 +5470,11 @@ CONFIG_ISCSI_IBFT=m
# CONFIG_GOOGLE_FIRMWARE is not set
#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
# File systems
#
CONFIG_DCACHE_WORD_ACCESS=y
@@ -5129,7 +5482,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# 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
@@ -5151,6 +5503,7 @@ CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
@@ -5163,6 +5516,9 @@ CONFIG_OCFS2_FS_STATS=y
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5171,7 +5527,7 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5232,13 +5588,15 @@ CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_CONFIGFS_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
CONFIG_AFFS_FS=m
CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5285,6 +5643,12 @@ CONFIG_UFS_FS=m
# CONFIG_UFS_DEBUG is not set
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5292,16 +5656,24 @@ CONFIG_NFS_V2=m
CONFIG_NFS_V3=m
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-# CONFIG_NFS_V4_1 is not set
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
@@ -5309,9 +5681,12 @@ CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
+CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5319,10 +5694,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5339,6 +5715,7 @@ CONFIG_AFS_FSCACHE=y
CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
@@ -5397,82 +5774,111 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
CONFIG_PRINTK_TIME=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_READABLE_ASM is not set
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
CONFIG_LOCKUP_DETECTOR=y
CONFIG_HARDLOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
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_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH 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_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_KOBJECT 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=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# 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=m
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5480,13 +5886,15 @@ 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_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
CONFIG_RING_BUFFER=y
CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING=y
@@ -5499,6 +5907,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5508,33 +5918,44 @@ CONFIG_KPROBE_EVENT=y
CONFIG_UPROBE_EVENT=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
# 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=m
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_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set
# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
@@ -5552,8 +5973,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
#
# Security options
@@ -5575,14 +5996,17 @@ CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -5591,8 +6015,6 @@ 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
#
@@ -5604,7 +6026,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5645,6 +6067,7 @@ CONFIG_CRYPTO_XTS=m
#
# Hash modes
#
+CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_HMAC=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_VMAC=m
@@ -5654,6 +6077,10 @@ CONFIG_CRYPTO_VMAC=m
#
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -5662,8 +6089,10 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -5673,7 +6102,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_X86_64=m
CONFIG_CRYPTO_AES_NI_INTEL=m
CONFIG_CRYPTO_ANUBIS=m
@@ -5683,8 +6112,13 @@ CONFIG_CRYPTO_BLOWFISH_COMMON=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
@@ -5694,6 +6128,7 @@ CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5707,6 +6142,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
#
# Random Number Generation
@@ -5719,20 +6156,25 @@ CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_HAVE_KVM=y
CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
CONFIG_HAVE_KVM_EVENTFD=y
CONFIG_KVM_APIC_ARCHITECTURE=y
CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_KVM_AMD=m
CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
CONFIG_BINARY_PRINTF=y
#
@@ -5742,10 +6184,14 @@ CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -5760,9 +6206,12 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
@@ -5777,11 +6226,11 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_ENC8=y
CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
CONFIG_BCH=m
CONFIG_BCH_CONST_PARAMS=y
CONFIG_TEXTSEARCH=y
@@ -5799,5 +6248,22 @@ CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/abs/core/linux/criu-no-expert.patch b/abs/core/linux/criu-no-expert.patch
new file mode 100644
index 0000000..2124427
--- /dev/null
+++ b/abs/core/linux/criu-no-expert.patch
@@ -0,0 +1,22 @@
+diff --git a/init/Kconfig b/init/Kconfig
+index be8b7f5..7461760 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+ endif # CGROUPS
+
+ config CHECKPOINT_RESTORE
+- bool "Checkpoint/restore support" if EXPERT
++ bool "Checkpoint/restore support"
+ default n
+ help
+ Enables additional kernel features in a sake of checkpoint/restore.
+@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
+ If unsure, say N here.
+
+ menuconfig NAMESPACES
+- bool "Namespaces support" if EXPERT
++ bool "Namespaces support"
+ default !EXPERT
+ help
+ Provides the way to make tasks work with different objects using
diff --git a/abs/core/linux/irq_cfg_pointer-3.6.6.patch b/abs/core/linux/irq_cfg_pointer-3.6.6.patch
deleted file mode 100644
index 32583c0..0000000
--- a/abs/core/linux/irq_cfg_pointer-3.6.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
-
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index c265593..1817fa9 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
- continue;
-
- cfg = irq_cfg(irq);
-+ if (!cfg)
-+ continue;
-+
- raw_spin_lock(&desc->lock);
-
- /*
diff --git a/abs/core/linux/linux.install b/abs/core/linux/linux.install
index 4ed8580..a70296f 100644
--- a/abs/core/linux/linux.install
+++ b/abs/core/linux/linux.install
@@ -2,10 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.6.7-1-ARCH
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
post_install () {
# updating module dependencies
@@ -13,40 +10,9 @@ post_install () {
depmod ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME}
-
- # compat symlinks for the official kernels only
- if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
- loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
- [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
- if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
- # add compat symlinks for the initramfs images
- ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
- ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
- boot/kernel26${KERNEL_NAME}-fallback.img
- ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
- fi
- fi
}
post_upgrade() {
- pacman -Q grub &>/dev/null
- hasgrub=$?
- pacman -Q grub-common &>/dev/null
- hasgrub2=$?
- pacman -Q lilo &>/dev/null
- haslilo=$?
- # reminder notices
- if [ $haslilo -eq 0 ]; then
- echo ">>>"
- if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
- echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
- else
- echo ">>> You appear to be using the LILO bootloader. You should run"
- echo ">>> 'lilo' before rebooting."
- fi
- echo ">>>"
- fi
-
if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
echo "WARNING: /boot appears to be a separate partition but is not mounted."
fi
@@ -60,6 +26,6 @@ post_upgrade() {
post_remove() {
# also remove the compat symlinks
- rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img
- rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img
+ rm -f boot/initramfs-linux${KERNEL_NAME}.img
+ rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
}
diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg
new file mode 100644
index 0000000..a5f68a8
--- /dev/null
+++ b/abs/core/linux/linux.install.pkg
@@ -0,0 +1,31 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+KERNEL_NAME=
+KERNEL_VERSION=3.12.6-1-ARCH
+
+post_install () {
+ # updating module dependencies
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod ${KERNEL_VERSION}
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux${KERNEL_NAME}
+}
+
+post_upgrade() {
+ if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
+ echo "WARNING: /boot appears to be a separate partition but is not mounted."
+ fi
+
+ # updating module dependencies
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod ${KERNEL_VERSION}
+ echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+ mkinitcpio -p linux${KERNEL_NAME}
+}
+
+post_remove() {
+ # also remove the compat symlinks
+ rm -f boot/initramfs-linux${KERNEL_NAME}.img
+ rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
+}
diff --git a/abs/core/linux/module-init-wait-3.6.patch b/abs/core/linux/module-init-wait-3.6.patch
deleted file mode 100644
index 1bcfd24..0000000
--- a/abs/core/linux/module-init-wait-3.6.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: wait when loading a module which is currently initializing.
-X-Git-Tag: v3.7-rc1~2^2~32
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
-
-module: wait when loading a module which is currently initializing.
-
-The original module-init-tools module loader used a fnctl lock on the
-.ko file to avoid attempts to simultaneously load a module.
-Unfortunately, you can't get an exclusive fcntl lock on a read-only
-fd, making this not work for read-only mounted filesystems.
-module-init-tools has a hacky sleep-and-loop for this now.
-
-It's not that hard to wait in the kernel, and only return -EEXIST once
-the first module has finished loading (or continue loading the module
-if the first one failed to initialize for some reason). It's also
-consistent with what we do for dependent modules which are still loading.
-
-Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 63cf6e7..74bc195 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
- return module_finalize(info->hdr, info->sechdrs, mod);
- }
-
-+/* Is this module of this name done loading? No locks held. */
-+static bool finished_loading(const char *name)
-+{
-+ struct module *mod;
-+ bool ret;
-+
-+ mutex_lock(&module_mutex);
-+ mod = find_module(name);
-+ ret = !mod || mod->state != MODULE_STATE_COMING;
-+ mutex_unlock(&module_mutex);
-+
-+ return ret;
-+}
-+
- /* Allocate and load the module: note that size of section 0 is always
- zero, and we rely on this for optional sections. */
- static struct module *load_module(void __user *umod,
-@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
- const char __user *uargs)
- {
- struct load_info info = { NULL, };
-- struct module *mod;
-+ struct module *mod, *old;
- long err;
-
- pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
-@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
- * function to insert in a way safe to concurrent readers.
- * The mutex protects against concurrent writers.
- */
-+again:
- mutex_lock(&module_mutex);
-- if (find_module(mod->name)) {
-+ if ((old = find_module(mod->name)) != NULL) {
-+ if (old->state == MODULE_STATE_COMING) {
-+ /* Wait in case it fails to load. */
-+ mutex_unlock(&module_mutex);
-+ err = wait_event_interruptible(module_wq,
-+ finished_loading(mod->name));
-+ if (err)
-+ goto free_arch_cleanup;
-+ goto again;
-+ }
- err = -EEXIST;
- goto unlock;
- }
diff --git a/abs/core/linux/module-symbol-waiting-3.6.patch b/abs/core/linux/module-symbol-waiting-3.6.patch
deleted file mode 100644
index b87a38f..0000000
--- a/abs/core/linux/module-symbol-waiting-3.6.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: fix symbol waiting when module fails before init
-X-Git-Tag: v3.7-rc1~2^2~33
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
-
-module: fix symbol waiting when module fails before init
-
-We use resolve_symbol_wait(), which blocks if the module containing
-the symbol is still loading. However:
-
-1) The module_wq we use is only woken after calling the modules' init
- function, but there are other failure paths after the module is
- placed in the linked list where we need to do the same thing.
-
-2) wake_up() only wakes one waiter, and our waitqueue is shared by all
- modules, so we need to wake them all.
-
-3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
- it after we've grabbed and dropped the module_mutex, not just after
- the state assignment.
-
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 7f2ee45f..63cf6e7 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
- /* Unlink carefully: kallsyms could be walking list. */
- list_del_rcu(&mod->list);
- module_bug_cleanup(mod);
--
-+ wake_up_all(&module_wq);
- ddebug:
- dynamic_debug_remove(info.debug);
- unlock:
-@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- blocking_notifier_call_chain(&module_notify_list,
- MODULE_STATE_GOING, mod);
- free_module(mod);
-- wake_up(&module_wq);
-+ wake_up_all(&module_wq);
- return ret;
- }
- if (ret > 0) {
-@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- dump_stack();
- }
-
-- /* Now it's a first class citizen! Wake up anyone waiting for it. */
-+ /* Now it's a first class citizen! */
- mod->state = MODULE_STATE_LIVE;
-- wake_up(&module_wq);
- blocking_notifier_call_chain(&module_notify_list,
- MODULE_STATE_LIVE, mod);
-
-@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- mod->init_ro_size = 0;
- mod->init_text_size = 0;
- mutex_unlock(&module_mutex);
-+ wake_up_all(&module_wq);
-
- return 0;
- }
--
cgit v0.12
From 8c247d9a23dd90b4e62b04138035b6650178eeff Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:53:55 -0600
Subject: lirc: update for kernel 3.12 update binary path to /usr/bin refs #961
---
abs/core/lirc/PKGBUILD | 82 +++++++++++++++++++++++--------------------
abs/core/lirc/linux-3.8.patch | 80 +++++++++++++++++++++++++++++++++++++++++
abs/core/lirc/lirc.install | 2 +-
abs/core/lirc/lirc.service | 5 +--
abs/core/lirc/lircm.service | 7 ++--
5 files changed, 131 insertions(+), 45 deletions(-)
create mode 100644 abs/core/lirc/linux-3.8.patch
diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index 956b1e5..666865f 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -1,60 +1,88 @@
-# $Id: PKGBUILD 170041 2012-10-31 07:25:00Z tpowa $
+# $Id: PKGBUILD 202757 2013-12-26 13:05:51Z thomas $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=34
+pkgrel=67
epoch=1
-_extramodules=extramodules-3.6-ARCH
+_extramodules=extramodules-3.12-ARCH
arch=('i686' 'x86_64')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.6' 'linux-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2' 'iguanair')
+makedepends=('help2man' 'linux>=3.12' 'linux<3.13' 'linux-headers>=3.12' 'linux-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
lircd-handle-large-config.patch
lirc_atiusb-kfifo.patch
kernel-2.6.39.patch
- lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
- lirc.service lircm.service irexec.service
- lirc.tmpfiles
- )
+ linux-3.8.patch
+ lirc.logrotate
+ lirc.service
+ lircm.service
+ irexec.service
+ lirc.tmpfiles)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
+ '3deb02604b37811d41816e9b4385fcc3'
+ 'a9ab637e7207472e61e55a2fa75dc555'
+ '1847b9997685bc3ad2cf11bea4590a92'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a')
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
cd "${srcdir}/lirc-${pkgver}"
patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+ patch -Np1 -i "${srcdir}/linux-3.8.patch"
+
+ # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+ sed -i -e 's|char.*font1_name.*Courier.*$|char font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
+ # use /dev/lirc0 by default instead of /dev/lirc
+ sed -i -e 's|#define DEV_LIRC "lirc"|#define DEV_LIRC "lirc0"|' config.h.in
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
-e 's/@X_LIBS@//g' \
-e 's/@X_PRE_LIBS@//g' \
-e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+
+ # fix for new automake #33497
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
libtoolize
autoreconf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}/lirc-${pkgver}"
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
--with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
- --with-transmitter
+ --sbindir=/usr/bin --with-transmitter
# Remove drivers already in kernel
sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
- -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
make
}
package_lirc() {
pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'linux>=3.6' 'linux<3.7' 'iguanair')
+ depends=('lirc-utils' 'linux>=3.12' 'linux<3.13' 'iguanair')
replaces=('lirc+pctv')
install=lirc.install
@@ -69,16 +97,13 @@ package_lirc() {
package_lirc-utils() {
pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair')
optdepends=('python2: pronto2lirc utility')
- options=('strip' '!libtool')
- backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+ options=('strip')
install=lirc-utils.install
cd "${srcdir}/lirc-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
- cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
@@ -89,29 +114,8 @@ package_lirc-utils() {
# install the logrotate config
install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
- # install conf.d file
- install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
- # install conf.d file
- install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
install -d "${pkgdir}/etc/lirc"
# remove built modules
rm -r "${pkgdir}/usr/lib/modules"
}
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '3deb02604b37811d41816e9b4385fcc3'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb'
- 'dab8a73bcc5fd5479d8750493d8d97dc'
- 'c2e20fe68b034df752dba2773db16ebe'
- '07131d117fcfe9dcd50c453c3a5e9531'
- 'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/abs/core/lirc/linux-3.8.patch b/abs/core/lirc/linux-3.8.patch
new file mode 100644
index 0000000..7b6378a
--- /dev/null
+++ b/abs/core/lirc/linux-3.8.patch
@@ -0,0 +1,80 @@
+diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200
+@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
+
+ static struct platform_device *lirc_serial_dev;
+
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
+
+ static struct platform_driver lirc_serial_driver = {
+ .probe = lirc_serial_probe,
+- .remove = __devexit_p(lirc_serial_remove),
++ .remove = lirc_serial_remove,
+ .suspend = lirc_serial_suspend,
+ .resume = lirc_serial_resume,
+ .driver = {
+diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200
+@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
+ return 0;
+ }
+
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+ static struct platform_driver lirc_sir_driver = {
+ .probe = lirc_sir_probe,
+- .remove = __devexit_p(lirc_sir_remove),
++ .remove = lirc_sir_remove,
+ .driver = {
+ .name = "lirc_sir",
+ .owner = THIS_MODULE,
+diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200
+@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install
index a9f1c5c..31d4bcf 100644
--- a/abs/core/lirc/lirc.install
+++ b/abs/core/lirc/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.6-ARCH
+EXTRAMODULES=extramodules-3.12-ARCH
post_install() {
# updating module dependencies
diff --git a/abs/core/lirc/lirc.service b/abs/core/lirc/lirc.service
index 953601f..a797d16 100644
--- a/abs/core/lirc/lirc.service
+++ b/abs/core/lirc/lirc.service
@@ -1,11 +1,12 @@
[Unit]
Description=Linux Infrared Remote Control
+After=network.target
[Service]
-ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
Type=forking
PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0
[Install]
WantedBy=multi-user.target
+
diff --git a/abs/core/lirc/lircm.service b/abs/core/lirc/lircm.service
index 6b258e3..c0b5e36 100644
--- a/abs/core/lirc/lircm.service
+++ b/abs/core/lirc/lircm.service
@@ -1,11 +1,12 @@
[Unit]
Description=LIRC Mouse
-After=lirc.service
-Wants=lirc.service
+Requires=lirc.service
+After=network.target lirc.service
[Service]
-ExecStart=/usr/sbin/lircmd -u
Type=forking
+ExecStart=/usr/sbin/lircmd
[Install]
WantedBy=multi-user.target
+
--
cgit v0.12
From d3ddc9464d10d4ec2dddc43e2f0cb3725c6a2769 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:54:12 -0600
Subject: logrotate: update binary path to /usr/bin refs #961
---
abs/core/logrotate/PKGBUILD | 44 +++++++++---------
.../logrotate/logrotate-3.8.1-noasprintf.patch | 53 ----------------------
abs/core/logrotate/logrotate.conf | 9 +++-
abs/core/logrotate/logrotate.cron.daily | 16 ++++---
abs/core/logrotate/paths.patch | 25 ++++++++++
5 files changed, 64 insertions(+), 83 deletions(-)
delete mode 100644 abs/core/logrotate/logrotate-3.8.1-noasprintf.patch
mode change 100755 => 100644 abs/core/logrotate/logrotate.cron.daily
create mode 100644 abs/core/logrotate/paths.patch
diff --git a/abs/core/logrotate/PKGBUILD b/abs/core/logrotate/PKGBUILD
index 2e38d80..0730219 100644
--- a/abs/core/logrotate/PKGBUILD
+++ b/abs/core/logrotate/PKGBUILD
@@ -1,47 +1,45 @@
-# $Id: PKGBUILD 162089 2012-06-19 15:44:03Z allan $
+# $Id: PKGBUILD 196792 2013-10-19 09:14:49Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=logrotate
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.7
+pkgrel=1
pkgdesc="Rotates system logs automatically"
arch=('i686' 'x86_64')
url="https://fedorahosted.org/logrotate/"
license=('GPL')
groups=('base')
-depends=('popt' 'cron' 'gzip')
+depends=('popt' 'gzip' 'acl')
+optdepends=('cron: scheduled log rotation')
backup=('etc/logrotate.conf')
source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
- 'logrotate-3.8.1-noasprintf.patch'
+ 'paths.patch'
'logrotate.conf'
'logrotate.cron.daily')
-md5sums=('bd2e20d8dc644291b08f9215397d28a5'
- 'fc8e4e15211d8aefd431d0e2e96223c4'
- '462a5f364717461537eb2ae6394ad23e'
- 'aa8ac8283908b6114483a293adcb650f')
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ cd "$srcdir/${pkgname}-${pkgver}"
- patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch
+ patch -p0 -i "$srcdir/paths.patch"
- sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
- -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\
- -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\
- -i config.h
-
- make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
+ make WITH_ACL=yes RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
}
check() {
- cd "$srcdir/${pkgname}-${pkgver}"
- make test
+ cd "$srcdir/${pkgname}-${pkgver}"
+ make test
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}"
- make PREFIX="$pkgdir" MANDIR="usr/share/man" install
+ cd "$srcdir/${pkgname}-${pkgver}"
+ make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
+ mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
- install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
- install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
+ install -dm755 "$pkgdir/etc/logrotate.d"
+ install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
+ install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
}
+md5sums=('99e08503ef24c3e2e3ff74cc5f3be213'
+ 'e76526bcd6fc33c9d921e1cb1eff1ffb'
+ '86209d257c8b8bc0ae34d6f6ef057c0f'
+ 'dd5fd26724274fd9c827eadad60ff4c5')
diff --git a/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch b/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch
deleted file mode 100644
index be0c080..0000000
--- a/abs/core/logrotate/logrotate-3.8.1-noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
-- va_list arg;
-- char *str;
-- int size;
-- int rv;
--
-- va_start(arg, format);
-- size = vsnprintf(NULL, 0, format, arg);
-- size++;
-- va_start(arg, format);
-- str = malloc(size);
-- if (str == NULL) {
-- va_end(arg);
-- /*
-- * Strictly speaking, GNU asprintf doesn't do this,
-- * but the caller isn't checking the return value.
-- */
-- fprintf(stderr, "failed to allocate memory\\n");
-- exit(1);
-- }
-- rv = vsnprintf(str, size, format, arg);
-- va_end(arg);
--
-- *string_ptr = str;
-- return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
---- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
-
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
-
- #endif
diff --git a/abs/core/logrotate/logrotate.conf b/abs/core/logrotate/logrotate.conf
index 88b4935..9c1927f 100644
--- a/abs/core/logrotate/logrotate.conf
+++ b/abs/core/logrotate/logrotate.conf
@@ -25,7 +25,14 @@ include /etc/logrotate.d
/var/log/wtmp {
monthly
- create 0664 root root
+ create 0664 root utmp
+ minsize 1M
rotate 1
}
+/var/log/btmp {
+ missingok
+ monthly
+ create 0600 root utmp
+ rotate 1
+}
diff --git a/abs/core/logrotate/logrotate.cron.daily b/abs/core/logrotate/logrotate.cron.daily
old mode 100755
new mode 100644
index ee0eeeb..11fe09c
--- a/abs/core/logrotate/logrotate.cron.daily
+++ b/abs/core/logrotate/logrotate.cron.daily
@@ -9,16 +9,20 @@ IONICE_CLASS=2
# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
IONICE_PRIORITY=7
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
-
+CMD_LOGROTATE="/usr/bin/logrotate /etc/logrotate.conf"
+
if [ -x /usr/bin/nice ]; then
CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
fi
-
+
if [ -x /usr/bin/ionice ]; then
- CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
+ IONICE_CMD="/usr/bin/ionice -c ${IONICE_CLASS:-2}"
+ if [ $IONICE_CLASS -ne 3 ]; then
+ IONICE_CMD="${IONICE_CMD} -n ${IONICE_PRIORITY:-7}"
+ fi
+ CMD_LOGROTATE="${IONICE_CMD} ${CMD_LOGROTATE}"
fi
-
+
${CMD_LOGROTATE}
-
+
exit 0
diff --git a/abs/core/logrotate/paths.patch b/abs/core/logrotate/paths.patch
new file mode 100644
index 0000000..83166b0
--- /dev/null
+++ b/abs/core/logrotate/paths.patch
@@ -0,0 +1,25 @@
+--- config.h 2012-08-01 12:56:47.000000000 +0200
++++ config.h 2012-08-03 09:53:05.025039199 +0200
+@@ -27,11 +27,11 @@
+ * Default settings for Linux - leave these last.
+ */
+ #ifndef DEFAULT_MAIL_COMMAND
+-#define DEFAULT_MAIL_COMMAND "/bin/mail"
++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
+ #endif
+
+ #ifndef COMPRESS_COMMAND
+-#define COMPRESS_COMMAND "/bin/gzip"
++#define COMPRESS_COMMAND "/usr/bin/gzip"
+ #endif
+
+ #ifndef COMPRESS_EXT
+@@ -39,7 +39,7 @@
+ #endif
+
+ #ifndef UNCOMPRESS_COMMAND
+-#define UNCOMPRESS_COMMAND "/bin/gunzip"
++#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
+ #endif
+
+ #ifndef STATEFILE
--
cgit v0.12
From e9cd17be0f57ba3a9abd1af55e306b5bb1a5dce6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:54:33 -0600
Subject: lsof: 4.0.87 update binary path to /usr/bin refs #961
---
abs/core/lsof/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/lsof/PKGBUILD b/abs/core/lsof/PKGBUILD
index 2c7f384..4cfc24f 100644
--- a/abs/core/lsof/PKGBUILD
+++ b/abs/core/lsof/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $
+# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
# Contributor: Jochem Kossen <j.kossen@home.nl>
pkgname=lsof
-pkgver=4.86
-pkgrel=1
+pkgver=4.87
+pkgrel=2
pkgdesc="Lists open files for running Unix processes"
arch=('i686' 'x86_64')
url="http://people.freebsd.org/~abe/"
@@ -34,11 +34,11 @@ package() {
$pkgdir/usr/share/doc/$pkgname/$file
done
- install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof
+ install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof
install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8
install -D -m0644 -o root -g root ${srcdir}/license.txt \
${pkgdir}/usr/share/licenses/lsof/LICENSE
}
-md5sums=('9f1cda41f35add068c7b81f873fa56b5'
+md5sums=('80e2a76d0e05826db910ec88e631296c'
'1b63c76bd10437cabf890508c8e58d36')
--
cgit v0.12
From a5ab0f4ea7aea271cd87c75a9cdfac595dcc97b7 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:54:48 -0600
Subject: lvm2 update binary path to /usr/bin refs #961
---
abs/core/lvm2/PKGBUILD | 74 +++++++++++++++++++++++++-----------
abs/core/lvm2/dmeventd.service | 14 +++++++
abs/core/lvm2/dmeventd.socket | 11 ++++++
abs/core/lvm2/lvm-monitoring.service | 17 +++++++++
abs/core/lvm2/lvm.service | 16 --------
abs/core/lvm2/lvm2.install | 16 ++++++++
abs/core/lvm2/lvm2_hook | 24 +++---------
abs/core/lvm2/lvm2_install | 16 ++++----
abs/core/lvm2/lvmetad.service | 16 ++++++++
abs/core/lvm2/lvmetad.socket | 10 +++++
abs/core/lvm2/sd-lvm2 | 31 +++++++++++++++
11 files changed, 180 insertions(+), 65 deletions(-)
create mode 100644 abs/core/lvm2/dmeventd.service
create mode 100644 abs/core/lvm2/dmeventd.socket
create mode 100644 abs/core/lvm2/lvm-monitoring.service
delete mode 100644 abs/core/lvm2/lvm.service
create mode 100644 abs/core/lvm2/lvm2.install
create mode 100644 abs/core/lvm2/lvmetad.service
create mode 100644 abs/core/lvm2/lvmetad.socket
create mode 100644 abs/core/lvm2/sd-lvm2
diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD
index bda634b..e31f8a8 100644
--- a/abs/core/lvm2/PKGBUILD
+++ b/abs/core/lvm2/PKGBUILD
@@ -1,60 +1,85 @@
-# $Id: PKGBUILD 163019 2012-07-05 20:37:09Z eric $
+# $Id: PKGBUILD 199802 2013-11-16 17:53:26Z thomas $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.96
-pkgrel=3
+pkgver=2.02.104
+pkgrel=1
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
+makedepends=('systemd' 'thin-provisioning-tools')
groups=('base')
source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
lvm2_install
lvm2_hook
+ sd-lvm2
11-dm-initramfs.rules
- lvm.service
- lvm2.conf)
-sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f'
- '12e9016485c415c344524e6e75e23dfa6ca097ac'
- '3e1680f9b76ce9150d08865d99db90fd15532271'
- 'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+ lvm2.conf
+ dmeventd.service
+ dmeventd.socket
+ lvm-monitoring.service
+ lvmetad.service
+ lvmetad.socket)
+sha1sums=('4c296453e10deafe02004fde40075cdb3792eeb2'
+ 'SKIP'
+ '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
+ 'ff0fdf0a3005a41acd4b36865056109effc3474b'
+ '30777d42e31cb7fe1f4fadc1e8f4c4d4cdd8ffed'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
- '17df8689630a77e46899a8bd56997d9db896d5af'
- 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+ 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
+ '01782ce8e10718c1513e3906b126f30f682f5cab'
+ '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
+ 'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec'
+ 'f857a4a63fcc604a981e56875edda91767d4f1bf'
+ 'fcfc265e3b10294cc4b10949a342e9db4310b186')
+
+prepare() {
+ cd LVM2.${pkgver}
+ # enable lvmetad
+ sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+}
build() {
- cd "${srcdir}/LVM2.${pkgver}"
+ cd LVM2.${pkgver}
unset LDFLAGS
- ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
- --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \
- --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
- --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \
- --with-default-locking-dir=/run/lock/lvm
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+ --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
+ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+ --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
+ --enable-lvmetad --with-thin=internal
make
}
package_device-mapper() {
pkgdesc="Device mapper userspace library and tools"
url="http://sourceware.org/dm/"
- depends=('glibc' 'udev')
+ depends=('glibc' 'systemd')
- cd "${srcdir}/LVM2.${pkgver}"
+ cd LVM2.${pkgver}
make DESTDIR="${pkgdir}" install_device-mapper
# extra udev rule for device-mapper in initramfs
install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+ # Install dmeventd socket and service
+ install -D -m644 "${srcdir}/dmeventd.service" "${pkgdir}/usr/lib/systemd/system/dmeventd.service"
+ install -D -m644 "${srcdir}/dmeventd.socket" "${pkgdir}/usr/lib/systemd/system/dmeventd.socket"
+ install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+ ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket"
}
package_lvm2() {
pkgdesc="Logical Volume Manager 2 utilities"
- depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+ depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline')
conflicts=('lvm' 'mkinitcpio<0.7')
backup=('etc/lvm/lvm.conf')
options=('!makeflags')
+ optdepends=('thin-provisioning-tools: For thin provisioning support.')
+ install=lvm2.install
- cd "${srcdir}/LVM2.${pkgver}"
+ cd LVM2.${pkgver}
make DESTDIR="${pkgdir}" install_lvm2
# install applib
make -C liblvm DESTDIR="${pkgdir}" install
@@ -63,7 +88,12 @@ package_lvm2() {
# mkinitcpio hook
install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+ install -D -m644 "${srcdir}/sd-lvm2" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
# systemd support
- install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
+ install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"
+ install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service"
+ install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket"
+ install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+ ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
}
diff --git a/abs/core/lvm2/dmeventd.service b/abs/core/lvm2/dmeventd.service
new file mode 100644
index 0000000..e0b1b33
--- /dev/null
+++ b/abs/core/lvm2/dmeventd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Device-mapper event daemon
+Documentation=man:dmeventd(8)
+Requires=dmeventd.socket
+After=dmeventd.socket
+DefaultDependencies=no
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/dmeventd
+ExecReload=/usr/bin/dmeventd -R
+Environment=SD_ACTIVATION=1
+PIDFile=/run/dmeventd.pid
+OOMScoreAdjust=-1000
diff --git a/abs/core/lvm2/dmeventd.socket b/abs/core/lvm2/dmeventd.socket
new file mode 100644
index 0000000..726d112
--- /dev/null
+++ b/abs/core/lvm2/dmeventd.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=Device-mapper event daemon FIFOs
+Documentation=man:dmeventd(8)
+Before=sockets.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Socket]
+ListenFIFO=/run/dmeventd-server
+ListenFIFO=/run/dmeventd-client
+SocketMode=0600
diff --git a/abs/core/lvm2/lvm-monitoring.service b/abs/core/lvm2/lvm-monitoring.service
new file mode 100644
index 0000000..14b2d1d
--- /dev/null
+++ b/abs/core/lvm2/lvm-monitoring.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
+Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
+Requires=dmeventd.socket
+After=dmeventd.socket lvmetad.socket
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
+ExecStart=/usr/bin/lvm vgchange --monitor y
+ExecStop=/usr/bin/lvm vgchange --monitor n
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
diff --git a/abs/core/lvm2/lvm.service b/abs/core/lvm2/lvm.service
deleted file mode 100644
index 277d5a7..0000000
--- a/abs/core/lvm2/lvm.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --sysinit --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/abs/core/lvm2/lvm2.install b/abs/core/lvm2/lvm2.install
new file mode 100644
index 0000000..7faf708
--- /dev/null
+++ b/abs/core/lvm2/lvm2.install
@@ -0,0 +1,16 @@
+post_upgrade() {
+ if [ $(vercmp $2 2.02.98-2) -lt 0 ]; then
+ echo "Changes to the lvm2 package:"
+ echo " + Activating lvm in mkinitcpio now requires both the 'udev' and 'lvm2' hooks."
+ echo " + LVM volumes are automatically activated by udev (full hotplug support)."
+ echo " + You MUST have use_lvmetad = 1 in /etc/lvm/lvm.conf (the default)."
+ echo " + If you uncomment auto_activation_volume_list in /etc/lvm/lvm.conf, only the"
+ echo " volumes listed there will be activated (default: it is commented out)."
+ if [ -f /etc/lvm/lvm.conf.pacnew ]; then
+ echo "WARNING: /etc/lvm/lvm.conf.pacnew exists. You MUST merge the required changes"
+ echo " into /etc/lvm/lvm.conf or LVM will fail to work."
+ fi
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook
index e69b334..65de7bd 100644
--- a/abs/core/lvm2/lvm2_hook
+++ b/abs/core/lvm2/lvm2_hook
@@ -1,24 +1,12 @@
#!/usr/bin/ash
-run_hook() {
- local pvdev
-
- modprobe -q dm-mod >/dev/null 2>&1
-
- # If the lvmwait= parameter has been specified on the command line
- # wait for the device(s) before trying to activate the volume group(s)
- for pvdev in ${lvmwait//,/ }; do
- poll_device ${pvdev} ${rootdelay}
- done
-
- msg "Activating logical volumes..."
- [ -d /etc/lvm ] && lvm vgscan
+run_earlyhook() {
+ mkdir /run/lvm
+ lvmetad
+}
- if [ -n "$quiet" ]; then
- lvm vgchange --sysinit -a y >/dev/null
- else
- lvm vgchange --sysinit -a y
- fi
+run_cleanuphook() {
+ kill $(cat /run/lvmetad.pid)
}
# vim: set ft=sh ts=4 sw=4 et:
diff --git a/abs/core/lvm2/lvm2_install b/abs/core/lvm2/lvm2_install
index 145ce49..6f3c1cb 100644
--- a/abs/core/lvm2/lvm2_install
+++ b/abs/core/lvm2/lvm2_install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
build() {
local mod
@@ -6,25 +6,23 @@ build() {
add_module "$mod"
done
- add_binary "/sbin/lvm"
- add_binary "/sbin/dmsetup"
+ add_binary "/usr/bin/lvm"
+ add_binary "/usr/bin/lvmetad"
+ add_binary "/usr/bin/dmsetup"
add_file "/usr/lib/udev/rules.d/10-dm.rules"
add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+ add_file "/etc/lvm/lvm.conf"
add_runscript
}
help() {
cat <<HELPEOF
-This hook loads the necessary modules for an LVM2 root device.
-
-The optional lvmwait= parameter followed by a comma-separated
-list of device names can be given on the command line.
-It will cause the hook to wait until all given devices exist
-before trying to scan and activate any volume groups.
+This hook enables LVM2 volumes in initramfs.
HELPEOF
}
diff --git a/abs/core/lvm2/lvmetad.service b/abs/core/lvm2/lvmetad.service
new file mode 100644
index 0000000..4be520a
--- /dev/null
+++ b/abs/core/lvm2/lvmetad.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=LVM2 metadata daemon
+Documentation=man:lvmetad(8)
+Requires=lvmetad.socket
+After=lvmetad.socket
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Service]
+Type=forking
+NonBlocking=true
+ExecStart=/usr/bin/lvmetad
+ExecReload=/usr/bin/lvmetad -R
+Environment=SD_ACTIVATION=1
+Restart=on-abort
+PIDFile=/run/lvmetad.pid
diff --git a/abs/core/lvm2/lvmetad.socket b/abs/core/lvm2/lvmetad.socket
new file mode 100644
index 0000000..9c0ffa5
--- /dev/null
+++ b/abs/core/lvm2/lvmetad.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=LVM2 metadata daemon socket
+Documentation=man:lvmetad(8)
+Before=sockets.target systemd-udev-trigger.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+[Socket]
+ListenStream=/run/lvm/lvmetad.socket
+SocketMode=0600
diff --git a/abs/core/lvm2/sd-lvm2 b/abs/core/lvm2/sd-lvm2
new file mode 100644
index 0000000..07cb19a
--- /dev/null
+++ b/abs/core/lvm2/sd-lvm2
@@ -0,0 +1,31 @@
+#!/usr/bin/bash
+
+build() {
+ local mod
+ for mod in dm-mod dm-snapshot dm-mirror; do
+ add_module "$mod"
+ done
+
+ add_binary "/usr/bin/lvm"
+ add_binary "/usr/bin/lvmetad"
+ add_binary "/usr/bin/dmsetup"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+ add_file "/etc/lvm/lvm.conf"
+
+ add_file "/usr/lib/systemd/system/lvmetad.service"
+ add_file "/usr/lib/systemd/system/lvmetad.socket"
+ add_symlink "/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+}
+
+help() {
+ cat <<HELPEOF
+This hook enables LVM2 volumes in systemd-based initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
--
cgit v0.12
From e1709677e5779e035df626feed810bf92085a0c2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:55:06 -0600
Subject: man-db: 2.6.5 update binary path to /usr/bin refs #961
---
abs/core/man-db/PKGBUILD | 30 +++++++++++++++++-------------
abs/core/man-db/man-db.cron.daily | 2 +-
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/abs/core/man-db/PKGBUILD b/abs/core/man-db/PKGBUILD
index b283a92..b9d5cda 100644
--- a/abs/core/man-db/PKGBUILD
+++ b/abs/core/man-db/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $
+# $Id: PKGBUILD 197832 2013-10-30 11:05:56Z allan $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
pkgname=man-db
-pkgver=2.6.3
+pkgver=2.6.5
pkgrel=1
pkgdesc="A utility for reading man pages"
arch=('i686' 'x86_64')
url="http://www.nongnu.org/man-db/"
license=('GPL' 'LGPL')
groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
+depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less')
+optdepends=('gzip')
backup=('etc/man_db.conf'
- 'etc/cron.daily/man-db')
+ 'etc/cron.daily/man-db')
conflicts=('man')
provides=('man')
replaces=('man')
install=${pkgname}.install
source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
convert-mans man-db.cron.daily)
-options=('!libtool')
-md5sums=('a593a095599ae97bcacf8d038659a146'
- '64975c20b1a6453f9b860ff7f916bcf1'
- '2b7662a7d5b33fe91f9f3e034361a2f6'
- 'd30c39ae47560304471b5461719e0f03')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
- --with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --with-db=gdbm \
+ --disable-setuid \
+ --enable-mandirs=GNU \
--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
- make check
+ make -k check
}
package() {
@@ -54,3 +54,7 @@ package() {
install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
}
+md5sums=('36f59d9314b45a266ba350584b4d7cc1'
+ 'SKIP'
+ '2b7662a7d5b33fe91f9f3e034361a2f6'
+ '934fd047fecb915038bf4bf844ea609c')
diff --git a/abs/core/man-db/man-db.cron.daily b/abs/core/man-db/man-db.cron.daily
index 53e66e1..9b4abd8 100755
--- a/abs/core/man-db/man-db.cron.daily
+++ b/abs/core/man-db/man-db.cron.daily
@@ -12,7 +12,7 @@ IONICE_PRIORITY=7
UPDATEMANDB="/usr/bin/mandb --quiet"
# Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
+#/usr/bin/makewhatis -u -w
# taken from Debian
# man-db cron daily
--
cgit v0.12
From 4061895c257e60fa6368b38c4cfd5191f5481a16 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:55:23 -0600
Subject: mdadm 3.3 update binary path to /usr/bin refs #961
---
abs/core/mdadm/PKGBUILD | 39 ++++-----
abs/core/mdadm/disable-werror.patch | 4 +-
abs/core/mdadm/mdadm | 42 ---------
abs/core/mdadm/mdadm-fix-udev-rules.patch | 137 ++++++++++++++++++++++++++++++
abs/core/mdadm/mdadm.conf | 4 +-
abs/core/mdadm/mdadm.service | 2 +-
abs/core/mdadm/mdadm_hook | 2 +-
abs/core/mdadm/mdadm_install | 3 +-
abs/core/mdadm/mdadm_udev_install | 7 +-
9 files changed, 167 insertions(+), 73 deletions(-)
delete mode 100755 abs/core/mdadm/mdadm
create mode 100644 abs/core/mdadm/mdadm-fix-udev-rules.patch
diff --git a/abs/core/mdadm/PKGBUILD b/abs/core/mdadm/PKGBUILD
index 3c905ac..c6402ac 100644
--- a/abs/core/mdadm/PKGBUILD
+++ b/abs/core/mdadm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160025 2012-05-28 10:25:39Z tpowa $
+# $Id: PKGBUILD 199470 2013-11-13 11:08:13Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=mdadm
-pkgver=3.2.5
+pkgver=3.3
pkgrel=2
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
arch=(i686 x86_64)
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
depends=('glibc')
backup=('etc/mdadm.conf')
source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
- mdadm
mdadm.conf
mdadm_install
mdadm_hook
@@ -21,19 +20,15 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
mdadm.service
disable-werror.patch)
replaces=('raidtools')
-md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
- '8333d405f550317c2bacd5510bf1cb60'
- '00cbed931db4f15b6ce49e3e7d433966'
- '609d10888727710cb20db7ac3e096116'
- 'fbb5542d9bdf87441a11dd7e7a0a17f8'
- 'd1d8e9eb81ce9347de74f3c84a9db09e'
- 'aafb5f9ac8437a284cbf948b9b13b179'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
-build() {
+prepare() {
cd $srcdir/$pkgname-$pkgver
patch -Np0 -i ../disable-werror.patch
- make CXFLAGS="$CFLAGS"
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
# build static mdassemble for Arch's initramfs
make MDASSEMBLE_AUTO=1 mdassemble
@@ -41,18 +36,20 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
- make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
- install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+ make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+ make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
+ install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
- install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
- # symlink for backward compatibility
- ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid
- # move /lib/* to /usr/lib/
- mv $pkgdir/lib/udev $pkgdir/usr/lib/
- rm -rf $pkgdir/lib
# systemd service file
install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
}
+md5sums=('8ac04259cdd74b4566c3b6dea9414b57'
+ '5a37c112aa07dccdde62f9fa5b888607'
+ 'af2f73f0094ebee66f503ca4710c7142'
+ 'fbfb7d07efcbaf5dc61af424c5f6e352'
+ 'b6b0bfd6487c99264578630616dfe5eb'
+ 'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+ '599745ed2bec4489e83991cff89c46ee')
diff --git a/abs/core/mdadm/disable-werror.patch b/abs/core/mdadm/disable-werror.patch
index 50a33f1..a80a414 100644
--- a/abs/core/mdadm/disable-werror.patch
+++ b/abs/core/mdadm/disable-werror.patch
@@ -3,9 +3,9 @@
@@ -42,7 +42,7 @@
CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
+ CXFLAGS ?= -ggdb
-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
endif
diff --git a/abs/core/mdadm/mdadm b/abs/core/mdadm/mdadm
deleted file mode 100755
index 9bf468e..0000000
--- a/abs/core/mdadm/mdadm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.pid
-if [[ -r $pidfile ]]; then
- read -r PID <"$pidfile"
- if [[ $PID && ! -d /proc/$PID ]]; then
- # stale pidfile
- unset PID
- rm -f "$pidfile"
- fi
-fi
-
-case $1 in
- start)
- stat_busy "Starting mdadm RAID Monitor"
- if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
- add_daemon mdadm
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping mdadm RAID Monitor"
- if [[ $PID ]] && kill "$PID" &>/dev/null; then
- rm_daemon mdadm
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/abs/core/mdadm/mdadm-fix-udev-rules.patch b/abs/core/mdadm/mdadm-fix-udev-rules.patch
new file mode 100644
index 0000000..941cadf
--- /dev/null
+++ b/abs/core/mdadm/mdadm-fix-udev-rules.patch
@@ -0,0 +1,137 @@
+diff --git a/Makefile b/Makefile
+index b6edb23..bedef96 100644
+--- a/Makefile
++++ b/Makefile
+@@ -253,8 +253,9 @@
+ $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
+ $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+
+-install-udev: udev-md-raid.rules
+- $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules
++install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules
++ $(INSTALL) -D -m 644 udev-md-raid-arrays.rules $(DESTDIR)/usr/lib/udev/rules.d/63-md-raid-arrays.rules
++ $(INSTALL) -D -m 644 udev-md-raid-assembly.rules $(DESTDIR)/usr/lib/udev/rules.d/64-md-raid-assembly.rules
+
+ uninstall:
+ rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
+diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules
+new file mode 100644
+index 0000000..883ee4d
+--- /dev/null
++++ b/udev-md-raid-arrays.rules
+@@ -0,0 +1,35 @@
++# do not edit this file, it will be overwritten on update
++
++SUBSYSTEM!="block", GOTO="md_end"
++
++# handle md arrays
++ACTION!="add|change", GOTO="md_end"
++KERNEL!="md*", GOTO="md_end"
++
++# partitions have no md/{array_state,metadata_version}, but should not
++# for that reason be ignored.
++ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
++
++# container devices have a metadata version of e.g. 'external:ddf' and
++# never leave state 'inactive'
++ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
++TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end"
++ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
++LABEL="md_ignore_state"
++
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
++ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
++ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
++ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
++ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
++ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
++ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
++ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
++
++IMPORT{builtin}="blkid"
++OPTIONS+="link_priority=100"
++OPTIONS+="watch"
++ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
++ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
++
++LABEL="md_end"
+diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules
+new file mode 100644
+index 0000000..b89775e
+--- /dev/null
++++ b/udev-md-raid-assembly.rules
+@@ -0,0 +1,19 @@
++# do not edit this file, it will be overwritten on update
++
++# assemble md arrays
++
++SUBSYSTEM!="block", GOTO="md_inc_end"
++
++# handle potential components of arrays (the ones supported by md)
++ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc"
++GOTO="md_inc_end"
++
++LABEL="md_inc"
++
++# remember you can limit what gets auto/incrementally assembled by
++# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
++
++LABEL="md_inc_end"
+diff --git a/udev-md-raid.rules b/udev-md-raid.rules
+deleted file mode 100644
+index cc7f5ef..0000000
+--- a/udev-md-raid.rules
++++ /dev/null
+@@ -1,49 +0,0 @@
+-# do not edit this file, it will be overwritten on update
+-
+-SUBSYSTEM!="block", GOTO="md_end"
+-
+-# handle potential components of arrays (the ones supported by md)
+-ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc"
+-GOTO="md_inc_skip"
+-
+-LABEL="md_inc"
+-
+-# remember you can limit what gets auto/incrementally assembled by
+-# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
+-ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode --offroot"
+-ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
+-ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
+-
+-LABEL="md_inc_skip"
+-
+-# handle md arrays
+-ACTION!="add|change", GOTO="md_end"
+-KERNEL!="md*", GOTO="md_end"
+-
+-# partitions have no md/{array_state,metadata_version}, but should not
+-# for that reason be ignored.
+-ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+-
+-# container devices have a metadata version of e.g. 'external:ddf' and
+-# never leave state 'inactive'
+-ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+-TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+-ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+-LABEL="md_ignore_state"
+-
+-IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
+-ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
+-ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+-ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
+-ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace"
+-ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n"
+-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+-ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+-
+-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+-OPTIONS+="link_priority=100"
+-OPTIONS+="watch"
+-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+-
+-LABEL="md_end"
diff --git a/abs/core/mdadm/mdadm.conf b/abs/core/mdadm/mdadm.conf
index 57bd4c6..36eaa0c 100644
--- a/abs/core/mdadm/mdadm.conf
+++ b/abs/core/mdadm/mdadm.conf
@@ -59,8 +59,8 @@ DEVICE partitions
# When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program. To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
+# mail address and/or a program. To start mdadm's monitor mode, enable
+# mdadm.service in systemd.
#
# If the lines are not found, mdadm will exit quietly
#MAILADDR root@mydomain.tld
diff --git a/abs/core/mdadm/mdadm.service b/abs/core/mdadm/mdadm.service
index 8389715..b3ca5f7 100644
--- a/abs/core/mdadm/mdadm.service
+++ b/abs/core/mdadm/mdadm.service
@@ -2,7 +2,7 @@
Description=MDADM Event Monitor
[Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/mdadm/mdadm_hook b/abs/core/mdadm/mdadm_hook
index 787be5d..5371baa 100755
--- a/abs/core/mdadm/mdadm_hook
+++ b/abs/core/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
fi
# assemble everything
- [ -s "$mdconfig" ] && /sbin/mdassemble
+ [ -s "$mdconfig" ] && /usr/bin/mdassemble
}
# vim: set ft=sh ts=4 sw=4 et:
diff --git a/abs/core/mdadm/mdadm_install b/abs/core/mdadm/mdadm_install
index cf6159e..7390509 100644
--- a/abs/core/mdadm/mdadm_install
+++ b/abs/core/mdadm/mdadm_install
@@ -8,7 +8,8 @@ build() {
echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
add_file "/etc/mdadm.conf"
fi
- add_binary "/sbin/mdassemble"
+ add_binary "/usr/bin/mdassemble"
+ add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
add_runscript
}
diff --git a/abs/core/mdadm/mdadm_udev_install b/abs/core/mdadm/mdadm_udev_install
index f6f5de4..c01cbaf 100644
--- a/abs/core/mdadm/mdadm_udev_install
+++ b/abs/core/mdadm/mdadm_udev_install
@@ -9,14 +9,15 @@ build() {
add_file "/etc/mdadm.conf"
fi
- add_binary "mdadm"
- add_file "/usr/lib/udev/rules.d/64-md-raid.rules"
+ add_binary "/usr/bin/mdadm"
+ add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
+ add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
}
help() {
cat <<HELPEOF
This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook with NOT work
+assembly via udev at runtime to create the devices. This hook will NOT work
without the udev hook included on the image.
HELPEOF
}
--
cgit v0.12
From 5e43b65f3e67974c0b421f631e6b5eeec2bb393c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:55:51 -0600
Subject: net-tools, nfstools update binary path to /usr/bin refs #961
---
abs/core/net-tools/Makefile.patch | 17 ++
abs/core/net-tools/PKGBUILD | 41 ++-
abs/core/net-tools/gcc340.patch | 46 ---
.../net-tools/net-tools-1.60-2.6-compilefix.patch | 23 --
abs/core/net-tools/net-tools-1.60-miiioctl.patch | 17 --
abs/core/net-tools/net-tools-1.60-nameif.patch | 58 ----
.../net-tools/net-tools-1.60-nameif_strncpy.patch | 13 -
abs/core/net-tools/net-tools.install | 12 -
abs/core/net-tools/net-tools.patch | 30 --
abs/core/nfs-utils/PKGBUILD | 86 +++---
abs/core/nfs-utils/blkmapd.service | 2 +-
abs/core/nfs-utils/id_resolver.conf | 1 +
abs/core/nfs-utils/nfs-common | 315 ---------------------
abs/core/nfs-utils/nfs-server | 299 -------------------
abs/core/nfs-utils/nfs-utils.install | 6 +-
abs/core/nfs-utils/nfsd.service | 8 +-
abs/core/nfs-utils/proc-fs-nfsd.mount | 2 +-
abs/core/nfs-utils/rpc-gssd.service | 3 +-
abs/core/nfs-utils/rpc-idmapd.service | 3 +-
abs/core/nfs-utils/rpc-mountd.service | 2 +-
abs/core/nfs-utils/rpc-statd.service | 3 +-
abs/core/nfs-utils/rpc-svcgssd.service | 2 +-
abs/core/nfs-utils/start-statd.patch | 22 +-
abs/core/nilfs-utils/PKGBUILD | 15 +-
24 files changed, 112 insertions(+), 914 deletions(-)
create mode 100644 abs/core/net-tools/Makefile.patch
delete mode 100644 abs/core/net-tools/gcc340.patch
delete mode 100644 abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch
delete mode 100644 abs/core/net-tools/net-tools-1.60-miiioctl.patch
delete mode 100644 abs/core/net-tools/net-tools-1.60-nameif.patch
delete mode 100644 abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch
delete mode 100644 abs/core/net-tools/net-tools.install
delete mode 100644 abs/core/net-tools/net-tools.patch
create mode 100644 abs/core/nfs-utils/id_resolver.conf
delete mode 100644 abs/core/nfs-utils/nfs-common
delete mode 100644 abs/core/nfs-utils/nfs-server
diff --git a/abs/core/net-tools/Makefile.patch b/abs/core/net-tools/Makefile.patch
new file mode 100644
index 0000000..aaacd6b
--- /dev/null
+++ b/abs/core/net-tools/Makefile.patch
@@ -0,0 +1,17 @@
+--- Makefile.old 2012-08-07 22:07:58.235437087 +0200
++++ Makefile 2012-08-07 22:10:21.192104345 +0200
+@@ -239,12 +239,12 @@
+ install -m 0755 -d ${BASEDIR}/bin
+ install -m 0755 arp ${BASEDIR}/sbin
+ install -m 0755 hostname ${BASEDIR}/bin
+- install -m 0755 ifconfig ${BASEDIR}/bin
++ install -m 0755 ifconfig ${BASEDIR}/sbin
+ install -m 0755 nameif ${BASEDIR}/sbin
+ install -m 0755 netstat ${BASEDIR}/bin
+ install -m 0755 plipconfig $(BASEDIR)/sbin
+ install -m 0755 rarp ${BASEDIR}/sbin
+- install -m 0755 route ${BASEDIR}/bin
++ install -m 0755 route ${BASEDIR}/sbin
+ install -m 0755 slattach $(BASEDIR)/sbin
+ ifeq ($(HAVE_IP_TOOLS),1)
+ install -m 0755 ipmaddr $(BASEDIR)/sbin
diff --git a/abs/core/net-tools/PKGBUILD b/abs/core/net-tools/PKGBUILD
index 605620a..dc1a161 100644
--- a/abs/core/net-tools/PKGBUILD
+++ b/abs/core/net-tools/PKGBUILD
@@ -1,43 +1,40 @@
-# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $
+# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=net-tools
-pkgver=1.60.20110819cvs
-pkgrel=3
+pkgver=1.60.20130531git
+pkgrel=1
pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('GPL2')
-url="http://www.tazenda.demon.co.uk/phil/net-tools"
+url="http://net-tools.sourceforge.net/"
depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use cvs checkout instead
-source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
- net-tools-1.60-miiioctl.patch
- net-tools-1.60-nameif_strncpy.patch)
+makedepends=('git')
+# use git snapshot currently prefered over release
+source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f")
options=(!makeflags)
-install=net-tools.install
-sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
- '654a96bc6575efb4a2e04b49de45d448d240eb6e'
- '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
+sha1sums=('SKIP')
+
+prepare() {
+ sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile
+ sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile
+}
build() {
- cd $srcdir/$pkgname-$pkgver
- patch -Np1 -i ../net-tools-1.60-miiioctl.patch
- patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
+ cd ${srcdir}/${pkgname}
yes "" | make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make BASEDIR=$pkgdir update
+ cd ${srcdir}/${pkgname}
+ make DESTDIR=${pkgdir}/usr update
# the following is provided by yp-tools
- rm "${pkgdir}"/bin/{nis,yp}domainname
+ rm "${pkgdir}"/usr/bin/{nis,yp}domainname
rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
# hostname is provided by inetutils
- rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+ rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname}
rm -rf "${pkgdir}"/usr/share/man/man1
}
diff --git a/abs/core/net-tools/gcc340.patch b/abs/core/net-tools/gcc340.patch
deleted file mode 100644
index 8089bf2..0000000
--- a/abs/core/net-tools/gcc340.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
---- net-tools-1.60-orig/hostname.c 2001-04-08 10:04:23.000000000 -0700
-+++ net-tools-1.60/hostname.c 2004-05-07 17:22:14.000000000 -0700
-@@ -78,6 +78,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ ;
- }
- exit(1);
- }
-@@ -98,6 +99,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ ;
- }
- exit(1);
- };
-@@ -117,6 +119,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ ;
- }
- exit(1);
- };
-@@ -174,6 +177,7 @@
- printf("%s\n", hp->h_name);
- break;
- default:
-+ ;
- }
- }
-
-diff -Naur net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
---- net-tools-1.60-orig/lib/inet_sr.c 2000-02-20 13:46:45.000000000 -0800
-+++ net-tools-1.60/lib/inet_sr.c 2004-05-07 17:20:14.000000000 -0700
-@@ -105,6 +105,7 @@
- case 2:
- isnet = 0; break;
- default:
-+ ;
- }
-
- /* Fill in the other fields. */
diff --git a/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch b/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch
deleted file mode 100644
index 92ce901..0000000
--- a/abs/core/net-tools/net-tools-1.60-2.6-compilefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
---- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200
-@@ -22,6 +22,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/x25.h>
-+#include <linux/version.h>
- #include <ctype.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -77,7 +78,11 @@
- rt.sigdigits=sigdigits;
-
- /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+#else
-+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
-+#endif
-
- while (*args) {
- if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/abs/core/net-tools/net-tools-1.60-miiioctl.patch b/abs/core/net-tools/net-tools-1.60-miiioctl.patch
deleted file mode 100644
index 6c7f069..0000000
--- a/abs/core/net-tools/net-tools-1.60-miiioctl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- net-tools-1.60.20110819cvs/include/mii.h 2011-08-19 10:14:00.743873299 +0200
-+++ net-tools-1.60.20110819cvs/include/mii.h.new 2011-08-19 10:28:26.500524160 +0200
-@@ -14,11 +14,9 @@
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
- #warning "SIOCGMIIPHY is not defined by your kernel source"
--#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947 /* Read from current PHY */
-+#define SIOCGMIIREG 0x8948 /* Read any PHY register */
-+#define SIOCSMIIREG 0x8949 /* Write any PHY register */
- #endif
-
- #include <linux/types.h>
diff --git a/abs/core/net-tools/net-tools-1.60-nameif.patch b/abs/core/net-tools/net-tools-1.60-nameif.patch
deleted file mode 100644
index 54def00..0000000
--- a/abs/core/net-tools/net-tools-1.60-nameif.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- net-tools-1.60/nameif.c.nameif 2000-10-18 19:26:29.000000000 +0200
-+++ net-tools-1.60/nameif.c 2003-03-19 11:02:01.000000000 +0100
-@@ -117,7 +117,8 @@
- }
-
- struct change {
-- struct change *next,**pprev;
-+ struct change *next;
-+ int found;
- char ifname[IFNAMSIZ+1];
- unsigned char mac[6];
- };
-@@ -139,10 +140,7 @@
- ch->ifname, pos);
- if (parsemac(p,ch->mac) < 0)
- complain(_("cannot parse MAC `%s' at %s"), p, pos);
-- if (clist)
-- clist->pprev = &ch->next;
- ch->next = clist;
-- ch->pprev = &clist;
- clist = ch;
- return 0;
- }
-@@ -200,7 +198,7 @@
-
- void usage(void)
- {
-- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}"));
-+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n"));
- exit(1);
- }
-
-@@ -277,21 +275,21 @@
- ch = lookupmac(mac);
- if (!ch)
- continue;
--
-- *ch->pprev = ch->next;
-+
-+ ch->found = 1;
- if (strcmp(p, ch->ifname)) {
- if (setname(p, ch->ifname) < 0)
- complain(_("cannot change name of %s to %s: %s"),
- p, ch->ifname, strerror(errno));
- }
-- free(ch);
- }
- fclose(ifh);
-
- while (clist) {
- struct change *ch = clist;
- clist = clist->next;
-- warning(_("interface '%s' not found"), ch->ifname);
-+ if (!ch->found)
-+ warning(_("interface '%s' not found"), ch->ifname);
- free(ch);
- }
-
diff --git a/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch b/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch
deleted file mode 100644
index 7568e21..0000000
--- a/abs/core/net-tools/net-tools-1.60-nameif_strncpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- net-tools-1.60/nameif.c.ncpy 2006-10-03 14:24:21.000000000 +0200
-+++ net-tools-1.60/nameif.c 2006-10-03 14:22:43.000000000 +0200
-@@ -100,8 +100,8 @@
- struct ifreq ifr;
- opensock();
- memset(&ifr,0,sizeof(struct ifreq));
-- strcpy(ifr.ifr_name, oldname);
-- strcpy(ifr.ifr_newname, newname);
-+ strncpy(ifr.ifr_name, oldname, IF_NAMESIZE);
-+ strncpy(ifr.ifr_newname, newname, IF_NAMESIZE);
- return ioctl(ctl_sk, SIOCSIFNAME, &ifr);
- }
-
diff --git a/abs/core/net-tools/net-tools.install b/abs/core/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e5..0000000
--- a/abs/core/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
- if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
- echo "hostname and {,yp,nis}domainname has moved:"
- echo "----------"
- echo "hostname is now in coreutils"
- echo "domainname is now in yp-tools"
- echo "their functionality might have changed slightly"
- echo ""
- echo "dnsdomainname remains in net-tools"
- echo "----------"
- fi
-}
diff --git a/abs/core/net-tools/net-tools.patch b/abs/core/net-tools/net-tools.patch
deleted file mode 100644
index 8af2d21..0000000
--- a/abs/core/net-tools/net-tools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
---- net-tools-1.60-orig/mii-tool.c 2000-05-21 07:31:17.000000000 -0700
-+++ net-tools-1.60/mii-tool.c 2004-05-31 12:35:21.000000000 -0700
-@@ -379,16 +379,16 @@
- /*--------------------------------------------------------------------*/
-
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
-- -V, --version display version information
-- -v, --verbose more verbose output
-- -R, --reset reset MII to poweron state
-- -r, --restart restart autonegotiation
-- -w, --watch monitor for link status changes
-- -l, --log with -w, write events to syslog
-- -A, --advertise=media,... advertise only specified media
-- -F, --force=media force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n\
-+ -V, --version display version information\n\
-+ -v, --verbose more verbose output\n\
-+ -R, --reset reset MII to poweron state\n\
-+ -r, --restart restart autonegotiation\n\
-+ -w, --watch monitor for link status changes\n\
-+ -l, --log with -w, write events to syslog\n\
-+ -A, --advertise=media,... advertise only specified media\n\
-+ -F, --force=media force specified media technology\n\
-+media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n\
- (to advertise both HD and FD) 100baseTx, 10baseT\n";
-
- int main(int argc, char **argv)
diff --git a/abs/core/nfs-utils/PKGBUILD b/abs/core/nfs-utils/PKGBUILD
index a6ac7ff..b94b840 100644
--- a/abs/core/nfs-utils/PKGBUILD
+++ b/abs/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160027 2012-05-28 10:26:22Z tpowa $
+# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,7 +6,7 @@
# Contributor: Marco Lima <cipparello gmail com>
pkgname=nfs-utils
-pkgver=1.2.6
+pkgver=1.2.9
pkgrel=1
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64')
@@ -14,15 +14,12 @@ url='http://nfs.sourceforge.net'
license=('GPL')
backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
- nfs-common
nfs-common.conf
- nfs-server
nfs-server.conf
exports
idmapd.conf
- start-statd.patch
nfs
nfs-utils-1.1.4-mtab-sym.patch
nfs-utils-1.1.4-no-exec.patch
@@ -35,57 +32,43 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
var-lib-nfs-rpc_pipefs.mount
proc-fs-nfsd.mount
blkmapd.service
- nfs-utils.conf)
+ nfs-utils.conf
+ id_resolver.conf
+ start-statd.patch)
install=nfs-utils.install
-md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
- 'dd0d65fc6e8f422fa12520813098264b'
- 'f73f197a16b02c3e248488ec35c4cf43'
- 'e619f18354ff958ed624d05d08853d8f'
- '9cef69bc686cc5dcac23fbb51450747d'
- 'ff585faf410a62c4333a027c50b56bae'
- 'eb4f4027fab6fc1201f1ca04f5954c76'
- 'e9144277a89a620d9bc80413158a7d27'
- 'f5e7bba09a46c5c5d7007cac6eff9df5'
- '7674106eaaa4c149bccd4f05fe3604e9'
- '4f4827dfc93008dfadd0a530ad0872b2'
- '38855936dc55a5afe37d84edc0f11066'
- '965311784d49a7d126d512cadbe91deb'
- 'e05705d9ccccaeaeb1ecaee20adc05bc'
- 'd7df7bc311fd95c5b80017dd1741570d'
- '2e72ee082cba5d3ec6f51d2a105664da'
- '5d33d2e754fd37280365b287603bac90'
- '1cd65909fa0983047f3f06a3ab352401'
- '02a34835aa077146a90eb7d191e612d0'
- '8ffc2ebe932d29efe17d6f3f23d5b975'
- '8ac484023d786766d287ccbe878ae4ba')
+optdepends=('sqlite: for nfsdcltrack usage')
-build() {
+
+prepare() {
cd $srcdir/${pkgname}-${pkgver}
patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
+ # fix /usr/bin in start-statd shell script
+ patch -Np1 -i ../start-statd.patch
#patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
- # arch specific patch
- patch -Np0 -i $srcdir/start-statd.patch
+}
- ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
+build() {
+ cd $srcdir/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \
--without-tcp-wrappers --with-statedir=/var/lib/nfs \
--enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
- --enable-mountconfig
-
+ --with-gssglue \
+ --enable-mountconfig --with-start-statd=/usr/bin/start-statd
+ # move mount helpers to /usr/bin
+ sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile
+ # move osd_login to /usr/bin
+ sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile
make
}
package() {
cd $srcdir/${pkgname}-${pkgver}
# fix make install
- mkdir -p $pkgdir/sbin
make DESTDIR=$pkgdir install
# support python2 (FS#25120)
- sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
+ sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
- # NFS & NFSv4 init scripts
- install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
- install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
# Configuration
install -D -m 644 ../exports "$pkgdir/"etc/exports
install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
@@ -93,6 +76,8 @@ package() {
install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
+ # keyutils id_resolver #35463
+ install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf
# systemd files
for i in ${srcdir}/*.{service,mount}; do
install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
@@ -100,6 +85,27 @@ package() {
install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
# directories
mkdir "$pkgdir/"etc/exports.d
- mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
+ mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
mkdir "$pkgdir/"var/lib/nfs/v4recovery
}
+
+md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
+ 'f73f197a16b02c3e248488ec35c4cf43'
+ '9cef69bc686cc5dcac23fbb51450747d'
+ 'ff585faf410a62c4333a027c50b56bae'
+ 'eb4f4027fab6fc1201f1ca04f5954c76'
+ 'f5e7bba09a46c5c5d7007cac6eff9df5'
+ '7674106eaaa4c149bccd4f05fe3604e9'
+ '4f4827dfc93008dfadd0a530ad0872b2'
+ '6aeb4a80b2a5162f5951438474ea22f3'
+ 'ff95ad9275ef774e0a2ea8adfe55ee66'
+ '2e991f0e440b4809e22b6c7689544fc0'
+ '42d0088add3beab0284be1379391382b'
+ '60d82e2d2d19d21ceb72665e54bf913e'
+ '3bcc9901478f4f9ea0a03b67171c13e3'
+ '1cd65909fa0983047f3f06a3ab352401'
+ '8f1b5282795895c9b8ce8430d20cdda6'
+ '8f03e708b230619ffc2a799a48bffb53'
+ '8ac484023d786766d287ccbe878ae4ba'
+ 'bed57f7c3911af695ec7b469248c104a'
+ 'f8bb29c2ca1ce178e6371091a3e1090d')
diff --git a/abs/core/nfs-utils/blkmapd.service b/abs/core/nfs-utils/blkmapd.service
index 16cb68b..fa7ce39 100644
--- a/abs/core/nfs-utils/blkmapd.service
+++ b/abs/core/nfs-utils/blkmapd.service
@@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount
[Service]
Type=forking
-ExecStart=/usr/sbin/blkmapd
+ExecStart=/usr/bin/blkmapd
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/id_resolver.conf b/abs/core/nfs-utils/id_resolver.conf
new file mode 100644
index 0000000..9c0fee3
--- /dev/null
+++ b/abs/core/nfs-utils/id_resolver.conf
@@ -0,0 +1 @@
+create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file
diff --git a/abs/core/nfs-utils/nfs-common b/abs/core/nfs-utils/nfs-common
deleted file mode 100644
index 7b16b4b..0000000
--- a/abs/core/nfs-utils/nfs-common
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-common
-
-NEED_STATD=
-STATD_OPTS=
-NEED_IDMAPD=
-IDMAPD_OPTS=
-NEED_GSSD=
-GSSD_OPTS=
-PIPEFS_MOUNTPOINT=
-PIPEFS_MOUNTOPTS=
-
-# rpc.statd daemon & binary location
-STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.gssd daemon & binary location
-GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default mountpoint and options for rpc_pipefs filesystem
-[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
-[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
-
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
-# /etc/conf.d/nfs-common settings, if any, will override our autodetection.)
-AUTO_NEED_IDMAPD=no
-AUTO_NEED_GSSD=no
-
-if [ -f /etc/fstab ]; then
- exec 9<&0 </etc/fstab
-
- while read DEV MTPT FSTYPE OPTS REST; do
- if [ "$FSTYPE" = "nfs4" ]; then
- AUTO_NEED_IDMAPD=yes
- fi
- case "$OPTS" in
- sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
- AUTO_NEED_GSSD=yes
- ;;
- esac
- done
-
- exec 0<&9 9<&-
-fi
-
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
- AUTO_NEED_IDMAPD=yes
-fi
-
-case "$NEED_STATD" in
- yes|no)
- ;;
- *)
- NEED_STATD=yes
- ;;
-esac
-
-case "$NEED_IDMAPD" in
- yes|no)
- ;;
- *)
- NEED_IDMAPD=$AUTO_NEED_IDMAPD
- ;;
-esac
-
-case "$NEED_GSSD" in
- yes|no)
- ;;
- *)
- NEED_GSSD=$AUTO_NEED_GSSD
- ;;
-esac
-
-do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
- modprobe -q "$1" || true
- fi
-}
-
-do_mount() {
- if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
- return 1
- fi
-
- if grep -vw "$1" /proc/mounts &> /dev/null ; then
- if ! mountpoint -q "$2" ; then
- mount -t "$1" "$1" "$2" -o "$3"
- return
- fi
- fi
- return 0
-}
-
-do_umount() {
- if mountpoint -q "$1" ; then
- umount "$1"
- fi
- return 0
-}
-
-get_pid() {
- pidof -o %PPID "$1"
-}
-
-case "$1" in
- start)
- ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
- rc=0
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Starting $STATD_DAEMON_NAME daemon"
- PID=$(get_pid $STATD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
- # RUN
- $STATD $STATD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- # Run sm-notify
- /usr/sbin/sm-notify $SMNOTIFY_OPTS
- fi
-
- if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
- stat_busy "Mounting pipefs filesystem"
- do_modprobe sunrpc
- do_modprobe nfs
- do_modprobe nfsd
- do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
- PID=$(get_pid $IDMAPD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
- # RUN
- $IDMAPD $IDMAPD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
-
- if [ "$NEED_GSSD" = yes ]; then
- do_modprobe rpcsec_gss_krb5
- stat_busy "Starting $GSSD_DAEMON_NAME daemon"
- PID=$(get_pid $GSSD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
- # RUN
- $GSSD $GSSD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
- fi
-
- add_daemon $daemon_name
- ;;
-
- stop)
- rc=0
- if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-
- if [ "$NEED_GSSD" = yes ]; then
- stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
- PID=$(get_pid $GSSD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
- PID=$(get_pid $IDMAPD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
- do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
- fi
-
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Stopping $STATD_DAEMON_NAME daemon"
- PID=$(get_pid $STATD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- rm_daemon $daemon_name
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
-
- if [ "$NEED_STATD" = yes ]; then
- stat_busy "Daemon $STATD_DAEMON_NAME running"
- PID=$(get_pid $STATD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
-
- if [ "$NEED_GSSD" = yes ]; then
- stat_busy "Daemon $GSSD_DAEMON_NAME running"
- PID=$(get_pid $GSSD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
-
- if [ "$NEED_IDMAPD" = yes ]; then
- stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
- PID=$(get_pid $IDMAPD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
- echo
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|status|restart}"
-esac
-exit 0
-
diff --git a/abs/core/nfs-utils/nfs-server b/abs/core/nfs-utils/nfs-server
deleted file mode 100644
index 6aa609d..0000000
--- a/abs/core/nfs-utils/nfs-server
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-server
-
-NFSD_COUNT=
-NFSD_OPTS=
-NEED_SVCGSSD=
-SVCGSSD_OPTS=
-MOUNTD_OPTS=
-PROCNFSD_MOUNTPOINT=
-PROCNFSD_MOUNTOPTS=
-
-# rpc.nfsd daemon & binary location
-NFSD_PROCESS_NAME=nfsd
-NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
-
-# rpc.svcgssd daemon & binary location
-SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.mountd daemon & binary location
-MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
-
-# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default number of nfsd servers
-[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
-
-# Default mountpoint and options for nfsd filesystem
-[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
-[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
-
-case "$NEED_SVCGSSD" in
- yes|no)
- ;;
- *)
- NEED_SVCGSSD=no
- ;;
-esac
-
-do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
- modprobe -q "$1" || true
- fi
-}
-
-do_mount() {
- if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
- return 1
- fi
-
- if grep -vw "$1" /proc/mounts &> /dev/null ; then
- if ! mountpoint -q "$2" ; then
- mount -t "$1" "$1" "$2" -o "$3"
- return
- fi
- fi
- return 0
-}
-
-do_umount() {
- if mountpoint -q "$1" ; then
- umount "$1"
- fi
- return 0
-}
-
-get_pid() {
- pidof -o %PPID "$1"
-}
-
-case "$1" in
- start)
- ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
- rc=0
- stat_busy "Mounting nfsd filesystem"
- do_modprobe nfsd
- do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- stat_busy "Exporting all directories"
- $EXPORTFS -r
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- stat_busy "Starting $NFSD_DAEMON_NAME daemon"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- if [ -z "$PID" ]; then
- [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
- # RUN
- $NFSD $NFSD_OPTS $NFSD_COUNT
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- do_modprobe rpcsec_gss_krb5
- stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
- PID=$(get_pid $SVCGSSD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
- # RUN
- $SVCGSSD $SVCGSSD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- fi
-
- PID=$(get_pid $IDMAPD)
- [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
-
- stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
- PID=$(get_pid $MOUNTD)
- if [ -z "$PID" ]; then
- [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
- # RUN
- $MOUNTD $MOUNTD_OPTS
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
-
- add_daemon $daemon_name
- ;;
-
- stop)
- rc=0
- stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
- PID=$(get_pid $MOUNTD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
- PID=$(get_pid $SVCGSSD)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
- fi
-
- stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- # KILL (SIGINT)
- [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
- #
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- sleep 1
- PID=$(get_pid $NFSD_PROCESS_NAME)
- # KILL (KILL) - just to be sure
- [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
- #
- rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
- stat_done
- fi
-
- stat_busy "Unexporting all directories"
- $EXPORTFS -au
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
-
- # flush everything out of the kernels export table
- if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
- $EXPORTFS -f
- fi
- do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
- rm_daemon $daemon_name
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
-
- stat_busy "Daemon $NFSD_DAEMON_NAME running"
- PID=$(get_pid $NFSD_PROCESS_NAME)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
-
- stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
- PID=$(get_pid $MOUNTD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
-
- if [ "$NEED_SVCGSSD" = yes ]; then
- stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
- PID=$(get_pid $SVCGSSD)
- if [ -z "$PID" ]; then
- stat_fail
- else
- stat_done
- fi
- fi
- echo
- ;;
-
- reload)
- rc=0
- stat_busy "Re-exporting all directories"
- $EXPORTFS -r
- rc=$(($rc+$?))
- if [ $rc -gt 0 ]; then
- stat_fail
- exit $rc
- else
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|status|reload|restart}"
-esac
-exit 0
diff --git a/abs/core/nfs-utils/nfs-utils.install b/abs/core/nfs-utils/nfs-utils.install
index 7dcdf95..f6c72d9 100644
--- a/abs/core/nfs-utils/nfs-utils.install
+++ b/abs/core/nfs-utils/nfs-utils.install
@@ -5,9 +5,9 @@ cat << 'EOM'
==> Extended configuration options for NFS (clients & server) are available in
==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
==>
- ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
- ==> for further information on NFS; for NFSv4, refer to
- ==> http://wiki.archlinux.org/index.php/NFSv4
+ ==> Please refer to http://wiki.archlinux.org/index.php/NFS
+ ==> for further information on NFS4; for NFSv3, refer to
+ ==> http://wiki.archlinux.org/index.php/NFSv3
EOM
}
diff --git a/abs/core/nfs-utils/nfsd.service b/abs/core/nfs-utils/nfsd.service
index e5481c3..d63e490 100644
--- a/abs/core/nfs-utils/nfsd.service
+++ b/abs/core/nfs-utils/nfsd.service
@@ -6,10 +6,10 @@ Requires=rpcbind.service
[Service]
Type=oneshot
EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
+ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStartPost=/usr/bin/exportfs -a
+ExecStop=/usr/bin/rpc.nfsd 0
+ExecStopPost=/usr/bin/exportfs -a -u
RemainAfterExit=yes
[Install]
diff --git a/abs/core/nfs-utils/proc-fs-nfsd.mount b/abs/core/nfs-utils/proc-fs-nfsd.mount
index f8664a8..e5ee6fb 100644
--- a/abs/core/nfs-utils/proc-fs-nfsd.mount
+++ b/abs/core/nfs-utils/proc-fs-nfsd.mount
@@ -5,4 +5,4 @@ DefaultDependencies=no
[Mount]
What=sunrpc
Where=/proc/fs/nfsd
-Type=rpc_pipefs
+Type=nfsd
diff --git a/abs/core/nfs-utils/rpc-gssd.service b/abs/core/nfs-utils/rpc-gssd.service
index 446864d..182d9b7 100644
--- a/abs/core/nfs-utils/rpc-gssd.service
+++ b/abs/core/nfs-utils/rpc-gssd.service
@@ -2,11 +2,12 @@
Description=RPC GSS-API client-side daemon
After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
+ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/rpc-idmapd.service b/abs/core/nfs-utils/rpc-idmapd.service
index 72cd26a..1167daf 100644
--- a/abs/core/nfs-utils/rpc-idmapd.service
+++ b/abs/core/nfs-utils/rpc-idmapd.service
@@ -2,11 +2,12 @@
Description=NFSv4 ID-name mapping daemon
After=var-lib-nfs-rpc_pipefs.mount nfsd.service
Requires=var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
+ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/rpc-mountd.service b/abs/core/nfs-utils/rpc-mountd.service
index edd8c85..7528884 100644
--- a/abs/core/nfs-utils/rpc-mountd.service
+++ b/abs/core/nfs-utils/rpc-mountd.service
@@ -6,7 +6,7 @@ Requires=rpcbind.service nfsd.service
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
+ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/rpc-statd.service b/abs/core/nfs-utils/rpc-statd.service
index 983b404..c2fd63b 100644
--- a/abs/core/nfs-utils/rpc-statd.service
+++ b/abs/core/nfs-utils/rpc-statd.service
@@ -2,11 +2,12 @@
Description=NFSv2/3 Network Status Monitor Daemon
After=rpcbind.service
Requires=rpcbind.service
+Before=remote-fs-pre.target
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
+ExecStart=/usr/bin/rpc.statd $STATD_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/rpc-svcgssd.service b/abs/core/nfs-utils/rpc-svcgssd.service
index 8152e83..876bad3 100644
--- a/abs/core/nfs-utils/rpc-svcgssd.service
+++ b/abs/core/nfs-utils/rpc-svcgssd.service
@@ -6,7 +6,7 @@ Requires=rpcbind.service
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS
+ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/nfs-utils/start-statd.patch b/abs/core/nfs-utils/start-statd.patch
index 5d73b6e..6f6f119 100644
--- a/abs/core/nfs-utils/start-statd.patch
+++ b/abs/core/nfs-utils/start-statd.patch
@@ -1,22 +1,10 @@
---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100
-+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100
-@@ -1,9 +1,16 @@
--#!/bin/bash -p
-+#!/bin/sh
-+
-+# Original script provided by the NFS project
-+# Modified for Arch Linux by Tom Killian
-+
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
+--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200
++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200
+@@ -4,6 +4,6 @@
# /var/run/rpc.statd.pid).
# It should run statd with whatever flags are apropriate for this
# site.
-PATH=/sbin:/usr/sbin
--exec rpc.statd --no-notify
-+
-+# source application-specific settings
-+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
-+
-+exec /usr/sbin/rpc.statd $STATD_OPTS
++PATH=/sbin:/usr/sbin:/usr/bin
+ exec rpc.statd --no-notify
diff --git a/abs/core/nilfs-utils/PKGBUILD b/abs/core/nilfs-utils/PKGBUILD
index f943a0d..f86b6b5 100644
--- a/abs/core/nilfs-utils/PKGBUILD
+++ b/abs/core/nilfs-utils/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 197802 2013-10-30 10:38:00Z allan $
+# Maintainer: Dan McGee <dan@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=nilfs-utils
-pkgver=2.1.4
-pkgrel=1
+pkgver=2.1.5
+pkgrel=3
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
arch=('i686' 'x86_64')
url="http://www.nilfs.org/"
license=('GPL2' 'LGPL2.1')
backup=('etc/nilfs_cleanerd.conf')
depends=('util-linux')
-options=(!libtool)
source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('e72f941f5041a057a81a1ce22e03497d')
build() {
cd $pkgname-$pkgver
- ./configure --enable-libmount
+ ./configure --sbindir=/usr/bin --enable-libmount
make
}
package() {
cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+ make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
}
+md5sums=('f072cc53c288492061b3199d63e32177')
--
cgit v0.12
From 10365dc137276fa2793d41606cb0d7047506d3ad Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:56:17 -0600
Subject: nvidia: 331.20
---
abs/core/nvidia-utils/PKGBUILD | 50 ++++++++++++++++++++++++++++--------------
abs/core/nvidia/PKGBUILD | 36 +++++++++++++++++-------------
abs/core/nvidia/nvidia.install | 6 ++---
3 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index c1180c0..4e5c35c 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $
+# $Id: PKGBUILD 199766 2013-11-15 21:30:02Z svenstaro $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Contributor: James Rayner <iphitus@gmail.com>
pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=310.19
+pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
+pkgver=331.20
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -14,12 +14,12 @@ if [ "$CARCH" = "i686" ]; then
_arch='x86'
_pkg="NVIDIA-Linux-${_arch}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('2adbdd38540b3a8955714760e05f575d')
+ md5sums+=('801aa04a087891690f1cac09575b2ba9')
elif [ "$CARCH" = "x86_64" ]; then
_arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('0ba08d32852e442ebba5ba22c7abed36')
+ md5sums+=('28295eed56c2ca996401c0093279620f')
fi
create_links() {
@@ -50,22 +50,37 @@ package_opencl-nvidia() {
create_links
}
-package_nvidia-utils() {
- pkgdesc="NVIDIA drivers utilities and libraries."
- depends=('xorg-server' 'libxvmc')
- optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig'
- 'opencl-nvidia: OpenCL support')
+package_nvidia-libgl() {
+ pkgdesc="NVIDIA drivers libraries symlinks"
+ depends=('nvidia-utils')
conflicts=('libgl')
provides=('libgl')
cd "${srcdir}/${_pkg}"
+ mkdir -p "${pkgdir}/usr/lib/xorg/modules/extensions"
+ ln -s "/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
+ ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
+ ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+ ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
+ ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
+ ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
+}
+
+package_nvidia-utils() {
+ pkgdesc="NVIDIA drivers utilities"
+ depends=('xorg-server')
+ optdepends=('gtk2: nvidia-settings'
+ 'opencl-nvidia: OpenCL support')
+ cd "${srcdir}/${_pkg}"
+
# X driver
install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
# GLX extension module for X
- install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
- ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise
+ install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
+ ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise
# OpenGL library
- install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
+ install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
# OpenGL core library
install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
# VDPAU
@@ -78,7 +93,10 @@ package_nvidia-utils() {
# CUDA
install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
-
+ #install -D -m755 nvidia-cuda-proxy-server "${pkgdir}/usr/bin/nvidia-cuda-proxy-server"
+ #install -D -m644 nvidia-cuda-proxy-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-proxy-control.1.gz"
+ # DEBUG
+ install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
# nvidia-xconfig
install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz"
@@ -103,4 +121,4 @@ package_nvidia-utils() {
create_links
}
-md5sums=('0ba08d32852e442ebba5ba22c7abed36')
+md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index a7d4b38..5c42e7b 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,37 +1,43 @@
-# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $
+# $Id: PKGBUILD 202756 2013-12-26 13:03:42Z thomas $
# Maintainer : Thomas Baechler <thomas@archlinux.org>
pkgname=nvidia
-pkgver=310.19
-_extramodules=extramodules-3.6-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux."
+pkgver=331.20
+_extramodules=extramodules-3.12-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
+depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
conflicts=('nvidia-96xx' 'nvidia-173xx')
license=('custom')
install=nvidia.install
options=(!strip)
+#source=('nvidia-linux-3.12.patch')
+#md5sums=('d267069bc456de269424b4e1b46a3745')
if [ "$CARCH" = "i686" ]; then
_arch='x86'
_pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('2adbdd38540b3a8955714760e05f575d')
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('801aa04a087891690f1cac09575b2ba9')
elif [ "$CARCH" = "x86_64" ]; then
_arch='x86_64'
_pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums=('0ba08d32852e442ebba5ba22c7abed36')
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('28295eed56c2ca996401c0093279620f')
fi
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
cd "${srcdir}"
sh "${_pkg}.run" --extract-only
- cd "${_pkg}/kernel"
+ cd "${_pkg}"
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"/"${_pkg}"/kernel
make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
}
@@ -43,4 +49,4 @@ package() {
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
-md5sums=('0ba08d32852e442ebba5ba22c7abed36')
+md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install
index c2c292a..b11a93e 100644
--- a/abs/core/nvidia/nvidia.install
+++ b/abs/core/nvidia/nvidia.install
@@ -1,11 +1,11 @@
post_install() {
- EXTRAMODULES='extramodules-3.6-ARCH'
+ EXTRAMODULES='extramodules-3.12-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.6-ARCH'
+ EXTRAMODULES='extramodules-3.12-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@ post_upgrade() {
}
post_remove() {
- EXTRAMODULES='extramodules-3.6-ARCH'
+ EXTRAMODULES='extramodules-3.12-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v0.12
From 374948afc489b11508c1e9109de0e1da54df4983 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:56:35 -0600
Subject: openssh: 6.4 update binary path to /usr/bin refs #961
---
abs/core/openssh/PKGBUILD | 49 +++++++++++++++---------------------
abs/core/openssh/install | 10 ++++++++
abs/core/openssh/sshd | 45 ---------------------------------
abs/core/openssh/sshd.close-sessions | 17 -------------
abs/core/openssh/sshd.confd | 4 ---
abs/core/openssh/sshd.pam | 17 ++++---------
abs/core/openssh/sshd.service | 12 ++++-----
abs/core/openssh/sshd.socket | 2 +-
abs/core/openssh/sshd@.service | 2 +-
abs/core/openssh/sshdgenkeys.service | 3 ---
abs/core/openssh/tmpfiles.d | 1 -
11 files changed, 42 insertions(+), 120 deletions(-)
create mode 100644 abs/core/openssh/install
delete mode 100755 abs/core/openssh/sshd
delete mode 100644 abs/core/openssh/sshd.close-sessions
delete mode 100644 abs/core/openssh/sshd.confd
delete mode 100644 abs/core/openssh/tmpfiles.d
diff --git a/abs/core/openssh/PKGBUILD b/abs/core/openssh/PKGBUILD
index fced1e1..63b69d3 100644
--- a/abs/core/openssh/PKGBUILD
+++ b/abs/core/openssh/PKGBUILD
@@ -1,46 +1,42 @@
-# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $
+# $Id: PKGBUILD 199078 2013-11-08 16:53:32Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
+pkgver=6.4p1
+pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
arch=('i686' 'x86_64')
+makedepends=('linux-headers')
depends=('krb5' 'openssl' 'libedit' 'ldns')
optdepends=('xorg-xauth: X11 forwarding'
'x11-ssh-askpass: input passphrase in X')
source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
- 'sshd.close-sessions'
'sshdgenkeys.service'
'sshd@.service'
'sshd.service'
'sshd.socket'
- 'tmpfiles.d'
- 'sshd.confd'
- 'sshd.pam'
- 'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
- '954bf1660aa32620c37034320877f4511b767ccb'
- '6c71de2c2ca9622aa8e863acd94b135555e11125'
- 'bd6eae36c7ef9efb7147778baad7858b81f2d660'
- '83a257b8f6a62237383262cb0e2583e5609ddac0'
- 'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
- 'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
- 'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
- '659e3ee95c269014783ff8b318c6f50bf7496fbd'
- 'ed36e3a522f619ff6b13e253526596e4cca11e9f')
+ 'sshd.pam')
+sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d'
+ '6df5be396f8c593bb511a249a1453294d18a01a6'
+ '6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
+ 'ec49c6beba923e201505f5669cea48cad29014db'
+ 'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
+ 'd93dca5ebda4610ff7647187f8928a3de28703f3')
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
+backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd')
+
+install=install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
+ --sbindir=/usr/bin \
--libexecdir=/usr/lib/ssh \
--sysconfdir=/etc/ssh \
--with-ldns \
@@ -60,30 +56,24 @@ build() {
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # The connect.sh test must be run by a user with a decent login shell;
- # chroot builds use nobody with /bin/false.
- make tests || true
+ make tests ||
+ grep $USER /etc/passwd | grep -q /bin/false
+ # connect.sh fails when run with stupid login shell
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
make DESTDIR="${pkgdir}" install
- rm "${pkgdir}"/usr/share/man/man1/slogin.1
ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
- install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf
-
- install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
- install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
- install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
@@ -91,6 +81,7 @@ package() {
sed \
-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
+ -e '/^#PrintMotd yes$/c PrintMotd no # pam does that' \
-e '/^#UsePAM no$/c UsePAM yes' \
-i "${pkgdir}"/etc/ssh/sshd_config
}
diff --git a/abs/core/openssh/install b/abs/core/openssh/install
new file mode 100644
index 0000000..6f0cd37
--- /dev/null
+++ b/abs/core/openssh/install
@@ -0,0 +1,10 @@
+post_upgrade() {
+ if [[ $(vercmp $2 6.2p2) = -1 ]]; then
+ cat <<EOF
+
+==> The sshd daemon has been moved to /usr/bin alongside all binaries.
+==> Please update this path in your scripts if applicable.
+
+EOF
+ fi
+}
diff --git a/abs/core/openssh/sshd b/abs/core/openssh/sshd
deleted file mode 100755
index 4bf4780..0000000
--- a/abs/core/openssh/sshd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
- PID=
- rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
- start)
- stat_busy 'Starting Secure Shell Daemon'
- /usr/bin/ssh-keygen -A
- [[ -d /var/empty ]] || mkdir -p /var/empty
- [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
- if [[ $? -gt 0 ]]; then
- stat_fail
- else
- add_daemon sshd
- stat_done
- fi
- ;;
- stop)
- stat_busy 'Stopping Secure Shell Daemon'
- [[ ! -z $PID ]] && kill $PID &> /dev/null
- if [[ $? -gt 0 ]]; then
- stat_fail
- else
- rm_daemon sshd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/openssh/sshd.close-sessions b/abs/core/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709..0000000
--- a/abs/core/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
- if ck_daemon sshd; then
- return
- fi
- /etc/rc.d/sshd stop
- stat_busy "Stopping Secure Shell Sessions"
- for i in $(pgrep sshd); do
- if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
- kill $i
- fi
- done &>/dev/null
- stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/abs/core/openssh/sshd.confd b/abs/core/openssh/sshd.confd
deleted file mode 100644
index 5ce7c00..0000000
--- a/abs/core/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/abs/core/openssh/sshd.pam b/abs/core/openssh/sshd.pam
index aeef8be..7ecef08 100644
--- a/abs/core/openssh/sshd.pam
+++ b/abs/core/openssh/sshd.pam
@@ -1,13 +1,6 @@
#%PAM-1.0
-#auth required pam_securetty.so #Disable remote root
-auth required pam_unix.so
-auth required pam_env.so
-account required pam_nologin.so
-account required pam_unix.so
-account required pam_time.so
-password required pam_unix.so
-session required pam_unix_session.so
-session required pam_limits.so
-session optional pam_loginuid.so
--session optional pam_ck_connector.so nox11
--session optional pam_systemd.so
+#auth required pam_securetty.so #disable remote root
+auth include system-remote-login
+account include system-remote-login
+password include system-remote-login
+session include system-remote-login
diff --git a/abs/core/openssh/sshd.service b/abs/core/openssh/sshd.service
index 7c8f883..55ed953 100644
--- a/abs/core/openssh/sshd.service
+++ b/abs/core/openssh/sshd.service
@@ -1,19 +1,17 @@
[Unit]
Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
After=sshdgenkeys.service
+After=network.target
[Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=always
[Install]
WantedBy=multi-user.target
-Also=sshdgenkeys.service
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
+# This service file runs an SSH daemon that forks for each incoming connection.
+# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/abs/core/openssh/sshd.socket b/abs/core/openssh/sshd.socket
index 6a67bfe..e09e328 100644
--- a/abs/core/openssh/sshd.socket
+++ b/abs/core/openssh/sshd.socket
@@ -1,5 +1,6 @@
[Unit]
Conflicts=sshd.service
+Wants=sshdgenkeys.service
[Socket]
ListenStream=22
@@ -7,4 +8,3 @@ Accept=yes
[Install]
WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/abs/core/openssh/sshd@.service b/abs/core/openssh/sshd@.service
index 2fd9b08..7ce3d37 100644
--- a/abs/core/openssh/sshd@.service
+++ b/abs/core/openssh/sshd@.service
@@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon
After=sshdgenkeys.service
[Service]
-ExecStart=-/usr/sbin/sshd -i
+ExecStart=-/usr/bin/sshd -i
StandardInput=socket
StandardError=syslog
diff --git a/abs/core/openssh/sshdgenkeys.service b/abs/core/openssh/sshdgenkeys.service
index 47c1c3f..8c27d71 100644
--- a/abs/core/openssh/sshdgenkeys.service
+++ b/abs/core/openssh/sshdgenkeys.service
@@ -13,6 +13,3 @@ ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
ExecStart=/usr/bin/ssh-keygen -A
Type=oneshot
RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/abs/core/openssh/tmpfiles.d b/abs/core/openssh/tmpfiles.d
deleted file mode 100644
index 7c5b261..0000000
--- a/abs/core/openssh/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/empty 0755 root root -
--
cgit v0.12
From 1f62bb057f75d84aaee417467428dc4a9d436f3a Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:57:34 -0600
Subject: pam: 1.1.8
---
abs/core/pam/PKGBUILD | 31 +++++++++++++++-------------
abs/core/pam/pam.install | 12 -----------
abs/core/pam/pam_namespace-build-1.1.6.patch | 11 ----------
3 files changed, 17 insertions(+), 37 deletions(-)
delete mode 100644 abs/core/pam/pam.install
delete mode 100644 abs/core/pam/pam_namespace-build-1.1.6.patch
diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD
index 1e7c611..965f215 100644
--- a/abs/core/pam/PKGBUILD
+++ b/abs/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168736 2012-10-15 05:13:56Z tpowa $
+# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=pam
-pkgver=1.1.6
-pkgrel=1
+pkgver=1.1.8
+pkgrel=2
pkgdesc="PAM (Pluggable Authentication Modules) library"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -15,23 +15,23 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac
source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
#http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
- pam_unix2-glibc216.patch
- pam_namespace-build-1.1.6.patch)
-options=('!libtool' '!emptydirs')
-md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
- 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
- 'dac109f68e04a4df37575fda6001ea17'
- '440a510164ba5eb69bf41e129746ff44')
+ pam_unix2-glibc216.patch)
+options=('!emptydirs')
build() {
cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib
- patch -Np0 -i ../pam_namespace-build-1.1.6.patch
+ ./configure --libdir=/usr/lib --sbindir=/usr/bin
make
cd $srcdir/pam_unix2-2.9.1
patch -Np1 -i ../pam_unix2-glibc216.patch
- ./configure --libdir=/usr/lib
+
+ # modify flags to build against the pam compiled here, not a system lib.
+ ./configure \
+ CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
+ LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
+ --libdir=/usr/lib \
+ --sbindir=/usr/bin
make
}
@@ -62,5 +62,8 @@ _EOT
ln -s pam_unix.so pam_unix_session.so
# set unix_chkpwd uid
- chmod +s $pkgdir/sbin/unix_chkpwd
+ chmod +s $pkgdir/usr/bin/unix_chkpwd
}
+md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
+ 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
+ 'dac109f68e04a4df37575fda6001ea17')
diff --git a/abs/core/pam/pam.install b/abs/core/pam/pam.install
deleted file mode 100644
index 9d45880..0000000
--- a/abs/core/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1: the new package version
-post_install() {
- # need to run this immediately -- pacman only runs it at the end of
- # all package installs
- /sbin/ldconfig -r .
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
diff --git a/abs/core/pam/pam_namespace-build-1.1.6.patch b/abs/core/pam/pam_namespace-build-1.1.6.patch
deleted file mode 100644
index aeabc23..0000000
--- a/abs/core/pam/pam_namespace-build-1.1.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200
-+++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200
-@@ -869,7 +869,7 @@
-
-
- install-data-local:
-- mkdir -p $(namespaceddir)
-+ mkdir -p $(DESTDIR)$(namespaceddir)
- README: pam_namespace.8.xml namespace.conf.5.xml
- -include $(top_srcdir)/Make.xml.rules
-
--
cgit v0.12
From d992bf484dfa07050c368c30a8c2dda70511c066 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:57:48 -0600
Subject: parted: update binary path to /usr/bin refs #961
---
abs/core/parted/PKGBUILD | 8 ++++----
abs/core/parted/linux.c.patch | 25 -------------------------
abs/core/parted/parted.install | 2 +-
3 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 abs/core/parted/linux.c.patch
diff --git a/abs/core/parted/PKGBUILD b/abs/core/parted/PKGBUILD
index 7a94164..a0211ff 100644
--- a/abs/core/parted/PKGBUILD
+++ b/abs/core/parted/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $
+# $Id: PKGBUILD 199967 2013-11-20 11:26:39Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=parted
pkgver=3.1
-pkgrel=1
+pkgrel=3
pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.gnu.org/software/parted/parted.html"
depends=('device-mapper' 'e2fsprogs')
makedepends=('pkg-config')
-options=('!libtool')
install=parted.install
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
+ --sbindir=/usr/bin \
--disable-debug \
--disable-rpath
make
@@ -30,3 +29,4 @@ package() {
make DESTDIR="${pkgdir}" install
}
+md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb')
diff --git a/abs/core/parted/linux.c.patch b/abs/core/parted/linux.c.patch
deleted file mode 100644
index c9feea1..0000000
--- a/abs/core/parted/linux.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200
-+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200
-@@ -601,17 +601,17 @@
- static int kver = -1;
-
- struct utsname uts;
-- int major;
-- int minor;
-- int teeny;
-+ int major = 0;
-+ int minor = 0;
-+ int teeny = 0;
-
- if (kver != -1)
- return kver;
-
- if (uname (&uts))
- return kver = 0;
-- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3)
-- return kver = 0;
-+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny);
-+ assert (n == 2 || n == 3);
-
- return kver = KERNEL_VERSION (major, minor, teeny);
- }
diff --git a/abs/core/parted/parted.install b/abs/core/parted/parted.install
index 5e00699..752a687 100644
--- a/abs/core/parted/parted.install
+++ b/abs/core/parted/parted.install
@@ -8,7 +8,7 @@ post_install() {
}
post_upgrade() {
- post_install $1
+ post_install
}
pre_remove() {
--
cgit v0.12
From 782a0571b32b84b46cac58f2561ac8ab4672decc Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:58:04 -0600
Subject: pciutils pcmciautils: update binary path to /usr/bin refs #961
---
abs/core/pciutils/PKGBUILD | 16 ++++++++--------
abs/core/pcmciautils/PKGBUILD | 26 ++++++++++++--------------
abs/core/pcmciautils/initcpio-install-pcmcia | 8 ++++----
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/abs/core/pciutils/PKGBUILD b/abs/core/pciutils/PKGBUILD
index 3046289..ffd8a22 100644
--- a/abs/core/pciutils/PKGBUILD
+++ b/abs/core/pciutils/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $
+# $Id: PKGBUILD 197782 2013-10-30 07:26:12Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=pciutils
-pkgver=3.1.10
-pkgrel=1
+pkgver=3.2.0
+pkgrel=4
pkgdesc="PCI bus configuration space access library and tools"
arch=(i686 x86_64)
license=('GPL2')
groups=('base')
url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids')
+depends=('glibc' 'hwids' 'kmod')
source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+ make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a
cp lib/libpci.a "${srcdir}/"
make clean
- make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+ make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+ make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
# this is now supplied by the hwids package
rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
}
+md5sums=('3fccb0b28879adb57d8156115f8003c8')
diff --git a/abs/core/pcmciautils/PKGBUILD b/abs/core/pcmciautils/PKGBUILD
index fcc5996..7e3dbab 100644
--- a/abs/core/pcmciautils/PKGBUILD
+++ b/abs/core/pcmciautils/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $
+# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=pcmciautils
pkgver=018
-pkgrel=4
+pkgrel=7
pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
license=('GPL')
groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
+depends=('systemd')
conflicts=('pcmcia-cs')
# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
- initcpio-install-pcmcia)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+ initcpio-install-pcmcia)
options=(!makeflags)
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's,/usr/bin/install,install,g;
- s,/lib/udev,/usr/lib/udev,g' Makefile
+ cd "$pkgname-$pkgver"
+ sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile
+ sed -i -e 's,/sbin,/usr/bin,g' Makefile
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
# install the mkinitpcio hook
- install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia
+ install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
}
md5sums=('964c802994677a71b38ec56554aa229f'
- '2659576a4637c58c4e79a96f8e43e316')
+ '041af04025daee5b3b05812ac3896c8f')
diff --git a/abs/core/pcmciautils/initcpio-install-pcmcia b/abs/core/pcmciautils/initcpio-install-pcmcia
index 71052d6..af89c4c 100644
--- a/abs/core/pcmciautils/initcpio-install-pcmcia
+++ b/abs/core/pcmciautils/initcpio-install-pcmcia
@@ -1,14 +1,14 @@
#!/bin/bash
build() {
- FILES="/etc/pcmcia/config.opts"
- MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')"
-
- [[ $MODULES ]] && MODULES+=" sd_mod?"
+ if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then
+ add_module 'sd_mod?'
+ fi
add_binary "/usr/lib/udev/pcmcia-socket-startup"
add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
+ add_file "/etc/pcmcia/config.opts"
}
help() {
--
cgit v0.12
From e2e6940857c635df49af42aced1e8a2fe293f665 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:58:36 -0600
Subject: ppp: update binary path to /usr/bin refs #961
---
abs/core/ppp/PKGBUILD | 59 +++++++++-------
abs/core/ppp/ip-down | 2 +-
abs/core/ppp/ip-down.d.dns.sh | 6 +-
abs/core/ppp/ip-up.d.dns.sh | 10 ++-
abs/core/ppp/ipv6-down | 12 ++++
abs/core/ppp/ipv6-up | 12 ++++
abs/core/ppp/ipv6-up.d.iface-config.sh | 4 ++
abs/core/ppp/plog | 7 --
abs/core/ppp/poff | 103 ----------------------------
abs/core/ppp/pon | 32 ---------
abs/core/ppp/pon.1 | 121 ---------------------------------
abs/core/ppp/ppp | 36 ----------
abs/core/ppp/ppp.systemd | 9 +++
13 files changed, 83 insertions(+), 330 deletions(-)
create mode 100644 abs/core/ppp/ipv6-down
create mode 100644 abs/core/ppp/ipv6-up
create mode 100644 abs/core/ppp/ipv6-up.d.iface-config.sh
delete mode 100644 abs/core/ppp/plog
delete mode 100644 abs/core/ppp/poff
delete mode 100644 abs/core/ppp/pon
delete mode 100644 abs/core/ppp/pon.1
delete mode 100644 abs/core/ppp/ppp
create mode 100644 abs/core/ppp/ppp.systemd
diff --git a/abs/core/ppp/PKGBUILD b/abs/core/ppp/PKGBUILD
index 33c7ecc..fb099a3 100644
--- a/abs/core/ppp/PKGBUILD
+++ b/abs/core/ppp/PKGBUILD
@@ -1,37 +1,24 @@
-# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $
+# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=ppp
pkgver=2.4.5
-pkgrel=3
+pkgrel=8
pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
arch=(i686 x86_64)
url="http://www.samba.org/ppp/"
license=('custom:GPL/BSD')
-groups=('base')
depends=('glibc' 'libpcap>=1.0.0')
-backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down})
+backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh})
source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
options
- pon
- poff
- ppp
- plog
- pon.1
ip-up
ip-down
ip-up.d.dns.sh
- ip-down.d.dns.sh)
-md5sums=('4621bc56167b6953ec4071043fe0ec57'
- '7a9259a8f038073eeea7e4552ff1849f'
- '48c024f73a80c8b69c4def22f86902cc'
- '2d811f8470ccdea3b8c4505a438483e9'
- '7561c73b557292d5ba1a9c5dbd270fde'
- '86cdaf133f7a79fb464f02d83afc7734'
- '44cc662ba9aa61dd9add3ddd4c5ded57'
- 'e4beb16ed600b61336d50b2bd2df7cd5'
- '2fa0671f40711e69194ccf60979f8b33'
- '4a074d74c29625b254a1db720cb87b99'
- '8d1be5af8e46393ba6eb273377831e38')
+ ip-down.d.dns.sh
+ ipv6-up
+ ipv6-down
+ ipv6-up.d.iface-config.sh
+ ppp.systemd)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -68,13 +55,33 @@ package() {
install -d -m755 "${pkgdir}/etc/ppp/ip-down.d"
install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh"
install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh"
- install -D -m755 ../pon "${pkgdir}/usr/bin/pon"
- install -D -m755 ../poff "${pkgdir}/usr/bin/poff"
- install -D -m755 ../plog "${pkgdir}/usr/sbin/plog"
+ install -D -m755 ../ipv6-up "${pkgdir}/etc/ppp/ipv6-up"
+ install -D -m755 ../ipv6-down "${pkgdir}/etc/ppp/ipv6-down"
+ install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d"
+ install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d"
+ install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh"
+ install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon"
+ install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff"
+ install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog"
+ install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets"
install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets"
- install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp"
- install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
install -d -m755 "${pkgdir}/etc/ppp/peers"
chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
+ install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin/* bin/
+ rmdir sbin
}
+md5sums=('4621bc56167b6953ec4071043fe0ec57'
+ '7a9259a8f038073eeea7e4552ff1849f'
+ 'e4beb16ed600b61336d50b2bd2df7cd5'
+ '529b924f644f80cf30d72a966abc7419'
+ '0e2eeb1af125a46291999162dcc9004a'
+ '3a5d56ac23e36cdbf48187813c8ec981'
+ '4cbd0a9af01c27067450ec7d3f5fa673'
+ 'b75c2fbc4afa9f2d8108b680c88c7036'
+ '9dde53aa5a931ebe1c7e3469199777c5'
+ '37401eb0c3dcccb87f5ac4716d0f9f2c')
diff --git a/abs/core/ppp/ip-down b/abs/core/ppp/ip-down
index 301f3ab..cfd3ae0 100644
--- a/abs/core/ppp/ip-down
+++ b/abs/core/ppp/ip-down
@@ -3,7 +3,7 @@
# This script is run by pppd after the connection has ended.
#
-# Execute all scripts in /etc/ppp/ip-up.d/
+# Execute all scripts in /etc/ppp/ip-down.d/
for ipdown in /etc/ppp/ip-down.d/*.sh; do
if [ -x $ipdown ]; then
# Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam
diff --git a/abs/core/ppp/ip-down.d.dns.sh b/abs/core/ppp/ip-down.d.dns.sh
index 9e19f7d..c9da47a 100644
--- a/abs/core/ppp/ip-down.d.dns.sh
+++ b/abs/core/ppp/ip-down.d.dns.sh
@@ -1,3 +1,7 @@
#!/bin/sh
-[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf
+if [ -x /usr/bin/resolvconf ]; then
+ /usr/bin/resolvconf -fd ${IFNAME}
+else
+ [ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf
+fi
diff --git a/abs/core/ppp/ip-up.d.dns.sh b/abs/core/ppp/ip-up.d.dns.sh
index f9df543..0fc737e 100644
--- a/abs/core/ppp/ip-up.d.dns.sh
+++ b/abs/core/ppp/ip-up.d.dns.sh
@@ -1,7 +1,11 @@
#!/bin/sh
if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then
- [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
- mv /etc/ppp/resolv.conf /etc/resolv.conf
- chmod 644 /etc/resolv.conf
+ if [ -x /usr/bin/resolvconf ]; then
+ /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf
+ else
+ [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
+ mv /etc/ppp/resolv.conf /etc/resolv.conf
+ chmod 644 /etc/resolv.conf
+ fi
fi
diff --git a/abs/core/ppp/ipv6-down b/abs/core/ppp/ipv6-down
new file mode 100644
index 0000000..d3b9e28
--- /dev/null
+++ b/abs/core/ppp/ipv6-down
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# This script is run by pppd after the connection has ended.
+#
+
+# Execute all scripts in /etc/ppp/ipv6-down.d/
+for ipdown in /etc/ppp/ipv6-down.d/*.sh; do
+ if [ -x $ipdown ]; then
+ # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
+ $ipdown "$@"
+ fi
+done
diff --git a/abs/core/ppp/ipv6-up b/abs/core/ppp/ipv6-up
new file mode 100644
index 0000000..b294aaf
--- /dev/null
+++ b/abs/core/ppp/ipv6-up
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# This script is run by pppd when there's a successful ppp connection.
+#
+
+# Execute all scripts in /etc/ppp/ipv6-up.d/
+for ipup in /etc/ppp/ipv6-up.d/*.sh; do
+ if [ -x $ipup ]; then
+ # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
+ $ipup "$@"
+ fi
+done
diff --git a/abs/core/ppp/ipv6-up.d.iface-config.sh b/abs/core/ppp/ipv6-up.d.iface-config.sh
new file mode 100644
index 0000000..b23d6f6
--- /dev/null
+++ b/abs/core/ppp/ipv6-up.d.iface-config.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr
+echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra
diff --git a/abs/core/ppp/plog b/abs/core/ppp/plog
deleted file mode 100644
index 84d2c73..0000000
--- a/abs/core/ppp/plog
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -s /var/log/ppp.log ]; then
- exec tail "$@" /var/log/ppp.log
-else
- exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\['
-fi
diff --git a/abs/core/ppp/poff b/abs/core/ppp/poff
deleted file mode 100644
index 8b4dffc..0000000
--- a/abs/core/ppp/poff
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Written by John Hasler <john@dhh.gt.org> and based on work
-# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL
-
-if [ -x /usr/bin/kill ]; then
- KILL="/usr/bin/kill"
-else
- KILL="/bin/kill"
-fi
-SIG=TERM
-DONE="stopped"
-MODE=""
-
-usage ()
-{
- cat <<!EOF!
-usage: $0 [option] [provider]
-options:
- -r Cause pppd to drop the line and redial.
- -d Toggle the state of pppd's debug option.
- -c Cause pppd to renegotiate compression.
- -a Stop all pppd's. 'provider' will be ignored.
- -h Print this help summary and exit.
- -v Print version and exit.
- none Stop pppd.
-
-Options may not be combined.
-
-If 'provider' is omitted pppd will be stopped or signalled if and only if
-there is exactly one running unless the '-a' option was given. If
-'provider' is supplied the pppd controlling the connection to that
-provider will be stopped or signalled.
-!EOF!
-}
-
-# Get option. If there are none replace the "?" that getopts puts in
-# FLAG on error with "null".
-getopts rdcavh FLAG
-if [ "$?" -ne 0 ]; then
- FLAG="null"
-fi
-
-# Check for additional options. Should be none.
-getopts :rdcavh DUMMY
-if [ "$?" -eq 0 ]; then
- echo "$0: Illegal option -- ${OPTARG}."
- exit 1
-fi
-
-case $FLAG in
- "r") SIG=HUP; DONE=signalled; shift ;;
- "d") SIG=USR1; DONE=signalled; shift ;;
- "c") SIG=USR2; DONE=signalled; shift ;;
- "a") MODE="all"; shift ;;
- "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;;
- "h") usage; exit 0 ;;
- "?") exit 1;
-esac
-
-# Get the PIDs of all the pppds running. Could also get these from
-# /var/run, but pppd doesn't create .pid files until ppp is up.
-PIDS=`pidof pppd`
-
-# poff is pointless if pppd isn't running.
-if test -z "$PIDS"; then
- echo "$0: No pppd is running. None ${DONE}."
- exit 1
-fi
-
-# Find out how many pppd's are running.
-N=`echo "$PIDS" | wc -w`
-
-# If there are no arguments we can't do anything if there is more than one
-# pppd running.
-if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then
- echo "$0: More than one pppd running and no "-a" option and
-no arguments supplied. Nothing ${DONE}."
- exit 1
-fi
-
-# If either there are no arguments or '-a' was specified kill all the
-# pppd's.
-if test "$#" -eq 0 -o "$MODE" = "all" ; then
- $KILL -$SIG $PIDS || {
- echo "$0: $KILL failed. None ${DONE}."
- exit 1
- }
- exit 0
-fi
-
-# There is an argument, so kill the pppd started on that provider.
-PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'`
-if test -n "$PID" ; then
- $KILL -$SIG $PID || {
- echo "$0: $KILL failed. None ${DONE}."
- exit 1
- }
-else
- echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}."
- exit 1
-fi
-exit 0
diff --git a/abs/core/ppp/pon b/abs/core/ppp/pon
deleted file mode 100644
index 3688505..0000000
--- a/abs/core/ppp/pon
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- -*) echo "
-Usage: pon [provider] [arguments]
-
-If you specify one argument, a PPP connection will be started using
-settings from the appropriate file in the /etc/ppp/peers/ directory, and
-any additional arguments supplied will be passed as extra arguments to
-pppd.
-"
- exit 0
- ;;
-esac
-
-if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then
- echo "
-Please configure /etc/ppp/peers/provider or use a command line argument to
-use another file in /etc/ppp/peers/ directory.
-"
- exit 1
-fi
-
-if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then
- echo "
-The file /etc/ppp/peers/$1 does not exist.
-"
- exit 1
-fi
-
-exec /usr/sbin/pppd call ${@:-provider}
-
diff --git a/abs/core/ppp/pon.1 b/abs/core/ppp/pon.1
deleted file mode 100644
index bb32205..0000000
--- a/abs/core/ppp/pon.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" This manual is published under the GPL.
-.\" All guidelines specified in the GPL apply here.
-.\" To get an ascii file:
-.\" groff -man -Tascii pon.1 > pon.txt
-.\"
-.TH PON 1 "July 2000" "Debian Project" "Debian PPPD"
-.SH NAME
-pon, poff, plog \- starts up, shuts down or lists the log of PPP connections
-.SH SYNOPSIS
-.B pon
-[ isp-name [ options ] ]
-.br
-.B poff
-[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ]
-.br
-.B plog
-[ arguments ]
-.SH DESCRIPTION
-This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP
-scripts, which allow users to control PPP connections.
-..
-.SS pon
-\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP
-file, if it exists and is executable. Otherwise, a PPP connection will be
-started using configuration from \fI/etc/ppp/peers/provider\fP.
-This is the default behaviour unless an \fBisp-name\fP argument is given.
-.PP
-For instance, to use ISP configuration "myisp" run:
-.IP
-pon myisp
-.PP
-\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP.
-You can pass additional \fBoptions\fP after the ISP name, too.
-\fBpon\fP can be used to run multiple, simultaneous PPP connections.
-..
-.SS poff
-\fBpoff\fP closes a PPP connection. If more than one PPP connection exists,
-the one named in the argument to \fBpoff\fP will be killed, e.g.
-.IP
-poff myprovider2
-.PP
-will terminate the connection to myprovider2, and leave the PPP connections
-to e.g. "myprovider1" or "myprovider3" up and running.
-.PP
-\fBpoff\fP takes the following command line options:
-.RS
-.TP
-.B "\-r"
-causes the connection to be redialed after it is dropped.
-.TP
-.B "\-d"
-toggles the state of pppd's debug option.
-.TP
-.B "\-c"
-causes
-.BR pppd (8)
-to renegotiate compression.
-.TP
-.B "\-a"
-stops all running ppp connections. If the argument \fBisp-name\fP
-is given it will be ignored.
-.TP
-.B "\-h"
-displays help information.
-.TP
-.B "\-v"
-prints the version and exits.
-.PP
-If no argument is given, \fBpoff\fP will stop or signal pppd if and only
-if there is exactly one running. If more than one connection is active,
-it will exit with an error code of 1.
-..
-.SS plog
-\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that
-file doesn't exist, it shows you the last few lines of your
-\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd.
-This script makes use of the
-.BR tail (1)
-command, so arguments that can be passed to
-.BR tail (1)
-can also be passed to \fBplog\fP.
-.PP
-Note: the \fBplog\fP script can only be used by root or another system
-administrator in group "adm", due to security reasons. Also, to have all
-pppd-generated information in one logfile, that plog can show, you need the
-following line in your \fI/etc/syslog.conf\fP file:
-.PP
-local2.* -/var/log/ppp.log
-.RE
-.SH FILES
-.TP
-.I /etc/ppp/options
-PPPd system options file.
-.TP
-.I /etc/ppp/pap-secrets
-System PAP passwords file.
-.TP
-.I /etc/ppp/chap-secrets
-System CHAP passwords file.
-.TP
-.I /etc/ppp/peers/
-Directory holding the peer options files. The default file is called
-\fIprovider\fP.
-.TP
-.I /etc/chatscripts/provider
-The chat script invoked from the default \fI/etc/ppp/peers/provider\fP.
-.TP
-.I /var/log/ppp.log
-The default PPP log file.
-.SH AUTHORS
-The p-commands were written by Christoph Lameter <clameter@debian.org>.
-Updated and revised by Philip Hands <phil@hands.com>.
-.br
-This manual was written by Othmar Pasteka <othmar@tron.at>. Modified
-by Rob Levin <lilo@openprojects.net>, with some extensions taken from
-the old p-commands manual written by John Hasler <jhasler@debian.org>.
-.SH "SEE ALSO"
-.BR pppd (8),
-.BR chat (8),
-.BR tail (1).
-
diff --git a/abs/core/ppp/ppp b/abs/core/ppp/ppp
deleted file mode 100644
index 16e01ba..0000000
--- a/abs/core/ppp/ppp
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pppd`
-case "$1" in
- start)
- stat_busy "Starting PPP daemon"
- [ -z "$PID" ] && /usr/bin/pon
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ppp
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping PPP daemon"
- [ ! -z "$PID" ] && poff -a &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ppp
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/ppp/ppp.systemd b/abs/core/ppp/ppp.systemd
new file mode 100644
index 0000000..8a963af
--- /dev/null
+++ b/abs/core/ppp/ppp.systemd
@@ -0,0 +1,9 @@
+[Unit]
+Description=PPP link to %I
+Before=network.target
+
+[Service]
+ExecStart=/usr/sbin/pppd call %I nodetach nolog
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From fd17c7ac0e076a888369d3e7f88a67a70617acb9 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:58:51 -0600
Subject: procpcs-ng 3.3.9 update binary path to /usr/bin refs #961
---
abs/core/procps-ng/PKGBUILD | 44 +++++++++++++++++++++++-------------------
abs/core/procps-ng/install | 14 ++++++++++++++
abs/core/procps-ng/sysctl.conf | 41 ---------------------------------------
3 files changed, 38 insertions(+), 61 deletions(-)
create mode 100644 abs/core/procps-ng/install
delete mode 100644 abs/core/procps-ng/sysctl.conf
diff --git a/abs/core/procps-ng/PKGBUILD b/abs/core/procps-ng/PKGBUILD
index deede7e..3942603 100644
--- a/abs/core/procps-ng/PKGBUILD
+++ b/abs/core/procps-ng/PKGBUILD
@@ -1,40 +1,44 @@
-# $Id: PKGBUILD 170098 2012-11-01 17:28:55Z bisson $
+# $Id: PKGBUILD 201333 2013-12-09 03:38:18Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=procps-ng
-pkgver=3.3.5
+pkgver=3.3.9
pkgrel=1
pkgdesc='Utilities for monitoring your system and its processes'
-url="http://gitorious.org/procps"
+url='http://sourceforge.net/projects/procps-ng/'
license=('GPL' 'LGPL')
arch=('i686' 'x86_64')
-groups=('base')
depends=('ncurses')
-conflicts=('procps')
-provides=('procps')
-replaces=('procps')
-backup=('etc/sysctl.conf')
-options=('!libtool')
-source=("procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}"
- 'sysctl.conf')
-sha1sums=('f591f2ff01f8866daf8999f45b797d18929b7aec'
- '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
+source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('088c77631745fc75ee41fc29c254a4069be4869a')
+
+groups=('base')
+
+conflicts=('procps' 'sysvinit-tools')
+provides=('procps' 'sysvinit-tools')
+replaces=('procps' 'sysvinit-tools')
+
+install=install
build() {
- cd "${srcdir}/procps-procps"
- echo ${pkgver} > .tarball-version
- ./autogen.sh
- ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --exec-prefix=/ \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
+
make
}
package() {
- cd "${srcdir}/procps-procps"
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
# provided by util-linux
- rm "${pkgdir}/bin/kill"
+ rm "${pkgdir}/usr/bin/kill"
rm "${pkgdir}/usr/share/man/man1/kill.1"
}
diff --git a/abs/core/procps-ng/install b/abs/core/procps-ng/install
new file mode 100644
index 0000000..2e6546e
--- /dev/null
+++ b/abs/core/procps-ng/install
@@ -0,0 +1,14 @@
+post_upgrade() {
+ if [[ $(vercmp $2 3.3.8-3) = -1 ]]; then
+ cat <<EOF
+
+==> The file /etc/sysctl.conf has been removed from this
+==> package, as all its settings are now kernel defaults.
+
+==> If you had customized it, you need to rename it as
+==> /etc/sysctl.d/99-sysctl.conf since from version 207 on
+==> systemd only applies settings from /etc/sysctl.d/* .
+
+EOF
+ fi
+}
diff --git a/abs/core/procps-ng/sysctl.conf b/abs/core/procps-ng/sysctl.conf
deleted file mode 100644
index 4695cdd..0000000
--- a/abs/core/procps-ng/sysctl.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Configuration file for runtime kernel parameters.
-# See sysctl.conf(5) for more information.
-
-# Have the CD-ROM close when you use it, and open when you are done.
-#dev.cdrom.autoclose = 1
-#dev.cdrom.autoeject = 1
-
-# Protection from the SYN flood attack.
-net.ipv4.tcp_syncookies = 1
-
-# See evil packets in your logs.
-#net.ipv4.conf.all.log_martians = 1
-
-# Never accept redirects or source routes (these are only useful for routers).
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_source_route = 0
-
-# Disable packet forwarding.
-net.ipv4.ip_forward = 0
-net.ipv6.conf.all.forwarding = 0
-
-# Tweak the port range used for outgoing connections.
-#net.ipv4.ip_local_port_range = 32768 61000
-
-# Tweak those values to alter disk syncing and swap behavior.
-#vm.vfs_cache_pressure = 100
-#vm.laptop_mode = 0
-#vm.swappiness = 60
-
-# Tweak how the flow of kernel messages is throttled.
-#kernel.printk_ratelimit_burst = 10
-#kernel.printk_ratelimit = 5
-
-# Reboot 600 seconds after kernel panic or oops.
-#kernel.panic_on_oops = 1
-#kernel.panic = 600
-
-# Disable SysRq key to avoid console security issues.
-kernel.sysrq = 0
--
cgit v0.12
From b91205d63dd37ff202fb46617d53e6ba27e1564d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:59:14 -0600
Subject: rsyslog, reiserfsprogs: update binary path to /usr/bin refs #961
---
abs/core/reiserfsprogs/PKGBUILD | 17 +++++++----------
abs/core/rsyslog/PKGBUILD | 3 ++-
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/abs/core/reiserfsprogs/PKGBUILD b/abs/core/reiserfsprogs/PKGBUILD
index ca73bf4..cd0827a 100644
--- a/abs/core/reiserfsprogs/PKGBUILD
+++ b/abs/core/reiserfsprogs/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 142934 2011-11-18 14:00:58Z pierre $
+# $Id: PKGBUILD 193785 2013-08-31 10:51:10Z tpowa $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=reiserfsprogs
-pkgver=3.6.21
-pkgrel=4
+pkgver=3.6.24
+pkgrel=1
pkgdesc="Reiserfs utilities"
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL')
groups=('base')
-depends=('util-linux-ng')
-source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2")
-md5sums=('0639cefac8f8150536cfa7531c2aa2d2')
+depends=('util-linux')
+source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sbindir=/sbin
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
@@ -28,7 +27,5 @@ check() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
-
- ln -s reiserfsck "${pkgdir}/sbin/fsck.reiserfs"
- ln -s mkreiserfs "${pkgdir}/sbin/mkfs.reiserfs"
}
+md5sums=('66787380fb418ff7d88a23e47cda7af6')
diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD
index 61e61f0..638c68d 100644
--- a/abs/core/rsyslog/PKGBUILD
+++ b/abs/core/rsyslog/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=rsyslog
pkgver=5.8.6
-pkgrel=11
+pkgrel=12
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
arch=('i686' 'x86_64')
@@ -27,6 +27,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr \
+ --sbindir=/usr/bin \
--enable-mysql \
--enable-mail \
--enable-imfile \
--
cgit v0.12
From 3dd19d5c2bfe42193faa314ca66696d32910dc85 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:59:32 -0600
Subject: runit, runitscripts: update binary path to /usr/bin refs #961
---
abs/core/runit-scripts/PKGBUILD | 7 ++--
abs/core/runit-scripts/__changelog | 2 +-
abs/core/runit-scripts/runitscripts/ctrlaltdel | 4 +-
abs/core/runit-scripts/runitscripts/logger | 11 ------
abs/core/runit-scripts/runitscripts/logger-runit | 11 ++++++
.../runitscripts/services/remotes/run | 45 +++++++++++++++-------
abs/core/runit/PKGBUILD | 14 +++----
abs/core/runit/runit.install | 24 ++++++++++--
8 files changed, 75 insertions(+), 43 deletions(-)
delete mode 100755 abs/core/runit-scripts/runitscripts/logger
create mode 100755 abs/core/runit-scripts/runitscripts/logger-runit
mode change 100644 => 100755 abs/core/runit/PKGBUILD
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 68ccd2f..9b32d76 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=7
+pkgrel=10
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
@@ -22,14 +22,15 @@ package() {
install -d $pkgdir/etc/
install -d $pkgdir/etc/runit/
install -d $pkgdir/etc/sv
- install -d $pkgdir/sbin
+ install -d $pkgdir/usr/bin
install -d $pkgdir/etc/rc.d/functions.d
#this file contains the function runit-stat which is needed by the runit service scripts
install -m755 $srcdir/fbsplash-runit.sh $pkgdir/etc/rc.d/functions.d/fbsplash-runit.sh
install -m0700 1 2 3 1.local 3.local ctrlaltdel $pkgdir/etc/runit
- install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
+ #install -m0755 reboot-runit halt-runit logger $pkgdir/usr/bin
+ #install -m0755 logger $pkgdir/usr/bin
rsync -a --exclude=.svn services/* $pkgdir/etc/sv
chmod -R 755 $pkgdir/etc/sv
chown -R root:root $pkgdir/etc/sv
diff --git a/abs/core/runit-scripts/__changelog b/abs/core/runit-scripts/__changelog
index 8b13789..cac3cd3 100644
--- a/abs/core/runit-scripts/__changelog
+++ b/abs/core/runit-scripts/__changelog
@@ -1 +1 @@
-
+removed logger to prevent conflicts with util-linux
diff --git a/abs/core/runit-scripts/runitscripts/ctrlaltdel b/abs/core/runit-scripts/runitscripts/ctrlaltdel
index 30c317b..d7cfcc0 100755
--- a/abs/core/runit-scripts/runitscripts/ctrlaltdel
+++ b/abs/core/runit-scripts/runitscripts/ctrlaltdel
@@ -1,4 +1,2 @@
#!/bin/sh
-
-PATH=/bin:/usr/bin
-/sbin/reboot
+reboot
diff --git a/abs/core/runit-scripts/runitscripts/logger b/abs/core/runit-scripts/runitscripts/logger
deleted file mode 100755
index 6888f6f..0000000
--- a/abs/core/runit-scripts/runitscripts/logger
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-svname=$( cd .. && basename $( pwd ) )
-if [ ! -d /var/log/$svname ]
-then
- mkdir /var/log/$svname
- chown root.root /var/log/$svname
- chmod 700 /var/log/$svname
-fi
-
-exec /sbin/svlogd -tt /var/log/$svname
diff --git a/abs/core/runit-scripts/runitscripts/logger-runit b/abs/core/runit-scripts/runitscripts/logger-runit
new file mode 100755
index 0000000..6888f6f
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/logger-runit
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+svname=$( cd .. && basename $( pwd ) )
+if [ ! -d /var/log/$svname ]
+then
+ mkdir /var/log/$svname
+ chown root.root /var/log/$svname
+ chmod 700 /var/log/$svname
+fi
+
+exec /sbin/svlogd -tt /var/log/$svname
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 19c6375..d0efe53 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -7,6 +7,23 @@ export TERM=linux
LOG=/tmp/remotes.log
+if [ -f /sbin/modprobe ]
+then
+ MODPROBE="/sbin/modprobe"
+else
+ MODPROBE="/usr/bin/modprobe"
+fi
+
+if [ -f /usr/sbin/lircd ]
+then
+ LIRCD="/usr/sbin/lircd "
+else
+ LIRCD="/usr/bin/lircd "
+fi
+
+
+SETSERIAL="/usr/bin/setserial"
+
if [ -f $LOG ]
then
rm -f $LOG
@@ -73,15 +90,15 @@ else
esac
#set_serial debugging
- /usr/bin/setserial -va /dev/$serial_port 2>&1 >> $LOG
+ $SETSERIAL -va /dev/$serial_port 2>&1 >> $LOG
echo '' 2>&1 >> $LOG
#run set_serial command
- /usr/bin/setserial -v /dev/$serial_port uart none 2>&1 >> $LOG
+ $SETSERIAL -v /dev/$serial_port uart none 2>&1 >> $LOG
echo '' 2>&1 >> $LOG
#set_serial debugging
- /usr/bin/setserial -va /dev/$serial_port 2>&1 >> $LOG
+ $SETSERIAL -va /dev/$serial_port 2>&1 >> $LOG
sleep 1
#remove lirc_serial
@@ -90,8 +107,8 @@ else
/usr/bin/rmmod -v lirc_dev 2>> $LOG
echo "*Loading lirc_serial" 2>&1 >> $LOG
- echo "/sbin/modprobe lirc_serial $FLAGS" 2>&1 >> $LOG
- /sbin/modprobe -v lirc_serial $FLAGS 2>&1 >> $LOG
+ echo "$MODPROBE lirc_serial $FLAGS" 2>&1 >> $LOG
+ $MODPROBE -v lirc_serial $FLAGS 2>&1 >> $LOG
echo "====== lirc modules after load ==========" >> $LOG
lsmod |grep lirc >> $LOG
@@ -107,7 +124,7 @@ else
if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
then
- CMD="/usr/sbin/lircd -r -n --driver=commandir"
+ CMD="$LIRCD-r -n --driver=commandir"
printhl " Using commandir"
echo $CMD >>$LOG
$CMD >>$LOG 2>>$LOG
@@ -115,7 +132,7 @@ else
elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
then
sv start igdaemon
- CMD="/usr/sbin/lircd -r -n --driver=iguanaIR"
+ CMD="$LIRCD-r -n --driver=iguanaIR"
printhl " Using iguanaIR usb"
echo $CMD >>$LOG
$CMD >>$LOG 2>>$LOG
@@ -123,7 +140,7 @@ else
elif [ x$ReceiverType = "xSiliconDust_HDHR" ]
then
# if using the SiliconDust_HDHR as an I/R Receiver
- CMD="/usr/sbin/lircd -H udp -d 5000 -n"
+ CMD="$LIRCD-H udp -d 5000 -n"
printhl " Using SiliconDust on port 5000"
echo $CMD >>$LOG
$CMD >>$LOG 2>>$LOG
@@ -172,7 +189,7 @@ else
DEFINED_RECEIVER="False"
for i in `seq 1 $num_lirc`
do
- CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+ CMD="$LIRCD-r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
printhl " Device $i"
echo $CMD >>$LOG
$CMD >>$LOG 2>>$LOG
@@ -211,24 +228,24 @@ else
then
#start receiver
#start blaster chain
- CMD="/usr/sbin/lircd -r -d $IRNODE --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
- LCMD="/usr/sbin/lircd -r -n -d $BLASTERNODE --output /var/run/lirc/lircd $LASTCMD"
+ CMD="$LIRCD-r -d $IRNODE --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
+ LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd $LASTCMD"
echo $CMD >>$LOG
$CMD >>$LOG 2>>$LOG
elif [ x$USE_BLASTER = xTrue ]
then
#start only the blaster
- LCMD="/usr/sbin/lircd -r -n -d $BLASTERNODE --output /var/run/lirc/lircd $LASTCMD"
+ LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd $LASTCMD"
elif [ x$DEFINED_RECEIVER = xTrue ]
then
#start reciever
- LCMD="/usr/sbin/lircd -r -n -d $IRNODE --output /var/run/lirc/lircd"
+ LCMD="$LIRCD-r -n -d $IRNODE --output /var/run/lirc/lircd"
else
#default case of /dev/lirc0
- LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD"
+ LCMD="$LIRCD-r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD"
fi
echo $LASTCMD >>$LOG
diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD
old mode 100644
new mode 100755
index 23559c3..02bb41a
--- a/abs/core/runit/PKGBUILD
+++ b/abs/core/runit/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit
pkgver=2.1.1
-pkgrel=7
+pkgrel=10
pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision"
url="http://smarden.org/runit/"
license=('BSD')
@@ -27,18 +27,18 @@ build() {
}
package() {
- install -d $pkgdir/sbin/
+ install -d $pkgdir/usr/bin/
install -d $pkgdir/usr/man/man8
- install -m0755 $srcdir/add_service.sh $pkgdir/sbin
- install -m0755 $srcdir/remove_service.sh $pkgdir/sbin
+ install -m0755 $srcdir/add_service.sh $pkgdir/usr/bin
+ install -m0755 $srcdir/remove_service.sh $pkgdir/usr/bin
cd $srcdir/admin/$pkgname-$pkgver/src
for i in `cat ../package/commands`; do
- install -m0755 $i $pkgdir/sbin/
+ install -m0755 $i $pkgdir/usr/bin/
done
- install -m0755 svwaitup $pkgdir/sbin/
- install -m0755 svwaitdown $pkgdir/sbin/
+ install -m0755 svwaitup $pkgdir/usr/bin/
+ install -m0755 svwaitdown $pkgdir/usr/bin/
install -m0644 ../man/*.8 $pkgdir/usr/man/man8
gzip -9 $pkgdir/usr/man/man8/*.8 || return 1
diff --git a/abs/core/runit/runit.install b/abs/core/runit/runit.install
index b62e94e..879f549 100755
--- a/abs/core/runit/runit.install
+++ b/abs/core/runit/runit.install
@@ -36,17 +36,33 @@ if [ ! -f /sbin/shutdown-init ] ; then
fi
fi
-if [ -e /sbin/reboot ] ; then
- rm -f /sbin/reboot
-fi
+#if [ -e /sbin/reboot ] ; then
+ rm -f /sbin/re*
+ rm -f /usr/sbin/re*
+
+ rm -f /sbin/powe*
+ rm -f /usr/sbin/power*
+
+ rm -f /sbin/halt*
+ rm -f /usr/sbin/halt*
+
+
+
+#fi
if [ -e /sbin/poweroff ] ; then
rm -f /sbin/poweroff
fi
+
+
+
+
+
+
}
-post_install () {
+apost_install () {
[ -e /sbin/halt ] || ln -sf /sbin/halt.script /sbin/halt
[ -e /sbin/reboot ] || ln -sf /sbin/reboot.script /sbin/reboot
[ -e /sbin/poweroff ] || ln -sf /sbin/poweroff.script /sbin/poweroff
--
cgit v0.12
From 2c68a40cdbfe2392ada429d1e126e551323ab10e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:59:45 -0600
Subject: sed: 4.2.2 update binary path to /usr/bin refs #961
---
abs/core/sed/PKGBUILD | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/abs/core/sed/PKGBUILD b/abs/core/sed/PKGBUILD
index 5e268d0..a6e3219 100644
--- a/abs/core/sed/PKGBUILD
+++ b/abs/core/sed/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $
+# $Id: PKGBUILD 187041 2013-06-03 11:15:34Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=sed
-pkgver=4.2.1
-pkgrel=4
+pkgver=4.2.2
+pkgrel=3
pkgdesc="GNU stream editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/sed"
license=('GPL3')
-groups=('base')
+groups=('base' 'base-devel')
depends=('acl' 'sh')
makedepends=('gettext')
install=sed.install
source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('f0fd4d7da574d4707e442285fd2d3b86'
- '91871b227dbf0916e019ba1fb0fbfdf3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --bindir=/bin --without-included-regex
+ ./configure --prefix=/usr
make
}
@@ -32,3 +30,5 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
+md5sums=('4111de4faa3b9848a0686b2f260c5056'
+ 'SKIP')
--
cgit v0.12
From 0b5bffbcb70ad84d0ff3ce8bac958a752d80807e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:00:01 -0600
Subject: shadow: update binary path to /usr/bin refs #961
---
abs/core/shadow/PKGBUILD | 57 +++---
abs/core/shadow/adduser | 399 --------------------------------------
abs/core/shadow/lastlog.tmpfiles | 1 +
abs/core/shadow/login.defs | 10 +-
abs/core/shadow/shadow.cron.daily | 4 +-
5 files changed, 45 insertions(+), 426 deletions(-)
delete mode 100644 abs/core/shadow/adduser
create mode 100644 abs/core/shadow/lastlog.tmpfiles
diff --git a/abs/core/shadow/PKGBUILD b/abs/core/shadow/PKGBUILD
index 971b59a..0ca6f54 100644
--- a/abs/core/shadow/PKGBUILD
+++ b/abs/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162993 2012-07-04 21:45:24Z dreisner $
+# $Id: PKGBUILD 197840 2013-10-30 11:06:53Z allan $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=shadow
pkgver=4.1.5.1
-pkgrel=1
+pkgrel=7
pkgdesc="Password and account management tool suite with support for shadow files and PAM"
arch=('i686' 'x86_64')
url='http://pkg-shadow.alioth.debian.org/'
@@ -16,11 +16,10 @@ backup=(etc/login.defs
etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
etc/pam.d/{chgpasswd,groupmems}
etc/default/useradd)
-options=('!libtool')
+options=(strip debug)
install='shadow.install'
source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
LICENSE
- adduser
chgpasswd
chpasswd
defaults.pam
@@ -30,21 +29,22 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{
shadow.cron.daily
useradd.defaults
xstrdup.patch
- shadow-strncpy-usage.patch)
+ shadow-strncpy-usage.patch
+ lastlog.tmpfiles)
sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
- '126570e2939bf3b57f28df5197ab9309747a6b5c'
+ 'SKIP'
'33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
- '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
'4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
- 'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
+ 'e92045fb75e0c21a3f294a00de0bd2cd252e9463'
'12427b1ca92a9b85ca8202239f0d9f50198b818f'
'611be25d91c3f8f307c7fe2485d5f781e5dee75f'
- '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
+ '98f4919014b1a9eb9f01ca7731e04b1d973cedd5'
'9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
'6010fffeed1fc6673ad9875492e1193b1a847b53'
- '21e12966a6befb25ec123b403cd9b5c492fe5b16')
+ '21e12966a6befb25ec123b403cd9b5c492fe5b16'
+ 'f57ecde3f72b4738fad75c097d19cf46a412350f')
build() {
cd "$pkgname-$pkgver"
@@ -53,7 +53,7 @@ build() {
sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
# link to glibc's crypt(3)
- LDFLAGS+=" -lcrypt"
+ export LIBS="-lcrypt"
# need to offer these upstream
patch -Np1 <"$srcdir/xstrdup.patch"
@@ -64,11 +64,14 @@ build() {
./configure \
--prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
--libdir=/lib \
--mandir=/usr/share/man \
--sysconfdir=/etc \
--with-libpam \
- --without-selinux
+ --without-selinux \
+ --with-group-name-max-length=32
make
}
@@ -81,9 +84,6 @@ package() {
# license
install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
- # interactive useradd
- install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
# useradd defaults
install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
@@ -106,10 +106,15 @@ package() {
install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
done
+ # lastlog log file creation
+ install -Dm644 "$srcdir/lastlog.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/lastlog.conf"
+
+ # Remove evil/broken tools
+ rm "$pkgdir"/usr/sbin/logoutd
+
# Remove utilities provided by util-linux
rm \
- "$pkgdir"/usr/bin/{chsh,chfn,sg} \
- "$pkgdir"/bin/{login,su} \
+ "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \
"$pkgdir"/usr/sbin/{vipw,vigr}
# but we keep newgrp, as sg is really an alias to it
@@ -117,15 +122,21 @@ package() {
# ...and their many man pages
find "$pkgdir"/usr/share/man \
- '(' -name 'chsh.1' -o \
- -name 'chfn.1' -o \
- -name 'su.1' -o \
- -name 'login.1' -o \
- -name 'vipw.8' -o \
- -name 'vigr.8' -o \
+ '(' -name 'chsh.1' -o \
+ -name 'chfn.1' -o \
+ -name 'su.1' -o \
+ -name 'logoutd.8' -o \
+ -name 'login.1' -o \
+ -name 'nologin.8' -o \
+ -name 'vipw.8' -o \
+ -name 'vigr.8' -o \
-name 'newgrp.1' ')' \
-delete
rmdir \
"$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
"$pkgdir"/usr/share/man/{fi,ko/man8}
+
+ # move everything else to /usr/bin, because this isn't handled by ./configure
+ mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin
+ rmdir "$pkgdir/usr/sbin"
}
diff --git a/abs/core/shadow/adduser b/abs/core/shadow/adduser
deleted file mode 100644
index a5d7fd4..0000000
--- a/abs/core/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995 Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK.
-# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-# Based on the original Slackware adduser by Hrvoje Dogan
-# with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04
-# * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-# * Disallow user names that begin with a numeric because useradd
-# (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-# * When supplying a null string for the uid (meaning 'Choose next available'),
-# if there were file names in the range 'a-z' in the pwd then the
-# egrep command considered these files rather than the null string.
-# The egrep expression is now in quotes.
-# Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-# * Ask to chown user.group the home directory if it already exists.
-# This helps reduce later confusion when adding users whose home dir
-# already exists (mounted partition for example) and is owned
-# by a user other than the user to which the directory is being
-# assigned as home. Default is not to chown.
-# Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-# * Advise & prevent users from creating logins with '.' characters
-# in the user name. <sw>
-# * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-# * Catered for shadow-4.0.3's 'useradd' binary that no longer
-# will let you create a user that has any uppercase chars in it
-# This was reported on the userlocal.org forums
-# by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-# * Support 'broken' (null lines in) /etc/passwd and
-# /etc/group files <sw>
-# * For recycling UIDs (default still 'off'), we now look in
-# /etc/login.defs for the UID_MIN value and use it
-# If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-# * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-# * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-# * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
- export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid. I like the idea of
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() {
- local output
- if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
- echo -n "${1} " >&2 # fudge for use with bash v1
- read output
- else # this should work with any other /bin/sh
- read -ep "${1} " output
- fi
- echo $output
-}
-
-# Function to display the account info
-function display () {
- local goose
- goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs
- echo -n "$1 "
- # If it's null then display the 'other' information
- if [ -z "$goose" -a ! -z "$3" ]; then
- echo "$3"
- else
- echo "$goose"
- fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
- local got_error group
- if [ ! -z "$@" ]; then
- for group in $@ ; do
- local uid_not_named="" uid_not_num=""
- grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes
- grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
- if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
- echo "- Group '$group' does not exist"
- got_error=yes
- fi
- done
- fi
- # Return exit code of 1 if at least one of the groups didn't exist
- if [ ! -z "$got_error" ]; then
- return 1
- fi
-}
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break. Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
- if [ -z "$LOGIN" ]; then
- while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
- fi
- grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used
- if [ $? -eq 0 ]; then
- echo "- User '$LOGIN' already exists; please choose another"
- unset LOGIN
- elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
- echo "- User names cannot begin with a number; please choose another"
- unset LOGIN
- elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
- echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
- unset LOGIN
- elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
- echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
- unset LOGIN
- else
- unset needinput
- fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
- echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
- grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
- if [ $? -eq 0 ]; then
- echo "- That UID is already in use; please choose another"
- elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
- echo "- UIDs are numerics only"
- else
- unset needinput
- fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then
- U_ID="-u ${_UID}"
-else
- # Will we be recycling UIDs?
- if [ "$recycleuids" = "yes" ]; then
- U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
- fi
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- GID="$(get_input "Initial group [ ${defgroup} ]:")"
- check_group "$GID"
- if [ $? -gt 0 ]; then
- echo "- Please choose another"
- else
- unset needinput
- fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
- GID="-g ${defgroup}"
-else
- GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- AGID="$(get_input "Additional groups (comma separated) []:")"
- AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing
- if [ ! -z "$AGID" ]; then
- check_group "$AGID" # check all groups at once (treated as N # of params)
- if [ $? -gt 0 ]; then
- echo "- Please re-enter the group(s)"
- else
- unset needinput # we found all groups specified
- AGID="-G $(echo "$AGID" | tr ' ' ,)"
- fi
- else
- unset needinput # we don't *have* to have additional groups
- fi
-done
-
-#: Get the new user's home dir :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
- if [ -z "$HME" ]; then
- HME="${defhome}/${LOGIN}"
- fi
- # Warn the user if the home dir already exists
- if [ -d "$HME" ]; then
- echo "- Warning: '$HME' already exists !"
- getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")"
- if [ "$(echo $getyn | grep -i "n")" ]; then
- unset needinput
- # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
- getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
- if [ "$(echo $getyn | grep -i "y")" ]; then
- CHOWNHOMEDIR=$HME # set this to the home directory
- fi
- fi
- else
- unset needinput
- fi
-done
-HME="-d ${HME}"
-
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- unset got_error
- SHL="$(get_input "Shell [ ${defshell} ]")"
- if [ -z "$SHL" ]; then
- SHL="${defshell}"
- fi
- # Warn the user if the shell doesn't exist in /etc/shells or as a file
- if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
- echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
- got_error=yes
- fi
- if [ ! -f "$SHL" ]; then
- echo "- Warning: ${SHL} does not exist as a file"
- got_error=yes
- fi
- if [ ! -z "$got_error" ]; then
- getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")"
- if [ "$(echo $getyn | grep -i "n")" ]; then
- unset needinput
- fi
- else
- unset needinput
- fi
-done
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
- if [ ! -z "$EXP" ]; then
- # Check to see whether the expiry date is in the valid format
- if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
- echo "- That is not a valid expiration date"
- else
- unset needinput
- EXP="-e ${EXP}"
- fi
- else
- unset needinput
- fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C. Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
- echo "- Error running useradd command -- account not created!"
- echo "(cmd: $CMD)"
- exit 1
-fi
-
-# chown the home dir ? We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
- chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
- echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
- echo "* WARNING: An error occured while setting the password for"
- echo " this account. Please manually investigate this *"
- exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/abs/core/shadow/lastlog.tmpfiles b/abs/core/shadow/lastlog.tmpfiles
new file mode 100644
index 0000000..9c07b39
--- /dev/null
+++ b/abs/core/shadow/lastlog.tmpfiles
@@ -0,0 +1 @@
+f /var/log/lastlog 0644 root root
diff --git a/abs/core/shadow/login.defs b/abs/core/shadow/login.defs
index 2500ee4..5913671 100644
--- a/abs/core/shadow/login.defs
+++ b/abs/core/shadow/login.defs
@@ -81,8 +81,8 @@ HUSHLOGIN_FILE .hushlogin
# *REQUIRED* The default PATH settings, for superuser and normal users.
#
# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH PATH=/bin:/usr/bin
+ENV_SUPATH PATH=/usr/bin
+ENV_PATH PATH=/usr/bin
#
# Terminal permissions
@@ -195,3 +195,9 @@ DEFAULT_HOME yes
#
USERGROUPS_ENAB yes
+#
+# Controls display of the motd file. This is better handled by pam_motd.so
+# so the declaration here is empty is suppress display by readers of this
+# file.
+#
+MOTD_FILE
diff --git a/abs/core/shadow/shadow.cron.daily b/abs/core/shadow/shadow.cron.daily
index 1931a79..1373ecd 100755
--- a/abs/core/shadow/shadow.cron.daily
+++ b/abs/core/shadow/shadow.cron.daily
@@ -1,6 +1,6 @@
#!/bin/sh
# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
+/usr/bin/pwck -r
+/usr/bin/grpck -r
--
cgit v0.12
From 6cfc3264b999f1c7624c316479b06ea9c7d852a0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:00:17 -0600
Subject: squashfs-tools: update binary path to /usr/bin refs #961
---
abs/core/squashfs-tools/PKGBUILD | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/abs/core/squashfs-tools/PKGBUILD b/abs/core/squashfs-tools/PKGBUILD
index ddbf5df..53db5b2 100644
--- a/abs/core/squashfs-tools/PKGBUILD
+++ b/abs/core/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $
+# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Original TU: Jeff Mickey <j@codemac.net>
@@ -6,24 +6,22 @@
pkgname=squashfs-tools
pkgver=4.2
-pkgrel=2
+pkgrel=4
pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
url="http://squashfs.sourceforge.net"
license=("GPL")
arch=('i686' 'x86_64')
depends=('zlib' 'lzo2' 'xz')
source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz")
-md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
build() {
cd ${srcdir}/squashfs${pkgver}/${pkgname}
- sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
- sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
- make
+ make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
}
package() {
cd ${srcdir}/squashfs${pkgver}/${pkgname}
- install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs
- install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs
+ install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs
+ install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs
}
+md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
--
cgit v0.12
From 7083b169234e350cec8ad3213b3e4a07e078a36d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:00:31 -0600
Subject: sudo: 1.8.8 update binary path to /usr/bin refs #961
---
abs/core/sudo/PKGBUILD | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/abs/core/sudo/PKGBUILD b/abs/core/sudo/PKGBUILD
index eaf765f..8adcf75 100644
--- a/abs/core/sudo/PKGBUILD
+++ b/abs/core/sudo/PKGBUILD
@@ -1,42 +1,52 @@
-# $Id: PKGBUILD 160450 2012-06-02 03:17:41Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_ver=1.8.5p2
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
+_sudover=1.8.8
+pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
arch=('i686' 'x86_64')
url="http://www.sudo.ws/sudo/"
license=('custom')
+groups=('base-devel')
depends=('glibc' 'pam')
backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
+source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
sudo.pam)
-md5sums=('dc42ed9f0946d92273762d0ae7314d59'
- '756d80fc1c996d4f5458deec5a69b5c4'
- '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
+sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9'
+ 'SKIP'
+ 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
build() {
- cd "$srcdir/$pkgname-$_ver"
+ cd "$srcdir/$pkgname-$_sudover"
- ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
- --with-env-editor --with-all-insults --with-logfac=auth
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --with-logfac=auth \
+ --with-pam \
+ --with-env-editor \
+ --with-passprompt="[sudo] password for %p: " \
+ --with-all-insults
make
}
check() {
- cd "$srcdir/$pkgname-$_ver"
+ cd "$srcdir/$pkgname-$_sudover"
make check
}
package() {
- cd "$srcdir/$pkgname-$_ver"
+ cd "$srcdir/$pkgname-$_sudover"
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 84a8c2bb49e91f5e94c2c6c7245172994f517a91 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:05 -0600
Subject: systemd: 208
---
.../systemd/0001-Reinstate-TIMEOUT-handling.patch | 124 -------
...ng-references-to-var-lib-backlight-random.patch | 54 +++
...ator-When-parsing-the-root-cmdline-option.patch | 29 ++
...-stop-a-running-user-manager-from-garbage.patch | 36 ++
...unt-check-for-NULL-before-reading-pm-what.patch | 29 ++
...-fix-off-by-one-error-in-tag_to_udev_node.patch | 50 +++
...ator-Generate-explicit-dependencies-on-sy.patch | 102 ++++++
...nerator-Generate-explicit-dependencies-on.patch | 55 ++++
...FsckPassNo-from-systemd-fsck-root.service.patch | 22 ++
...005-mount-service-drop-FsckPassNo-support.patch | 364 +++++++++++++++++++++
.../0006-efi-boot-generator-hookup-to-fsck.patch | 81 +++++
...sck-root-only-run-when-requested-in-fstab.patch | 95 ++++++
abs/core/systemd/PKGBUILD | 258 +++++++--------
abs/core/systemd/initcpio-hook-udev | 4 +-
abs/core/systemd/initcpio-install-systemd | 159 +++++++++
abs/core/systemd/initcpio-install-timestamp | 14 -
abs/core/systemd/initcpio-install-udev | 5 +-
abs/core/systemd/locale.sh | 60 ----
abs/core/systemd/systemd-187-2.src.tar.gz | 1 -
abs/core/systemd/systemd-tools.install | 35 --
abs/core/systemd/systemd.install | 113 ++++++-
21 files changed, 1296 insertions(+), 394 deletions(-)
delete mode 100644 abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch
create mode 100644 abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
create mode 100644 abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
create mode 100644 abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
create mode 100644 abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
create mode 100644 abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
create mode 100644 abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
create mode 100644 abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
create mode 100644 abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
create mode 100644 abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch
create mode 100644 abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch
create mode 100644 abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch
mode change 100644 => 100755 abs/core/systemd/PKGBUILD
create mode 100644 abs/core/systemd/initcpio-install-systemd
delete mode 100644 abs/core/systemd/initcpio-install-timestamp
delete mode 100644 abs/core/systemd/locale.sh
delete mode 120000 abs/core/systemd/systemd-187-2.src.tar.gz
delete mode 100644 abs/core/systemd/systemd-tools.install
diff --git a/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch b/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb8..0000000
--- a/abs/core/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c | 19 +++++++++++++++++++
- src/libudev/libudev-private.h | 1 +
- src/udev/udevd.c | 13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
- struct udev_list tags_list;
- unsigned long long int seqnum;
- unsigned long long int usec_initialized;
-+ int timeout;
- int devlink_priority;
- int refcount;
- dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
- bool db_persist;
- };
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+ return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+ char num[32];
-+
-+ udev_device->timeout = timeout;
-+ snprintf(num, sizeof(num), "%u", timeout);
-+ udev_device_add_property(udev_device, "TIMEOUT", num);
-+ return 0;
-+}
-+
- /**
- * udev_device_get_seqnum:
- * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-
- util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
- udev_device_set_syspath(udev_device, path);
-+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
- } else if (startswith(property, "SUBSYSTEM=")) {
- udev_device_set_subsystem(udev_device, &property[10]);
- } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
- udev_list_init(udev, &udev_device->sysattr_value_list, true);
- udev_list_init(udev, &udev_device->sysattr_list, false);
- udev_list_init(udev, &udev_device->tags_list, true);
-+ udev_device->timeout = -1;
- udev_device->watch_handle = -1;
- /* copy global properties */
- udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
- return;
- }
-
-- if (children >= children_max) {
-+ if (!force && children >= children_max) {
- if (children_max > 1)
- log_debug("maximum number (%i) of children reached\n", children);
- return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
-
- event->state = EVENT_QUEUED;
- udev_list_node_append(&event->node, &event_list);
-+
-+ /* run all events with a timeout set immediately */
-+ if (udev_device_get_timeout(dev) > 0) {
-+ event_run(event, true);
-+ return 0;
-+ }
-+
- return 0;
- }
-
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
- if (is_devpath_busy(event))
- continue;
-
-- event_run(event);
-+ event_run(event, false);
- }
- }
-
---
-1.7.10.2
-
diff --git a/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch b/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
new file mode 100644
index 0000000..49b960c
--- /dev/null
+++ b/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
@@ -0,0 +1,54 @@
+From 6c8c92fef72cf6a7ef7109a424ef82dbdc4f6952 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Wed, 2 Oct 2013 07:46:24 -0400
+Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed}
+
+This should have been part of ef5bfcf668e6029faa78534dfe.
+---
+ man/systemd-backlight@.service.xml | 2 +-
+ man/systemd-random-seed.service.xml | 2 +-
+ units/systemd-backlight@.service.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
+index 2b73625..4318964 100644
+--- a/man/systemd-backlight@.service.xml
++++ b/man/systemd-backlight@.service.xml
+@@ -58,7 +58,7 @@
+ is a service that restores the display backlight
+ brightness at early-boot and saves it at shutdown. On
+ disk, the backlight brightness is stored in
+- <filename>/var/lib/backlight/</filename>. Note that by
++ <filename>/var/lib/systemd/backlight/</filename>. Note that by
+ default, only firmware backlight devices are
+ saved/restored.</para>
+ </refsect1>
+diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
+index 8cd14b7..e5cd037 100644
+--- a/man/systemd-random-seed.service.xml
++++ b/man/systemd-random-seed.service.xml
+@@ -61,7 +61,7 @@
+ for details. Saving/restoring the random seed across
+ boots increases the amount of available entropy early
+ at boot. On disk the random seed is stored in
+- <filename>/var/lib/random-seed</filename>.</para>
++ <filename>/var/lib/systemd/random-seed</filename>.</para>
+ </refsect1>
+
+ <refsect1>
+diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
+index b0e75db..5caa5d5 100644
+--- a/units/systemd-backlight@.service.in
++++ b/units/systemd-backlight@.service.in
+@@ -9,7 +9,7 @@
+ Description=Load/Save Screen Backlight Brightness of %I
+ Documentation=man:systemd-backlight@.service(8)
+ DefaultDependencies=no
+-RequiresMountsFor=/var/lib/backlight
++RequiresMountsFor=/var/lib/systemd/backlight
+ Conflicts=shutdown.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
+ Before=sysinit.target shutdown.target
+--
+1.8.4
+
diff --git a/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch b/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
new file mode 100644
index 0000000..3cdbcf0
--- /dev/null
+++ b/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
@@ -0,0 +1,29 @@
+From 7f5806d7095a197e4788a7803642831beec295bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 00:32:33 +0200
+Subject: [PATCH 1/7] fstab-generator: When parsing the root= cmdline option,
+ set FsckPassNo to 1
+
+[tomegun: without this we would never fsck the rootfs if it was directly
+mounted 'rw' from the initrd. We now risk fsck'ing it twice in the case it
+is mounted 'ro', so that should be addressed in a separate patch.]
+---
+ src/fstab-generator/fstab-generator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 9e7d55d..a7536f8 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -442,7 +442,7 @@ static int parse_new_root_from_proc_cmdline(void) {
+ }
+
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+- r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
++ r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false,
+ SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+
+ return (r < 0) ? r : 0;
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
new file mode 100644
index 0000000..9a92209
--- /dev/null
+++ b/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
@@ -0,0 +1,36 @@
+From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Sun, 15 Dec 2013 12:18:00 +0100
+Subject: [PATCH] login: Don't stop a running user manager from
+ garbage-collecting the user.
+
+With the current logic, a user will never be garbage-collected, since its
+manager will always be around. Change the logic such that a user is
+garbage-collected when it has no sessions and linger is disabled.
+
+This is a backport from the master branch to 208 which also backports
+the improved handling of running slice and service jobs.
+---
+ src/login/logind-user.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/login/logind-user.c b/src/login/logind-user.c
+index adbe638..e2fce5c 100644
+--- a/src/login/logind-user.c
++++ b/src/login/logind-user.c
+@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) {
+ if (u->slice_job || u->service_job)
+ return 1;
+
+- if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
+- return 1;
+-
+- if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
+- return 1;
+-
+ return 0;
+ }
+
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
new file mode 100644
index 0000000..2725648
--- /dev/null
+++ b/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
@@ -0,0 +1,29 @@
+From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 4 Oct 2013 18:22:40 -0400
+Subject: [PATCH] mount: check for NULL before reading pm->what
+
+Since a57f7e2c828b85, a mount unit with garbage in it would cause
+systemd to crash on loading it.
+
+ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 93bfa99..db055f0 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
+ * for the source path (if this is a bind mount) to be
+ * available. */
+ pm = get_mount_parameters_fragment(m);
+- if (pm && path_is_absolute(pm->what)) {
++ if (pm && pm->what && path_is_absolute(pm->what)) {
+ r = unit_require_mounts_for(UNIT(m), pm->what);
+ if (r < 0)
+ return r;
+--
+1.8.4.1
+
diff --git a/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
new file mode 100644
index 0000000..8c8ea46
--- /dev/null
+++ b/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
@@ -0,0 +1,50 @@
+From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sun, 6 Oct 2013 18:26:23 -0400
+Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
+
+Triggered false negatives when encoding a string which needed every
+character to be escaped, e.g. "LABEL=/".
+---
+ src/shared/util.c | 2 +-
+ src/test/test-device-nodes.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 82f4221..31cea79 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
+ if (u == NULL)
+ return NULL;
+
+- enc_len = strlen(u) * 4;
++ enc_len = strlen(u) * 4 + 1;
+ t = new(char, enc_len);
+ if (t == NULL)
+ return NULL;
+diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
+index 2f3dedb..59ba4be 100644
+--- a/src/test/test-device-nodes.c
++++ b/src/test/test-device-nodes.c
+@@ -26,7 +26,7 @@
+
+ /* helpers for test_encode_devnode_name */
+ static char *do_encode_string(const char *in) {
+- size_t out_len = strlen(in) * 4;
++ size_t out_len = strlen(in) * 4 + 1;
+ char *out = malloc(out_len);
+
+ assert_se(out);
+@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
+ assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
+ assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
+ assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
++ assert_se(expect_encoded_as("/", "\\x2f"));
++ assert_se(expect_encoded_as("!", "\\x21"));
+ }
+
+ int main(int argc, char *argv[]) {
+--
+1.8.4.1
+
diff --git a/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch b/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
new file mode 100644
index 0000000..57edf64
--- /dev/null
+++ b/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
@@ -0,0 +1,102 @@
+From 64e70e4b86d3f732d3513189312f6220d1d5cfbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:44 +0200
+Subject: [PATCH 2/7] fstab-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun:
+ * order all fsck instances after fsck-root
+ * check for OOM
+ * added notes in the manpages]
+---
+ man/systemd-fsck@.service.xml | 3 ++-
+ man/systemd-fstab-generator.xml | 5 +++++
+ src/fstab-generator/fstab-generator.c | 21 +++++++++++++++++----
+ units/systemd-fsck@.service.in | 2 +-
+ 4 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index e934352..17bd1c0 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -62,7 +62,8 @@
+ system
+ check. <filename>systemd-fsck-root.service</filename> is
+ responsible for file system checks on the root
+- file system.</para>
++ file system. The root file system check is performed
++ before the other file systems.</para>
+
+ <para><filename>systemd-fsck</filename> will
+ forward file system checking progress to the
+diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
+index 9ca16c7..740db8f 100644
+--- a/man/systemd-fstab-generator.xml
++++ b/man/systemd-fstab-generator.xml
+@@ -61,6 +61,11 @@
+ reloaded. This will instantiate mount and swap units
+ as necessary.</para>
+
++ <para>The <term><varname>passno</varname></term> field
++ is treated like a simlpe boolean, and the ordering information
++ is discarded. However, the root filesystem is checked
++ before all the other filesystems.</para>
++
+ <para>See
+ <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ and
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index a7536f8..77247de 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -209,17 +209,30 @@ static int add_mount(
+ "Before=%s\n",
+ post);
+
++ if (passno > 0) {
++ _cleanup_free_ char *fsck = NULL;
++
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck)
++ return log_oom();
++
++ fprintf(f,
++ "Requires=%s\n"
++ "After=%s\n",
++ fsck,
++ fsck);
++ }
++
++
+ fprintf(f,
+ "\n"
+ "[Mount]\n"
+ "What=%s\n"
+ "Where=%s\n"
+- "Type=%s\n"
+- "FsckPassNo=%i\n",
++ "Type=%s\n",
+ what,
+ where,
+- type,
+- passno);
++ type);
+
+ if (!isempty(opts) &&
+ !streq(opts, "defaults"))
+diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
+index e229cdc..c12efa8 100644
+--- a/units/systemd-fsck@.service.in
++++ b/units/systemd-fsck@.service.in
+@@ -10,7 +10,7 @@ Description=File System Check on %f
+ Documentation=man:systemd-fsck@.service(8)
+ DefaultDependencies=no
+ BindsTo=%i.device
+-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
++After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service
+ Before=shutdown.target
+
+ [Service]
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch b/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
new file mode 100644
index 0000000..c1b3aa0
--- /dev/null
+++ b/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
@@ -0,0 +1,55 @@
+From 4c8bda2442bfc6d84a5deb241dc29efcb81bf3af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:45 +0200
+Subject: [PATCH 3/7] gpt-auto-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun: check for OOM]
+---
+ src/gpt-auto-generator/gpt-auto-generator.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
+index fae4b71..25440e7 100644
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -182,7 +182,7 @@ static int add_swap(const char *path, const char *fstype) {
+ }
+
+ static int add_home(const char *path, const char *fstype) {
+- _cleanup_free_ char *unit = NULL, *lnk = NULL;
++ _cleanup_free_ char *unit = NULL, *lnk = NULL, *fsck = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+
+ if (dir_is_empty("/home") <= 0)
+@@ -200,19 +200,23 @@ static int add_home(const char *path, const char *fstype) {
+ return -errno;
+ }
+
++ fsck = unit_name_from_path_instance("systemd-fsck", path, ".service");
++ if (!fsck)
++ return log_oom();
++
+ fprintf(f,
+ "# Automatically generated by systemd-gpt-auto-generator\n\n"
+ "[Unit]\n"
+ "DefaultDependencies=no\n"
+- "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n"
++ "Requires=%s\n"
++ "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n"
+ "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
+ "Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n"
+ "[Mount]\n"
+ "What=%s\n"
+ "Where=/home\n"
+- "Type=%s\n"
+- "FsckPassNo=2\n",
+- path, fstype);
++ "Type=%s\n",
++ fsck, fsck, path, fstype);
+
+ fflush(f);
+ if (ferror(f)) {
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch b/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
new file mode 100644
index 0000000..90ff545
--- /dev/null
+++ b/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
@@ -0,0 +1,22 @@
+From 4952a9beff339b75641a7a84c226c11d6bd680c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:46 +0200
+Subject: [PATCH 4/7] Remove FsckPassNo from systemd-fsck-root.service
+
+---
+ units/systemd-fsck-root.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
+index 4388314..4162983 100644
+--- a/units/systemd-fsck-root.service.in
++++ b/units/systemd-fsck-root.service.in
+@@ -19,5 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-fsck
+ StandardOutput=journal+console
+-FsckPassNo=1
+ TimeoutSec=0
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch b/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch
new file mode 100644
index 0000000..9758c46
--- /dev/null
+++ b/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch
@@ -0,0 +1,364 @@
+From accdd018ede77ef1c057775396c18c73406cbcb4 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:28:09 +0200
+Subject: [PATCH 5/7] mount/service: drop FsckPassNo support
+
+We now treat passno as boleans in the generators, and don't need this any more. fsck itself
+is able to sequentialize checks on the same local media, so in the common case the ordering
+is redundant.
+
+It is still possible to force an order by using .d fragments, in case that is desired.
+---
+ TODO | 4 ---
+ man/systemd.mount.xml | 22 ---------------
+ man/systemd.service.xml | 27 -------------------
+ src/core/load-fragment-gperf.gperf.m4 | 2 --
+ src/core/load-fragment.c | 30 ---------------------
+ src/core/load-fragment.h | 1 -
+ src/core/mount.c | 32 +---------------------
+ src/core/mount.h | 1 -
+ src/core/service.c | 51 -----------------------------------
+ src/core/service.h | 2 --
+ 10 files changed, 1 insertion(+), 171 deletions(-)
+
+diff --git a/TODO b/TODO
+index 29a76ef..f0060d9 100644
+--- a/TODO
++++ b/TODO
+@@ -84,8 +84,6 @@ Features:
+
+ * ensure scope units may be started only a single time
+
+-* document that in instead of FsckPassNo= people should just add a manual dep to systemd-fsck@.service to their mount units.
+-
+ * better error message if you run systemctl without systemd running
+
+ * systemctl status output should should include list of triggering units and their status
+@@ -562,8 +560,6 @@ Features:
+
+ * when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr
+
+-* move passno parsing to fstab generator
+-
+ * automount: implement expire:
+ - set superblock timeout AUTOFS_DEV_IOCTL_TIMEOUT_CMD
+ - periodically run AUTOFS_DEV_IOCTL_EXPIRE_CMD
+diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
+index 48af1ca..217289a 100644
+--- a/man/systemd.mount.xml
++++ b/man/systemd.mount.xml
+@@ -273,28 +273,6 @@
+ </refsect1>
+
+ <refsect1>
+- <title>Compatibility Options</title>
+-
+- <para>The following option is also available in the
+- <literal>[Mount]</literal> section, but exists purely
+- for compatibility reasons and should not be used in
+- newly written mount files.</para>
+-
+- <variablelist class='unit-directives'>
+- <varlistentry>
+- <term><varname>FsckPassNo=</varname></term>
+-
+- <listitem><para>The pass number for
+- the file system checking service for
+- this mount. See
+- <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+- for more information on this setting.
+- </para></listitem>
+- </varlistentry>
+- </variablelist>
+- </refsect1>
+-
+- <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+diff --git a/man/systemd.service.xml b/man/systemd.service.xml
+index 81a4078..b1e3af2 100644
+--- a/man/systemd.service.xml
++++ b/man/systemd.service.xml
+@@ -970,33 +970,6 @@
+ range 0-99.</para></listitem>
+ </varlistentry>
+
+- <varlistentry>
+- <term><varname>FsckPassNo=</varname></term>
+- <listitem><para>Set the fsck passno
+- priority to use to order this service
+- in relation to other file system
+- checking services. This option is only
+- necessary to fix ordering in relation
+- to fsck jobs automatically created for
+- all <filename>/etc/fstab</filename>
+- entries with a value in the fs_passno
+- column > 0. As such it should only be
+- used as option for fsck
+- services. Almost always it is a better
+- choice to add explicit ordering
+- directives via
+- <varname>After=</varname> or
+- <varname>Before=</varname>,
+- instead. For more details see
+- <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
+- used, pass an integer value in the
+- same range as
+- <filename>/etc/fstab</filename>'s
+- fs_passno column. See
+- <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+- for details.</para></listitem>
+- </varlistentry>
+-
+ </variablelist>
+ </refsect1>
+
+diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
+index 31fb7bc..e3025d2 100644
+--- a/src/core/load-fragment-gperf.gperf.m4
++++ b/src/core/load-fragment-gperf.gperf.m4
+@@ -173,7 +173,6 @@ Service.NonBlocking, config_parse_bool, 0,
+ Service.BusName, config_parse_unit_string_printf, 0, offsetof(Service, bus_name)
+ Service.NotifyAccess, config_parse_notify_access, 0, offsetof(Service, notify_access)
+ Service.Sockets, config_parse_service_sockets, 0, 0
+-Service.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Service, fsck_passno)
+ EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+@@ -225,7 +224,6 @@ Mount.What, config_parse_string, 0,
+ Mount.Where, config_parse_path, 0, offsetof(Mount, where)
+ Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options)
+ Mount.Type, config_parse_string, 0, offsetof(Mount, parameters_fragment.fstype)
+-Mount.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Mount, parameters_fragment.passno)
+ Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec)
+ Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode)
+ EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
+diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
+index fb7efca..4067930 100644
+--- a/src/core/load-fragment.c
++++ b/src/core/load-fragment.c
+@@ -1033,35 +1033,6 @@ int config_parse_sysv_priority(const char *unit,
+ }
+ #endif
+
+-int config_parse_fsck_passno(const char *unit,
+- const char *filename,
+- unsigned line,
+- const char *section,
+- const char *lvalue,
+- int ltype,
+- const char *rvalue,
+- void *data,
+- void *userdata) {
+-
+- int *passno = data;
+- int i, r;
+-
+- assert(filename);
+- assert(lvalue);
+- assert(rvalue);
+- assert(data);
+-
+- r = safe_atoi(rvalue, &i);
+- if (r || i < 0) {
+- log_syntax(unit, LOG_ERR, filename, line, -r,
+- "Failed to parse fsck pass number, ignoring: %s", rvalue);
+- return 0;
+- }
+-
+- *passno = (int) i;
+- return 0;
+-}
+-
+ DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+
+ int config_parse_kill_signal(const char *unit,
+@@ -2708,7 +2679,6 @@ void unit_dump_config_items(FILE *f) {
+ { config_parse_start_limit_action, "ACTION" },
+ { config_parse_set_status, "STATUS" },
+ { config_parse_service_sockets, "SOCKETS" },
+- { config_parse_fsck_passno, "PASSNO" },
+ { config_parse_environ, "ENVIRON" },
+ { config_parse_syscall_filter, "SYSCALL" },
+ { config_parse_cpu_shares, "SHARES" },
+diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
+index 90e5e3a..404df76 100644
+--- a/src/core/load-fragment.h
++++ b/src/core/load-fragment.h
+@@ -56,7 +56,6 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign
+ int config_parse_bounding_set(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_limit(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_sysv_priority(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+-int config_parse_fsck_passno(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_timer(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 70cd372..88563b3 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) {
+ if (r < 0)
+ return r;
+
+- if (p->passno > 0 &&
+- UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
+- char *name;
+- Unit *fsck;
+- /* Let's add in the fsck service */
+-
+- /* aka SPECIAL_FSCK_SERVICE */
+- name = unit_name_from_path_instance("systemd-fsck", p->what, ".service");
+- if (!name)
+- return -ENOMEM;
+-
+- r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck);
+- if (r < 0) {
+- log_warning_unit(name,
+- "Failed to prepare unit %s: %s", name, strerror(-r));
+- free(name);
+- return r;
+- }
+- free(name);
+-
+- SERVICE(fsck)->fsck_passno = p->passno;
+-
+- r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true);
+- if (r < 0)
+- return r;
+- }
+-
+ return 0;
+ }
+
+@@ -1410,7 +1383,6 @@ static int mount_add_one(
+ const char *where,
+ const char *options,
+ const char *fstype,
+- int passno,
+ bool set_flags) {
+ int r;
+ Unit *u;
+@@ -1530,8 +1502,6 @@ static int mount_add_one(
+ free(p->fstype);
+ p->fstype = f;
+
+- p->passno = passno;
+-
+ if (load_extras) {
+ r = mount_add_extras(MOUNT(u));
+ if (r < 0)
+@@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+ if (!d || !p)
+ return log_oom();
+
+- k = mount_add_one(m, d, p, o, fstype, 0, set_flags);
++ k = mount_add_one(m, d, p, o, fstype, set_flags);
+ if (k < 0)
+ r = k;
+ }
+diff --git a/src/core/mount.h b/src/core/mount.h
+index 7cd4320..a955069 100644
+--- a/src/core/mount.h
++++ b/src/core/mount.h
+@@ -58,7 +58,6 @@ typedef struct MountParameters {
+ char *what;
+ char *options;
+ char *fstype;
+- int passno;
+ } MountParameters;
+
+ typedef enum MountResult {
+diff --git a/src/core/service.c b/src/core/service.c
+index 96ed2d3..ce75757 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1056,48 +1056,6 @@ static int service_load_sysv(Service *s) {
+ }
+ #endif
+
+-static int fsck_fix_order(Service *s) {
+- Unit *other;
+- int r;
+-
+- assert(s);
+-
+- if (s->fsck_passno <= 0)
+- return 0;
+-
+- /* For each pair of services where both have an fsck priority
+- * we order things based on it. */
+-
+- LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) {
+- Service *t;
+- UnitDependency d;
+-
+- t = SERVICE(other);
+-
+- if (s == t)
+- continue;
+-
+- if (UNIT(t)->load_state != UNIT_LOADED)
+- continue;
+-
+- if (t->fsck_passno <= 0)
+- continue;
+-
+- if (t->fsck_passno < s->fsck_passno)
+- d = UNIT_AFTER;
+- else if (t->fsck_passno > s->fsck_passno)
+- d = UNIT_BEFORE;
+- else
+- continue;
+-
+- r = unit_add_dependency(UNIT(s), d, UNIT(t), true);
+- if (r < 0)
+- return r;
+- }
+-
+- return 0;
+-}
+-
+ static int service_verify(Service *s) {
+ assert(s);
+
+@@ -1254,10 +1212,6 @@ static int service_load(Unit *u) {
+ return r;
+ #endif
+
+- r = fsck_fix_order(s);
+- if (r < 0)
+- return r;
+-
+ if (s->bus_name)
+ if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
+ return r;
+@@ -1381,11 +1335,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
+ prefix, s->sysv_runlevels);
+ #endif
+
+- if (s->fsck_passno > 0)
+- fprintf(f,
+- "%sFsckPassNo: %i\n",
+- prefix, s->fsck_passno);
+-
+ if (s->status_text)
+ fprintf(f, "%sStatus Text: %s\n",
+ prefix, s->status_text);
+diff --git a/src/core/service.h b/src/core/service.h
+index ce5b5e0..37fa6ff 100644
+--- a/src/core/service.h
++++ b/src/core/service.h
+@@ -157,8 +157,6 @@ struct Service {
+ pid_t main_pid, control_pid;
+ int socket_fd;
+
+- int fsck_passno;
+-
+ bool permissions_start_only;
+ bool root_directory_start_only;
+ bool remain_after_exit;
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch b/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch
new file mode 100644
index 0000000..3830ecf
--- /dev/null
+++ b/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch
@@ -0,0 +1,81 @@
+From d09ee17da21b7ca2259067ac4e54f8a1cc3c0fc0 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:32:21 +0200
+Subject: [PATCH 6/7] efi-boot-generator: hookup to fsck
+
+---
+ TODO | 1 -
+ src/efi-boot-generator/efi-boot-generator.c | 26 ++++++++++++++++++++++----
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/TODO b/TODO
+index f0060d9..814d82d 100644
+--- a/TODO
++++ b/TODO
+@@ -308,7 +308,6 @@ Features:
+ * introduce ExecCondition= in services
+
+ * EFI:
+- - fsck hookup for the ESP mount is missing
+ - write man page for efi boot generator
+ - honor language efi variables for default language selection (if there are any?)
+ - honor timezone efi variables for default timezone selection (if there are any?)
+diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
+index 05b95ed..e20d325 100644
+--- a/src/efi-boot-generator/efi-boot-generator.c
++++ b/src/efi-boot-generator/efi-boot-generator.c
+@@ -26,13 +26,14 @@
+ #include "path-util.h"
+ #include "util.h"
+ #include "mkdir.h"
++#include "unit-name.h"
+
+ static const char *arg_dest = "/tmp";
+
+ int main(int argc, char *argv[]) {
+ int r = EXIT_SUCCESS;
+ sd_id128_t id;
+- _cleanup_free_ char *name = NULL;
++ _cleanup_free_ char *name = NULL, *what = NULL, *fsck = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+
+ if (argc > 1 && argc != 4) {
+@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) {
+ return EXIT_FAILURE;
+ }
+
++ r = asprintf(&what,
++ "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
++ SD_ID128_FORMAT_VAL(id));
++ if (r < 0) {
++ log_oom();
++ return EXIT_FAILURE;
++ }
++
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck) {
++ log_oom();
++ return EXIT_FAILURE;
++ }
++
+ fprintf(f,
+ "# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Unit]\n"
+- "Description=EFI System Partition\n\n"
++ "Description=EFI System Partition\n"
++ "Requires=%s\n"
++ "After=%s\n"
++ "\n"
+ "[Mount]\n"
+ "Where=/boot\n"
+- "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
++ "What=%s\n"
+ "Options=umask=0077\n",
+- SD_ID128_FORMAT_VAL(id));
++ fsck, fsck, what);
+
+ free(name);
+ name = strjoin(arg_dest, "/boot.automount", NULL);
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch b/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch
new file mode 100644
index 0000000..112b5b5
--- /dev/null
+++ b/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch
@@ -0,0 +1,95 @@
+From a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 19 Oct 2013 11:38:42 +0200
+Subject: [PATCH 7/7] fsck-root: only run when requested in fstab
+
+fsck-root is redundant in case an initrd is used, or in case the rootfs
+is never remounted 'rw', so the new default is the correct behavior for
+most users. For the rest, they should enable it in fstab.
+---
+ Makefile.am | 1 -
+ man/systemd-fsck@.service.xml | 4 +++-
+ src/fstab-generator/fstab-generator.c | 31 ++++++++++++++++++++++---------
+ 3 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ca01179..a29a32a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4447,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \
+ systemd-update-utmp.service
+ LOCAL_FS_TARGET_WANTS += \
+ systemd-remount-fs.service \
+- systemd-fsck-root.service \
+ tmp.mount
+ MULTI_USER_TARGET_WANTS += \
+ getty.target \
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index 17bd1c0..811392b 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -63,7 +63,9 @@
+ check. <filename>systemd-fsck-root.service</filename> is
+ responsible for file system checks on the root
+ file system. The root file system check is performed
+- before the other file systems.</para>
++ before the other file systems. Either service is enabled
++ at boot if passno in <filename>/etc/fstab</filename> for
++ the filesystem is set to a value greater than zero.</para>
+
+ <para><filename>systemd-fsck</filename> will
+ forward file system checking progress to the
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 77247de..78d7609 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,17 +210,29 @@ static int add_mount(
+ post);
+
+ if (passno > 0) {
+- _cleanup_free_ char *fsck = NULL;
++ if (streq(where, "/")) {
++ lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
++ if (!lnk)
++ return log_oom();
+
+- fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
+- if (!fsck)
+- return log_oom();
++ mkdir_parents_label(lnk, 0755);
++ if (symlink("systemd-fsck-root.service", lnk) < 0) {
++ log_error("Failed to create symlink %s: %m", lnk);
++ return -errno;
++ }
++ } else {
++ _cleanup_free_ char *fsck = NULL;
+
+- fprintf(f,
+- "Requires=%s\n"
+- "After=%s\n",
+- fsck,
+- fsck);
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck)
++ return log_oom();
++
++ fprintf(f,
++ "Requires=%s\n"
++ "After=%s\n",
++ fsck,
++ fsck);
++ }
+ }
+
+
+@@ -248,6 +260,7 @@ static int add_mount(
+
+ if (!noauto) {
+ if (post) {
++ free(lnk);
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ if (!lnk)
+ return log_oom();
+--
+1.8.5.1
+
diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD
old mode 100644
new mode 100755
index d677cfc..de605e8
--- a/abs/core/systemd/PKGBUILD
+++ b/abs/core/systemd/PKGBUILD
@@ -1,103 +1,140 @@
# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
+# Maintainer: Tom Gundersen <teg@jklm.no>
pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=187
-pkgrel=2
+pkgname=('systemd' 'systemd-sysvcompat')
+pkgver=208
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz')
-options=('!libtool')
+ 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt'
+ 'linux-api-headers' 'pam' 'python2' 'quota-tools' 'xz')
+options=('strip' 'debug')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
+ 'initcpio-install-systemd'
'initcpio-install-udev'
- 'initcpio-install-timestamp'
- '0001-Reinstate-TIMEOUT-handling.patch'
- 'locale.sh')
-md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
- 'e99e9189aa2f6084ac28b8ddf605aeb8'
- '59e91c4d7a69b7bf12c86a9982e37ced'
- 'df69615503ad293c9ddf9d8b7755282d'
- '5543be25f205f853a21fa5ee68e03f0d'
- 'f15956945052bb911e5df81cf5e7e5dc')
+ '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
+ '0001-mount-check-for-NULL-before-reading-pm-what.patch'
+ '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
+ '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch'
+ '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch'
+ '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch'
+ '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch'
+ '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
+ '0005-mount-service-drop-FsckPassNo-support.patch'
+ '0006-efi-boot-generator-hookup-to-fsck.patch'
+ '0007-fsck-root-only-run-when-requested-in-fstab.patch')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
+ patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
+ patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+ # Fix lingering user managers
+ patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+ # Backport changes in fstab passno handling
+ # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches,
+ # and it doesn't hurt to backport them all.
+ patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
+ patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
+ patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
+ patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
+ patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
+ patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
+ patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
+
+ autoreconf
+}
build() {
cd "$pkgname-$pkgver"
- # still waiting on ipw2x00 to get fixed...
- patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
- --enable-split-usr \
--enable-introspection \
--enable-gtk-doc \
--disable-audit \
--disable-ima \
- --with-pamlibdir=/usr/lib/security \
- --with-distro=arch \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids \
- --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path= \
+ --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware"
make
}
+check() {
+ make -C "$pkgname-$pkgver" check || :
+}
+
package_systemd() {
pkgdesc="system and service manager"
- depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
- "systemd-tools=$pkgver" 'util-linux' 'xz')
- optdepends=('initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: legacy generator for initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'python2-dbus: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+ license=('GPL2' 'LGPL2.1' 'MIT')
+ depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
+ 'pam' 'util-linux' 'xz')
+ provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
+ 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+ 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
+ replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+ optdepends=('cryptsetup: required for encrypted block devices'
+ 'libmicrohttpd: systemd-journal-gatewayd'
+ 'quota-tools: kernel-level quota management'
+ 'python2: systemd library bindings'
'systemd-sysvcompat: symlink package to provide sysvinit binaries')
backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
etc/dbus-1/system.d/org.freedesktop.hostname1.conf
etc/dbus-1/system.d/org.freedesktop.login1.conf
etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.machine1.conf
etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/pam.d/systemd-user
+ etc/systemd/bootchart.conf
+ etc/systemd/journald.conf
+ etc/systemd/logind.conf
etc/systemd/system.conf
etc/systemd/user.conf
- etc/systemd/logind.conf
- etc/systemd/journald.conf)
+ etc/udev/udev.conf)
install="systemd.install"
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
- install -dm755 "$pkgdir/bin"
- ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
- # move bash-completion and symlink for loginctl
- install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
- "$pkgdir/usr/share/bash-completion/completions/systemctl"
- ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
- rm -rf "$pkgdir/etc/bash_completion.d"
+ # fix .so links in manpage stubs
+ find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+ -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
# don't write units to /etc by default -- we'll enable this on post_install
# as a sane default
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
- # fix systemd-analyze for python2. the 'plot' verb does not work
- # with py3k due to a bug in python-cairo
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+ # get rid of RPM macros
+ rm -r "$pkgdir/usr/lib/rpm"
+
+ # add back tmpfiles.d/legacy.conf
+ install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+
+ # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+ sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
+ s#GROUP="tape"#GROUP="storage"#g;
+ s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
- ### split off libsystemd (libs, includes, pkgconfig, man3)
- rm -rf "$srcdir/_libsystemd"
- install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
- cd "$srcdir"/_libsystemd
- mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
- mv "$pkgdir/usr/include/systemd" usr/include
- mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+ # add mkinitcpio hooks
+ install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
+ install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
+ install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+
+ # ensure proper permissions for /var/log/journal
+ chown root:systemd-journal "$pkgdir/var/log/journal"
+ chmod 2755 "$pkgdir/var/log/journal"
+
+ # fix pam file
+ sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
### split out manpages for sysvcompat
rm -rf "$srcdir/_sysvcompat"
@@ -105,105 +142,42 @@ package_systemd() {
mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
"$srcdir"/_sysvcompat/usr/share/man/man8
- ### split out systemd-tools/udev
- rm -rf "$srcdir/_tools"
- install -dm755 \
- "$srcdir"/_tools/etc/udev \
- "$srcdir"/_tools/usr/bin \
- "$srcdir"/_tools/usr/include \
- "$srcdir"/_tools/usr/lib/udev \
- "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
- "$srcdir"/_tools/usr/lib/girepository-1.0 \
- "$srcdir"/_tools/usr/share/pkgconfig \
- "$srcdir"/_tools/usr/share/gir-1.0 \
- "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
- "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
-
- cd "$srcdir/_tools"
- mv "$pkgdir"/etc/udev etc
- mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
- mv "$pkgdir"/usr/bin/udevadm usr/bin
- mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin
- mv "$pkgdir"/usr/lib/pkgconfig usr/lib
- mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
- mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
- mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants
- mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants
- mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib
- mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib
- mv "$pkgdir"/usr/lib/udev usr/lib
- mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include
- mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib
- mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig
- mv "$pkgdir"/usr/share/gir-1.0 usr/share
- mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
- mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
- mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
- mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
- mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
- mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5
- mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
- mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
+ # include MIT license, since it's technically custom
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+ "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
}
package_systemd-sysvcompat() {
pkgdesc="sysvinit compat for systemd"
- conflicts=('sysvinit' 'initscripts')
+ license=('GPL2')
+ groups=('base')
+ conflicts=('sysvinit')
+ depends=('systemd')
mv "$srcdir/_sysvcompat"/* "$pkgdir"
- install -dm755 "$pkgdir/sbin"
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+ install -dm755 "$pkgdir/usr/bin"
+ #for tool in runlevel reboot shutdown poweroff halt telinit; do
+ for tool in runlevel telinit; do
+ ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
done
- ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-
- install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('xz')
-
- mv "$srcdir/_libsystemd"/* "$pkgdir"
-}
-
-package_systemd-tools() {
- pkgdesc='standalone tools from systemd'
- url='http://www.freedesktop.org/wiki/Software/systemd'
- depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd')
- optdepends=('cryptsetup: required for encrypted block devices')
- provides=("udev=$pkgver")
- conflicts=('udev')
- replaces=('udev')
- install='systemd-tools.install'
-
- mv "$srcdir/_tools/"* "$pkgdir"
-
- # the path to udevadm is hardcoded in some places
- install -d "$pkgdir/sbin"
- ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
- # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
- ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
- # add back tmpfiles.d/legacy.conf
- install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
- # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
- sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
- s#GROUP="tape"#GROUP="storage"#g;
- s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
- # add mkinitcpio hooks
- install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
- install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
- install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
- # XXX: kill off coredump rule until the journal can recover coredumps
- # this file needs to come back as part of systemd, not systemd-tools
- rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
+ ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
}
# vim: ft=sh syn=sh et
+md5sums=('df64550d92afbffb4f67a434193ee165'
+ '29245f7a240bfba66e2b1783b63b6b40'
+ '8b68b0218a3897d4d37a6ccf47914774'
+ 'bde43090d4ac0ef048e3eaee8202a407'
+ '1b191c4e7a209d322675fd199e3abc66'
+ 'a693bef63548163ffc165f4c4801ebf7'
+ 'ccafe716d87df9c42af0d1960b5a4105'
+ '441e3d464ee6af5fe4af6a8bc10d7980'
+ '718d841203cf2ea9e24a7d0f1d19d48b'
+ '623c77bad0d2968e44963d72924825f1'
+ 'e52fc8368853c7800ab03ab8868cfd41'
+ '2096f33bd36dfa0a7f0431d0a429787a'
+ 'd2481a6ea199b581e243a950125b0ca6'
+ 'c2aee634a3a6c50778968f0d5c756f40'
+ 'ef8b8212d504bb73c10bf4e85f0703b2')
diff --git a/abs/core/systemd/initcpio-hook-udev b/abs/core/systemd/initcpio-hook-udev
index 75da7e4..0bc32e0 100644
--- a/abs/core/systemd/initcpio-hook-udev
+++ b/abs/core/systemd/initcpio-hook-udev
@@ -1,7 +1,9 @@
#!/usr/bin/ash
run_earlyhook() {
- udevd --daemon --resolve-names=never
+ kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ systemd-tmpfiles --prefix=/dev --create
+ /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
udevd_running=1
}
diff --git a/abs/core/systemd/initcpio-install-systemd b/abs/core/systemd/initcpio-install-systemd
new file mode 100644
index 0000000..2c59074
--- /dev/null
+++ b/abs/core/systemd/initcpio-install-systemd
@@ -0,0 +1,159 @@
+#!/bin/bash
+
+strip_quotes() {
+ local len=${#1} quotes=$'[\'"]' str=${!1}
+
+ if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+ declare -g "$1=${str:1:-1}"
+ fi
+}
+
+add_udev_rule() {
+ # Add an udev rules file to the initcpio image. Dependencies on binaries
+ # will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local rules= rule= key= value= binary=
+
+ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+ if [[ -z $rules ]]; then
+ # complain about not found rules
+ return 1
+ fi
+
+ add_file "$rules"
+
+ while IFS=, read -ra rule; do
+ # skip empty lines, comments
+ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+ for pair in "${rule[@]}"; do
+ IFS=' =' read -r key value <<< "$pair"
+ case $key in
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+ strip_quotes 'value'
+ # just take the first word as the binary name
+ binary=${value%% *}
+ if [[ ${binary:0:1} != '/' ]]; then
+ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+ fi
+ add_binary "$binary"
+ ;;
+ esac
+ done
+ done <"$rules"
+}
+
+add_systemd_unit() {
+ # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
+ # and other unit files will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local unit= rule= entry= key= value= binary= dep=
+
+ unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+ if [[ -z $unit ]]; then
+ # complain about not found unit file
+ return 1
+ fi
+
+ add_file "$unit"
+
+ while IFS='=' read -r key values; do
+ read -ra values <<< "$values"
+
+ case $key in
+ Requires|OnFailure)
+ # only add hard dependencies (not Wants)
+ map add_systemd_unit "${values[@]}"
+ ;;
+ Exec*)
+ # don't add binaries unless they are required
+ if [[ ${values[0]:0:1} != '-' ]]; then
+ add_binary "${values[0]}"
+ fi
+ ;;
+ esac
+
+ done <"$unit"
+
+ # preserve reverse soft dependency
+ for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+ if [[ -L $dep ]]; then
+ add_symlink "$dep"
+ fi
+ done
+
+ # add hard dependencies
+ if [[ -d $unit.requires ]]; then
+ for dep in "$unit".requires/*; do
+ add_systemd_unit ${dep##*/}
+ done
+ fi
+}
+
+build() {
+ local rules unit
+
+ # from base
+ add_binary /bin/mount
+ add_binary /usr/bin/kmod /usr/bin/modprobe
+
+ # systemd
+ add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/systemd-tmpfiles
+
+ # generate sysroot.mount and sysroot-usr.mount
+ add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator"
+
+ # udev rules and systemd units
+ map add_udev_rule "$rules" \
+ 50-udev-default.rules \
+ 60-persistent-storage.rules \
+ 64-btrfs.rules \
+ 80-drivers.rules \
+ 99-systemd.rules \
+
+ map add_systemd_unit \
+ ctrl-alt-del.target \
+ initrd-cleanup.service \
+ initrd-fs.target \
+ initrd-parse-etc.service \
+ initrd-root-fs.target \
+ initrd-switch-root.service \
+ initrd-switch-root.target \
+ initrd-udevadm-cleanup-db.service \
+ initrd.target \
+ kmod-static-nodes.service \
+ sockets.target \
+ systemd-fsck@.service \
+ systemd-journald.service \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-udev-trigger.service \
+ systemd-udevd-control.socket \
+ systemd-udevd-kernel.socket \
+ systemd-udevd.service
+
+ add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+
+ # libdbus needs the passwd info of the root user
+ # TODO: make sure this is no longer necessary when systemctl moves to sd-bus
+ add_file "/etc/nsswitch.conf"
+ add_file "/etc/passwd"
+ add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+
+ # udev wants /etc/group since it doesn't launch with --resolve-names=never
+ add_file "/etc/group"
+}
+
+help() {
+ cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/abs/core/systemd/initcpio-install-timestamp b/abs/core/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc70..0000000
--- a/abs/core/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
- add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
- cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/abs/core/systemd/initcpio-install-udev b/abs/core/systemd/initcpio-install-udev
index 7624299..419c19e 100644
--- a/abs/core/systemd/initcpio-install-udev
+++ b/abs/core/systemd/initcpio-install-udev
@@ -4,10 +4,11 @@ build() {
local rules tool
add_file "/etc/udev/udev.conf"
- add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+ add_binary /usr/lib/systemd/systemd-udevd
add_binary /usr/bin/udevadm
+ add_binary /usr/bin/systemd-tmpfiles
- for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+ for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
add_file "/usr/lib/udev/rules.d/$rules"
done
for tool in ata_id scsi_id; do
diff --git a/abs/core/systemd/locale.sh b/abs/core/systemd/locale.sh
deleted file mode 100644
index a4c413e..0000000
--- a/abs/core/systemd/locale.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
- return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
- export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
- export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
- export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
- export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
- export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
- export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
- export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
- export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
- export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
- export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
- export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
- export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
- export LC_IDENTIFICATION
-fi
-
diff --git a/abs/core/systemd/systemd-187-2.src.tar.gz b/abs/core/systemd/systemd-187-2.src.tar.gz
deleted file mode 120000
index 980a3eb..0000000
--- a/abs/core/systemd/systemd-187-2.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/src_packages/systemd-187-2.src.tar.gz
\ No newline at end of file
diff --git a/abs/core/systemd/systemd-tools.install b/abs/core/systemd/systemd-tools.install
deleted file mode 100644
index 7d0bd87..0000000
--- a/abs/core/systemd/systemd-tools.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_install() {
- systemd-machine-id-setup
-}
-
-post_upgrade() {
- systemd-machine-id-setup
-
- if [ "$(vercmp $2 174)" -lt 0 ]; then
- echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
- echo " 'scanner' and 'video' groups. Beware of any changes."
- echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
- echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
- echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
- echo " this functionality back."
- echo " * We no longer create the static nodes on install needed for an initrd-less"
- echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh"
- echo " installs."
- fi
- if [ "$(vercmp $2 175)" -lt 0 ]; then
- echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
- echo " kernels have this enabled."
- fi
- if [ "$(vercmp $2 181)" -lt 0 ]; then
- echo " * udev-compat has been removed, and should be uninstalled."
- echo " * Framebuffers are no longer blacklisted by default."
- echo " * binaries moved from /sbin to /usr/bin"
- fi
- if [ "$(vercmp $2 181-3)" -lt 0 ]; then
- echo " * if your kernel does not provide /dev/loop-control, you need to manually"
- echo " load the 'loop' module before using losetup"
- fi
-}
diff --git a/abs/core/systemd/systemd.install b/abs/core/systemd/systemd.install
index e369f09..1e79585 100644
--- a/abs/core/systemd/systemd.install
+++ b/abs/core/systemd/systemd.install
@@ -4,33 +4,116 @@ sd_booted() {
[ -e sys/fs/cgroup/systemd ]
}
+add_privs() {
+ if ! setcap "$2" "$1" 2>/dev/null; then
+ echo "==> Warning: setcap failed, falling back to setuid root on /$1"
+ chmod u+s "$1"
+ fi
+}
+
+post_common() {
+ systemd-machine-id-setup
+
+ add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep'
+
+ udevadm hwdb --update
+ journalctl --update-catalog
+
+ if sd_booted; then
+ systemctl --system daemon-reexec
+ fi
+}
+
+mask_net_naming() {
+ if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then
+ printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \
+ "This file masks persistent renaming rules for network devices. If you" \
+ "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \
+ "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \
+ "properties of your network devices, with priority in that order. See" \
+ "the output of 'udevadm test-builtin net_id /sys/class/net/\$interface'" \
+ "for details on what that new name might be." \
+ "" \
+ "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ fi
+}
+
+_208_changes() {
+ chown root:systemd-journal var/log/journal
+ chmod 2755 var/log/journal
+
+ if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then
+ mv -T var/lib/backlight var/lib/systemd/backlight
+ fi
+
+ if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then
+ mv -T var/lib/random-seed var/lib/systemd/random-seed
+ fi
+}
+
post_install() {
+ post_common
+
# enable getty@tty1 by default, but don't track the file
- systemctl enable getty@.service
+ systemctl enable getty@tty1.service
- echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd"
+ echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+ echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
}
post_upgrade() {
- if sd_booted; then
- # we moved the binary in 44-2 to /usr, so a reexec leads to a
- # coredump. refuse this reexec and warn the user that they should
- # reboot instead.
- if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
- echo "warning: refusing to reexec systemd. the system should be rebooted."
- else
- systemctl daemon-reload
- systemctl daemon-reexec
- fi
- fi
+ post_common
# getty@tty1.service is no longer enabled by default, but we don't want to break
# existing setups.
if [ "$(vercmp 183 "$2")" -eq 1 ]; then
# systemctl seems to be whiny on sysvinit. this will succeed unless something
# horrific happens, so just mask the error.
- systemctl -q enable getty@.service || true
+ systemctl -q enable getty@tty1.service || true
+ fi
+
+ if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
+ printf '==> journald now writes to /var/log/journal by default. This can be\n'
+ printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n'
+ fi
+
+ # logind's protocol changed. kindly restart the daemon to avoid locking
+ # out further logins.
+ if [ "$(vercmp 195 "$2")" -eq 1 ]; then
+ if sd_booted; then
+ systemctl restart systemd-logind.service
+ fi
+ fi
+
+ if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then
+ printf '==> The legacy configuration options are no longer supported in rc.conf,\n'
+ printf ' convert your rc.conf to the new configuration formats.\n'
+ fi
+
+ if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then
+ mask_net_naming
+ printf '==> Persistent net naming rules have been shipped as disabled.\n'
+ printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
+ fi
+
+ if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then
+ printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
+ printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
+ fi
+
+ if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then
+ printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n'
+ printf ' protocols. You should reboot at your earliest convenience.\n'
+ fi
+
+ if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then
+ printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n'
+ printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n'
+ printf ' hook has been added which provides this functionality, and more.\n'
+ fi
+
+ if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
+ _208_changes
fi
}
--
cgit v0.12
From 44583f174e00b6d5799e5a5990d16a41ebc2e832 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:16 -0600
Subject: tar 1.2.7 update binary path to /usr/bin refs #961
---
abs/core/tar/PKGBUILD | 21 ++-
abs/core/tar/tar.1 | 367 --------------------------------------------------
2 files changed, 9 insertions(+), 379 deletions(-)
delete mode 100644 abs/core/tar/tar.1
diff --git a/abs/core/tar/PKGBUILD b/abs/core/tar/PKGBUILD
index f064f08..2fa4afb 100644
--- a/abs/core/tar/PKGBUILD
+++ b/abs/core/tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $
+# $Id: PKGBUILD 199999 2013-11-21 01:21:02Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=tar
-pkgver=1.26
-pkgrel=2
+pkgver=1.27.1
+pkgrel=1
pkgdesc="Utility used to store, backup, and transport files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/tar/tar.html"
@@ -13,20 +13,16 @@ groups=('base')
depends=('glibc' 'sh')
options=('!emptydirs')
install=tar.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
- tar.1)
-md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1'
- '6618d5fe7785e138c27d7d6a24e998b2'
- 'e97e7343f4e23724b4c48bca2f033e38')
+source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
build() {
cd ${srcdir}/$pkgname-$pkgver
-
- ./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
+export FORCE_UNSAFE_CONFIGURE=1
+ ./configure --prefix=/usr --libexecdir=/usr/lib/tar
make
}
-check() {
+3check() {
cd ${srcdir}/$pkgname-$pkgver
make check
}
@@ -34,5 +30,6 @@ check() {
package() {
cd ${srcdir}/$pkgname-$pkgver
make DESTDIR=${pkgdir} install
- install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1
}
+md5sums=('e0382a4064e09a4943f3adeff1435978'
+ 'SKIP')
diff --git a/abs/core/tar/tar.1 b/abs/core/tar/tar.1
deleted file mode 100644
index 75bbcd3..0000000
--- a/abs/core/tar/tar.1
+++ /dev/null
@@ -1,367 +0,0 @@
-.\" generated by script on Fri Aug 19 16:19:30 2011
-.Dd Aug 19, 2011
-.Dt TAR 1
-.Sh NAME
-.Nm tar
-.Nd The GNU version of the tar archiving utility
-.Sh SYNOPSIS
-.Nm tar
-.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get
-.Op Ar options
-.Op Ar pathname ...
-.Sh DESCRIPTION
-.Nm Tar
-stores and extracts files from a tape or disk archive.
-.Pp
-The first argument to
-tar
-should be a function; either one of the letters
-.Cm Acdrtux ,
-or one of the long function names.
-A function letter need not be prefixed with ``\-'', and may be combined
-with other single-letter options.
-A long function name must be prefixed with
-.Cm \\-\\- .
-Some options take a parameter; with the single-letter form
-these must be given as separate arguments.
-With the long form, they may be given by appending
-.Cm = Ns Ar value
-to the option.
-.Sh FUNCTION LETTERS
-Main operation mode:
-.Bl -tag -width flag
-.It Fl A , Fl \-catenate , Fl \-concatenate
-append tar files to an archive
-.It Fl c , Fl \-create
-create a new archive
-.It Fl d , Fl \-diff , Fl \-compare
-find differences between archive and file system
-.It Fl \-delete
-delete from the archive (not on mag tapes!)
-.It Fl r , Fl \-append
-append files to the end of an archive
-.It Fl t , Fl \-list
-list the contents of an archive
-.It Fl \-test\-label
-test the archive volume label and exit
-.It Fl u , Fl \-update
-only append files newer than copy in archive
-.It Fl x , Fl \-extract , Fl \-get
-extract files from an archive
-.El
-.Sh OTHER OPTIONS
-Operation modifiers:
-.Bl -tag -width flag
-.It \-[0\-7][lmh]
-specify drive and density
-.It Fl a , Fl \-auto\-compress
-use archive suffix to determine the compression program
-.It Fl \-add\-file Ns \= Ns Ar FILE
-add given FILE to the archive (useful if its name starts with a dash)
-.It Fl \-anchored
-patterns match file name start
-.It Fl \-no\-anchored
-patterns match after any `/' (default for exclusion)
-.It Fl \-atime\-preserve
-preserve access times on dumped files, either by restoring the times
-.It Fl \-no\-auto\-compress
-do not use archive suffix to determine the compression program
-.It Fl b , Fl \-blocking\-factor Ar BLOCKS
-BLOCKS x 512 bytes per record
-.It Fl B , Fl \-read\-full\-records
-reblock as we read (for 4.2BSD pipes)
-.It Fl \-backup
-backup before removal, choose version CONTROL
-.It Fl C , Fl \-directory Ar DIR
-change to directory DIR
-.It Fl \-check\-device
-check device numbers when creating incremental archives (default)
-.It Fl \-no\-check\-device
-do not check device numbers when creating incremental archives
-.It Fl \-checkpoint
-display progress messages every NUMBERth record (default 10)
-.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION
-execute ACTION on each checkpoint
-.It Fl \-delay\-directory\-restore
-delay setting modification times and permissions of extracted
-.It Fl \-no\-delay\-directory\-restore
-cancel the effect of --delay-directory-restore option
-.It Fl \-exclude Ns \= Ns Ar PATTERN
-exclude files, given as a PATTERN
-.It Fl \-exclude\-backups
-exclude backup and lock files
-.It Fl \-exclude\-caches
-exclude contents of directories containing CACHEDIR.TAG,
-.It Fl \-exclude\-caches\-all
-exclude directories containing CACHEDIR.TAG
-.It Fl \-exclude\-caches\-under
-exclude everything under directories containing CACHEDIR.TAG
-.It Fl \-exclude\-tag Ns \= Ns Ar FILE
-exclude contents of directories containing FILE, except
-.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE
-exclude directories containing FILE
-.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE
-exclude everything under directories containing FILE
-.It Fl \-exclude\-vcs
-exclude version control system directories
-.It Fl f , Fl \-file Ar ARCHIVE
-use archive file or device ARCHIVE
-.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME
-run script at end of each tape (implies -M)
-.It Fl \-force\-local
-archive file is local even if it has a colon
-.It Fl \-full\-time
-print file time to its full resolution
-.It Fl g , Fl \-listed\-incremental Ar FILE
-handle new GNU-format incremental backup
-.It Fl G , Fl \-incremental
-handle old GNU-format incremental backup
-.It Fl \-group Ns \= Ns Ar NAME
-force NAME as group for added files
-.It Fl h , Fl \-dereference
-follow symlinks; archive and dump the files they point to
-.It Fl H , Fl \-format Ar FORMAT
-create archive of the given formatFORMAT is one of the following:
-.Bl -tag -width flag
-.It Fl \-format=gnu
-GNU tar 1.13.x format
-.It Fl \-format=oldgnu
-GNU format as per tar <= 1.12
-.It Fl \-format=pax
-POSIX 1003.1-2001 (pax) format
-.It Fl \-format=posix
-same as pax
-.It Fl \-format=ustar
-POSIX 1003.1-1988 (ustar) format
-.It Fl \-format=v7
-old V7 tar format
-.El
-.It Fl \-hard\-dereference
-follow hard links; archive and dump the files they refer to
-.It Fl i , Fl \-ignore\-zeros
-ignore zeroed blocks in archive (means EOF)
-.It Fl I , Fl \-use\-compress\-program Ar PROG
-filter through PROG (must accept -d)
-.It Fl \-ignore\-case
-ignore case
-.It Fl \-no\-ignore\-case
-case sensitive matching (default)
-.It Fl \-ignore\-command\-error
-ignore exit codes of children
-.It Fl \-no\-ignore\-command\-error
-treat non-zero exit codes of children as error
-.It Fl \-ignore\-failed\-read
-do not exit with nonzero on unreadable files
-.It Fl \-index\-file Ns \= Ns Ar FILE
-send verbose output to FILE
-.It Fl j , Fl \-bzip2
-
-.It Fl J , Fl \-xz
-
-.It Fl k , Fl \-keep\-old\-files
-don't replace existing files when extracting
-.It Fl K , Fl \-starting\-file Ar MEMBER-NAME
-begin at member MEMBER-NAME in the archive
-.It Fl \-keep\-newer\-files
-don't replace existing files that are newer than their archive copies
-.It Fl l , Fl \-check\-links
-print a message if not all links are dumped
-.It Fl L , Fl \-tape\-length Ar NUMBER
-change tape after writing NUMBER x 1024 bytes
-.It Fl \-level Ns \= Ns Ar NUMBER
-dump level for created listed-incremental archive
-.It Fl \-lzip
-
-.It Fl \-lzma
-
-.It Fl \-lzop
-
-.It Fl m , Fl \-touch
-don't extract file modified time
-.It Fl M , Fl \-multi\-volume
-create/list/extract multi-volume archive
-.It Fl \-mode Ns \= Ns Ar CHANGES
-force (symbolic) mode CHANGES for added files
-.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE
-set mtime for added files from DATE-OR-FILE
-.It Fl n , Fl \-seek
-archive is seekable
-.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE
-only store files newer than DATE-OR-FILE
-.It Fl \-newer\-mtime Ns \= Ns Ar DATE
-compare date and time when data changed only
-.It Fl \-null
--T reads null-terminated names, disable -C
-.It Fl \-no\-null
-disable the effect of the previous --null option
-.It Fl \-numeric\-owner
-always use numbers for user/group names
-.It Fl O , Fl \-to\-stdout
-extract files to standard output
-.It Fl \-occurrence
-process only the NUMBERth occurrence of each file in the archive;
-.It Fl \-old\-archive , Fl \-portability
-same as --format=v7
-.It Fl \-one\-file\-system
-stay in local file system when creating archive
-.It Fl \-overwrite
-overwrite existing files when extracting
-.It Fl \-overwrite\-dir
-overwrite metadata of existing directories when extracting (default)
-.It Fl \-no\-overwrite\-dir
-preserve metadata of existing directories
-.It Fl \-owner Ns \= Ns Ar NAME
-force NAME as owner for added files
-.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions
-extract information about file permissions (default for superuser)
-.It Fl P , Fl \-absolute\-names
-don't strip leading `/'s from file names
-.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]...
-control pax keywords
-.It Fl \-posix
-same as --format=posix
-.It Fl \-preserve
-same as both -p and -s
-.It Fl \-quote\-chars Ns \= Ns Ar STRING
-additionally quote characters from STRING
-.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING
-disable quoting for characters from STRING
-.It Fl \-quoting\-style Ns \= Ns Ar STYLE
-set name quoting style; see below for valid STYLE values
-.It Fl R , Fl \-block\-number
-show block number within archive with each message
-.It Fl \-record\-size Ns \= Ns Ar NUMBER
-NUMBER of bytes per record, multiple of 512
-.It Fl \-recursion
-recurse into directories (default)
-.It Fl \-no\-recursion
-avoid descending automatically in directories
-.It Fl \-recursive\-unlink
-empty hierarchies prior to extracting directory
-.It Fl \-remove\-files
-remove files after adding them to the archive
-.It Fl \-restrict
-disable use of some potentially harmful options
-.It Fl \-rmt\-command Ns \= Ns Ar COMMAND
-use given rmt COMMAND instead of rmt
-.It Fl \-rsh\-command Ns \= Ns Ar COMMAND
-use remote COMMAND instead of rsh
-.It Fl s , Fl \-preserve\-order , Fl \-same\-order
-sort names to extract to match archive
-.It Fl S , Fl \-sparse
-handle sparse files efficiently
-.It Fl \-same\-owner
-try extracting files with the same ownership as exists in the archive (default for superuser)
-.It Fl \-no\-same\-owner
-extract files as yourself (default for ordinary users)
-.It Fl \-no\-same\-permissions
-apply the user's umask when extracting permissions from the archive (default for ordinary users)
-.It Fl \-no\-seek
-archive is not seekable
-.It Fl \-show\-defaults
-show tar defaults
-.It Fl \-show\-omitted\-dirs
-when listing or extracting, list each directory that does not match search criteria
-.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names
-show file or archive names after transformation
-.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR]
-set version of the sparse format to use (implies --sparse)
-.It Fl \-strip\-components Ns \= Ns Ar NUMBER
-strip NUMBER leading components from file names on extraction
-.It Fl \-suffix Ns \= Ns Ar STRING
-backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)
-.It Fl T , Fl \-files\-from Ar FILE
-get names to extract or create from FILE
-.It Fl \-to\-command Ns \= Ns Ar COMMAND
-pipe extracted files to another program
-.It Fl \-totals
-print total bytes after processing the archive;
-.It Fl \-transform , Fl \-xform Ar EXPRESSION
-use sed replace EXPRESSION to transform file names
-.It Fl U , Fl \-unlink\-first
-remove each file prior to extracting over it
-.It Fl \-unquote
-unquote filenames read with -T (default)
-.It Fl \-no\-unquote
-do not unquote filenames read with -T
-.It Fl \-utc
-print file modification times in UTC
-.It Fl v , Fl \-verbose
-verbosely list files processed
-.It Fl V , Fl \-label Ar TEXT
-create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name
-.It Fl \-volno\-file Ns \= Ns Ar FILE
-use/update the volume number in FILE
-.It Fl w , Fl \-interactive , Fl \-confirmation
-ask for confirmation for every action
-.It Fl W , Fl \-verify
-attempt to verify the archive after writing it
-.It Fl \-warning Ns \= Ns Ar KEYWORD
-warning control
-.It Fl \-wildcards
-use wildcards (default for exclusion)
-.It Fl \-wildcards\-match\-slash
-wildcards match `/' (default for exclusion)
-.It Fl \-no\-wildcards\-match\-slash
-wildcards do not match `/'
-.It Fl \-no\-wildcards
-verbatim string matching
-.It Fl X , Fl \-exclude\-from Ar FILE
-exclude patterns listed in FILE
-.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip
-
-.It Fl Z , Fl \-compress , Fl \-uncompress
-
-.El
-.Sh ENVIRONMENT
-The behavior of tar is controlled by the following environment variables,
-among others:
-.Bl -tag -width Ds
-.It Ev SIMPLE_BACKUP_SUFFIX
-Backup prefix to use when extracting, if
-.Fl \-suffix
-is not specified.
-The backup suffix defaults to `~' if neither is specified.
-.It Ev TAR_OPTIONS
-Options to prepend to those specified on the command line, separated by
-whitespace. Embedded backslashes may be used to escape whitespace or
-backslashes within an option.
-.It Ev TAPE
-Device or file to use for the archive if
-.Fl \-file
-is not specified.
-If this environment variable is unset, use stdin or stdout instead.
-.It Ev TAR_LONGLINK_100
-.El
-.Sh EXAMPLES
-Create archive.tar from files foo and bar.
-.Bd -literal -offset indent -compact
-tar \-cf archive.tar foo bar
-.Ed
-List all files in archive.tar verbosely.
-.Bd -literal -offset indent -compact
-tar \-tvf archive.tar
-.Ed
-Extract all files from archive.tar.
-.Bd -literal -offset indent -compact
-tar \-xf archive.tar
-.Ed
-.Sh SEE ALSO
-.\" libarchive
-.Xr tar 5 ,
-.\" man-pages
-.Xr symlink 7 ,
-.Xr rmt 8
-.Sh HISTORY
-The
-.Nm tar
-command appeared in
-.At v7 .
-.Sh BUGS
-The GNU folks, in general, abhor man pages, and create info documents instead.
-Unfortunately, the info document describing tar is licensed under the GFDL with
-invariant cover texts, which makes it impossible to include any text
-from that document in this man page.
-Most of the text in this document was automatically extracted from the usage
-text in the source.
-It may not completely describe all features of the program.
--
cgit v0.12
From 76d8789a8f3dd26cd1a6cea90517d75efa922f40 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:27 -0600
Subject: udisks: update binary path to /usr/bin refs #961
---
abs/core/udisks/PKGBUILD | 33 ++++++++++++++++++++++++++-------
abs/core/udisks/drop-pci-db.patch | 28 ++++++++++++++++++++++++++++
abs/core/udisks/udisks.service | 10 ++++++++++
3 files changed, 64 insertions(+), 7 deletions(-)
create mode 100644 abs/core/udisks/drop-pci-db.patch
create mode 100644 abs/core/udisks/udisks.service
diff --git a/abs/core/udisks/PKGBUILD b/abs/core/udisks/PKGBUILD
index e576d2e..08ab090 100644
--- a/abs/core/udisks/PKGBUILD
+++ b/abs/core/udisks/PKGBUILD
@@ -1,31 +1,50 @@
-# $Id: PKGBUILD 160373 2012-06-01 12:58:48Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 198467 2013-10-30 15:03:09Z allan $
+# Maintainer: Tom Gundersen <teg@jklm.no>
pkgname=udisks
pkgver=1.0.4
-pkgrel=4
+pkgrel=8
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/udisks --disable-static
+
+ patch -p1 < ../drop-pci-db.patch
+
make
+ # fix mdadm location
+ sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \
+ "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
+
# move udev helpers and rules to /usr/lib
mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
rm -r "${pkgdir}"/lib
+
+ # move umount helper to /usr/bin
+ mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/
+ rm -r "${pkgdir}"/sbin
+
+ install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
+ echo "SystemdService=udisks.service" \
+ >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
+
+ # install the /media folder
+ install -d -m 755 $pkgdir/media
}
+md5sums=('86c63b2b5484f2060499a052b5b6256b'
+ '5d80832b4d4da72beeb45c15b63a1481'
+ '773cccd70afd18ace4332037feff67ec')
diff --git a/abs/core/udisks/drop-pci-db.patch b/abs/core/udisks/drop-pci-db.patch
new file mode 100644
index 0000000..6de6f56
--- /dev/null
+++ b/abs/core/udisks/drop-pci-db.patch
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date: 2 days ago
+
+ udev: remove redundant call to deprecated pci-db
+
+ The binary is no longer shipped with systemd/udev. The functionality
+ is taken over by a builtin, which is ran for all devices, rendering
+ this rule superfluous.
+
+ Cc: Jan de Groot <jgc@archlinux.org>
+ Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/abs/core/udisks/udisks.service b/abs/core/udisks/udisks.service
new file mode 100644
index 0000000..7105e90
--- /dev/null
+++ b/abs/core/udisks/udisks.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=UDisks
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=/usr/lib/udisks/udisks-daemon
+
+[Install]
+WantedBy=graphical.target
--
cgit v0.12
From 15471fc26d53c9431ebf69b06bb6ac0036484d54 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:44 -0600
Subject: util-linux 2.2.4 update binary path to /usr/bin refs #961
---
.../util-linux/0001-lsblk-fix-D-segfault.patch | 45 +++++++++++++++++++
...mount-correctly-import-from-pylibmount.so.patch | 30 +++++++++++++
abs/core/util-linux/PKGBUILD | 50 +++++++++++++++-------
abs/core/util-linux/__changelog | 3 ++
abs/core/util-linux/term_utils-agetty.patch | 17 --------
5 files changed, 113 insertions(+), 32 deletions(-)
create mode 100644 abs/core/util-linux/0001-lsblk-fix-D-segfault.patch
create mode 100644 abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
mode change 100644 => 100755 abs/core/util-linux/PKGBUILD
create mode 100644 abs/core/util-linux/__changelog
delete mode 100644 abs/core/util-linux/term_utils-agetty.patch
diff --git a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch
new file mode 100644
index 0000000..8e4d7c6
--- /dev/null
+++ b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch
@@ -0,0 +1,45 @@
+From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 18 Nov 2013 11:27:35 +0100
+Subject: [PATCH] lsblk: fix -D segfault
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/lsblk.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index 9f7f1b6..9b53be3 100644
+--- a/misc-utils/lsblk.c
++++ b/misc-utils/lsblk.c
+@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ if (cxt->discard && p)
+ tt_line_set_data(ln, col, p);
+ else
+- tt_line_set_data(ln, col, "0");
++ tt_line_set_data(ln, col, xstrdup("0"));
+ break;
+ case COL_DGRAN:
+ if (lsblk->bytes)
+@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ if (cxt->discard && p)
+ tt_line_set_data(ln, col, p);
+ else
+- tt_line_set_data(ln, col, "0");
++ tt_line_set_data(ln, col, xstrdup("0"));
+ break;
+ case COL_WSAME:
+ if (lsblk->bytes)
+@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ "queue/write_same_max_bytes", &x) == 0)
+ p = size_to_human_string(SIZE_SUFFIX_1LETTER, x);
+ }
+- tt_line_set_data(ln, col, p ? p : "0");
++ tt_line_set_data(ln, col, p ? p : xstrdup("0"));
+ break;
+ };
+ }
+--
+1.8.4.2
+
diff --git a/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
new file mode 100644
index 0000000..34040b9
--- /dev/null
+++ b/abs/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
@@ -0,0 +1,30 @@
+From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 21 Nov 2013 12:25:27 -0500
+Subject: [PATCH] pylibmount: correctly import from pylibmount.so
+
+Without this, python is unable to find the module:
+
+$ python -c 'import libmount'
+Traceback (most recent call last):
+ File "<string>", line 1, in <module>
+ File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module>
+ from pylibmount import *
+ImportError: No module named 'pylibmount'
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ libmount/python/libmount/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py
+index 243c639..09104e2 100644
+--- a/libmount/python/libmount/__init__.py
++++ b/libmount/python/libmount/__init__.py
+@@ -1,2 +1,2 @@
+-from pylibmount import *
++from .pylibmount import *
+
+--
+1.8.4.2
+
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD
old mode 100644
new mode 100755
index 857bcc4..53aa53e
--- a/abs/core/util-linux/PKGBUILD
+++ b/abs/core/util-linux/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $
+# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.22.1
-pkgrel=3
+pkgver=2.24
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
-groups=('base')
+groups=('base' 'base-devel')
depends=('pam' 'shadow' 'coreutils' 'glibc')
+optdepends=('python: python bindings to libmount')
+makedepends=('systemd' 'python2')
# checkdepends=('bc')
conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
+provides=("util-linux-ng=$pkgver" 'eject')
license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
+options=('strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
+ 0001-lsblk-fix-D-segfault.patch
+ 0001-pylibmount-correctly-import-from-pylibmount.so.patch
uuidd.tmpfiles
pam-login
pam-common
@@ -27,23 +32,31 @@ backup=(etc/pam.d/chfn
etc/pam.d/su-l)
install=util-linux.install
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch
+ patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--libdir=/usr/lib \
+ --bindir=/usr/bin \
--localstatedir=/run \
- --enable-fs-paths-extra=/usr/bin:/usr/sbin \
+ --enable-fs-paths-extra=/usr/bin \
--enable-raw \
--enable-vipw \
--enable-newgrp \
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
- --enable-socket-activation
+ --enable-socket-activation \
+ --with-python=2
# --enable-reset \ # part of ncurses
-# --enable-line \ # not part of any package
# --enable-last \ # not compat
make
@@ -55,12 +68,10 @@ build() {
#}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
make DESTDIR="${pkgdir}" install
- cd "${pkgdir}"
-
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
@@ -74,8 +85,17 @@ package() {
# include tmpfiles fragment for uuidd
# TODO(dreisner): offer this upstream?
install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+ # usrmove
+ cd "$pkgdir"
+ mv {,usr/}sbin/* usr/bin
+ rmdir sbin usr/sbin
+
+
}
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
+md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
+ '1899fe3b853a5835c76cca0501b6b518'
+ 'a18a1e89ffdfa3bc96ae976646a723ec'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
diff --git a/abs/core/util-linux/__changelog b/abs/core/util-linux/__changelog
new file mode 100644
index 0000000..31b27cd
--- /dev/null
+++ b/abs/core/util-linux/__changelog
@@ -0,0 +1,3 @@
+changed python from 3->2
+ mv $pkgdir/usr/bin/logger $pkgdir/usr/bin/logger-util-linux
+
diff --git a/abs/core/util-linux/term_utils-agetty.patch b/abs/core/util-linux/term_utils-agetty.patch
deleted file mode 100644
index f0b37b3..0000000
--- a/abs/core/util-linux/term_utils-agetty.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- term-utils/agetty.orig 2012-08-02 19:44:36.234757299 +0000
-+++ term-utils/agetty.c 2012-08-02 19:47:15.464752505 +0000
-@@ -961,12 +961,12 @@
- */
-
- if ((fcntl(STDIN_FILENO, F_GETFL, 0) & O_RDWR) != O_RDWR)
-- log_err(_("%s: not open for read/write"), tty);
-+ log_warn(_("%s: not open for read/write"), tty);
-
- }
-
- if (tcsetpgrp(STDIN_FILENO, pid))
-- log_err("/dev/%s: cannot set process group: %m", tty);
-+ log_warn("/dev/%s: cannot set process group: %m", tty);
-
- /* Get rid of the present outputs. */
- close(STDOUT_FILENO);
--
cgit v0.12
From 573f7604c1e3473553c69330c5580cf800d4c8ac Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:01:55 -0600
Subject: v4l-utils: 1.0 update binary path to /usr/bin refs #961
---
abs/core/v4l-utils/PKGBUILD | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD
index 62ec3d6..72ff71a 100644
--- a/abs/core/v4l-utils/PKGBUILD
+++ b/abs/core/v4l-utils/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $
+# $Id: PKGBUILD 196834 2013-10-20 12:03:29Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=v4l-utils
-pkgver=0.8.8
-pkgrel=1
+pkgver=1.0.0
+pkgrel=2
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/libv4l"
provides=("libv4l=$pkgver")
replaces=('libv4l')
conflicts=('libv4l')
+backup=(etc/rc_maps.cfg)
license=('LGPL')
makedepends=('qt')
optdepends=('qt')
depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
+sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30'
+ 'SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
-
- make PREFIX="/usr"
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
+ make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make install PREFIX="/usr" DESTDIR="${pkgdir}/"
- rm -f "${pkgdir}/usr/bin/ivtv-ctl"
- mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
- rm -rf "${pkgdir}/lib"
+ MAKEFLAGS="-j1" make install DESTDIR="${pkgdir}/"
+ rm "${pkgdir}/usr/bin/ivtv-ctl"
}
-md5sums=('40fdda3f4055ed818012d7a7b5ef5be5'
- 'cceb1325f35789c95f875b705b3eb373')
--
cgit v0.12
From 492f9c705027a36f69c06f5ee2849753aaa70a44 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:02:24 -0600
Subject: v86d: update binary path to /usr/bin refs #961
---
abs/core/v86d/PKGBUILD | 31 ++++++++++++++++++-------------
abs/core/v86d/v86d | 14 --------------
abs/core/v86d/v86d_install | 14 ++++++++++++++
3 files changed, 32 insertions(+), 27 deletions(-)
delete mode 100644 abs/core/v86d/v86d
create mode 100644 abs/core/v86d/v86d_install
diff --git a/abs/core/v86d/PKGBUILD b/abs/core/v86d/PKGBUILD
index 13cc2eb..3ff4385 100644
--- a/abs/core/v86d/PKGBUILD
+++ b/abs/core/v86d/PKGBUILD
@@ -1,36 +1,41 @@
-# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# $Id: PKGBUILD 187075 2013-06-03 11:17:01Z allan $
+# Maintainer:
pkgname=v86d
pkgver=0.1.10
-pkgrel=4
+pkgrel=5
pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
arch=('i686' 'x86_64')
-url="http://dev.gentoo.org/~spock/projects/uvesafb/"
+url="https://github.com/mjanusz/v86d"
license=('GPL2')
depends=('glibc')
+makedepends=('git')
options=('!makeflags')
-source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
- v86d
+source=("git://github.com/mjanusz/v86d.git#tag=$pkgname-$pkgver"
+ v86d_install
v86d_hook
modprobe.uvesafb)
-md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
- '66ab32602ab29cc5635eaac7f3e42283'
- '5f75b8bc4a7ddf595014591e5db263cb'
- '2d7cc8dc6a41916a13869212d0191147')
build() {
- cd "$srcdir/v86d-$pkgver"
+ cd "$pkgname"
./configure --with-x86emu
# we only need /usr/include/video/uvesafb.h
make KDIR=/usr
}
package() {
- cd "$srcdir/v86d-$pkgver"
+ cd "$pkgname"
make DESTDIR="$pkgdir" install
- install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d"
+ install -D -m644 "$srcdir/v86d_install" "$pkgdir/usr/lib/initcpio/install/v86d"
install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d"
install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf"
+
+ # usrmove
+ cd "$pkgdir"
+ mv sbin usr/bin
}
+md5sums=('SKIP'
+ '66ab32602ab29cc5635eaac7f3e42283'
+ '5f75b8bc4a7ddf595014591e5db263cb'
+ '2d7cc8dc6a41916a13869212d0191147')
diff --git a/abs/core/v86d/v86d b/abs/core/v86d/v86d
deleted file mode 100644
index 840b34e..0000000
--- a/abs/core/v86d/v86d
+++ /dev/null
@@ -1,14 +0,0 @@
-build() {
- add_module 'uvesafb'
-
- add_binary "v86d"
- add_file "/usr/lib/modprobe.d/uvesafb.conf"
-
- add_runscript
-}
-
-help() {
- echo "This hook sets up v86d, the userspace helper for uvesafb."
-}
-
-# vim: set ft=sh ts=4 sw=4 expandtab:
diff --git a/abs/core/v86d/v86d_install b/abs/core/v86d/v86d_install
new file mode 100644
index 0000000..840b34e
--- /dev/null
+++ b/abs/core/v86d/v86d_install
@@ -0,0 +1,14 @@
+build() {
+ add_module 'uvesafb'
+
+ add_binary "v86d"
+ add_file "/usr/lib/modprobe.d/uvesafb.conf"
+
+ add_runscript
+}
+
+help() {
+ echo "This hook sets up v86d, the userspace helper for uvesafb."
+}
+
+# vim: set ft=sh ts=4 sw=4 expandtab:
--
cgit v0.12
From 24954b1c13e839c211ca12ab64e84da68fe22659 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:02:46 -0600
Subject: wireless_tools, wpa_actiond, wpa_supplicant: update binary path to
/usr/bin refs #961
---
abs/core/wireless_tools/PKGBUILD | 23 +++++++-----
abs/core/wireless_tools/dense.patch | 49 +++++++++++++++++++++++++
abs/core/wpa_actiond/PKGBUILD | 14 ++++----
abs/core/wpa_supplicant/PKGBUILD | 22 ++++++------
abs/core/wpa_supplicant/config | 71 +++++++++++++++++++++++++++++++++++--
5 files changed, 150 insertions(+), 29 deletions(-)
create mode 100644 abs/core/wireless_tools/dense.patch
diff --git a/abs/core/wireless_tools/PKGBUILD b/abs/core/wireless_tools/PKGBUILD
index cb6de3c..57ba757 100644
--- a/abs/core/wireless_tools/PKGBUILD
+++ b/abs/core/wireless_tools/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $
+# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jchu@xentac.net>
pkgname=wireless_tools
pkgver=29
-pkgrel=6
-pkgdesc='Wireless Tools'
+pkgrel=8
+pkgdesc='Tools allowing to manipulate the Wireless Extensions'
url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
-arch=('i686' 'x86_64')
license=('GPL')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710')
+arch=('i686' 'x86_64')
+source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
+ 'dense.patch')
+sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
+ '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
+
+prepare() {
+ cd "${srcdir}/${pkgname}.${pkgver}"
+ patch -p1 -i ../dense.patch # FS#15363
+}
build() {
cd "${srcdir}/${pkgname}.${pkgver}"
- make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}"
+ make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}"
}
package() {
cd "${srcdir}/${pkgname}.${pkgver}"
make \
- INSTALL_DIR="${pkgdir}/usr/sbin" \
+ INSTALL_DIR="${pkgdir}/usr/bin" \
INSTALL_LIB="${pkgdir}/usr/lib" \
INSTALL_INC="${pkgdir}/usr/include" \
INSTALL_MAN="${pkgdir}/usr/share/man" \
diff --git a/abs/core/wireless_tools/dense.patch b/abs/core/wireless_tools/dense.patch
new file mode 100644
index 0000000..85182cd
--- /dev/null
+++ b/abs/core/wireless_tools/dense.patch
@@ -0,0 +1,49 @@
+The length field of wext data (iw_point.data) is 16 bits. The largest
+value is thus 65535. During the attempts to increase buffer size the
+buffer starts at 4096 and is doubled after each failure to fill. From the
+time this length reaches 65536 it is effectively zero. We thus loose all
+potential space from 32768 to 65535.
+
+This problem is clear when scanning in a RF dense environment.
+
+Without this patch:
+~$ iwlist wlan0 scan
+print_scanning_info: Allocation failed
+
+With this patch:
+~$ iwlist wlan0 scan | grep Cell | wc -l
+86
+
+Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+
+---
+A similar patch was recently created to fix wpa_supplicant.
+
+I could not find a source code repo for this code and created this patch
+against version 30-pre7 downloaded from
+http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+
+diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
+--- wireless_tools_org/wireless_tools.30/iwlist.c 2008-01-16 17:45:41.000000000 -0800
++++ wireless_tools.30/iwlist.c 2009-02-12 14:16:48.000000000 -0800
+@@ -800,7 +800,7 @@ print_scanning_info(int skfd,
+ if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
+ {
+ /* Check if buffer was too small (WE-17 only) */
+- if((errno == E2BIG) && (range.we_version_compiled > 16))
++ if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
+ {
+ /* Some driver may return very large scan results, either
+ * because there are many cells, or because they have many
+@@ -816,6 +816,10 @@ print_scanning_info(int skfd,
+ else
+ buflen *= 2;
+
++ /* wrq.u.data.length is 16 bits so max size is 65535 */
++ if(buflen > 65535)
++ buflen = 65535;
++
+ /* Try again */
+ goto realloc;
+ }
+
diff --git a/abs/core/wpa_actiond/PKGBUILD b/abs/core/wpa_actiond/PKGBUILD
index ea23e8b..f233fd5 100644
--- a/abs/core/wpa_actiond/PKGBUILD
+++ b/abs/core/wpa_actiond/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 155389 2012-04-03 08:18:09Z thomas $
+# $Id: PKGBUILD 187047 2013-06-03 11:15:41Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_actiond
-pkgver=1.2
-pkgrel=1
+pkgver=1.4
+pkgrel=2
pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
arch=('i686' 'x86_64')
url="http://projects.archlinux.org/wpa_actiond.git/"
license=('GPL')
depends=('glibc' 'wpa_supplicant')
-source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('578efa1141fbf1acb56efff8061f4ac7ab99f257f8a3e1588db51a8ce77ac2b5')
+source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz
+ ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz.sig)
+sha256sums=('e0e65e7c52a32796a0ff855ab18aa0b237d6b9afc87d4008c0380735abcb1a54'
+ 'fb026e76979e3bb78dfb38ddc01b9cd57dc0885c9965d2e60c4d8a0ec95d6b74')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +22,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond"
+ install -D -m755 wpa_actiond "${pkgdir}/usr/bin/wpa_actiond"
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/core/wpa_supplicant/PKGBUILD b/abs/core/wpa_supplicant/PKGBUILD
index 5a7db18..9b73f77 100644
--- a/abs/core/wpa_supplicant/PKGBUILD
+++ b/abs/core/wpa_supplicant/PKGBUILD
@@ -1,29 +1,21 @@
-# $Id: PKGBUILD 162909 2012-07-03 19:16:48Z dreisner $
+# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_supplicant
-pkgver=1.0
-pkgrel=1
+pkgver=2.0
+pkgrel=4
pkgdesc="A utility providing key negotiation for WPA wireless networks"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
depends=('openssl' 'dbus-core' 'readline' 'libnl')
optdepends=('wpa_supplicant_gui: wpa_gui program')
license=('GPL')
-groups=('base')
backup=('etc/wpa_supplicant/wpa_supplicant.conf')
source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
- config hostap_allow-linking-with-libnl-3.2.patch)
-md5sums=('8650f6aa23646ef634402552d0669640'
- '380d8d1fe24bccb2a2636cb2a6038c39'
- '473fb6b77909ec5a50b6f4d91370e86b')
+ config)
build() {
cd "${srcdir}/${pkgname}-${pkgver}/"
-
- # from fedora
- patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
cd "${pkgname}"
cp "${srcdir}/config" ./.config
@@ -53,4 +45,10 @@ package() {
install -d -m755 "${pkgdir}/usr/lib/systemd/system"
install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
+
+ # usrmove
+ cd "$pkgdir"/usr
+ mv sbin bin
}
+md5sums=('3be2ebfdcced52e00eda0afe2889839d'
+ '4aa1e5accd604091341b989b47fe1076')
diff --git a/abs/core/wpa_supplicant/config b/abs/core/wpa_supplicant/config
index 59da1e2..50426bf 100644
--- a/abs/core/wpa_supplicant/config
+++ b/abs/core/wpa_supplicant/config
@@ -204,6 +204,8 @@ CONFIG_WPS=y
# Disable credentials for an open network by default when acting as a WPS
# registrar.
#CONFIG_WPS_REG_DISABLE_OPEN=y
+# Enable WPS support with NFC config method
+CONFIG_WPS_NFC=y
# EAP-IKEv2
#CONFIG_EAP_IKEV2=y
@@ -220,6 +222,9 @@ CONFIG_SMARTCARD=y
# Enable this if EAP-SIM or EAP-AKA is included
#CONFIG_PCSC=y
+# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
+CONFIG_HT_OVERRIDES=y
+
# Development testing
#CONFIG_EAPOL_TEST=y
@@ -227,6 +232,7 @@ CONFIG_SMARTCARD=y
# unix = UNIX domain sockets (default for Linux/*BSD)
# udp = UDP sockets using localhost (127.0.0.1)
# named_pipe = Windows Named Pipe (default for Windows)
+# udp-remote = UDP sockets with remote access (only for tests systems/purpose)
# y = use default (backwards compatibility)
# If this option is commented out, control interface is not included in the
# build.
@@ -303,6 +309,9 @@ CONFIG_BACKEND=file
# eloop_none = Empty template
#CONFIG_ELOOP=eloop
+# Should we use poll instead of select? Select is used by default.
+#CONFIG_ELOOP_POLL=y
+
# Select layer 2 packet implementation
# linux = Linux packet socket (default)
# pcap = libpcap/libdnet/WinPcap
@@ -315,9 +324,7 @@ CONFIG_BACKEND=file
# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
CONFIG_PEERKEY=y
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
+# IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w.
#CONFIG_IEEE80211W=y
@@ -335,6 +342,13 @@ CONFIG_PEERKEY=y
# sent prior to negotiating which version will be used)
#CONFIG_TLSV11=y
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
+# can be enabled to enable use of stronger crypto algorithms. It should be
+# noted that some existing TLS v1.0 -based implementation may not be compatible
+# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
+# will be used)
+#CONFIG_TLSV12=y
+
# If CONFIG_TLS=internal is used, additional library and include paths are
# needed for LibTomMath. Alternatively, an integrated, minimal version of
# LibTomMath can be used. See beginning of libtommath.c for details on benefits
@@ -400,6 +414,12 @@ CONFIG_DEBUG_FILE=y
# Set syslog facility for debug messages
#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+# Add support for sending all debug messages (regardless of debug verbosity)
+# to the Linux kernel tracing facility. This helps debug the entire stack by
+# making it easy to record everything happening from the driver up into the
+# same file, e.g., using trace-cmd.
+#CONFIG_DEBUG_LINUX_TRACING=y
+
# Enable privilege separation (see README 'Privilege separation' for details)
#CONFIG_PRIVSEP=y
@@ -459,10 +479,55 @@ CONFIG_NO_RANDOM_POOL=y
# IEEE 802.11n (High Throughput) support (mainly for AP mode)
#CONFIG_IEEE80211N=y
+# Wireless Network Management (IEEE Std 802.11v-2011)
+# Note: This is experimental and not complete implementation.
+#CONFIG_WNM=y
+
# Interworking (IEEE 802.11u)
# This can be used to enable functionality to improve interworking with
# external networks (GAS/ANQP to learn more about the networks and network
# selection based on available credentials).
#CONFIG_INTERWORKING=y
+# Hotspot 2.0
+#CONFIG_HS20=y
+
+# AP mode operations with wpa_supplicant
+# This can be used for controlling AP mode operations with wpa_supplicant. It
+# should be noted that this is mainly aimed at simple cases like
+# WPA2-Personal while more complex configurations like WPA2-Enterprise with an
+# external RADIUS server can be supported with hostapd.
+CONFIG_AP=y
+
+# P2P (Wi-Fi Direct)
+# This can be used to enable P2P support in wpa_supplicant. See README-P2P for
+# more information on P2P operations.
+CONFIG_P2P=y
+
+# Autoscan
+# This can be used to enable automatic scan support in wpa_supplicant.
+# See wpa_supplicant.conf for more information on autoscan usage.
+#
+# Enabling directly a module will enable autoscan support.
+# For exponential module:
+CONFIG_AUTOSCAN_EXPONENTIAL=y
+# For periodic module:
+CONFIG_AUTOSCAN_PERIODIC=y
+
+# Password (and passphrase, etc.) backend for external storage
+# These optional mechanisms can be used to add support for storing passwords
+# and other secrets in external (to wpa_supplicant) location. This allows, for
+# example, operating system specific key storage to be used
+#
+# External password backend for testing purposes (developer use)
+#CONFIG_EXT_PASSWORD_TEST=y
+
CONFIG_LIBNL32=y
+
+# More options that are not in defconfig:
+
+# RSN IBSS/AdHoc support
+CONFIG_IBSS_RSN=y
+
+# Simple background scan
+CONFIG_BGSCAN_SIMPLE=y
--
cgit v0.12
From 8fbb8d1e260eaa571aca058a0723865206a86b6e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:02:58 -0600
Subject: xfsprogs: 3.1.11 update binary path to /usr/bin refs #961
---
abs/core/xfsprogs/PKGBUILD | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD
index 0f28ad9..c974a34 100644
--- a/abs/core/xfsprogs/PKGBUILD
+++ b/abs/core/xfsprogs/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $
+# $Id: PKGBUILD 197846 2013-10-30 11:07:35Z allan $
#
pkgname=xfsprogs
-pkgver=3.1.8
+pkgver=3.1.11
pkgrel=2
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64')
@@ -9,25 +9,25 @@ license=('LGPL')
url="http://oss.sgi.com/projects/xfs/"
groups=('base')
depends=('util-linux')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
# We mirror the sources as upstream tends to move them once a new release is out
source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
export OPTIMIZER="-march=${CARCH/_/-} -O1"
export DEBUG=-DNDEBUG
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DIST_ROOT="${pkgdir}" install install-dev
+ make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev
chown -R root $pkgdir
chgrp -R root $pkgdir
# add hack as we cannot set rootlibdir
mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/"
rm -rf "${pkgdir}/lib"
}
+md5sums=('de9f1f45026c2f4e0776058d429ff4b6')
--
cgit v0.12
From a9abd6237a047a63b9bcf75b90055cb4321dd0f6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:03:22 -0600
Subject: cifs-utils: 6.2 update binary path to /usr/bin refs #961
---
abs/extra/cifs-utils/PKGBUILD | 10 ++++++----
abs/extra/cifs-utils/fix-5.9-credentials.patch | 16 ++++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 abs/extra/cifs-utils/fix-5.9-credentials.patch
diff --git a/abs/extra/cifs-utils/PKGBUILD b/abs/extra/cifs-utils/PKGBUILD
index f220fa4..fb2db27 100644
--- a/abs/extra/cifs-utils/PKGBUILD
+++ b/abs/extra/cifs-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 161430 2012-06-11 13:06:12Z tpowa $
+# $Id: PKGBUILD 200381 2013-11-27 10:08:51Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
-pkgver=5.5
+pkgver=6.2
pkgrel=1
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64)
@@ -12,7 +12,9 @@ source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
+ # systemd support is broken in mount.cifs
+ # https://bugs.archlinux.org/task/30958
+ ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd
make
}
@@ -22,4 +24,4 @@ package() {
# set mount.cifs uid, to enable none root mounting form fstab
chmod +s $pkgdir/usr/bin/mount.cifs
}
-md5sums=('4de6c660ccdb9506d0e2cff4f37b8707')
+md5sums=('6a83fe19e02266cb468ea3bf1cc0d007')
diff --git a/abs/extra/cifs-utils/fix-5.9-credentials.patch b/abs/extra/cifs-utils/fix-5.9-credentials.patch
new file mode 100644
index 0000000..24e20ed
--- /dev/null
+++ b/abs/extra/cifs-utils/fix-5.9-credentials.patch
@@ -0,0 +1,16 @@
+X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=blobdiff_plain;f=mount.cifs.c;h=40b77e92e3f734c606f522ccf279a0508ad64eab;hp=c7c3055cb890764937193b1d50d1f0fb7ae18826;hb=1a01f7c4b90695211d12291d7a24bec05b1f2922;hpb=739289ad3ce915e1ee2705ecd7ac4e907cd91405
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index c7c3055..40b77e9 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
+ switch (parse_cred_line(line_buf + i, &temp_val)) {
+ case CRED_USER:
+ strlcpy(parsed_info->username, temp_val,
+- sizeof(parsed_info->domain));
++ sizeof(parsed_info->username));
++ parsed_info->got_user = 1;
+ break;
+ case CRED_PASS:
+ i = set_password(parsed_info, temp_val);
--
cgit v0.12
From 8757317b405200fa7d06fafbf1c3e9993e4015d3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:03:35 -0600
Subject: crda: 1.1.3 update binary path to /usr/bin refs #961
---
abs/extra/crda/PKGBUILD | 26 +++++++++++++-------------
abs/extra/crda/crda.install | 15 +--------------
abs/extra/crda/crda.rc | 26 --------------------------
abs/extra/crda/set-wireless-regdom | 5 +++++
4 files changed, 19 insertions(+), 53 deletions(-)
delete mode 100755 abs/extra/crda/crda.rc
create mode 100755 abs/extra/crda/set-wireless-regdom
diff --git a/abs/extra/crda/PKGBUILD b/abs/extra/crda/PKGBUILD
index 88ad6cc..2f4f1c2 100644
--- a/abs/extra/crda/PKGBUILD
+++ b/abs/extra/crda/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 158615 2012-05-05 03:17:06Z allan $
+# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=crda
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.1.3
+pkgrel=2
pkgdesc="Central Regulatory Domain Agent for wireless networks"
arch=(i686 x86_64)
url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
+depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
makedepends=('python-m2crypto')
install=crda.install
source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
- crda.rc libnl32.patch)
-md5sums=('5226f65aebacf94baaf820f8b4e06df4'
- '014eef3f8655e9a130064ec6891317fc'
- 'c1f7aff29f15a0364ae6f7905a1d4ae6')
-
+ set-wireless-regdom)
+
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
- patch -Np1 -i "$srcdir/libnl32.patch"
sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
make crda regdbdump
}
@@ -27,11 +23,15 @@ build() {
package() {
# Install crda, regdbdump and udev rules
cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install
+ make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
+ # Adjust paths in udev rule file
+ sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
# This rule automatically sets the regulatory domain when cfg80211 is loaded
- echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
+ echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
- install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
+ install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
}
+md5sums=('29579185e06a75675507527243d28e5c'
+ '65c93f2ff2eb1b29d9e9fa102ae2dd45')
diff --git a/abs/extra/crda/crda.install b/abs/extra/crda/crda.install
index c18e15f..9618a74 100644
--- a/abs/extra/crda/crda.install
+++ b/abs/extra/crda/crda.install
@@ -1,18 +1,5 @@
## arg 1: the new package version
post_install() {
echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom."
- echo "It will automatically be set when necessary."
-}
-
-## arg 1: the new package version
-## arg 2: the old package version
-post_upgrade() {
- # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
- # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
- # from wireless-regdb by the user-defined one
- if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
- if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
- mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
- fi
- fi
+ echo "It will automatically be set on boot."
}
diff --git a/abs/extra/crda/crda.rc b/abs/extra/crda/crda.rc
deleted file mode 100755
index 13dbd87..0000000
--- a/abs/extra/crda/crda.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
- start)
- if [ -n "${WIRELESS_REGDOM}" ]; then
- stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
- if iw reg set ${WIRELESS_REGDOM}; then
- stat_done
- else
- stat_fail
- fi
- fi
- ;;
- stop)
- ;;
- restart)
- $0 start
- ;;
- *)
- echo "usage: $0 start"
-esac
-exit 0
diff --git a/abs/extra/crda/set-wireless-regdom b/abs/extra/crda/set-wireless-regdom
new file mode 100755
index 0000000..3905ae9
--- /dev/null
+++ b/abs/extra/crda/set-wireless-regdom
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+unset WIRELESS_REGDOM
+. /etc/conf.d/wireless-regdom
+[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}
--
cgit v0.12
From 96a811dd401826531a28d28262fc48d5638478d0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:04:02 -0600
Subject: efibootmgr: update binary path to /usr/bin refs #961
---
abs/extra/efibootmgr/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/efibootmgr/PKGBUILD b/abs/extra/efibootmgr/PKGBUILD
index 0fd7bb2..813f99d 100755
--- a/abs/extra/efibootmgr/PKGBUILD
+++ b/abs/extra/efibootmgr/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=efibootmgr
pkgver=0.5.4
-pkgrel=3
+pkgrel=4
pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
arch=('i686' 'x86_64')
url="http://linux.dell.com/efibootmgr/"
@@ -38,12 +38,12 @@ build () {
package() {
- mkdir -p ${pkgdir}/usr/sbin/
+ mkdir -p ${pkgdir}/usr/bin/
mkdir -p ${pkgdir}/usr/share/man/man8/
cd ${srcdir}/efibootmgr-${pkgver}_build/
- install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/sbin/efibootmgr
+ install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr
install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
}
--
cgit v0.12
From 24ed89c67ae43e56a5ce8c42557dc47f768efa4d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:04:16 -0600
Subject: efivar: first include update binary path to /usr/bin refs #961
---
abs/extra/efivar/PKGBUILD | 65 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 abs/extra/efivar/PKGBUILD
diff --git a/abs/extra/efivar/PKGBUILD b/abs/extra/efivar/PKGBUILD
new file mode 100644
index 0000000..e8d8995
--- /dev/null
+++ b/abs/extra/efivar/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 199468 2013-11-13 11:07:43Z tpowa $
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+_gitroot="git://github.com/vathpela/efivar.git"
+_gitname="efivar"
+_gitbranch="master"
+
+_pkgname="efivar"
+pkgname="${_pkgname}"
+
+pkgdesc="Library to manipulate EFI variables"
+pkgver=0.7
+pkgrel=1
+arch=('x86_64' 'i686')
+url="https://github.com/vathpela/efivar"
+license=('LGPL2.1')
+makedepends=('git')
+depends=('popt')
+conflicts=('libefivar')
+provides=('libefivar')
+options=('zipman' 'docs' '!makeflags')
+
+source=("${_gitname}::git+${_gitroot}#tag=${pkgver}")
+sha1sums=('SKIP')
+
+pkgver() {
+ cd "${srcdir}/${_gitname}/"
+ echo "$(git describe --tags)" | sed 's|-|\.|g'
+}
+
+build() {
+
+ rm -rf "${srcdir}/${_gitname}_build/" || true
+ cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
+
+ cd "${srcdir}/${_gitname}_build/"
+
+ git clean -x -d -f
+ echo
+
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true
+
+ make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1
+ echo
+
+}
+
+package() {
+
+ cd "${srcdir}/${_gitname}_build/"
+
+ make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install
+ echo
+
+ install -d "${pkgdir}/usr/bin"
+ install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester"
+
+}
--
cgit v0.12
From 867f417be1293cd89097d00bd9422fb0b0cb345e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:04:46 -0600
Subject: etherwake, ethtool, gconf:
---
abs/extra/etherwake/PKGBUILD | 4 ++--
abs/extra/ethtool/PKGBUILD | 9 +++++----
abs/extra/gconf/PKGBUILD | 22 +++++++++++++---------
abs/extra/gconf/gconf.install | 5 +----
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/abs/extra/etherwake/PKGBUILD b/abs/extra/etherwake/PKGBUILD
index bbe4f6a..4d53d1e 100644
--- a/abs/extra/etherwake/PKGBUILD
+++ b/abs/extra/etherwake/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=etherwake
pkgver=1.09
-pkgrel=5
+pkgrel=6
arch=(i686 x86_64)
pkgdesc="Utility for waking up computers via wake-on-lan (wol)"
license="GPL"
@@ -19,7 +19,7 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver.orig"
- install -Dm0755 etherwake "$pkgdir/usr/sbin/etherwake"
+ install -Dm0755 etherwake "$pkgdir/usr/bin/etherwake"
install -Dm0644 etherwake.8.gz "$pkgdir/usr/share/man/man8/etherwake.8"
}
diff --git a/abs/extra/ethtool/PKGBUILD b/abs/extra/ethtool/PKGBUILD
index 27ba9a5..cdf5122 100644
--- a/abs/extra/ethtool/PKGBUILD
+++ b/abs/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161868 2012-06-16 00:18:47Z ibiru $
+# $Id: PKGBUILD 196480 2013-10-14 08:50:55Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Martin Kemp <mdkemp@elys.com>
pkgname=ethtool
-pkgver=3.4
+pkgver=3.11
pkgrel=1
epoch=1
pkgdesc="Utility for controlling network drivers and hardware"
@@ -16,7 +16,8 @@ source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar
build() {
cd $pkgname-$pkgver
- ./configure --prefix=/usr --mandir=/usr/share/man
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --sbindir=/usr/bin
make
}
@@ -24,4 +25,4 @@ package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums=('cc4c4cf3ac086a53cd24f17d426f2b8f')
+md5sums=('5f3a0ed1b3510ca0695db0b4debdd292')
diff --git a/abs/extra/gconf/PKGBUILD b/abs/extra/gconf/PKGBUILD
index 9a4d1f6..d7fc7e6 100644
--- a/abs/extra/gconf/PKGBUILD
+++ b/abs/extra/gconf/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 156770 2012-04-23 09:05:12Z ibiru $
+# $Id: PKGBUILD 197971 2013-10-30 12:00:18Z allan $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=gconf
-pkgver=3.2.5
-pkgrel=2
+pkgver=3.2.6
+pkgrel=3
pkgdesc="A configuration database system"
arch=(i686 x86_64)
license=('LGPL')
-depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
+depends=('libxml2' 'polkit' 'libldap' 'dbus-glib')
makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
install=gconf.install
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
@@ -17,14 +16,15 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
gconfpkg
gconf-reload.patch
01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
+sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
'567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
-build() {
+prepare() {
cd "GConf-$pkgver"
+
# Patch from fedora - reloads gconf after installing schemas
patch -Np1 -i "$srcdir/gconf-reload.patch"
# http://bugzilla.gnome.org/show_bug.cgi?id=568845
@@ -32,10 +32,14 @@ build() {
# Python2 fix
sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
+}
+
+build() {
+ cd "GConf-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --libexecdir=/usr/lib/GConf \
- --disable-static --enable-defaults-service --with-gtk=3.0 \
+ --disable-static --enable-defaults-service \
--disable-orbit
make pkglibdir=/usr/lib/GConf
@@ -47,5 +51,5 @@ package() {
install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system"
install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/"
- install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg"
+ install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg"
}
diff --git a/abs/extra/gconf/gconf.install b/abs/extra/gconf/gconf.install
index f7945d1..a5ea777 100644
--- a/abs/extra/gconf/gconf.install
+++ b/abs/extra/gconf/gconf.install
@@ -9,10 +9,7 @@ post_upgrade() {
chmod 755 etc/gconf/gconf.xml.system
usr/bin/gio-querymodules usr/lib/gio/modules
- PID=`pidof gconfd-2`
- if [ ! -z "${PID}" ]; then
- kill ${PID}
- fi
+ pkill /usr/lib/GConf/gconfd-2 || return 0
}
post_remove() {
--
cgit v0.12
From a256cea7231ed200a5dc44d4f15e9cbd5f04e6e6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:05:02 -0600
Subject: gnu-efi-libs: first include update binary path to /usr/bin refs #961
---
abs/extra/gnu-efi-libs/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 abs/extra/gnu-efi-libs/PKGBUILD
diff --git a/abs/extra/gnu-efi-libs/PKGBUILD b/abs/extra/gnu-efi-libs/PKGBUILD
new file mode 100644
index 0000000..7487c8b
--- /dev/null
+++ b/abs/extra/gnu-efi-libs/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}u"
+pkgrel="4"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('x86_64' 'i686')
+options=('!strip' '!makeflags' 'staticlibs')
+makedepends=('pciutils')
+
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
+build() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ ## Unset all compiler FLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ make -j1
+ make -j1 -C apps all
+
+}
+
+package() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
+
+ install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+ install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+
+}
+md5sums=('d15d3c700e79a1e2938544d73edc572d')
--
cgit v0.12
From 859decb6e331f0cb49c2b2b94b0f39ed154292a4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:05:30 -0600
Subject: icu, iw: update binary path to /usr/bin refs #961
---
abs/extra/icu/PKGBUILD | 7 ++++---
abs/extra/iw/PKGBUILD | 10 +++++-----
abs/extra/iw/__changelog | 5 ++++-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/abs/extra/icu/PKGBUILD b/abs/extra/icu/PKGBUILD
index 95b0fab..bf029ee 100644
--- a/abs/extra/icu/PKGBUILD
+++ b/abs/extra/icu/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=icu
pkgver=49.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
url="http://www.icu-project.org/"
@@ -13,8 +13,6 @@ depends=('gcc-libs' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
icu.8198.revert.icu5431.patch)
-md5sums=('bbc609fe5237202d7abf016141012a45'
- 'ebd5470fc969c75e52baf4af94a9ee82')
build() {
cd ${srcdir}/icu/source
@@ -22,6 +20,7 @@ build() {
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --sbindir=/usr/bin \
--mandir=/usr/share/man
make
}
@@ -33,3 +32,5 @@ package() {
# Install license
install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html
}
+md5sums=('bbc609fe5237202d7abf016141012a45'
+ 'ebd5470fc969c75e52baf4af94a9ee82')
diff --git a/abs/extra/iw/PKGBUILD b/abs/extra/iw/PKGBUILD
index ed927b0..48da071 100644
--- a/abs/extra/iw/PKGBUILD
+++ b/abs/extra/iw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159175 2012-05-17 10:12:16Z thomas $
+# $Id: PKGBUILD 195909 2013-10-05 07:30:47Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=iw
-pkgver=3.4
+pkgver=3.11
pkgrel=1
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64")
@@ -10,8 +10,8 @@ url="http://wireless.kernel.org/en/users/Documentation/iw"
license=("GPL")
depends=("libnl")
makedepends=("linux-api-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a')
+source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff')
build() {
cd "$srcdir"/$pkgname-$pkgver
@@ -20,5 +20,5 @@ build() {
package() {
cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" SBINDIR="/usr/bin" install
}
diff --git a/abs/extra/iw/__changelog b/abs/extra/iw/__changelog
index 9723f2f..2f6d9a5 100644
--- a/abs/extra/iw/__changelog
+++ b/abs/extra/iw/__changelog
@@ -1 +1,4 @@
-linux-api-headers
+no changes, but version.c needs to be createdoutside of our git
+copy to /tmp
+makepkg
+copy srcdir back
--
cgit v0.12
From 088c5b470b114a46fb991d99c2242f04fec0307e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:05:45 -0600
Subject: libftdi: update binary path to /usr/bin refs #961
---
abs/extra/libftdi-compat/PKGBUILD | 26 ++++++++++++++++++++++++++
abs/extra/libftdi/PKGBUILD | 36 ++++++++++++++++++++++--------------
2 files changed, 48 insertions(+), 14 deletions(-)
create mode 100644 abs/extra/libftdi-compat/PKGBUILD
diff --git a/abs/extra/libftdi-compat/PKGBUILD b/abs/extra/libftdi-compat/PKGBUILD
new file mode 100644
index 0000000..9be6032
--- /dev/null
+++ b/abs/extra/libftdi-compat/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 200728 2013-12-03 16:50:08Z eric $
+# Maintainer:
+
+pkgname=libftdi-compat
+pkgver=0.20
+pkgrel=1
+pkgdesc="A library to talk to FTDI chips"
+arch=('i686' 'x86_64')
+url="http://www.intra2net.com/en/developer/libftdi/download.php"
+license=('GPL2' 'LGPL2.1')
+depends=('libusb-compat' 'gcc-libs')
+makedepends=('boost')
+source=(http://www.intra2net.com/en/developer/libftdi/download/libftdi-$pkgver.tar.gz{,.sig})
+sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2'
+ '807d145147c9bee08b4cea4d7ca82ccaf1330f02')
+
+build() {
+ cd libftdi-$pkgver
+ ./configure --prefix=/usr --without-examples
+ make
+}
+
+package() {
+ cd libftdi-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/abs/extra/libftdi/PKGBUILD b/abs/extra/libftdi/PKGBUILD
index 61165b2..76e3f58 100644
--- a/abs/extra/libftdi/PKGBUILD
+++ b/abs/extra/libftdi/PKGBUILD
@@ -1,28 +1,36 @@
-# $Id: PKGBUILD 153977 2012-03-21 07:09:24Z eric $
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 200729 2013-12-03 16:51:00Z eric $
+# Maintainer:
pkgname=libftdi
-pkgver=0.20
-pkgrel=1
+pkgver=1.0
+pkgrel=2
pkgdesc="A library to talk to FTDI chips"
arch=('i686' 'x86_64')
url="http://www.intra2net.com/en/developer/libftdi/download.php"
license=('GPL2' 'LGPL2.1')
-depends=('libusb-compat' 'gcc-libs')
-makedepends=('boost')
-options=('!libtool')
-source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig})
-sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2'
- '807d145147c9bee08b4cea4d7ca82ccaf1330f02')
+depends=('libusbx')
+makedepends=('boost' 'cmake')
+source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig})
+sha1sums=('5be76cfd7cd36c5291054638f7caf4137303386f'
+ 'SKIP')
+
+prepare() {
+ cd ${pkgname}1-$pkgver
+ sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i '/no-install/d' examples/Makefile.in
- ./configure --prefix=/usr
+ cd ${pkgname}1-$pkgver
+ mkdir build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd ${pkgname}1-$pkgver/build
make DESTDIR="$pkgdir" install
+ find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \;
+ # Remove eepreom (conflict with i2c-tools FS#37925)
+ rm "$pkgdir/usr/bin/eeprom"
}
--
cgit v0.12
From 34aea02a41d9c352742211190131dbd72bb1d04c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:05:58 -0600
Subject: nbd: 3.6 update binary path to /usr/bin refs #961
---
abs/extra/nbd/PKGBUILD | 20 +++++++++-----------
abs/extra/nbd/nbd | 39 ---------------------------------------
2 files changed, 9 insertions(+), 50 deletions(-)
delete mode 100644 abs/extra/nbd/nbd
diff --git a/abs/extra/nbd/PKGBUILD b/abs/extra/nbd/PKGBUILD
index e02e890..cfe0c50 100644
--- a/abs/extra/nbd/PKGBUILD
+++ b/abs/extra/nbd/PKGBUILD
@@ -1,30 +1,26 @@
-# $Id: PKGBUILD 73924 2012-07-17 05:54:37Z svenstaro $
+# $Id: PKGBUILD 103355 2014-01-04 02:43:25Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
pkgname=nbd
-pkgver=3.2
-pkgrel=2
+pkgver=3.6
+pkgrel=1
pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
arch=('i686' 'x86_64')
url="http://nbd.sourceforge.net"
license=('GPL')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
- config nbd nbd.service)
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz
+ config nbd.service)
backup=('etc/nbd-server/config')
depends=('glib2')
install=nbd.install
-md5sums=('9cafce4ecfb55e670d7ded4c8f4e6bc9'
- '2d05d426b8c2708d5f8a0d028fcbae05'
- 'e7b13a8b3369e11927d9917664557efa'
- '5d1acc143018117174f79eff15afa038')
build(){
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog --sbindir=/usr/bin
make
}
@@ -35,8 +31,10 @@ package() {
make DESTDIR="${pkgdir}" install
install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config
- install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd
install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service
install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README
}
+md5sums=('717213c2c99b693321fe444e319336ba'
+ '2d05d426b8c2708d5f8a0d028fcbae05'
+ '5d1acc143018117174f79eff15afa038')
diff --git a/abs/extra/nbd/nbd b/abs/extra/nbd/nbd
deleted file mode 100644
index 76d16c7..0000000
--- a/abs/extra/nbd/nbd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE="/var/run/nbd-server.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
- start)
- stat_busy "Starting Network Block Device Server"
- if [ "$PID" = "" ]; then
- /usr/bin/nbd-server
- fi
- if [ "$PID" != "" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon nbd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Network Block Device Server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- rm -f $PIDFILE
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon nbd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
--
cgit v0.12
From 5595bd9f091248a9cc8dcca60776cd7c919d10ef Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:06:33 -0600
Subject: oss: 4.2_2008 update binary path to /usr/bin refs #961
---
abs/extra/oss/PKGBUILD | 158 +++++++++++++++++++++++-----------------
abs/extra/oss/kmod-link.patch | 27 +++++++
abs/extra/oss/oss.install | 45 ++----------
abs/extra/oss/oss.service | 12 +++
abs/extra/oss/ossvermagic.patch | 12 +++
abs/extra/oss/rc-script | 30 --------
6 files changed, 151 insertions(+), 133 deletions(-)
create mode 100644 abs/extra/oss/kmod-link.patch
create mode 100644 abs/extra/oss/oss.service
create mode 100644 abs/extra/oss/ossvermagic.patch
delete mode 100644 abs/extra/oss/rc-script
diff --git a/abs/extra/oss/PKGBUILD b/abs/extra/oss/PKGBUILD
index 8303c40..829c839 100644
--- a/abs/extra/oss/PKGBUILD
+++ b/abs/extra/oss/PKGBUILD
@@ -1,88 +1,114 @@
-# $Id: PKGBUILD 54037 2011-08-12 13:13:29Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Maintainer: Damian Nowak <damian.nowak@atlashost.eu>
+# Maintainer: Julian Rother <julian@toksik.org>
+# Contributor: Sebastian Schwarz <seschwar@gmail.com>
+# Contributor: Kyle Keen <keenerd@gmail.com>
+# Contributor: Florian Pritz <bluewind@xinu.at>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgbase=oss
pkgname=oss
-pkgver=4.2_2006
-pkgrel=1
-pkgdesc="Open Sound System UNIX audio architecture"
-arch=('i686' 'x86_64')
+true && pkgname=(oss libflashsupport-oss)
+pkgver=4.2_2008
+pkgrel=3
+arch=(i686 x86_64)
url="http://developer.opensound.com/"
-license=('GPL2')
-depends=('gcc' 'make' 'linux-headers' 'module-init-tools' 'libtool' 'sed')
-makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils')
-optdepends=('gtk2: for graphical mixer (ossxmix)')
-conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
-replaces=('libflashsupport-oss')
-install=oss.install
-backup=('usr/lib/oss/soundon.user')
+license=(GPL2)
+makedepends=(gcc gtk2)
source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
- "rm-init-scripts.patch"
- "rc-script"
- "soundon.patch"
- "remove-hal.patch"
- )
+ 'linux-3.8.0.patch::http://www.opensound.com/forum/download/file.php?id=113'
+ 'linux-3.10.0.patch::http://www.opensound.com/forum/download/file.php?id=126'
+ 'linux-3.10.7.patch::http://www.opensound.com/forum/download/file.php?id=129'
+ oss.service
+ remove-hal.patch
+ rm-init-scripts.patch
+ soundon.patch
+ kmod-link.patch
+ ossvermagic.patch)
+sha512sums=('bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e0bbaba4a614267bad4792252d0b3a431d926ae7bf15b01df9442988118b07'
+ '6483ed671b79a01dded17732e23a7cb8141329b62a2ddb812567f119389e98afc735d6b3cea20e801517d1a417dc823a3ebdbdcba004f44a0c3e6674a169a16e'
+ 'a2793ec82152167615428ed00ba423fa0571bafdb3e5eb790a02a276d5a4eb663c8a4bae6923f7b2536ed8ed5683254bb1efea26336810b7685aa2b1c9f4a5c5'
+ '609367d6eadc29a34535461db719b132fe675a06a0532ea3a451191b21a0499801a3a6e706a214833db8179741086a9c1a3f450b79d2d663ec8fb173c97c01f8'
+ '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
+ '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
+ '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
+ 'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6'
+ 'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df'
+ 'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad')
+_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
-build() {
- _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
- cd "${srcdir}/${_dir}"
+prepare() {
+ cd "$srcdir/$_dir"
- # Avoid these flags conflicting with OSS build system.
- unset CFLAGS
- unset LDFLAGS
- unset OSFLAGS
- unset LIBRARIES
- export NO_WARNING_CHECKS=yes
+ # OSS wants an empty build directory
+ rm -rf build
+ mkdir build
- # Compile libflashsupport.so only in packaging time, so we avoid
- # conflicts with other packages and ease package management.
- msg "Building libflashsupport.so."
- cd oss/lib/
- gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so
+ # make OSS compile with current Linux kernels
+ patch -p0 < "$srcdir/linux-3.8.0.patch"
+ patch -p0 < "$srcdir/linux-3.10.0.patch"
+ patch -p0 < "$srcdir/linux-3.10.7.patch"
+ patch -p0 < "$srcdir/ossvermagic.patch"
- msg "Preparing the build environment."
- cd "${srcdir}"
+ # remove outdated stuff
+ cd setup/Linux
+ patch -p2 < "$srcdir/rm-init-scripts.patch"
+ rm oss/etc/S89oss
+ patch -p2 < "$srcdir/remove-hal.patch"
+ rm oss/scripts/*oss_usb-create-device*
+ patch -p1 < "$srcdir/soundon.patch"
- # Create build directory and configure
- rm -rf build
- mkdir build && cd build
- "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
+ # FS#35672
+ mv oss/build/{osscore.c,osscore_wrapper.c}
+ patch -p2 < "$srcdir/kmod-link.patch"
+ cd ../..
+}
- msg "Building OSS."
- make build
+build() {
+ cd "$srcdir/$_dir/build"
+ ../configure --enable-libsalsa=NO --regparm
+ make build
+ gcc $CFLAGS -shared -fPIC -Wall -Werror oss/lib/flashsupport.c \
+ -o libflashsupport.so
+}
- msg "Patching init scripts."
- cd "${srcdir}/build/prototype"
- rm usr/lib/oss/etc/S89oss
- patch -p0 -i "${srcdir}/rm-init-scripts.patch"
- patch -p0 -i "${srcdir}/soundon.patch"
- # remove hal dependency
- patch -p0 -i "${srcdir}/remove-hal.patch"
+package_libflashsupport-oss() {
+ pkgdesc="Adobe flash plugin support lib (OSSv4)"
+ conflicts=(libflashsupport libflashsupport-pulse)
+ depends=(oss)
- rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
+ install -dm755 "$pkgdir/usr/lib"
+ ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
}
-package() {
- _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
- cd "${srcdir}/${_dir}"
+package_oss() {
+ pkgdesc="Open Sound System UNIX audio architecture"
+ depends=(gcc make linux-headers libtool sed)
+ optdepends=('gtk2: for graphical mixer (ossxmix)'
+ 'libflashsupport-oss: Adobe flash plugin support')
+ conflicts=(oss-linux oss-linux-free oss-testing)
+ backup=(usr/lib/oss/soundon.user)
+ install=oss.install
- msg "Copying files."
+ cd "$srcdir/$_dir/build"
+ make DESTDIR="$pkgdir/" copy
+ install -Dm755 libflashsupport.so \
+ "$pkgdir/usr/lib/oss/lib/libflashsupport.so"
+ cd "$pkgdir"
- # Install libflashsupport.so
- install -dm755 "$pkgdir/usr/lib"
- ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
+ # usr-move fixes
+ mv usr/sbin/* usr/bin
+ rmdir usr/sbin
+ grep -IlrZ '\<s\?bin\>' . \
+ | xargs -0 sed -i 's,\<\(usr/\)\?s\?bin\>,usr/bin,g' --
+ grep -IlrZ '\<lib/modules\>' . \
+ | xargs -0 sed -i 's,\<\(usr/\)\?lib/modules\>,usr/&,g' --
- cd "${srcdir}/build/prototype"
- cp -a * "${pkgdir}"
+ # make OSS install its modules to /usr/lib/modules/$KERNEL/extramodules/oss
+ grep -IlrZ '\<usr/lib/modules/[^/]\+/kernel/oss\>' . \
+ | xargs -0 sed -i 's,\<usr/lib/modules/\([^/]\+\)/kernel/oss\>,usr/lib/modules/\1/extramodules/oss,g' --
- chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815)
- find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy
- install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss"
+ chmod -R a+rX . # FS#13815
+ install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service
}
-md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c'
- 'b9a380a0ac8896390d71ac13676f27e1'
- 'cbcbce5c03b127df5eafa8faa091492c'
- '65f07fe241bfbf912f76d8b6d8f276b5'
- 'cd7f1dc6166bba8c94d96f3a28e948a5')
diff --git a/abs/extra/oss/kmod-link.patch b/abs/extra/oss/kmod-link.patch
new file mode 100644
index 0000000..8ee9ab5
--- /dev/null
+++ b/abs/extra/oss/kmod-link.patch
@@ -0,0 +1,27 @@
+--- setup/Linux/oss/build/install.sh 2012-05-22 00:23:41.000000000 +0200
++++ setup/Linux/oss/build/install.sh 2013-11-10 21:00:08.858276861 +0100
+@@ -203,11 +203,8 @@
+ exit 3
+ fi
+
+-if ! $LD -r osscore.ko osscore_mainline.o -o /lib/modules/$UNAME/kernel/oss/osscore.ko
+-then
+- echo Linking the osscore module failed
+- exit 5
+-fi
++
++cp -f osscore.ko /lib/modules/$UNAME/kernel/oss/osscore.ko
+
+ if test -f Module.symvers
+ then
+--- setup/Linux/oss/build/Makefile.osscore 2012-05-22 00:23:41.000000000 +0200
++++ setup/Linux/oss/build/Makefile.osscore 2013-11-14 18:57:44.270163268 +0100
+@@ -5,6 +5,7 @@
+ ifneq ($(KERNELRELEASE),)
+
+ obj-m := osscore.o
++ osscore-y := osscore_wrapper.o osscore_mainline.o
+
+ else
+
+
diff --git a/abs/extra/oss/oss.install b/abs/extra/oss/oss.install
index f665416..672d636 100644
--- a/abs/extra/oss/oss.install
+++ b/abs/extra/oss/oss.install
@@ -1,59 +1,30 @@
-_MSG_LIBOSSDIR=" Please note that OSS stores some of its configuration files
- at /usr/lib/oss. If you are upgrading from an older OSS
- release and it doesn't work properly, try removing that
- directory and reinstall this package."
-
post_install() {
echo "Running OSS install script..."
- /bin/sh /usr/lib/oss/build/install.sh &> /dev/null
- echo
- echo "-------------------------------------------------------------"
- echo " Open Sound System was installed. Now you should add 'oss'"
- echo " to your DAEMONS variable at /etc/rc.conf, and start the"
- echo " daemon by running /etc/rc.d/oss start."
+ sh /usr/lib/oss/build/install.sh &>/dev/null
echo
echo " Note that OSS can't currently work together with kernel"
echo " ALSA modules, so they were moved out by the OSS install"
echo " scripts. If you want the ALSA kernel modules back, you can"
echo " just remove this package using pacman."
- echo
- echo "${_MSG_LIBOSSDIR}"
- echo "-------------------------------------------------------------"
- /bin/true
}
post_upgrade() {
echo "Running OSS update script..."
- /bin/sh /usr/lib/oss/build/install.sh &> /dev/null
- echo
- echo "-------------------------------------------------------------"
- echo " Open Sound System was updated. Now you should restart the"
- echo " daemon by running /etc/rc.d/oss restart."
- echo
- echo "${_MSG_LIBOSSDIR}"
- echo "-------------------------------------------------------------"
- /bin/true
+ sh /usr/lib/oss/build/install.sh &>/dev/null
+
+ if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then
+ echo "libflashsupport.so has been split into a seperate package."
+ echo "If you want flash to use oss, please install libflashsupport-oss"
+ fi
}
pre_remove() {
# Restore any replaced ALSA drivers.
- /bin/sh /usr/lib/oss/scripts/restore_drv.sh
- # Remove symlinks left by the 'install.sh' script.
- rm -f /usr/lib/hal/scripts/oss_usb-create-devices
- rm -f /usr/share/hal/fdi/policy/20thirdparty/90-oss_usb-create-device.fdi
- /bin/true
+ sh /usr/lib/oss/scripts/restore_drv.sh
}
post_remove() {
- echo
- echo "-------------------------------------------------------------"
echo " Open Sound System was now removed, and the ALSA kernel"
echo " modules were restored."
- echo
- echo " Please note that OSS stores some of its configuration files"
- echo " at /usr/lib/oss. If you don't plan to use OSS anymore, you"
- echo " can remove this directory."
- echo "-------------------------------------------------------------"
- /bin/true
}
diff --git a/abs/extra/oss/oss.service b/abs/extra/oss/oss.service
new file mode 100644
index 0000000..0200d24
--- /dev/null
+++ b/abs/extra/oss/oss.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Open Sound System v4
+Before=sound.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/soundon
+ExecStop=/usr/bin/soundoff
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/extra/oss/ossvermagic.patch b/abs/extra/oss/ossvermagic.patch
new file mode 100644
index 0000000..9c20912
--- /dev/null
+++ b/abs/extra/oss/ossvermagic.patch
@@ -0,0 +1,12 @@
+--- os_cmd/Linux/ossvermagic/ossvermagic.c 2013-06-14 06:55:00.000000000 +0200
++++ os_cmd/Linux/ossvermagic/ossvermagic.c 2013-11-14 18:42:23.910206071 +0100
+@@ -81,6 +81,8 @@
+ if (!ok)
+ ok = ELF_LOAD_SYMTAB (fname, "__mod_vermagic", sym_callback);
+ if (!ok)
++ ok = ELF_LOAD_SYMTAB (fname, "__UNIQUE_ID_vermagic0", sym_callback);
++ if (!ok)
+ ELF_LOAD_SYMTAB (fname, "__oss_compile_vermagic", sym_callback);
+ }
+
+
diff --git a/abs/extra/oss/rc-script b/abs/extra/oss/rc-script
deleted file mode 100644
index 5c93010..0000000
--- a/abs/extra/oss/rc-script
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy 'Starting Open Sound System'
- if /usr/sbin/soundon; then
- add_daemon oss
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy 'Stopping Open Sound System'
- if /usr/sbin/soundoff; then
- rm_daemon oss
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart}"
-esac
--
cgit v0.12
From 6b9c9d0e6335e536d3bbd990e780a710275c22de Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:06:56 -0600
Subject: quota-tools, snappy: first include
---
abs/extra/quota-tools/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 abs/extra/quota-tools/PKGBUILD
diff --git a/abs/extra/quota-tools/PKGBUILD b/abs/extra/quota-tools/PKGBUILD
new file mode 100644
index 0000000..d58311b
--- /dev/null
+++ b/abs/extra/quota-tools/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 185213 2013-05-12 07:52:46Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=quota-tools
+pkgver=4.01
+pkgrel=2
+epoch=1
+pkgdesc="Tools to manage kernel-level quotas in Linux"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/linuxquota/"
+license=('GPL' 'BSD')
+depends=('e2fsprogs')
+backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz)
+sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf')
+
+build() {
+ cd ${pkgname}
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd ${pkgname}
+ make ROOTDIR="${pkgdir}" sbindir=/usr/bin root_sbindir=/usr/bin STRIP="" install
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+# remove conflicts with glibc
+ rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}
+}
--
cgit v0.12
From f3feb9104cf0d194d6d1c3e0adbb49130aef37bd Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:07:17 -0600
Subject: syslinux: 6.0.2 update binary path to /usr/bin refs #961
---
abs/extra/syslinux/PKGBUILD | 218 ++++++--
.../syslinux/syslinux-6.02-fix-bios-isolinux.patch | 12 +
.../syslinux/syslinux-6.02-fix-chainloading.patch | 47 ++
.../syslinux/syslinux-6.02-fix-efi-ovmf.patch | 621 +++++++++++++++++++++
.../syslinux-dont-build-dos-windows-targets.patch | 12 -
abs/extra/syslinux/syslinux-install_update | 126 ++---
abs/extra/syslinux/syslinux.cfg | 27 +-
abs/extra/syslinux/syslinux.install | 42 +-
8 files changed, 967 insertions(+), 138 deletions(-)
create mode 100644 abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch
create mode 100644 abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch
create mode 100644 abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch
delete mode 100644 abs/extra/syslinux/syslinux-dont-build-dos-windows-targets.patch
diff --git a/abs/extra/syslinux/PKGBUILD b/abs/extra/syslinux/PKGBUILD
index f8bcb92..e68cc11 100644
--- a/abs/extra/syslinux/PKGBUILD
+++ b/abs/extra/syslinux/PKGBUILD
@@ -1,51 +1,193 @@
-# $Id: PKGBUILD 155387 2012-04-03 08:18:06Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=syslinux
-pkgver=4.05
-pkgrel=4
-arch=('i686' 'x86_64')
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Thomas Bächler <thomas@archlinux.org>
+# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+pkgname="syslinux"
+pkgver="6.02"
+pkgrel="8"
+arch=('x86_64' 'i686')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
url="http://syslinux.zytor.com/"
license=('GPL2')
+options=('!makeflags' '!emptydirs')
+backup=('boot/syslinux/syslinux.cfg')
+makedepends=('python2' 'nasm' 'gnu-efi-libs')
depends=('perl' 'glibc')
optdepends=('perl-passwd-md5: For md5pass'
'perl-digest-sha1: For sha1pass'
'mtools: For mkdiskimage and syslinux support'
- )
-makedepends=('nasm')
-backup=('boot/syslinux/syslinux.cfg')
-install=syslinux.install
-source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2
- syslinux-dont-build-dos-windows-targets.patch
- syslinux.cfg
- syslinux-install_update)
-md5sums=('82299242418385da1274c9479a778cb2'
- '1528c376e43f0eaccaa80d8ad1bc13b4'
- '832595501944fbcabcdc1207f4724fe7'
- '680750f73dc2e587ac567d057d485813')
+ 'gptfdisk: For GPT support'
+ 'util-linux: For isohybrid'
+ 'efibootmgr: For EFI support'
+ 'dosfstools: For EFI support')
+install="${pkgname}.install"
+source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
+ 'syslinux.cfg'
+ 'syslinux-install_update'
+ 'syslinux-6.02-fix-chainloading.patch'
+ 'syslinux-6.02-fix-bios-isolinux.patch'
+ 'syslinux-6.02-fix-efi-ovmf.patch')
+prepare() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ ## Do not try to build the Windows or DOS installers and DIAG files
+ sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+
+ ## Fix FHS manpage path
+ sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+
+ # fix chainloading
+ # http://bugzilla.syslinux.org/show_bug.cgi?id=31
+ # http://www.syslinux.org/archives/2013-October/020971.html
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch"
+
+ # fix bios booting from isohybrid
+ # http://www.syslinux.org/archives/2013-November/021189.html
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-bios-isolinux.patch"
+
+ # fix efi booting in qemu/ovmf
+ # http://bugzilla.syslinux.org/show_bug.cgi?id=23
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-efi-ovmf.patch"
+
+}
+
+_build_syslinux_bios() {
+
+ rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
+ cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
+ cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+
+ ## Do not try to build syslinux with our default LDFLAGS, it will fail
+ unset LDFLAGS
+ make PYTHON="python2" bios
+ make PYTHON="python2" bios installer
+
+}
+
+_build_syslinux_efi64() {
+
+ rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
+ cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
+ cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+
+ ## Unset all compiler FLAGS for efi64 build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ make PYTHON="python2" efi64
+ make PYTHON="python2" efi64 installer
+
+}
+
+_build_syslinux_efi32() {
+
+ rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
+ cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
+ cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+
+ ## Unset all compiler FLAGS for efi32 build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ make PYTHON="python2" efi32
+ make PYTHON="python2" efi32 installer
+
+}
build() {
- # Do not try to build syslinux with our default LDFLAGS, it will fail
- unset LDFLAGS
- cd "$srcdir"/$pkgname-${pkgver}
- # Do not try to build the Windows or DOS installers
- patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
- # Fix FHS manpage path
- sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
- make
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ ## Build syslinux-efi
+ if [[ "${CARCH}" == "x86_64" ]]; then
+ _build_syslinux_efi64
+ fi
+
+ if [[ "${CARCH}" == "i686" ]]; then
+ _build_syslinux_efi32
+ fi
+
+ ## Build syslinux-bios
+ _build_syslinux_bios
+
}
-package() {
- cd "$srcdir"/$pkgname-${pkgver}
- make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
+_package_syslinux_bios() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+
+ ## Install Syslinux bios
+ make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
+
+ ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
+ rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
+ rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true
+ rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true
+
+ ## Remove com32 and diag dirs
+ rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true
+ rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true
+
+ ## Move extlinux binary to /usr/bin
+ install -d "${pkgdir}/usr/bin"
+ mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
+ rm -rf "${pkgdir}/sbin/"
+
+ ## Install docs
+ install -d "${pkgdir}/usr/share/doc"
+ cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
+
+ ## Install the default configuration
+ install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg"
+
+ ## Install the installation and update script
+ ## This script is maintained at git://gist.github.com/772138.git
+ ## Script not yet updated for syslinux-efi
+ install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
+
+}
- # Install the default configuration
- install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
- # Install the installation and update script
- # This script is maintained at git://gist.github.com/772138.git
- install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
- # move extlinux binary to /usr/sbin
- mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
+_package_syslinux_efi() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ if [[ "${CARCH}" == "x86_64" ]]; then
+ cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+ make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
+ fi
+
+ if [[ "${CARCH}" == "i686" ]]; then
+ cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+ make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
+ fi
+
}
+
+package() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ _package_syslinux_efi
+
+ _package_syslinux_bios
+
+}
+
+md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
+ '46ca150f53322ff8f1597d9a342f7e40'
+ '9376f18fa3e42fc36cffa4cff0a84c09'
+ '9dbede6b71a4de9e46aac4aad65334d7'
+ 'adf71eceb4fccecd9a7efe1ab3d54918'
+ '62d22b101ef2ef53e25b4f86d9f41cb5')
diff --git a/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch b/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch
new file mode 100644
index 0000000..48df46f
--- /dev/null
+++ b/abs/extra/syslinux/syslinux-6.02-fix-bios-isolinux.patch
@@ -0,0 +1,12 @@
+diff --git a/core/isolinux.asm b/core/isolinux.asm
+index bd4e9556922d..c4db4133e274 100644
+--- a/core/isolinux.asm
++++ b/core/isolinux.asm
+@@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K)
+ call getlinsec
+ pop eax
+ pop cx
+- mov dx,cx
++ movzx edx,cx
+ pop bp
+ pop bx
diff --git a/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch b/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch
new file mode 100644
index 0000000..6fd7ef4
--- /dev/null
+++ b/abs/extra/syslinux/syslinux-6.02-fix-chainloading.patch
@@ -0,0 +1,47 @@
+Reported-by: Dark Raven <drdarkraven at gmail.com>
+Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com>
+---
+ com32/lib/syslinux/disk.c | 22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c
+index 0b0c737..47ecb52 100644
+--- a/com32/lib/syslinux/disk.c
++++ b/com32/lib/syslinux/disk.c
+@@ -171,22 +171,28 @@ out:
+ static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg,
+ uint64_t lba, uint8_t count, uint8_t op_code)
+ {
+- static __lowmem struct disk_ebios_dapa dapa;
++ static struct disk_ebios_dapa *dapa = NULL;
+ void *buf;
+
++ if (!dapa) {
++ dapa = lmalloc(sizeof *dapa);
++ if (!dapa)
++ return NULL;
++ }
++
+ buf = lmalloc(count * diskinfo->bps);
+ if (!buf)
+ return NULL;
+
+- dapa.len = sizeof(dapa);
+- dapa.count = count;
+- dapa.off = OFFS(buf);
+- dapa.seg = SEG(buf);
+- dapa.lba = lba;
++ dapa->len = sizeof(*dapa);
++ dapa->count = count;
++ dapa->off = OFFS(buf);
++ dapa->seg = SEG(buf);
++ dapa->lba = lba;
+
+ inreg->eax.b[1] = op_code;
+- inreg->esi.w[0] = OFFS(&dapa);
+- inreg->ds = SEG(&dapa);
++ inreg->esi.w[0] = OFFS(dapa);
++ inreg->ds = SEG(dapa);
+ inreg->edx.b[0] = diskinfo->disk;
+
+ return buf;
diff --git a/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch b/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch
new file mode 100644
index 0000000..f33f4c1
--- /dev/null
+++ b/abs/extra/syslinux/syslinux-6.02-fix-efi-ovmf.patch
@@ -0,0 +1,621 @@
+The value of the field rva_and_sizes_nr is used by OVMF to check the
+consistency of the PE file with respect to the field optional_hdr_sz. It
+now have the right value.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+ efi/wrapper.c | 6 +++---
+ efi/wrapper.h | 28 ++++++++++++++++------------
+ 2 files changed, 19 insertions(+), 15 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index 04c895f..ec77271 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -102,7 +102,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ e_hdr.image_sz = total_sz;
+ e_hdr.headers_sz = 512;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+- e_hdr.rva_and_sizes_nr = 1;
++ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr, sizeof(e_hdr), 1, f);
+ }
+ else if (class == ELFCLASS64) {
+@@ -130,7 +130,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ e_hdr_pe32p.image_sz = total_sz;
+ e_hdr_pe32p.headers_sz = 512;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+- e_hdr_pe32p.rva_and_sizes_nr = 1;
++ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
+ }
+
+@@ -237,7 +237,7 @@ int main(int argc, char **argv)
+ fprintf(stderr, "Unsupported architecture\n");
+ exit(EXIT_FAILURE);
+ }
+-
++
+ if (id[EI_MAG0] != ELFMAG0 ||
+ id[EI_MAG1] != ELFMAG1 ||
+ id[EI_MAG2] != ELFMAG2 ||
+diff --git a/efi/wrapper.h b/efi/wrapper.h
+index 4f76991..0e6b38e 100644
+--- a/efi/wrapper.h
++++ b/efi/wrapper.h
+@@ -102,12 +102,14 @@ struct extra_hdr {
+ __uint32_t heap_commit_sz;
+ __uint32_t loader_flags;
+ __uint32_t rva_and_sizes_nr;
+- __uint64_t export_table;
+- __uint64_t import_table;
+- __uint64_t resource_table;
+- __uint64_t exception_table;
+- __uint64_t certification_table;
+- __uint64_t base_relocation_table;
++ struct {
++ __uint64_t export_table;
++ __uint64_t import_table;
++ __uint64_t resource_table;
++ __uint64_t exception_table;
++ __uint64_t certification_table;
++ __uint64_t base_relocation_table;
++ } data_directory;
+ } __packed;
+
+ /* Extra header for PE32+ format
+@@ -136,12 +138,14 @@ struct extra_hdr_pe32p {
+ __uint64_t heap_commit_sz;
+ __uint32_t loader_flags;
+ __uint32_t rva_and_sizes_nr;
+- __uint64_t export_table;
+- __uint64_t import_table;
+- __uint64_t resource_table;
+- __uint64_t exception_table;
+- __uint64_t certification_table;
+- __uint64_t base_relocation_table;
++ struct {
++ __uint64_t export_table;
++ __uint64_t import_table;
++ __uint64_t resource_table;
++ __uint64_t exception_table;
++ __uint64_t certification_table;
++ __uint64_t base_relocation_table;
++ } data_directory;
+ } __packed;
+
+ struct section {
+In the generated PE file, the section header for the .text section used
+to address more than the whole file. Starting at offset 0 (before the
+end of the headers) is illegal and is rejected by OVMF. Giving a size
+greater than the actual file size is also illegal and rejected.
+
+Moreover, the actual data inside the PE file have to be aligned to at
+least 512 bytes. Hence, .text need to be aligned as well.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+ efi/wrapper.c | 44 +++++++++++++++++++++++++-------------------
+ 1 file changed, 25 insertions(+), 19 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index ec77271..bd2c175 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -54,11 +54,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ struct coff_hdr c_hdr;
+ struct header hdr;
+ struct coff_reloc c_rel;
+- __uint32_t total_sz = so_size;
++ __uint32_t total_sz = data_size;
+ __uint32_t dummy = 0;
+ __uint32_t hdr_sz;
+ __uint32_t reloc_start, reloc_end;
+
++ hdr_sz = 512;
++ total_sz += hdr_sz;
++ entry += hdr_sz;
++
+ memset(&hdr, 0, sizeof(hdr));
+ hdr.msdos_signature = MSDOS_SIGNATURE;
+
+@@ -77,11 +81,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ c_hdr.nr_sections = 2;
+ c_hdr.nr_syms = 1;
+ if (class == ELFCLASS32) {
+- hdr_sz = sizeof(o_hdr) + sizeof(t_sec) + sizeof(e_hdr) +
+- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
+- + sizeof(dummy);
+- total_sz += hdr_sz;
+- entry += hdr_sz;
+ c_hdr.arch = IMAGE_FILE_MACHINE_I386;
+ c_hdr.characteristics = IMAGE_FILE_32BIT_MACHINE |
+ IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
+@@ -92,25 +91,20 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr.format = PE32_FORMAT;
+ o_hdr.major_linker_version = 0x02;
+ o_hdr.minor_linker_version = 0x14;
+- o_hdr.code_sz = total_sz;
++ o_hdr.code_sz = data_size;
+ o_hdr.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr, sizeof(o_hdr), 1, f);
+ memset(&e_hdr, 0, sizeof(e_hdr));
+ e_hdr.section_align = 4096;
+ e_hdr.file_align = 512;
+- e_hdr.image_sz = total_sz;
+- e_hdr.headers_sz = 512;
++ e_hdr.image_sz = hdr_sz + so_size;
++ e_hdr.headers_sz = hdr_sz;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr, sizeof(e_hdr), 1, f);
+ }
+ else if (class == ELFCLASS64) {
+- hdr_sz = sizeof(o_hdr_pe32p) + sizeof(t_sec) + sizeof(e_hdr_pe32p) +
+- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
+- + sizeof(dummy);
+- total_sz += hdr_sz;
+- entry += hdr_sz;
+ c_hdr.arch = IMAGE_FILE_MACHINE_X86_64;
+ c_hdr.characteristics = IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
+ IMAGE_FILE_LINE_NUMBERS_STRIPPED;
+@@ -120,15 +114,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr_pe32p.format = PE32P_FORMAT;
+ o_hdr_pe32p.major_linker_version = 0x02;
+ o_hdr_pe32p.minor_linker_version = 0x14;
+- o_hdr_pe32p.code_sz = total_sz;
++ o_hdr_pe32p.code_sz = data_size;
+ o_hdr_pe32p.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
+ memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+- e_hdr_pe32p.image_sz = total_sz;
+- e_hdr_pe32p.headers_sz = 512;
++ e_hdr_pe32p.image_sz = hdr_sz + so_size;
++ e_hdr_pe32p.headers_sz = hdr_sz;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
+@@ -136,8 +130,10 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+
+ memset(&t_sec, 0, sizeof(t_sec));
+ strcpy((char *)t_sec.name, ".text");
+- t_sec.virtual_sz = total_sz;
+- t_sec.raw_data_sz = total_sz;
++ t_sec.virtual_sz = data_size;
++ t_sec.virtual_address = hdr_sz;
++ t_sec.raw_data_sz = t_sec.virtual_sz;
++ t_sec.raw_data = t_sec.virtual_address;
+ t_sec.characteristics = IMAGE_SCN_CNT_CODE |
+ IMAGE_SCN_ALIGN_16BYTES | IMAGE_SCN_MEM_EXECUTE |
+ IMAGE_SCN_MEM_READ;
+@@ -163,6 +159,16 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&c_rel, sizeof(c_rel), 1, f);
+ fwrite(&dummy, sizeof(dummy), 1, f);
+
++ /*
++ * Add some padding to align the ELF as needed
++ */
++ if (ftell(f) > t_sec.virtual_address) {
++ // A fseek that rewind would be a bug hard to track
++ fprintf(stderr, "PE+ headers are too large.\n");
++ exit(EXIT_FAILURE);
++ }
++
++ fseek(f, t_sec.virtual_address, SEEK_SET);
+ }
+
+ static void usage(char *progname)
+There is no need to have a relocation section that nothing points at.
+The image is still seen as relocatable as long as the Characteristics of
+the FileHeader do not say otherwise.
+
+Moreover, the field base_relocation_table wasn't initialized properly
+leading to unpredictable bugs.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+
+I'm not 100% positive about the uselessness of the relocation section. However:
+1) it works on my real hardware;
+2) OVMF doesn't check the section headers at all;
+3) all the docs I could find say that the section names are arbitrary;
+4) the only way to make the relocation actually happen is by setting the
+base_relocation_table field of the extra headers to point to this section;
+5) The right way to indicate the image is not relocatable would be by setting
+the characteristics IMAGE_FILE_RELOCS_STRIPPED in the coff header.
+
+Moreover, the relocation entry cannot be inserted before the end of the headers
+(512 bytes), this mean we would have to push everything a few bytes further.
+And I think it's better if it can be avoided. :)
+
+ efi/wrapper.c | 28 +++-------------------------
+ 1 file changed, 3 insertions(+), 25 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index bd2c175..9652368 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -48,14 +48,12 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ {
+ struct optional_hdr o_hdr;
+ struct optional_hdr_pe32p o_hdr_pe32p;
+- struct section t_sec, r_sec;
++ struct section t_sec;
+ struct extra_hdr e_hdr;
+ struct extra_hdr_pe32p e_hdr_pe32p;
+ struct coff_hdr c_hdr;
+ struct header hdr;
+- struct coff_reloc c_rel;
+ __uint32_t total_sz = data_size;
+- __uint32_t dummy = 0;
+ __uint32_t hdr_sz;
+ __uint32_t reloc_start, reloc_end;
+
+@@ -78,7 +76,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&hdr, sizeof(hdr), 1, f);
+
+ memset(&c_hdr, 0, sizeof(c_hdr));
+- c_hdr.nr_sections = 2;
++ c_hdr.nr_sections = 1;
+ c_hdr.nr_syms = 1;
+ if (class == ELFCLASS32) {
+ c_hdr.arch = IMAGE_FILE_MACHINE_I386;
+@@ -118,7 +116,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr_pe32p.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
+- memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
++ memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+ e_hdr_pe32p.image_sz = hdr_sz + so_size;
+@@ -140,26 +138,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&t_sec, sizeof(t_sec), 1, f);
+
+ /*
+- * Write our dummy relocation and reloc section.
+- */
+- memset(&r_sec, 0, sizeof(r_sec));
+- strcpy((char *)r_sec.name, ".reloc");
+- r_sec.virtual_sz = sizeof(c_rel);
+- r_sec.virtual_address = ftell(f) + sizeof(r_sec);
+- r_sec.raw_data_sz = r_sec.virtual_sz;
+- r_sec.raw_data = r_sec.virtual_address;
+- r_sec.characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA |
+- IMAGE_SCN_ALIGN_1BYTES | IMAGE_SCN_MEM_DISCARDABLE |
+- IMAGE_SCN_MEM_READ;
+- fwrite(&r_sec, sizeof(r_sec), 1, f);
+-
+- memset(&c_rel, 0, sizeof(c_rel));
+- c_rel.virtual_address = ftell(f) + sizeof(c_rel);
+- c_rel.symtab_index = 10;
+- fwrite(&c_rel, sizeof(c_rel), 1, f);
+- fwrite(&dummy, sizeof(dummy), 1, f);
+-
+- /*
+ * Add some padding to align the ELF as needed
+ */
+ if (ftell(f) > t_sec.virtual_address) {
+PE headers code_sz and image_sz indicate more or less, the size of the
+file and the size of the in-memory image. They are now given the right
+value.
+
+In the ELF format, only the program headers are reliable to determine
+the actually needed part of the file and the in-memory size.
+
+The .bss section should always be marked as NOLOAD for ld since its
+content shouldn't be included into the binary file.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+
+Again, I'm not 100% positive about the semantics of NOLOAD in a linker script.
+However I found this make things work better.
+Actually the file core/fs/fs.o have a .bss16 section that is not empty. If I
+understood correctly, only .bss can be empty in a .o. Thus ld generates the
+zeros that belong to that section in the .o. Then, when merging the section
+.bss16 into the .bss of syslinux.so, ld is forced to generate ALL the zeros
+that belong to the .bss section. Marking this section as NOLOAD make ld to
+ignore its content but still produce a PT_LOAD program header with the right
+memory size, as needed for the bss.
+
+ efi/i386/syslinux.ld | 4 +-
+ efi/wrapper.c | 138 +++++++++++++++----------------------------------
+ efi/x86_64/syslinux.ld | 4 +-
+ 3 files changed, 45 insertions(+), 101 deletions(-)
+
+diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
+index 523a9b9..bab3fc7 100644
+--- a/efi/i386/syslinux.ld
++++ b/efi/i386/syslinux.ld
+@@ -136,7 +136,7 @@ SECTIONS
+ *(.strtab)
+ }
+
+- .bss : {
++ .bss (NOLOAD) : {
+ /* the EFI loader doesn't seem to like a .bss section,
+ so we stick it all into .data: */
+ __bss_start = .;
+@@ -153,7 +153,7 @@ SECTIONS
+ __bss_dwords = (__bss_len + 3) >> 2;
+
+ . = ALIGN(128);
+-
++
+ /* Very large objects which don't need to be zeroed */
+
+ .hugebss : {
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index 9652368..a5247ae 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -35,7 +35,7 @@ typedef Elf64_Addr Elf_Addr;
+ #endif
+
+ /*
+- * 'so_size' is the file size of the ELF shared object.
++ * 'so_memsz' is the size of the ELF shared object once loaded.
+ * 'data_size' is the size of initialised data in the shared object.
+ * 'class' dictates how the header is written
+ * For 32bit machines (class == ELFCLASS32), the optional
+@@ -44,7 +44,7 @@ typedef Elf64_Addr Elf_Addr;
+ * header includes PE32+header fields
+ */
+ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+- __uint32_t so_size, __uint8_t class)
++ __uint32_t so_memsz, __uint8_t class)
+ {
+ struct optional_hdr o_hdr;
+ struct optional_hdr_pe32p o_hdr_pe32p;
+@@ -96,7 +96,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ memset(&e_hdr, 0, sizeof(e_hdr));
+ e_hdr.section_align = 4096;
+ e_hdr.file_align = 512;
+- e_hdr.image_sz = hdr_sz + so_size;
++ e_hdr.image_sz = hdr_sz + so_memsz;
+ e_hdr.headers_sz = hdr_sz;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+@@ -119,7 +119,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+- e_hdr_pe32p.image_sz = hdr_sz + so_size;
++ e_hdr_pe32p.image_sz = hdr_sz + so_memsz;
+ e_hdr_pe32p.headers_sz = hdr_sz;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+@@ -157,17 +157,16 @@ static void usage(char *progname)
+
+ int main(int argc, char **argv)
+ {
+- struct stat st;
+ Elf32_Ehdr e32_hdr;
+ Elf64_Ehdr e64_hdr;
+ __uint32_t entry;
+ __uint8_t class;
+- __uint64_t shoff;
+- __uint16_t shnum, shentsize, shstrndx;
++ __uint64_t phoff = 0;
++ __uint16_t phnum = 0, phentsize = 0;
+ unsigned char *id;
+ FILE *f_in, *f_out;
+ void *buf;
+- size_t datasz, rv;
++ size_t datasz, memsz, rv;
+
+ if (argc < 3) {
+ usage(argv[0]);
+@@ -180,11 +179,6 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- if (stat(argv[1], &st) != 0) {
+- perror("stat");
+- exit(EXIT_FAILURE);
+- }
+-
+ f_out = fopen(argv[2], "w");
+ if (!f_out) {
+ perror("fopen");
+@@ -194,15 +188,14 @@ int main(int argc, char **argv)
+ /*
+ * Parse the ELF header and find the entry point.
+ */
+- fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
++ fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
+ if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
+ id = e32_hdr.e_ident;
+ class = ELFCLASS32;
+ entry = e32_hdr.e_entry;
+- shoff = e32_hdr.e_shoff;
+- shnum = e32_hdr.e_shnum;
+- shstrndx = e32_hdr.e_shstrndx;
+- shentsize = e32_hdr.e_shentsize;
++ phoff = e32_hdr.e_phoff;
++ phnum = e32_hdr.e_phnum;
++ phentsize = e32_hdr.e_phentsize;
+ }
+ else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
+ /* read the header again for x86_64
+@@ -213,10 +206,9 @@ int main(int argc, char **argv)
+ fread((void *)&e64_hdr, sizeof(e64_hdr), 1, f_in);
+ id = e64_hdr.e_ident;
+ entry = e64_hdr.e_entry;
+- shoff = e64_hdr.e_shoff;
+- shnum = e64_hdr.e_shnum;
+- shstrndx = e64_hdr.e_shstrndx;
+- shentsize = e64_hdr.e_shentsize;
++ phoff = e64_hdr.e_phoff;
++ phnum = e64_hdr.e_phnum;
++ phentsize = e64_hdr.e_phentsize;
+ } else {
+ fprintf(stderr, "Unsupported architecture\n");
+ exit(EXIT_FAILURE);
+@@ -230,98 +222,47 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- if (!shoff || !shnum || (shstrndx == SHN_UNDEF)) {
+- fprintf(stderr, "Cannot find section table\n");
++ if (!phoff || !phnum) {
++ fprintf(stderr, "Cannot find segment table\n");
+ exit(EXIT_FAILURE);
+ }
+
+ /*
+- * Find the beginning of the .bss section. Everything preceding
+- * it is copied verbatim to the output file.
++ * Find the LOAD program header. Everything in this segment
++ * is copied verbatim to the output file.
++ * Although there may be several LOAD program headers, only
++ * one is currently copied.
+ */
+ if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
+- const char *shstrtab, *name;
+- Elf32_Shdr shdr;
++ Elf32_Phdr phdr;
+ int i;
+- void *strtab;
+-
+- fseek(f_in, shoff, SEEK_SET);
+-
+- /* First find the strtab section */
+- fseek(f_in, shstrndx * shentsize, SEEK_CUR);
+- fread(&shdr, sizeof(shdr), 1, f_in);
+
+- strtab = malloc(shdr.sh_size);
+- if (!strtab) {
+- fprintf(stderr, "Failed to malloc strtab\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- fseek(f_in, shdr.sh_offset, SEEK_SET);
+- fread(strtab, shdr.sh_size, 1, f_in);
+-
+- /* Now search for the .bss section */
+- fseek(f_in, shoff, SEEK_SET);
+- for (i = 0; i < shnum; i++) {
+- rv = fread(&shdr, sizeof(shdr), 1, f_in);
+- if (!rv) {
+- fprintf(stderr, "Failed to read section table\n");
+- exit(EXIT_FAILURE);
+- }
++ /* Find the first LOAD program header */
++ for (i = 0; i < phnum; i++) {
++ fseek(f_in, phoff + i * phentsize, SEEK_SET);
++ fread(&phdr, sizeof(phdr), 1, f_in);
+
+- name = strtab + shdr.sh_name;
+- if (!strcmp(name, ".bss"))
++ if (phdr.p_type == PT_LOAD)
+ break;
+ }
+
+- if (i == shnum) {
+- fprintf(stderr, "Failed to find .bss section\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- datasz = shdr.sh_offset;
+- }
+- else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
+- const char *shstrtab, *name;
+- Elf64_Shdr shdr;
++ datasz = phdr.p_filesz;
++ memsz = phdr.p_memsz;
++ } else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
++ Elf64_Phdr phdr;
+ int i;
+- void *strtab;
+-
+- fseek(f_in, shoff, SEEK_SET);
+
+- /* First find the strtab section */
+- fseek(f_in, shstrndx * shentsize, SEEK_CUR);
+- fread(&shdr, sizeof(shdr), 1, f_in);
+-
+- strtab = malloc(shdr.sh_size);
+- if (!strtab) {
+- fprintf(stderr, "Failed to malloc strtab\n");
+- exit(EXIT_FAILURE);
+- }
++ /* Find the first LOAD program header */
++ for (i = 0; i < phnum; i++) {
++ fseek(f_in, phoff + i * phentsize, SEEK_SET);
++ fread(&phdr, sizeof(phdr), 1, f_in);
+
+- fseek(f_in, shdr.sh_offset, SEEK_SET);
+- fread(strtab, shdr.sh_size, 1, f_in);
+-
+- /* Now search for the .bss section */
+- fseek(f_in, shoff, SEEK_SET);
+- for (i = 0; i < shnum; i++) {
+- rv = fread(&shdr, sizeof(shdr), 1, f_in);
+- if (!rv) {
+- fprintf(stderr, "Failed to read section table\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- name = strtab + shdr.sh_name;
+- if (!strcmp(name, ".bss"))
++ if (phdr.p_type == PT_LOAD)
+ break;
+ }
+
+- if (i == shnum) {
+- fprintf(stderr, "Failed to find .bss section\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- datasz = shdr.sh_offset;
++ datasz = phdr.p_filesz;
++ memsz = phdr.p_memsz;
+ }
+
+ buf = malloc(datasz);
+@@ -330,7 +271,7 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- write_header(f_out, entry, datasz, st.st_size, class);
++ write_header(f_out, entry, datasz, memsz, class);
+
+ /* Write out the entire ELF shared object */
+ rewind(f_in);
+@@ -341,5 +282,8 @@ int main(int argc, char **argv)
+ }
+
+ fwrite(buf, datasz, rv, f_out);
++ free(buf);
++ fclose(f_out);
++ fclose(f_in);
+ return 0;
+ }
+diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
+index 95160bd..450641c 100644
+--- a/efi/x86_64/syslinux.ld
++++ b/efi/x86_64/syslinux.ld
+@@ -136,7 +136,7 @@ SECTIONS
+ *(.strtab)
+ }
+
+- .bss : {
++ .bss (NOLOAD) : {
+ /* the EFI loader doesn't seem to like a .bss section,
+ so we stick it all into .data: */
+ __bss_start = .;
+@@ -153,7 +153,7 @@ SECTIONS
+ __bss_dwords = (__bss_len + 3) >> 2;
+
+ . = ALIGN(128);
+-
++
+ /* Very large objects which don't need to be zeroed */
+
+ .hugebss : {
diff --git a/abs/extra/syslinux/syslinux-dont-build-dos-windows-targets.patch b/abs/extra/syslinux/syslinux-dont-build-dos-windows-targets.patch
deleted file mode 100644
index 2b86ab8..0000000
--- a/abs/extra/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
---- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200
-@@ -54,7 +54,7 @@
- # files that depend only on the B phase, but may have to be regenerated
- # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
-- diag libinstaller dos win32 win64 dosutil
-+ libinstaller
- ITARGET =
- IOBJECTS = $(ITARGET) \
- utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/abs/extra/syslinux/syslinux-install_update b/abs/extra/syslinux/syslinux-install_update
index cd1baa5..3843b5f 100644
--- a/abs/extra/syslinux/syslinux-install_update
+++ b/abs/extra/syslinux/syslinux-install_update
@@ -1,7 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
-# Sylinux Installer / Updater Scripts
-# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net>
+# Syslinux Installer / Updater Script (for BIOS only)
+# Copyright (C) 2011-2013 Matthew Gyurgyik <pyther@pyther.net>
+# Copyright (C) 2013 Keshav Padram Amburay <(the) (ddoott) (ridikulus) (ddoott) (rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -18,21 +19,24 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#-----------------
+# ChangeLog:
+# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Arch Linux pkg
+#-----------------
# Exit Codes:
# 1 - get_boot_device or other function failed
# 2 - install/update failed
# 3 - set_active failed
# 4 - install_mbr failed
-#
+#-----------------
+
shopt -s nullglob
-libpath="/usr/lib/syslinux"
-bootpath="/boot/syslinux"
-extlinux="/usr/sbin/extlinux"
+bios_libpath="/usr/lib/syslinux/bios"
+bios_bootpath="/boot/syslinux"
+EXTLINUX="/usr/bin/extlinux"
-autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
-pciids_file=/usr/share/hwdata/pci.ids
+bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE"
+pciids_file="/usr/share/hwdata/pci.ids"
## Helper functions ##
# Taken from libui-sh
@@ -120,7 +124,7 @@ usage() {
cat << EOF
usage: $0 options
-This script will install or upgrade Syslinux
+This script will install or upgrade Syslinux (for BIOS only)
OPTIONS:
-h Show this message
@@ -133,16 +137,16 @@ OPTIONS:
Arguments Required:
-c Chroot install (ex: -c /mnt)
-Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr)
- syslinux-install_update.sh -u (update)
+Example Usage: $0 -i -a -m # (install, set boot flag, install mbr)
+ $0 -u # (update)
EOF
}
# Trys to find the partition that /boot resides on
# This will either be on /boot or / (root)
getBoot() {
- if [[ ! -d "$bootpath" ]]; then
- echo "Could not find $bootpath"
+ if [[ ! -d "$bios_bootpath" ]]; then
+ echo "Could not find $bios_bootpath"
echo "Is boot mounted? Is Syslinux installed?"
exit 1
fi
@@ -278,9 +282,9 @@ install_mbr() {
{ echo "ABORT! MBR installation to partition ($disk)!"; exit 4;}
if [[ "$ptb" = MBR ]]; then
- mbrfile="$libpath/mbr.bin"
+ mbrfile="$bios_libpath/mbr.bin"
elif [[ "$ptb" = GPT ]]; then
- mbrfile="$libpath/gptmbr.bin"
+ mbrfile="$bios_libpath/gptmbr.bin"
fi
if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then
@@ -293,67 +297,53 @@ install_mbr() {
return 0
}
-_install() {
- # Copy files to /boot
- for file in "${com32_files[@]}"; do
- # Symlink files even if links exist
- if [[ "$boot" = root ]]; then
- ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$libpath/$file" "$bootpath/$file"
- fi
- done
+install_modules() {
+ # Copy all syslinux *.c32 modules to /boot
+ rm "$bios_bootpath"/*.c32 &> /dev/null
+ cp "$bios_libpath"/*.c32 "$bios_bootpath"/ &> /dev/null
- # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
- if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then
- if [[ "$boot" = root ]]; then
- ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- fi
+ # Copy / Symlink pci.ids if pci.ids exists on the FS
+ if [[ -f "$pciids_file" ]]; then
+ rm "$bios_bootpath/pci.ids" &> /dev/null
+ cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
fi
+}
- if device_is_raid "$bootpart"; then
+_install() {
+ install_modules
+
+ if device_is_raid "$bootpart" ; then
echo "Detected RAID on /boot - installing Syslinux with --raid"
- "$extlinux" --install "$bootpath" -r > /dev/null 2>&1
+ "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null
else
- "$extlinux" --install "$bootpath" > /dev/null 2>&1
+ "$EXTLINUX" --install "$bios_bootpath" &> /dev/null
fi
if (( $? )); then
- echo "Syslinux install failed"
+ echo "Syslinux BIOS install failed"
exit 2
else
- echo "Syslinux install successful"
+ echo "Syslinux BIOS install successful"
fi
- touch "$CHROOT/$autoupdate_file"
+ touch "$CHROOT/$bios_autoupdate_file"
}
update() {
- # Update any com and c32 files in /boot
- if [[ "$boot" = boot ]]; then
- for file in "$bootpath"/*.{c32,com}; do
- file=$(basename "$file")
- cp "$libpath/$file" "$bootpath/$file" &> /dev/null
- done
- if [[ -f "$bootpath/pci.ids" ]]; then
- cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- fi
- fi
+ install_modules
- if device_is_raid $bootpart; then
- echo "Detected RAID on /boot - installing Syslinux with --raid"
- "$extlinux" --update "$bootpath" -r &> /dev/null
+ if device_is_raid "$bootpart" ; then
+ echo "Detected RAID on /boot - updating Syslinux with --raid"
+ "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
else
- "$extlinux" --update "$bootpath" &> /dev/null
+ "$EXTLINUX" --update "$bios_bootpath" &> /dev/null
fi
if (($?)); then
- echo "Syslinux update failed"
+ echo "Syslinux BIOS update failed"
exit 2
else
- echo "Syslinux update successful"
+ echo "Syslinux BIOS update successful"
fi
}
@@ -388,7 +378,7 @@ while getopts "c:uihmas" opt; do
;;
s)
# If AUTOUPDATE_FILE does not exist exit the script
- if [[ -f $autoupdate_file ]]; then
+ if [[ -f $bios_autoupdate_file ]]; then
UPDATE="True"
else
exit 0
@@ -406,28 +396,28 @@ if [[ $USAGE ]]; then
exit 0
fi
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
- echo "This script must be run as root" 1>&2
- exit 1
-fi
-
# Display Usage Information if both Install and Update are passed
if [[ $INSTALL && $UPDATE ]]; then
usage
exit 1
fi
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+ echo "This script must be run as root" 1>&2
+ exit 1
+fi
+
# If a chroot dir is path set variables to reflect chroot
if [[ "$CHROOT" ]]; then
- libpath="$CHROOT$libpath"
- bootpath="$CHROOT$bootpath"
- extlinux="$CHROOT$extlinux"
+ bios_libpath="$CHROOT$bios_libpath"
+ bios_bootpath="$CHROOT$bios_bootpath"
+ EXTLINUX="$CHROOT$EXTLINUX"
fi
# Exit if no /boot path exists
-if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then
- echo "Error: $bootpath is empty!"
+if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then
+ echo "Error: $bios_bootpath is empty!"
echo "Is /boot mounted?"
exit 1
fi
diff --git a/abs/extra/syslinux/syslinux.cfg b/abs/extra/syslinux/syslinux.cfg
index 5a588f5..2b77038 100644
--- a/abs/extra/syslinux/syslinux.cfg
+++ b/abs/extra/syslinux/syslinux.cfg
@@ -7,7 +7,6 @@
# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
# * hdt.c32 - hardware detection tool
# * reboot.c32 - reboots the system
-# * poweroff.com - shutdown the system
#
# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
# If /usr and /boot are on the same file system, symlink the files instead
@@ -50,16 +49,16 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
#-*
LABEL arch
- MENU LABEL Arch Linux
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux.img
+ MENU LABEL Arch Linux
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda3 rw
+ INITRD ../initramfs-linux.img
LABEL archfallback
- MENU LABEL Arch Linux Fallback
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux-fallback.img
+ MENU LABEL Arch Linux Fallback
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda3 rw
+ INITRD ../initramfs-linux-fallback.img
#LABEL windows
# MENU LABEL Windows
@@ -69,11 +68,11 @@ LABEL archfallback
LABEL hdt
MENU LABEL HDT (Hardware Detection Tool)
COM32 hdt.c32
-
+
LABEL reboot
MENU LABEL Reboot
COM32 reboot.c32
-
-LABEL off
- MENU LABEL Power Off
- COMBOOT poweroff.com
+
+LABEL poweroff
+ MENU LABEL Poweroff
+ COM32 poweroff.c32
diff --git a/abs/extra/syslinux/syslinux.install b/abs/extra/syslinux/syslinux.install
index 0dc0ece..4bb7f85 100644
--- a/abs/extra/syslinux/syslinux.install
+++ b/abs/extra/syslinux/syslinux.install
@@ -1,13 +1,43 @@
post_install() {
- echo "==> If you want to use syslinux as your bootloader"
- echo "==> edit /boot/syslinux/syslinux.cfg and run"
- echo "==> # /usr/sbin/syslinux-install_update -i -a -m"
- echo "==> to install it."
+
+ cat << EOF
+
+==> For setting up Syslinux BIOS using the syslinux-install_update script follow
+ https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install
+EOF
+
+ ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade
+ if [ "$(vercmp $2 6.00)" -lt 0 ]; then
+
+ cat << EOF
+
+==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install
+ (not update) Syslinux BIOS manually (not using the install script) once
+ by following https://wiki.archlinux.org/index.php/Syslinux#Manual_install
+
+==> The install script may not properly upgrade Syslinux to 6.xx version
+EOF
+
+ fi
+
+ cat << EOF
+
+==> For setting up Syslinux EFI follow
+ https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems
+
+==> The syslinux-install_update script does not currently support EFI install
+
+EOF
+
}
post_upgrade() {
- # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
- /usr/sbin/syslinux-install_update -s
+
+ ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
+ /usr/bin/syslinux-install_update -s
+
+ post_install
+
}
# vim:set ts=2 sw=2 et:
--
cgit v0.12
From d8b6c41b41644281729f379050b63700a11cceab Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:07:30 -0600
Subject: thin-provisioning-tools: first include
---
abs/extra/thin-provisioning-tools/PKGBUILD | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 abs/extra/thin-provisioning-tools/PKGBUILD
diff --git a/abs/extra/thin-provisioning-tools/PKGBUILD b/abs/extra/thin-provisioning-tools/PKGBUILD
new file mode 100644
index 0000000..a57b847
--- /dev/null
+++ b/abs/extra/thin-provisioning-tools/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 195238 2013-09-28 21:28:47Z thomas $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: Jason Hall <cakersq@gmail.com>
+
+pkgname=thin-provisioning-tools
+pkgver=0.2.7
+pkgrel=1
+pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target"
+arch=('i686' 'x86_64')
+url="https://github.com/jthornber/thin-provisioning-tools"
+license=('GPL3')
+depends=('expat' 'gcc-libs')
+makedepends=('boost')
+source=(https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz)
+sha1sums=('23ce1110899adce9406aa614a4ee19950e00ee7a')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ autoconf
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" BINDIR="${pkgdir}"/usr/bin MANDIR=/usr/share/man install
+}
+
--
cgit v0.12
From 48c7caf0470b8693b849ac13454fdac4a697e812 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:08:18 -0600
Subject: filesystem: 2013_05 update binary path to /usr/bin refs #961
---
abs/core/filesystem/PKGBUILD | 61 ++++++++++++++++++++++------------
abs/core/filesystem/__changelog | 3 --
abs/core/filesystem/archlinux.7.txt | 60 +++++++++++++++++++--------------
abs/core/filesystem/filesystem.install | 17 +++-------
abs/core/filesystem/fstab | 1 -
abs/core/filesystem/group | 2 ++
abs/core/filesystem/gshadow | 4 ++-
abs/core/filesystem/os-release | 12 +++----
abs/core/filesystem/passwd | 1 +
abs/core/filesystem/profile | 2 +-
abs/core/filesystem/securetty | 2 +-
abs/core/filesystem/shadow | 1 +
12 files changed, 93 insertions(+), 73 deletions(-)
delete mode 100644 abs/core/filesystem/__changelog
diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD
index 1bce61a..ad62704 100644
--- a/abs/core/filesystem/PKGBUILD
+++ b/abs/core/filesystem/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 169662 2012-10-25 10:06:29Z tomegun $
+# $Id: PKGBUILD 187026 2013-06-03 11:15:07Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
pkgname=filesystem
-pkgver=2012.10
-pkgrel=2
+pkgver=2013.05
+pkgrel=3
pkgdesc='Base filesystem'
-arch=('any')
+arch=('i686' 'x86_64')
license=('GPL')
url='http://www.archlinux.org'
groups=('base')
install='filesystem.install'
makedepends=('asciidoc')
-depends=('iana-etc' 'bash' 'coreutils' 'nss-myhostname')
+depends=('iana-etc')
backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
-source=('group' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
+source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'archlinux.7.txt'
- 'locale.sh')
+ 'locale.sh')
build() {
cd ${srcdir}
@@ -31,7 +31,7 @@ package() {
#
# setup root filesystem
#
- for d in boot dev etc home media mnt usr var opt srv/http run; do
+ for d in boot dev etc home mnt usr var opt srv/http run; do
install -d -m755 ${d}
done
install -d -m555 proc
@@ -43,7 +43,7 @@ package() {
# setup /etc
install -d etc/{ld.so.conf.d,skel,profile.d}
- for f in fstab group host.conf hosts ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
+ for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
install -m644 ${srcdir}/${f} etc/
done
ln -s /proc/self/mounts etc/mtab
@@ -65,10 +65,10 @@ package() {
ln -s ../run var/run
ln -s ../run/lock var/lock
- #
- # setup /usr hierarchy
- #
- for d in bin include lib sbin share/misc src; do
+
+ #setup /usr hierarchy
+
+ for d in bin include lib share/misc src; do
install -d -m755 usr/${d}
done
for d in $(seq 8); do
@@ -76,6 +76,22 @@ package() {
done
#
+ # add lib symlinks
+ #
+ ln -s usr/lib ${pkgdir}/lib
+ [[ ${CARCH} = "x86_64" ]] && (
+ ln -s usr/lib ${pkgdir}/lib64
+ ln -s lib ${pkgdir}/usr/lib64
+ )
+
+# #
+# # add bin symlinks
+# #
+ ln -s usr/bin ${pkgdir}/bin
+ ln -s usr/bin ${pkgdir}/sbin
+ ln -s bin ${pkgdir}/usr/sbin
+
+ #
# install archlinux(7) manpage
#
install -D -m644 ${srcdir}/archlinux.7 usr/share/man/man7/archlinux.7
@@ -88,22 +104,23 @@ package() {
done
ln -s ../man usr/local/share/man
}
-md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
+md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
+ '7813c481156f6b280a3ba91fc6236368'
'9e4533df61f0c82d6b2e2371f7376282'
- 'f833071f3b4c1e1033770c0ef30da0a4'
+ '4c4540eeb748bf1f71d631b8c1dcf0b3'
'f28150d4c0b22a017be51b9f7f9977ed'
'6e488ffecc8ba142c0cf7e2d7aeb832e'
- '455b78cada80f40b6f6968f5cbd97a2e'
- '01249bb0ba4468f95e2cc3a627f5e6e3'
- 'ca716f853860199c1286e7939b2f2666'
+ '1cfd310dff0804a7d21958487c32a3b1'
+ '2ef2429c2c98d0883906aa6f5363be80'
+ '693c97f2c9a519bb97a17008e92c2b74'
'1745349eb24ed21b4cfaa6f423bddb76'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
'd41d8cd98f00b204e9800998ecf8427e'
- 'c1e795aa3bae70bf0fb76b8a720e4825'
+ 'b16a4674ccf3a932ff34c6c8393a4f33'
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
- '677523dbe94b79299aa91b35ed8203b6'
- 'f3b6ae7db8adffaaa4bffc6099dcbd50'
+ 'f45389e116ab0b9e9968287617d27c7d'
+ '0b6f835598c7640184e476057b3c7722'
'a8a962370cd0128465d514e6a1f74130'
- 'f339bbc45ff3ad4dd73039beab2f28e3'
+ '2e193c4a37245f2323ebe87f1a673563'
'3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/abs/core/filesystem/__changelog b/abs/core/filesystem/__changelog
deleted file mode 100644
index b68b199..0000000
--- a/abs/core/filesystem/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-added tty10 to securetty
-os-release
-remove issue
diff --git a/abs/core/filesystem/archlinux.7.txt b/abs/core/filesystem/archlinux.7.txt
index 74eee59..b46ab05 100644
--- a/abs/core/filesystem/archlinux.7.txt
+++ b/abs/core/filesystem/archlinux.7.txt
@@ -14,66 +14,76 @@ Overview of the basic configuration of Arch Linux.
DESCRIPTION
-----------
-Arch Linux exposes the user to the system without hiding any details. This manpage gives a
-brief overview of the configuration files that should be set up on a fresh install.
+Arch Linux exposes the user to the system without hiding any details.
+This man page gives a brief overview of the configuration files that should be set up on a fresh install.
SYSTEM SERVICES[[S]]
--------------------
-System services to be started at boot can be enabled using 'systemctl enable <name>.service'. To view
-available services use 'systemctl list-unit-files'.
+System services to be started at boot can be enabled using 'systemctl enable <name>'.
+To view available services, use 'systemctl list-unit-files'.
HOSTNAME[[H]]
-------------
-The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'. It will then be
-written to /etc/hostname.
+The hostname of the machine can be set using 'hostnamectl set-hostname <hostname>'.
+It will then be written to /etc/hostname.
LOCALIZATION[[L]]
-----------------
-Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used
-can be configured in /etc/locale.conf. These settings can be overridden on a per-user basis by keeping a
-user-specific locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists.
+Various locales may be enabled in /etc/locale.gen and are generated by 'locale-gen'.
+The system-wide locale to be used can be configured in /etc/locale.conf.
+These settings can be overridden on a per-user basis by keeping a user-specific locale.conf in $HOME/.config/locale.conf.
+The user-specific file will take precedence if it exists.
VIRTUAL CONSOLE[[V]]
--------------------
-The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among
-other things. Note that these settings only apply to the console, and not if you use X.
+The virtual console is configured in /etc/vconsole.conf.
+It allows you to set a font and a keyboard layout, among other things.
+Note that these settings only apply to the console and do not apply if you use X.
TIME[[T]]
---------
-The local timezone is configured by calling 'timedatectl set-timezone <Region/City>'. A *symlink* is then created
-from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. E.g.,
+The local time zone is configured by calling 'timedatectl set-timezone <Region/City>'.
+A relative *symlink* is then created from /etc/localtime to the correct zoneinfo file under /usr/share/zoneinfo/. For example,
/etc/localtime -> ../usr/share/zoneinfo/Europe/Paris
The real-time clock, which keeps track of time when the computer is off, can be configured to either
-be in UTC or in localtime by calling 'timedatectl set-local-rtc <false|true>'. The default is UTC.
+be in UTC or in local time by calling 'timedatectl set-local-rtc <false|true>'.
+The default is UTC.
-FILESYSTEMS[[F]]
-----------------
-Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
+FILE SYSTEMS[[F]]
+-----------------
+File systems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab.
INITRAMFS[[R]]
--------------
-The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf.
+The initramfs is generated by 'mkinitcpio -p <preset>'.
+The default preset is "linux".
+The initramfs can be configured in /etc/mkinitcpio.conf and must be regenerated after making configuration changes.
PACKAGE MANAGER[[P]]
--------------------
The package manager, pacman, is configured in /etc/pacman.conf.
-BOOTLOADER[[B]]
----------------
-GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg
+BOOT LOADER[[B]]
+----------------
+GRUB's configuration is generated from /etc/default/grub by 'grub-mkconfig -o /boot/grub/grub.cfg'.
+Syslinux is configured in /boot/syslinux/syslinux.cfg.
MODULES[[M]]
------------
-Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
-and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/.
+Most modules should be loaded on-demand.
+Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/,
+and modules to be blacklisted from automatically loading can be configured in /etc/modprobe.d/.
SEE ALSO
--------
-systemctl(1), hostnamectl(1), hostname(5), locale.conf(5), vconsole.conf(5), timedatectl(1), timezone(3), hwclock(8), fstab(5),
-crypttab(5), mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5)
+*systemctl*(1), *hostnamectl*(1), *hostname*(5), *locale.conf*(5),
+*vconsole.conf*(5), *timedatectl*(1), *timezone*(3), *hwclock*(8),
+*fstab*(5), *crypttab*(5), *mkinitcpio*(8), *pacman*(8), *pacman.conf*(5),
+*grub-mkconfig*(8), *syslinux*(1), *modules-load.d*(5), *modprobe.d*(5),
+*systemd*(1)
AUTHORS
-------
diff --git a/abs/core/filesystem/filesystem.install b/abs/core/filesystem/filesystem.install
index 34fcc0d..c043744 100644
--- a/abs/core/filesystem/filesystem.install
+++ b/abs/core/filesystem/filesystem.install
@@ -1,13 +1,3 @@
-post_install() {
- [ -f var/log/lastlog ] || : >var/log/lastlog
- [ -f var/log/wtmp ] || : >var/log/wtmp
- [ -f var/log/btmp ] || { : >var/log/btmp && chmod 600 var/log/btmp; }
- # workaround for bug #7194
- # readded due to bug #9465
- # please do not remove!
- chmod 1777 var/spool/mail tmp var/tmp
-}
-
# args: <group> [options]
_addgroup() {
if ! getent group "$1" >/dev/null; then
@@ -23,8 +13,6 @@ _adduser() {
}
post_upgrade() {
- post_install
-
_addgroup optical -g 93
_addgroup audio -g 92
_addgroup video -g 91
@@ -42,7 +30,10 @@ post_upgrade() {
_addgroup rfkill -g 24
_addgroup lock -g 54
_addgroup uuidd -g 68
- _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
+ _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
+ _addgroup dbus -g 81
+ _adduser dbus -u 81 -d / -g dbus -s /sbin/nologin
+ _addgroup systemd-journal -g 190
# sync gshadow to group (fixes FS#19869)
if ! grep -q '^lock:' etc/gshadow; then
diff --git a/abs/core/filesystem/fstab b/abs/core/filesystem/fstab
index f7f9298..b6716c1 100644
--- a/abs/core/filesystem/fstab
+++ b/abs/core/filesystem/fstab
@@ -2,4 +2,3 @@
# /etc/fstab: static file system information
#
# <file system> <dir> <type> <options> <dump> <pass>
-tmpfs /tmp tmpfs nodev,nosuid 0 0
diff --git a/abs/core/filesystem/group b/abs/core/filesystem/group
index cfee1f2..6c91b29 100644
--- a/abs/core/filesystem/group
+++ b/abs/core/filesystem/group
@@ -21,6 +21,7 @@ http:x:33:
games:x:50:
lock:x:54:
uuidd:x:68:
+dbus:x:81:
network:x:90:
video:x:91:
audio:x:92:
@@ -31,3 +32,4 @@ scanner:x:96:
power:x:98:
nobody:x:99:
users:x:100:
+systemd-journal:x:190:
diff --git a/abs/core/filesystem/gshadow b/abs/core/filesystem/gshadow
index c5ac185..fb475bf 100644
--- a/abs/core/filesystem/gshadow
+++ b/abs/core/filesystem/gshadow
@@ -20,7 +20,8 @@ smmsp:::
http:::
games:::
lock:::
-uuidd:!::
+uuidd:x::
+dbus:x::
network:x::
video:x::
audio:::
@@ -31,3 +32,4 @@ scanner:x::
power:x::
nobody:::
users:::
+systemd-journal:x::
diff --git a/abs/core/filesystem/os-release b/abs/core/filesystem/os-release
index c36b91c..09bc7de 100644
--- a/abs/core/filesystem/os-release
+++ b/abs/core/filesystem/os-release
@@ -1,8 +1,8 @@
-NAME="LinHES"
-ID=linhes
-PRETTY_NAME="LinHES The Home Entertainment System"
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
ANSI_COLOR="0;36"
-HOME_URL="http://www.linhes.org/"
-SUPPORT_URL="http://forum.archlinux.org/"
-BUG_REPORT_URL="http://bugs.linhes.org/"
+HOME_URL="https://www.archlinux.org/"
+SUPPORT_URL="https://bbs.archlinux.org/"
+BUG_REPORT_URL="https://bugs.archlinux.org/"
diff --git a/abs/core/filesystem/passwd b/abs/core/filesystem/passwd
index cb9fec7..671fc48 100644
--- a/abs/core/filesystem/passwd
+++ b/abs/core/filesystem/passwd
@@ -5,4 +5,5 @@ mail:x:8:12:mail:/var/spool/mail:/bin/false
ftp:x:14:11:ftp:/srv/ftp:/bin/false
http:x:33:33:http:/srv/http:/bin/false
uuidd:x:68:68:uuidd:/:/sbin/nologin
+dbus:x:81:81:dbus:/:/sbin/nologin
nobody:x:99:99:nobody:/:/bin/false
diff --git a/abs/core/filesystem/profile b/abs/core/filesystem/profile
index 3bc22db..59d0abc 100644
--- a/abs/core/filesystem/profile
+++ b/abs/core/filesystem/profile
@@ -4,7 +4,7 @@
umask 022
# Set our default path
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
+PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
export PATH
# Load profiles from /etc/profile.d
diff --git a/abs/core/filesystem/securetty b/abs/core/filesystem/securetty
index 5cc27d8..5a2235c 100644
--- a/abs/core/filesystem/securetty
+++ b/abs/core/filesystem/securetty
@@ -11,5 +11,5 @@ tty5
tty6
ttyS0
hvc0
-tty10
+
# End of file
diff --git a/abs/core/filesystem/shadow b/abs/core/filesystem/shadow
index 5eff493..39ebb13 100644
--- a/abs/core/filesystem/shadow
+++ b/abs/core/filesystem/shadow
@@ -5,4 +5,5 @@ mail:x:14871::::::
ftp:x:14871::::::
http:x:14871::::::
uuidd:x:14871::::::
+dbus:x:14871::::::
nobody:x:14871::::::
--
cgit v0.12
From 16bb1dce51851d71fc173ce662443b10222438d3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 18:09:25 -0600
Subject: poweroff-scripts: update binary path to /usr/bin refs #961
---
abs/core/poweroff-scripts/halt.script | 19 +++++++++++--------
abs/core/poweroff-scripts/poweroff-scripts.install | 8 +++++---
abs/core/poweroff-scripts/poweroff.script | 7 +++++--
abs/core/poweroff-scripts/reboot.script | 6 ++++--
4 files changed, 25 insertions(+), 15 deletions(-)
mode change 100644 => 100755 abs/core/poweroff-scripts/halt.script
mode change 100644 => 100755 abs/core/poweroff-scripts/reboot.script
diff --git a/abs/core/poweroff-scripts/halt.script b/abs/core/poweroff-scripts/halt.script
old mode 100644
new mode 100755
index dacf16a..51c9925
--- a/abs/core/poweroff-scripts/halt.script
+++ b/abs/core/poweroff-scripts/halt.script
@@ -2,16 +2,19 @@
MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
-if [ x$1 = x-w ]
-then
- /sbin/halt.init -w
- exit 0
-fi
-chvt 1
+# if [ x$1 = x-w ]
+# then
+# /sbin/halt.init -w
+# exit 0
+# fi
+
if [ x$INIT = xrunit ]
then
- /sbin/halt-runit $@
+ echo "System whill shutdown NOW" |wall
+ chvt 1
+ runit-init 0
+
else
- /sbin/halt.init $@
+ systemctrl $@
fi
diff --git a/abs/core/poweroff-scripts/poweroff-scripts.install b/abs/core/poweroff-scripts/poweroff-scripts.install
index b066f1d..00b4a84 100644
--- a/abs/core/poweroff-scripts/poweroff-scripts.install
+++ b/abs/core/poweroff-scripts/poweroff-scripts.install
@@ -10,9 +10,11 @@ pre_upgrade () {
}
post_install () {
-
- [ -e /sbin/halt.init ] || ln -sf /sbin/halt.init /sbin/reboot.init
- [ -e /sbin/halt.init ] || ln -sf /sbin/halt.init /sbin/poweroff.init
+ rm -f /sbin/reboot.init
+ rm -f /sbin/poweroff.init
+
+ [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/reboot.init
+ [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/poweroff.init
}
# arg 1: the new package version
diff --git a/abs/core/poweroff-scripts/poweroff.script b/abs/core/poweroff-scripts/poweroff.script
index 99779eb..211c9ee 100644
--- a/abs/core/poweroff-scripts/poweroff.script
+++ b/abs/core/poweroff-scripts/poweroff.script
@@ -1,11 +1,14 @@
#!/bin/bash
+MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
chvt 1
if [ x$INIT = xrunit ]
then
- /sbin/halt-runit $@
+ echo "System whill shutdown NOW" |wall
+ chvt 1
+ runit-init 0
else
- /sbin/poweroff.init $@
+ systemctl poweroff $@
fi
diff --git a/abs/core/poweroff-scripts/reboot.script b/abs/core/poweroff-scripts/reboot.script
old mode 100644
new mode 100755
index 47ad99e..de2651c
--- a/abs/core/poweroff-scripts/reboot.script
+++ b/abs/core/poweroff-scripts/reboot.script
@@ -5,8 +5,10 @@ INIT=`ps -p 1 -o comm=`
chvt 1
if [ x$INIT = xrunit ]
then
- /sbin/reboot-runit $@
+ echo "System will reboot NOW" |wall
+ chvt 1
+ runit-init 6
else
- /sbin/reboot.init $@
+ systemctl reboot $@
fi
--
cgit v0.12
From 66ffc6371f3429a3778ce0f88953df7111f34ab6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 19 Feb 2014 14:06:21 -0600
Subject: LinHES-config, system & templates: recompiled after merge to get all
changes into the pkg
---
abs/core/LinHES-config/PKGBUILD | 2 +-
abs/core/LinHES-system/PKGBUILD | 2 +-
abs/core/system-templates/PKGBUILD | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 961de74..a3a323a 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=13
+pkgrel=14
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 82df8b0..80874c6 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 9dab574..7a66e82 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=26
+pkgrel=27
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
--
cgit v0.12
From d383e18985ab0d72bb9a5e046775a64f54920ba5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 16:54:04 +0000
Subject: LinHES-system: linhes_update: check if started using
mythfrontend-start just kill mythfrontend
mythfrontend-start is started from mythwelcome and if USR1 is used it ends mythfrontend-start which causes mythwelcome to accept remote commands and multiple mythfrontends will try to be started.
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/linhes_update.sh | 18 ++++++++++++++++--
abs/core/LinHES-system/linhes_update2.sh | 9 ++++++++-
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 80874c6..7c1b968 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=18
+pkgrel=19
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -121,8 +121,8 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'34fc1f58ad1eabf4eff4979d420760c0'
'1118e7982ba77cb5be9b2391b7cdfd38'
'a94fe6d980f4b810f2e2ae5352084b39'
- '24b18dd43b983748359f472ee70fe139'
- '96b9e14b063e251fc3c2fe9f5b42a22e'
+ '384956b4fd9bf40907856bab0e67b169'
+ 'f4ce577e2ab1b6dbf9def46a8ab86e2d'
'28f29578e5b3ba84fdf2aa57cf475bcf'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh
index 21dfb6c..d563504 100644
--- a/abs/core/LinHES-system/linhes_update.sh
+++ b/abs/core/LinHES-system/linhes_update.sh
@@ -9,6 +9,17 @@ usage () {
exit $1
}
+restart_mfe () {
+ #check if started from mythfrontend-start and if so just kill mfe
+ #otherwise reload mfe
+ if [[ `pgrep -fx "/bin/bash /usr/LH/bin/mythfrontend-start"` ]]
+ then
+ killall mythfrontend
+ else
+ pkill -USR1 mythfrontend
+ fi
+}
+
dsply () {
if grep -q "Updates Available" /usr/share/mythtv/themes/defaultmenu/linhes.xml
then
@@ -16,9 +27,10 @@ dsply () {
msg_client.py --clear --tag "checkUpdates"
msg_client.py --kill
msg_client.py --msg "Updates available!\nGo to the Service Menu to install the updates.|middle"
+ else
+ restart_mfe
fi
echo " Updates available!"
- pkill -USR1 mythfrontend
exit
else
[ "$1" = false ] && { msg_client.py --msg "Checking for updates...|middle" --timeout 600 --tag "checkUpdates"; }
@@ -40,6 +52,8 @@ chck () {
msg_client.py --clear --tag "checkUpdates"
msg_client.py --kill
msg_client.py --msg "No updates available.\nReturning to Main Menu.|middle"
+ else
+ restart_mfe
fi
echo " No updates available."
else
@@ -109,4 +123,4 @@ shift $(($OPTIND - 1))
dsply $SILENT
chck $SILENT
-pkill -USR1 mythfrontend
+#pkill -USR1 mythfrontend
diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh
index d1913d0..5c05c99 100644
--- a/abs/core/LinHES-system/linhes_update2.sh
+++ b/abs/core/LinHES-system/linhes_update2.sh
@@ -41,4 +41,11 @@ fi
sudo sed -i '/LinHES UPDATE MESSAGE/c\ <!--LinHES UPDATE MESSAGE' /usr/share/mythtv/themes/LinHES/menu-ui.xml
#reload theme
-pkill -USR1 mythfrontend
+#check if started from mythfrontend-start and if so just kill mfe
+#otherwise reload mfe
+if [[ `pgrep -fx "/bin/bash /usr/LH/bin/mythfrontend-start"` ]]
+then
+ killall mythfrontend
+else
+ pkill -USR1 mythfrontend
+fi
--
cgit v0.12
From aeaf5d3c1dfefb966ba5eed88a4b699233100586 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 17:04:22 +0000
Subject: pm-utils: update binary path. refs #961
---
abs/core/pm-utils/PKGBUILD | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/pm-utils/PKGBUILD b/abs/core/pm-utils/PKGBUILD
index 9f861a5..b59f4d6 100644
--- a/abs/core/pm-utils/PKGBUILD
+++ b/abs/core/pm-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=pm-utils
pkgver=1.4.1
-pkgrel=5
+pkgrel=6
pkgdesc="Utilities and scripts for suspend and hibernate power management"
arch=('i686' 'x86_64')
url="http://pm-utils.freedesktop.org"
@@ -31,6 +31,7 @@ build() {
patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch"
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --sbindir=/usr/bin \
--localstatedir=/var
make
}
--
cgit v0.12
From 683ff573cea3992d60463d5fc6cb2e9399ce4568 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 17:26:52 +0000
Subject: libical: inital inclusion. dep of bluez
---
abs/extra/libical/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 abs/extra/libical/PKGBUILD
diff --git a/abs/extra/libical/PKGBUILD b/abs/extra/libical/PKGBUILD
new file mode 100644
index 0000000..ef24bd1
--- /dev/null
+++ b/abs/extra/libical/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=libical
+pkgver=1.0
+pkgrel=3
+pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/freeassociation/'
+license=('LGPL' 'MPL')
+depends=('glibc')
+makedepends=('cmake')
+source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz")
+md5sums=('4438c31d00ec434f02867a267a92f8a1')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From 5b05d269d795e1734f3f1b0ca08edc91ff372576 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 17:33:55 +0000
Subject: bluez: update to 5.15 and update binary path. ref #961
---
...obexd-without-systemd-in-the-user-session.patch | 59 ++++++
abs/extra/bluez/PKGBUILD | 200 +++++++++++++--------
abs/extra/bluez/__changelog | 3 +
abs/extra/bluez/audio-streaming.patch | 13 --
abs/extra/bluez/bluetooth.conf.d | 30 ----
abs/extra/bluez/bluetooth.modprobe | 3 +
abs/extra/bluez/bluez.install | 2 +-
abs/extra/bluez/org.bluez.service | 5 -
8 files changed, 194 insertions(+), 121 deletions(-)
create mode 100644 abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
delete mode 100644 abs/extra/bluez/audio-streaming.patch
delete mode 100644 abs/extra/bluez/bluetooth.conf.d
create mode 100644 abs/extra/bluez/bluetooth.modprobe
delete mode 100644 abs/extra/bluez/org.bluez.service
diff --git a/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
new file mode 100644
index 0000000..fe3c513
--- /dev/null
+++ b/abs/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
@@ -0,0 +1,59 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd | 4 ++--
+ obexd/src/org.bluez.obex.service | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+
+ obex_plugindir = $(libdir)/obex/plugins
+
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+--
+1.8.3.1
+
+
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index 758e858..9465acb 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -3,86 +3,142 @@
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-pkgname=bluez
-pkgver=4.101
+pkgbase=bluez
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
+pkgver=5.15
pkgrel=1
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
license=('GPL2')
-depends=('dbus-core' 'python2' 'udev')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusb')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
- "alsa-lib: Audio bluetooth devices support"
- "dbus-python: to run bluez-simple-agent"
- "pygobject: to run bluez-simple-agent"
- "libusb-compat: USB adapters support"
- "cups: CUPS backend")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
- 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
- 'bluetooth.conf.d'
- 'org.bluez.service'
- 'audio-streaming.patch')
+makedepends=('dbus' 'libical' 'systemd')
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
+ 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ bluetooth.modprobe)
+# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
+sha256sums=('487bd75697e565793bf5bc4fbd5fa6a602788313b0c694f7542b81689fc0aa87'
+ '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b'
+ '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # patch not upstreamable for obex file transfer - FS#37773 taken from FC
+ # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html
+ patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ autoreconf -vfi
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Add setting that allows audio streaming out-of-the-box
- patch -Np1 -i ${srcdir}/audio-streaming.patch || return 1
-
- cp ../org.bluez.service src/
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/lib \
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-tools \
- --enable-bccmd \
- --enable-dfutool \
- --enable-hid2hci \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
- --enable-cups \
- --enable-wiimote \
- --disable-test \
- --with-systemdunitdir=/usr/lib/systemd/system
-
- make
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib \
+ --enable-sixaxis \
+ --enable-library # this is deprecated
+# --enable-experimental \
+
+ make all V=1
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+
+package_bluez() {
+ pkgdesc="Daemons for the bluetooth protocol stack"
+ depends=('libical' 'dbus' 'glib2')
+ backup=('etc/dbus-1/system.d/bluetooth.conf'
+ 'etc/bluetooth/main.conf')
+ conflicts=('obexd-client' 'obexd-server')
+
+ cd ${pkgbase}-${pkgver}
+ #make DESTDIR=${pkgdir} install
+ #return 1
+
+ make DESTDIR=${pkgdir} \
+ install-libexecPROGRAMS \
+ install-dbussessionbusDATA \
+ install-systemdsystemunitDATA \
+ install-systemduserunitDATA \
+ install-dbussystembusDATA \
+ install-dbusDATA \
+ install-man8
+
+ # ship upstream main config file
+ install -dm755 ${pkgdir}/etc/bluetooth
+ install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
+
+ # add basic documention
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+ cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+ # fix module loading errors
+ install -dm755 ${pkgdir}/usr/lib/modprobe.d
+ install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
+}
+
+package_bluez-utils() {
+ pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+ depends=('dbus' 'systemd')
+ conflicts=('bluez-hcidump')
+ provides=('bluez-hcidump')
+ replaces=('bluez-hcidump' 'bluez<=4.101')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-binPROGRAMS \
+ install-man1
+
+ # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+ #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+ #rmdir ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/lib
+
+ # move the hid2hci man page out
+ mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+ pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+ depends=('glibc')
+ license=('LGPL2.1')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+package_bluez-cups() {
+ pkgdesc="CUPS printer backend for Bluetooth printers"
+ depends=('cups')
- install -d ${pkgdir}/etc/bluetooth
- install -m644 network/network.conf \
- input/input.conf \
- audio/audio.conf \
- serial/serial.conf \
- ${pkgdir}/etc/bluetooth/
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+ pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-udevPROGRAMS \
+ install-rulesDATA
- install -Dm644 ${srcdir}/bluetooth.conf.d \
- ${pkgdir}/etc/conf.d/bluetooth
-
- # FS#27630
- install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
- install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
- install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
- sed -i 's#/usr/bin/python#/usr/bin/python2#' \
- "${pkgdir}"/usr/bin/bluez-simple-agent \
- "${pkgdir}"/usr/bin/bluez-test-device \
- "${pkgdir}"/usr/bin/bluez-test-input
+ install -dm755 ${pkgdir}/usr/share/man/man1
+ mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
+
+package_bluez-plugins() {
+ pkgdesc="bluez plugins (PS3 Sixaxis controller)"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-pluginLTLIBRARIES
}
-md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
- '7412982b440f29fa7f76a41a87fef985'
- '54c7de598327bf11d56592235d0702f4'
- 'cc9c86af1ced7ad46fc7be114d32adfb')
diff --git a/abs/extra/bluez/__changelog b/abs/extra/bluez/__changelog
index e6448b6..47f870d 100644
--- a/abs/extra/bluez/__changelog
+++ b/abs/extra/bluez/__changelog
@@ -22,3 +22,6 @@ re-add audio-streaming.patch for ootb audio streaming
- change 'systemd-tools' dependency back to 'udev'
- change 'libusbx' dependency back to 'libusb'
- remove refrences to rc.bluetooth
+
+2014-03-07
+- update bluez 5.15 arch pkgbuild no changes
diff --git a/abs/extra/bluez/audio-streaming.patch b/abs/extra/bluez/audio-streaming.patch
deleted file mode 100644
index 83705c5..0000000
--- a/abs/extra/bluez/audio-streaming.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bluez-4.98/audio/audio.conf.orig 2012-02-27 23:52:30.960349047 +0000
-+++ bluez-4.98/audio/audio.conf 2012-02-27 23:54:19.768069787 +0000
-@@ -4,6 +4,11 @@
- # particular interface
- [General]
-
-+# Allow audio streaming with bluez-4.98 and alsa-lib 1.0.24.1
-+# https://wiki.archlinux.org/index.php/Bluetooth#Audio_streaming
-+
-+Enable=Socket
-+
- # Switch to master role for incoming connections (defaults to true)
- #Master=true
diff --git a/abs/extra/bluez/bluetooth.conf.d b/abs/extra/bluez/bluetooth.conf.d
deleted file mode 100644
index 1c1e025..0000000
--- a/abs/extra/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-HIDD_OPTIONS="--server"
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/abs/extra/bluez/bluetooth.modprobe b/abs/extra/bluez/bluetooth.modprobe
new file mode 100644
index 0000000..3072d78
--- /dev/null
+++ b/abs/extra/bluez/bluetooth.modprobe
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
diff --git a/abs/extra/bluez/bluez.install b/abs/extra/bluez/bluez.install
index 30bd262..9cfe793 100644
--- a/abs/extra/bluez/bluez.install
+++ b/abs/extra/bluez/bluez.install
@@ -9,7 +9,7 @@ post_install() {
pre_remove() {
for d in { bluetoothd,hidd,dund,pand,sdpd,rfcomm,hid2hci } ; do
if [ -d /var/service/${d} ] ; then
- remove_servcie.sh $d
+ remove_service.sh $d
fi
done
}
diff --git a/abs/extra/bluez/org.bluez.service b/abs/extra/bluez/org.bluez.service
deleted file mode 100644
index dd7ae8f..0000000
--- a/abs/extra/bluez/org.bluez.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.bluez
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.bluez.service
--
cgit v0.12
From 0230fddb88133838d0d50d8a6a49eef3510f1080 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 17:41:52 +0000
Subject: ca-certificates-java: update to 20130815. refs #961
---
abs/extra/ca-certificates-java/PKGBUILD | 23 ++++++++++++++++------
.../ca-certificates-java.install | 2 +-
abs/extra/ca-certificates-java/init-jks-keystore | 0
3 files changed, 18 insertions(+), 7 deletions(-)
mode change 100755 => 100644 abs/extra/ca-certificates-java/init-jks-keystore
diff --git a/abs/extra/ca-certificates-java/PKGBUILD b/abs/extra/ca-certificates-java/PKGBUILD
index ff1a341..cafb68d 100644
--- a/abs/extra/ca-certificates-java/PKGBUILD
+++ b/abs/extra/ca-certificates-java/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162732 2012-06-29 08:16:24Z pierre $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=ca-certificates-java
-pkgver=20120721
+pkgver=20130815
pkgrel=1
pkgdesc='Common CA certificates (JKS keystore)'
arch=('any')
@@ -10,10 +10,14 @@ url='http://packages.qa.debian.org/c/ca-certificates-java.html'
license=('GPL')
depends=('ca-certificates')
makedepends=('jdk7-openjdk')
+checkdepends=('junit')
install='ca-certificates-java.install'
backup=('etc/default/cacerts')
source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
'init-jks-keystore' 'jks-keystore.hook')
+md5sums=('f93e4762800515d6f12ceb397e80a150'
+ '75eeca3f443f4b5a17ed5ac81875f1e9'
+ '6dd4f915aee0df51260083e00b7fa012')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -21,15 +25,22 @@ build() {
jar cfe ca-certificates-java.jar UpdateCertificates *.class
}
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ javac -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar \
+ UpdateCertificatesTest.java Exceptions.java
+ java -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar:. \
+ org.junit.runner.JUnitCore \
+ UpdateCertificatesTest
+}
+
package() {
cd ${srcdir}/${pkgname}-${pkgver}
install -d -m755 ${pkgdir}/etc/ssl/certs/java
install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
install -D -m644 ca-certificates-java.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
- install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/sbin/init-jks-keystore
+ install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/bin/init-jks-keystore
install -D -m755 ${srcdir}/jks-keystore.hook ${pkgdir}/etc/ca-certificates/update.d/jks-keystore
}
-md5sums=('a4c17590cc91a498b611c2dc62795273'
- '75eeca3f443f4b5a17ed5ac81875f1e9'
- '6dd4f915aee0df51260083e00b7fa012')
diff --git a/abs/extra/ca-certificates-java/ca-certificates-java.install b/abs/extra/ca-certificates-java/ca-certificates-java.install
index f5ce35e..3cbcb16 100644
--- a/abs/extra/ca-certificates-java/ca-certificates-java.install
+++ b/abs/extra/ca-certificates-java/ca-certificates-java.install
@@ -1,7 +1,7 @@
post_install() {
if [ ! -f etc/ssl/certs/java/cacerts ]; then
if which java >/dev/null 2>&1; then
- usr/sbin/init-jks-keystore
+ usr/bin/init-jks-keystore
fi
fi
}
diff --git a/abs/extra/ca-certificates-java/init-jks-keystore b/abs/extra/ca-certificates-java/init-jks-keystore
old mode 100755
new mode 100644
--
cgit v0.12
From 4c44c7fa3ce44ac09e044d41dde9e428c09de1c0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 17:51:42 +0000
Subject: usbmuxd: update binary path. refs #961
---
abs/extra/usbmuxd/PKGBUILD | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/abs/extra/usbmuxd/PKGBUILD b/abs/extra/usbmuxd/PKGBUILD
index 885dcae..3282c08 100644
--- a/abs/extra/usbmuxd/PKGBUILD
+++ b/abs/extra/usbmuxd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $
+# $Id$
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=usbmuxd
pkgver=1.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="USB Multiplex Daemon"
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
arch=('i686' 'x86_64')
@@ -32,10 +32,13 @@ package() {
# fix udev dir being hardcoded
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
rmdir "${pkgdir}/lib"
+ # usrmove
+ mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/"
+ rmdir "${pkgdir}/usr/sbin"
# install systemd service file
install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
# use udev rule that works with systemd
- install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
+ install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
#fix version
sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc
--
cgit v0.12
From 17a417e13530325e7e6a5ebb5277f2c42685a74a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 7 Mar 2014 21:24:40 +0000
Subject: lm_sensors: update to 3.3.5 and update bin path. refs #961
---
abs/extra/lm_sensors/PKGBUILD | 65 +++++--------
abs/extra/lm_sensors/daemonarg.patch | 50 ----------
abs/extra/lm_sensors/fancontrol.rc | 35 -------
abs/extra/lm_sensors/fancontrol.service | 9 --
abs/extra/lm_sensors/healthd | 2 +-
abs/extra/lm_sensors/healthd.conf | 2 +-
abs/extra/lm_sensors/healthd.rc | 36 -------
abs/extra/lm_sensors/healthd.service | 2 +-
abs/extra/lm_sensors/linux_3.0.patch | 11 ---
abs/extra/lm_sensors/lm_sensors-fancontrol.patch | 29 ++++++
abs/extra/lm_sensors/sensord.conf | 9 +-
abs/extra/lm_sensors/sensord.rc | 37 -------
abs/extra/lm_sensors/sensord.service | 9 --
abs/extra/lm_sensors/sensors.rc | 119 -----------------------
14 files changed, 66 insertions(+), 349 deletions(-)
delete mode 100644 abs/extra/lm_sensors/daemonarg.patch
delete mode 100644 abs/extra/lm_sensors/fancontrol.rc
delete mode 100644 abs/extra/lm_sensors/fancontrol.service
delete mode 100644 abs/extra/lm_sensors/healthd.rc
delete mode 100644 abs/extra/lm_sensors/linux_3.0.patch
create mode 100644 abs/extra/lm_sensors/lm_sensors-fancontrol.patch
delete mode 100644 abs/extra/lm_sensors/sensord.rc
delete mode 100644 abs/extra/lm_sensors/sensord.service
delete mode 100644 abs/extra/lm_sensors/sensors.rc
diff --git a/abs/extra/lm_sensors/PKGBUILD b/abs/extra/lm_sensors/PKGBUILD
index 9635bb1..78f622e 100644
--- a/abs/extra/lm_sensors/PKGBUILD
+++ b/abs/extra/lm_sensors/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170399 2012-11-07 01:42:13Z eric $
+# $Id$
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=lm_sensors
-pkgver=3.3.3
+pkgver=3.3.5
pkgrel=1
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
arch=('i686' 'x86_64')
@@ -12,50 +12,39 @@ depends=('perl' 'sysfsutils')
makedepends=('rrdtool')
optdepends=('rrdtool: for logging with sensord')
backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
- sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
- sensord.rc fancontrol.service sensord.service healthd.service \
- daemonarg.patch linux_3.0.patch)
-sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
- '035a721f20e4ad568f4fdde2d7c25d906c192458'
- 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
- 'a068ac0a3115a6191a487e11422506baa922b40a'
- 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
- '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
- 'de5a46afc39a77ae8721246a0223baf21a2d4c9c'
- 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
- '72a60251d1d55a67307dab4105d9f3f01a080af4'
- '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
- 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
- 'a7a20eb3c799d70287e6c7968a7ab42165925293'
- '34241388c4001bfb6e49b7e10da1217e29a258d6'
- '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
+source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig}
+ healthd healthd.conf healthd.service sensord.conf
+ lm_sensors-fancontrol.patch)
+sha1sums=('179989a52bae8f01ba8ed77e8a15af6ec653d89e'
+ 'SKIP'
+ '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+ '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
+ 'd72ec328e9303acef86342483b6f8537de6117d9'
+ 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
+ 'b0bc977348610d6a008d75a43f65800251c4c9f7')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
- -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
- sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
- patch -p1 < ../daemonarg.patch
- patch -p0 < ../linux_3.0.patch
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
make PREFIX=/usr
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
- PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
- install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
- install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
- install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
- install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
- install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
+ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
- install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
- install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
- install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
+
install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+ install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
}
diff --git a/abs/extra/lm_sensors/daemonarg.patch b/abs/extra/lm_sensors/daemonarg.patch
deleted file mode 100644
index 4b80cef..0000000
--- a/abs/extra/lm_sensors/daemonarg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol 2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol 2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- # bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
-
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+ DAEMON=1
-+ shift
-+fi
-+
- declare -i pwmval
-
- function LoadConfig {
-@@ -303,7 +311,6 @@
- echo "File $PIDFILE exists, is fancontrol already running?"
- exit 1
- fi
--echo $$ > "$PIDFILE"
-
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- let fcvcount=$fcvcount+1
- done
-
-+if [ "$DAEMON" -gt 0 ]; then
-+ echo "Forking..."
-+ $0 $* &> /dev/null &
-+ exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
-
- # main loop calling the main function at specified intervals
diff --git a/abs/extra/lm_sensors/fancontrol.rc b/abs/extra/lm_sensors/fancontrol.rc
deleted file mode 100644
index 8e98d06..0000000
--- a/abs/extra/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
- start)
- stat_busy "Starting fancontrol"
- [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
- if [ $? -gt 0 -o -n "$PID" ]; then
- stat_fail
- else
- add_daemon fancontrol
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping fancontrol"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon fancontrol
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/lm_sensors/fancontrol.service b/abs/extra/lm_sensors/fancontrol.service
deleted file mode 100644
index c86b498..0000000
--- a/abs/extra/lm_sensors/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/abs/extra/lm_sensors/healthd b/abs/extra/lm_sensors/healthd
index 5ffed56..b1e2fd6 100644
--- a/abs/extra/lm_sensors/healthd
+++ b/abs/extra/lm_sensors/healthd
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# /usr/sbin/healthd
+# /usr/bin/healthd
#
. /etc/healthd.conf
diff --git a/abs/extra/lm_sensors/healthd.conf b/abs/extra/lm_sensors/healthd.conf
index a8b2c3f..8df3e39 100644
--- a/abs/extra/lm_sensors/healthd.conf
+++ b/abs/extra/lm_sensors/healthd.conf
@@ -1,5 +1,5 @@
#
-# /etc/conf.d/healthd
+# /etc/healthd.conf
#
# reset any pending alarms on startup
diff --git a/abs/extra/lm_sensors/healthd.rc b/abs/extra/lm_sensors/healthd.rc
deleted file mode 100644
index f50f4a6..0000000
--- a/abs/extra/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
- start)
- stat_busy "Starting Health Daemon"
- [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo "${PID}" > /var/run/healthd.pid
- add_daemon healthd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Health Daemon"
- [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon healthd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/lm_sensors/healthd.service b/abs/extra/lm_sensors/healthd.service
index 59d3270..1933192 100644
--- a/abs/extra/lm_sensors/healthd.service
+++ b/abs/extra/lm_sensors/healthd.service
@@ -3,7 +3,7 @@ Description=A daemon which can be used to alert you in the event of a hardware h
[Service]
Type=forking
-ExecStart=/usr/sbin/healthd
+ExecStart=/usr/bin/healthd
[Install]
WantedBy=multi-user.target
diff --git a/abs/extra/lm_sensors/linux_3.0.patch b/abs/extra/lm_sensors/linux_3.0.patch
deleted file mode 100644
index da02a3d..0000000
--- a/abs/extra/lm_sensors/linux_3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
-
- sub initialize_kernel_version
- {
-- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+ `uname -r` =~ /(\d+)\.(\d+)(.*)/;
- @kernel_version = ($1, $2, $3, $4);
- chomp($kernel_arch = `uname -m`);
-
diff --git a/abs/extra/lm_sensors/lm_sensors-fancontrol.patch b/abs/extra/lm_sensors/lm_sensors-fancontrol.patch
new file mode 100644
index 0000000..c42d7b8
--- /dev/null
+++ b/abs/extra/lm_sensors/lm_sensors-fancontrol.patch
@@ -0,0 +1,29 @@
+--- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
++++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
+@@ -297,7 +297,7 @@
+ cd $DIR
+
+ # Check for configuration change
+-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]]
+ then
+ echo "Configuration is too old, please run pwmconfig again" >&2
+ exit 1
+@@ -337,7 +337,7 @@
+ # It didn't work, try pwmN_enable=1 pwmN=255
+ echo 1 > $ENABLE 2> /dev/null
+ echo $MAX > $1
+- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
++ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
+ then
+ # Success
+ return 0
+@@ -469,7 +469,7 @@
+ else
+ # calculate the new value from temperature and settings
+ pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
+- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
++ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
+ then # if fan was stopped start it using a safe value
+ echo $minsa > $pwmo
+ # Sleep while still handling signals
diff --git a/abs/extra/lm_sensors/sensord.conf b/abs/extra/lm_sensors/sensord.conf
index a1cf091..133783a 100644
--- a/abs/extra/lm_sensors/sensord.conf
+++ b/abs/extra/lm_sensors/sensord.conf
@@ -1,4 +1,9 @@
#
-# Parameters to be passed to sensord
+# /etc/conf.d/sensord
#
-SENSORD_ARGS=""
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
diff --git a/abs/extra/lm_sensors/sensord.rc b/abs/extra/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d2..0000000
--- a/abs/extra/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
- start)
- stat_busy "Starting sensord"
- [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon sensord
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping sensord"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sensord
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/lm_sensors/sensord.service b/abs/extra/lm_sensors/sensord.service
deleted file mode 100644
index 6d272f1..0000000
--- a/abs/extra/lm_sensors/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/abs/extra/lm_sensors/sensors.rc b/abs/extra/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde22..0000000
--- a/abs/extra/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-# http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-# MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
- WITHSYS=1
-else
- WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
- # If sensors isn't supported by the kernel, try loading the module...
- [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
- # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
- if ! [ -e /proc/sys/dev/sensors ]; then
- echo "lm_sensors: kernel does not have sensors support"
- stat_fail
- fi
-
- # If sensors was not already running, unload the module...
- [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
- CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
- # Moving config to new Arch-specific location
- mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
- CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
- start)
- stat_busy "Starting Up Sensors"
-
- if [ -r "$CONFIG" ]; then
- . "$CONFIG"
- modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
- i=0
- while [ $i -lt $modules ] ; do
- module=$(eval echo '$'MODULE_$i)
- # echo starting module __${module}__ #debug
- /sbin/modprobe $module &>/dev/null
- i=$(expr $i + 1)
- done
- fi
-
- $PSENSORS -s
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon sensors
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Shutting Down Sensors"
-
- if [ -r "$CONFIG" ]; then
- . "$CONFIG"
- modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
- i=$(expr $modules - 1)
- while [ $i -ge 0 ] ; do
- module=$(eval echo '$'MODULE_$i)
- # echo stoping module __${module}__ #debug
- /sbin/modprobe -r $module &>/dev/null
- i=$(expr $i - 1)
- done
- fi
-
- if [ $WITHSYS == "0" ]; then
- /sbin/modprobe -r i2c-proc &>/dev/null
- fi
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sensors
- stat_done
- fi
- ;;
-
- status)
- $PSENSORS
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- condrestart)
- [ -e /var/run/daemons/sensors ] && $0 restart || :
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
--
cgit v0.12
From 557a78548b3fbd66c7a37dcc3ac74e7f5e3d330f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 8 Mar 2014 02:27:11 +0000
Subject: linhes-theme: pick up some update from upstream
---
abs/core/linhes-theme/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index bd61ff0..b33a911 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=23
+pkgrel=24
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.41 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.42 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
'LHLogoAndText.png')
--
cgit v0.12
From 0a1907fccd5657aaaf6115d3025b81688d25e796 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 8 Mar 2014 02:48:25 +0000
Subject: rsync: update to 3.1.0
---
abs/extra/rsync/PKGBUILD | 28 ++++++++++++++++++----------
abs/extra/rsync/rsyncd | 37 -------------------------------------
abs/extra/rsync/rsyncd.service | 3 +--
abs/extra/rsync/rsyncd.socket | 10 ++++++++++
abs/extra/rsync/rsyncd@.service | 11 +++++++++++
5 files changed, 40 insertions(+), 49 deletions(-)
delete mode 100644 abs/extra/rsync/rsyncd
create mode 100644 abs/extra/rsync/rsyncd.socket
create mode 100644 abs/extra/rsync/rsyncd@.service
diff --git a/abs/extra/rsync/PKGBUILD b/abs/extra/rsync/PKGBUILD
index 1224537..ab83127 100644
--- a/abs/extra/rsync/PKGBUILD
+++ b/abs/extra/rsync/PKGBUILD
@@ -1,25 +1,32 @@
-# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $
+# $Id$
pkgname=rsync
-pkgver=3.0.9
-pkgrel=3
+pkgver=3.1.0
+pkgrel=1
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
url="http://samba.anu.edu.au/rsync/"
license=('GPL3')
-depends=('perl')
+depends=('perl' 'popt')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
- 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service')
-md5sums=('5ee72266fe2c1822333c407e1761b92b'
+ "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc"
+ 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service'
+ 'rsyncd.socket' 'rsyncd@.service')
+md5sums=('3be148772a33224771a8d4d2a028b132'
+ 'SKIP'
'bce64d122a8e0f86872a4a21a03bc7f3'
- 'ba413da4ebca05c57860151fda21efbc'
'ea3e9277dc908bc51f9eddc0f6b935c1'
- 'ec96f9089d71109557cdcaa3f0633ed6')
+ '084140868d38cf3e937a2db716d47c0f'
+ 'ae4c381e0c02d6132c7f6ded3f473041'
+ '53f94e613e0bc502d38dd61bd2cd7636')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --with-included-popt
+ ./configure --prefix=/usr \
+ --with-included-popt=no \
+ --with-included-zlib=no \
+ --disable-debug
make
}
@@ -31,9 +38,10 @@ check() {
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd"
install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
+ install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket"
+ install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service"
install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
}
diff --git a/abs/extra/rsync/rsyncd b/abs/extra/rsync/rsyncd
deleted file mode 100644
index 27836d5..0000000
--- a/abs/extra/rsync/rsyncd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
-
-case "$1" in
- start)
- stat_busy "Starting rsyncd"
- [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon rsyncd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping rsyncd"
- [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid`
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon rsyncd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/rsync/rsyncd.service b/abs/extra/rsync/rsyncd.service
index ea2e32c..8502c08 100644
--- a/abs/extra/rsync/rsyncd.service
+++ b/abs/extra/rsync/rsyncd.service
@@ -2,8 +2,7 @@
Description=A file transfer program to keep remote files in sync
[Service]
-EnvironmentFile=-/etc/conf.d/rsyncd
-ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS}
+ExecStart=/usr/bin/rsync --daemon --no-detach
RestartSec=1
[Install]
diff --git a/abs/extra/rsync/rsyncd.socket b/abs/extra/rsync/rsyncd.socket
new file mode 100644
index 0000000..2b9a964
--- /dev/null
+++ b/abs/extra/rsync/rsyncd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Rsync Socket
+Conflicts=rsyncd.service
+
+[Socket]
+ListenStream=873
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/extra/rsync/rsyncd@.service b/abs/extra/rsync/rsyncd@.service
new file mode 100644
index 0000000..33db95c
--- /dev/null
+++ b/abs/extra/rsync/rsyncd@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A file transfer program to keep remote files in sync
+After=network.target
+
+[Service]
+ExecStart=-/usr/bin/rsync --daemon
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
+User=nobody
+Group=nobody
--
cgit v0.12
From 1e95562f05bf7c62c3e6c003ae396473d5e5ec1e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 8 Mar 2014 18:06:52 +0000
Subject: mythtv, mythplugins and mythinstall: update to latest fixes and
rebuild for binary compat
---
abs/core/mythinstall/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index c851516..ec5d403 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=10
+pkgrel=11
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index bb4009e..bb67190 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-9bf1070d86ab4ca515830f4d330f7b720830463c
+6b14852a6a3750e1d5c1bf7d461a5338ef535cbb
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index b7a5006..f7b75ff 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 4500705..8dce5df 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=10
+pkgrel=11
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 32a740e2acc7676085250ea77557c3787e7ace2c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 10 Mar 2014 14:16:27 +0000
Subject: poweroff-scripts: change shutdown messages
---
abs/core/poweroff-scripts/PKGBUILD | 12 ++++++------
abs/core/poweroff-scripts/halt.script | 2 +-
abs/core/poweroff-scripts/poweroff.script | 2 +-
abs/core/poweroff-scripts/shutdown.script | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/abs/core/poweroff-scripts/PKGBUILD b/abs/core/poweroff-scripts/PKGBUILD
index ff32494..e5cab49 100644
--- a/abs/core/poweroff-scripts/PKGBUILD
+++ b/abs/core/poweroff-scripts/PKGBUILD
@@ -1,9 +1,9 @@
pkgname=poweroff-scripts
pkgver=1.1
-pkgrel=4
+pkgrel=5
pkgdesc="replacement scripts to work with sysvinit and runit"
license=('GPL')
-depends=('sysvinit>=2.88' 'runit>=2.1.1-6')
+depends=('systemd-sysvcompat' 'runit>=2.1.1-6')
makedepends=()
conflicts=()
replaces=()
@@ -21,7 +21,7 @@ package() {
}
-md5sums=('68ac5d7d5784e9559c9752d94a4943d5'
- '3e042113f8715bc5bfd365d2486d0108'
- '3ec5f3013dcbd60b6b957d17ba220585'
- '1dccfcd2283d4ed193511535b0b220fc')
+md5sums=('a3538350e5c8e65a1418d9f1b5ff83c1'
+ 'c9cbd22b341cf9e566eeedba7e51ecd2'
+ '58c374b2cacabac6728bb09c24e512a5'
+ 'c151f7a35acc0db524c290be7594f09e')
diff --git a/abs/core/poweroff-scripts/halt.script b/abs/core/poweroff-scripts/halt.script
index 51c9925..b2e8170 100755
--- a/abs/core/poweroff-scripts/halt.script
+++ b/abs/core/poweroff-scripts/halt.script
@@ -10,7 +10,7 @@ INIT=`ps -p 1 -o comm=`
if [ x$INIT = xrunit ]
then
- echo "System whill shutdown NOW" |wall
+ echo "System will shutdown NOW" |wall
chvt 1
runit-init 0
diff --git a/abs/core/poweroff-scripts/poweroff.script b/abs/core/poweroff-scripts/poweroff.script
index 211c9ee..2236983 100644
--- a/abs/core/poweroff-scripts/poweroff.script
+++ b/abs/core/poweroff-scripts/poweroff.script
@@ -5,7 +5,7 @@ INIT=`ps -p 1 -o comm=`
chvt 1
if [ x$INIT = xrunit ]
then
- echo "System whill shutdown NOW" |wall
+ echo "System will shutdown NOW" |wall
chvt 1
runit-init 0
else
diff --git a/abs/core/poweroff-scripts/shutdown.script b/abs/core/poweroff-scripts/shutdown.script
index 978f7a2..b87b52f 100644
--- a/abs/core/poweroff-scripts/shutdown.script
+++ b/abs/core/poweroff-scripts/shutdown.script
@@ -36,7 +36,7 @@ then
if [ x$halt = x1 ]
then
- echo "System will poweroff in $delay seconds" | wall
+ echo "System will poweroff in $delay seconds" | wall
sleep $delay
/sbin/runit-init 0
fi
--
cgit v0.12
From d5ed728117417fdadfe7eb82102f0ea36c80f48e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 13 Mar 2014 16:23:14 +0000
Subject: LinHES-system: create_media_dirs.sh: change pretty dir to recordings.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/create_media_dirs.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 7c1b968..f0253f0 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=19
+pkgrel=20
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -99,7 +99,7 @@ md5sums=('7ab2a2c643d2b286811d8303d08982ad'
'2c005d95312018bef80092136f80f254'
'6519d209e151cdc39ae7e1091d189c3e'
'ca63946920ba33de1f15abda83e74e40'
- '7f7c49d859abdaa0b5fca399241d4998'
+ '84c0ea62550b0bf9d84ab48eddc08276'
'3e60b17892e5b8214d47dcfddf5215a4'
'57ec994cc3964a10c00580e89ebcae35'
'7ba5e774bfebc3ec2469c9fe9a76e2ce'
diff --git a/abs/core/LinHES-system/create_media_dirs.sh b/abs/core/LinHES-system/create_media_dirs.sh
index 6af6eb7..f56377b 100644
--- a/abs/core/LinHES-system/create_media_dirs.sh
+++ b/abs/core/LinHES-system/create_media_dirs.sh
@@ -50,7 +50,7 @@ media/games
media/video
media/tmp
media/archive
-media/pretty
+media/recordings
media/streaming
media/artwork/trailers
media/artwork/coverart
--
cgit v0.12
From 505e4c0734274b850798f43ebb7278df04a7f47b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 14 Mar 2014 19:11:42 +0000
Subject: mythinstall: add XBMC to Programs Menu. refs #962
---
.../MythVantage-app/mythinstall/installsettings.cpp | 11 +++++++++++
.../mythinstall/MythVantage-app/mythinstall/installsettings.h | 1 +
abs/core/mythinstall/PKGBUILD | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
index fb5f841..3171c67 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
@@ -1205,6 +1205,14 @@ static HostCheckBox *HostHuluDesktop()
return gc;
};
+static HostCheckBox *HostXBMC()
+{
+ HostCheckBox *gc = new HostCheckBox("HostXBMC");
+ gc->setLabel(QObject::tr("XBMC"));
+ gc->setValue(false);
+ gc->setHelpText(QObject::tr("A software media player and entertainment hub for digital media."));
+ return gc;
+};
static HostComboBox *Hostfoldingusername()
{
@@ -4049,6 +4057,7 @@ void writesettings ()
// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes");
hostparm.ThisHostHuluDesktop = gCoreContext->GetSetting("HostHuluDesktop");
hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes");
+ hostparm.ThisHostXBMC = gCoreContext->GetSetting("HostXBMC");
// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes");
@@ -4386,6 +4395,7 @@ void writesettings ()
myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n";
myfile << "webonlinhes=\"" + hostparm.ThisHostwebonlinhes + "\"\n";
myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n";
+ myfile << "xbmc=\"" + hostparm.ThisHostXBMC + "\"\n";
//myfile << "fuppes=\"" + hostparm.ThisHostfuppes + "\"\n";
myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n";
myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n";
@@ -4831,6 +4841,7 @@ MythInstallSettings::MythInstallSettings()
//GridShowPlugin4->addChild(Hostfuppes());
GridShowPlugin4->addChild(HostHuluDesktop());
GridShowPlugin4->addChild(Hostwebonlinhes());
+ GridShowPlugin4->addChild(HostXBMC());
ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2);
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
index 23c00f0..719eea5 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
@@ -532,6 +532,7 @@ struct HostParms
QString ThisHostMiro;
QString ThisHostwebonlinhes;
+ QString ThisHostXBMC;
QString ThisHostHuluDesktop;
QString ThisHostpluginmythgameMame;
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index ec5d403..50e4bca 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=11
+pkgrel=12
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From 600fc5bf5b9fefec496a9750c873c3e064730a0a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 14 Mar 2014 19:27:43 +0000
Subject: LinHES-config: add xmbc to mv_software and mv_common. refs #962
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_common.py | 4 ++++
abs/core/LinHES-config/mv_software.py | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a3a323a..4e1486c 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=14
+pkgrel=15
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -157,14 +157,14 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'e959df98947eb0d2ea64ff616b61aab5'
'2506860a416e1988934225d80d501c2c'
'c0549457750c4f8e8038d904a0f3012a'
- 'b2d227d8ccb933b444c023d0c0e8da92'
+ '08dff9a1fc70c30bf4759e1821e824bd'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'6356c271bf6639002d4c59406250a1f6'
'8b7dce4a3a0a281fa6656aa8781a648e'
'f7f2dc11d1ba454cd25eeaa133104b62'
'824e49d9b01fed295c704ab68908b464'
'fe5e31b833cc6707209e9d656b6eb53c'
- '3eec99951c01d1a1abf7ecfeb33f922b'
+ '71b4860bbc8b7d94311acee7efa7269c'
'087a0ef743bc8af915503f8773536ce4'
'6721f0283850db684a61773bc95d18c5'
'80685e047993b00161be29e3580f3a40'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index 34d8a58..bc5382d 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -222,6 +222,8 @@ def pacinstall(pkg):
pacinstall("dolphin-emu")
elif pkg == "webonlinhes":
pacinstall("web-on-linhes")
+ elif pkg == "xbmc":
+ pacinstall("xbmc-pvr-addons")
elif pkg == "mame":
pacinstall("sdlmame")
elif pkg == "foldingathome":
@@ -258,6 +260,8 @@ def pacremove(pkg):
pacremove("dolphin-emu")
elif pkg == "webonlinhes":
pacremove("web-on-linhes")
+ elif pkg == "xbmc":
+ pacremove("xbmc-pvr-addons")
elif pkg == "mame":
pacremove("sdlmame")
elif pkg == "foldingathome":
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index 41ca7c7..097a7bc 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -69,6 +69,7 @@ def setup_software(systemconfig, data_config):
"miro",
"webonlinhes",
"huludesktop",
+ "xbmc",
"dvdcss",
"foldingathome")
--
cgit v0.12
From acca99b0f5c89cc3d5d9dc8df9df3d46282a338d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 18 Mar 2014 21:19:07 +0000
Subject: xbmc: update to 12.3. refs #962
---
abs/extra/xbmc/ChangeLog | 69 ----------------------------------
abs/extra/xbmc/FEH.sh | 23 ------------
abs/extra/xbmc/PKGBUILD | 38 ++++++++++++-------
abs/extra/xbmc/__changelog | 4 +-
abs/extra/xbmc/polkit.rules | 12 ++++++
abs/extra/xbmc/snapstream_remote.patch | 55 ---------------------------
abs/extra/xbmc/xbmc.install | 14 ++++---
abs/extra/xbmc/xbmc.service | 9 +++--
8 files changed, 52 insertions(+), 172 deletions(-)
delete mode 100644 abs/extra/xbmc/ChangeLog
delete mode 100755 abs/extra/xbmc/FEH.sh
create mode 100644 abs/extra/xbmc/polkit.rules
delete mode 100644 abs/extra/xbmc/snapstream_remote.patch
diff --git a/abs/extra/xbmc/ChangeLog b/abs/extra/xbmc/ChangeLog
deleted file mode 100644
index 66ae97e..0000000
--- a/abs/extra/xbmc/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
- * 9.11-15 :
- Made it back compliant with FHS ( thx pierre for pointing that out )
- namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-10 :
- Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-9 :
- Replace some libtool 'ltmain.sh' scripts with the one from libtool
- installed with Arch.
- Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
- on systems using the nvidia driver.
-
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-8 :
- Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
- undefined '::realloc' anymore.
- Remove Mac OS X specific files.
-
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-7 :
- Moved libcdio, pmount, smbclient and unrar to optdepends.
- Removed unneeded dependency on sdl_gfx.
- Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-6 :
- Added libpng to dependency list.
- Added gawk to dependency list.
- Removed '--disable-mms' and '--enable-halmount' configure flags as they
- are not mentioned as supported in the configure script.
-
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-5 :
- Added libmad to the dependency list.
- Streamripper 1.64.0+ does not include tre anymore, removed streamripper
- and added tre instead.
- Removed subversion from makedepends.
-
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-4 :
- Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
- fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-3 :
- Added lirc to the optdepends array.
-
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-2 :
- Added install file which informs users that a display depth of at
- least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
- * 8.10-1 :
- Initial package, based on previous work by Zeqadious.
diff --git a/abs/extra/xbmc/FEH.sh b/abs/extra/xbmc/FEH.sh
deleted file mode 100755
index db8c692..0000000
--- a/abs/extra/xbmc/FEH.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-RETVAL=0
-
-if [[ -z $(glxinfo | grep "direct rendering.*Yes" | uniq) ]]; then
- echo "XBMC needs hardware accelerated OpenGL rendering."
- echo "Install an appropriate graphics driver."
- echo
- echo "Please consult XBMC Wiki for supported hardware"
- echo "http://xbmc.org/wiki/?title=Supported_hardware"
- echo
- RETVAL=1
-fi
-
-if [[ -z $(xdpyinfo | grep "depth of root.*24" | uniq) ]]; then
- echo "XBMC cannot run unless the"
- echo "screen color depth is at least 24 bit."
- echo
- echo "Please reconfigure your screen."
- RETVAL=1
-fi
-
-exit ${RETVAL}
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 6134074..6b626c6 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -8,8 +8,9 @@
_prefix=/usr
pkgname=xbmc
-pkgver=12.2
-pkgrel=7
+pkgver=12.3
+_codename=Frodo
+pkgrel=12
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -25,19 +26,27 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'lirc: remote controller support'
'udisks: automount external drives'
- 'upower: used to trigger suspend functionality'
+ 'upower: used to trigger power management functionality'
'unrar: access compressed files without unpacking them'
'xorg-xinit: autostart xbmc')
install="${pkgname}.install"
source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
- "xbmc.service" "xbmc.sh" "xbmc_lib.conf")
+ "xbmc.service" "xbmc.sh" "xbmc_lib.conf"
+ "polkit.rules"
+ "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
-build() {
- cd "${srcdir}/xbmc-$pkgver"
+prepare() {
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
+
+ patch -p0 <$srcdir/libass.patch
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
# sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+}
+
+build() {
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
# Bootstrapping XBMC
./bootstrap
@@ -81,7 +90,7 @@ build() {
}
package() {
- cd "${srcdir}/xbmc-$pkgver"
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
# Running make install
make DESTDIR="${pkgdir}" install
@@ -93,8 +102,8 @@ package() {
sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
# Tools
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
@@ -108,11 +117,14 @@ package() {
#add in xbmc_lib.conf
install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf
- # systemd stuff
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
}
# vim:set ts=2 sw=2 et:
-md5sums=('489f3877decae4e265ece54f9eaef0ba'
- '76fae229ebc3bcfaab7e7f27e4fb51f5'
+md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
+ '03e9a33e15714d1fd1f2a516abea5393'
'e48a3d87984669ef206e902bc8290ff9'
- '71176cb0e5aaa230d7c9634c37245bfb')
+ '71176cb0e5aaa230d7c9634c37245bfb'
+ '02f7951824ee13103344f36009c0ef2a'
+ '7fd6399d2ffbdf06b724f0cc2efa0784')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 10c3bd8..c01c1ea 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,4 +1,2 @@
-7/5/11 - chw - Removed libpulse and lsb-release dep.
-8/8/11 - mjh - Add patch for Snapstream Firefly remote. Ref #728
8/23/12 -jm -Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
-
+brf - keep --disable-external-ffmpeg instead of using external ffmpeg
diff --git a/abs/extra/xbmc/polkit.rules b/abs/extra/xbmc/polkit.rules
new file mode 100644
index 0000000..4b6d0fd
--- /dev/null
+++ b/abs/extra/xbmc/polkit.rules
@@ -0,0 +1,12 @@
+polkit.addRule(function(action, subject) {
+ if (subject.user == "xbmc") {
+ polkit.log("action=" + action);
+ polkit.log("subject=" + subject);
+ if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+ return polkit.Result.YES;
+ }
+ if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
+ return polkit.Result.YES;
+ }
+ }
+});
diff --git a/abs/extra/xbmc/snapstream_remote.patch b/abs/extra/xbmc/snapstream_remote.patch
deleted file mode 100644
index c379b81..0000000
--- a/abs/extra/xbmc/snapstream_remote.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- xbmc-10.1/system/Lircmap.xml.orig 2011-03-05 03:33:37.000000000 +0000
-+++ xbmc-10.1/system/Lircmap.xml 2011-08-09 00:16:44.000000000 +0000
-@@ -332,6 +332,52 @@
- <yellow>Yellow</yellow>
- <blue>Blue</blue>
- </remote>
-+
-+ <remote device="Snapstream_Firefly">
-+ <pause>PAUSE</pause>
-+ <stop>STOP</stop>
-+ <forward>FWD</forward>
-+ <reverse>REW</reverse>
-+ <left>LEFT</left>
-+ <right>RIGHT</right>
-+ <up>UP</up>
-+ <down>DOWN</down>
-+ <select>OK</select>
-+ <pageplus>CH+</pageplus>
-+ <pageminus>CH-</pageminus>
-+ <back>EXIT</back>
-+ <menu>MENU</menu>
-+ <title>PLAY</title>
-+ <info>INFO</info>
-+ <skipplus>NEXT</skipplus>
-+ <skipminus>PREV</skipminus>
-+ <display>MAXI</display>
-+ <start>FIREFLY</start>
-+ <record>REC</record>
-+ <volumeplus>VOL+</volumeplus>
-+ <volumeminus>VOL-</volumeminus>
-+ <mute>MUTE</mute>
-+ <power>CLOSE</power>
-+ <myvideo>VIDEO</myvideo>
-+ <mymusic>MUSIC</mymusic>
-+ <mypictures>PHOTOS</mypictures>
-+ <mytv>TV</mytv>
-+ <one>1</one>
-+ <two>2</two>
-+ <three>3</three>
-+ <four>4</four>
-+ <five>5</five>
-+ <six>6</six>
-+ <seven>7</seven>
-+ <eight>8</eight>
-+ <nine>9</nine>
-+ <zero>0</zero>
-+ <mytv>A</mytv>
-+ <mymusic>B</mymusic>
-+ <mypictures>C</mypictures>
-+ <myvideo>D</myvideo>
-+ </remote>
-+
- <remote device="TwinHanRemote">
- <display>fullscreen</display>
- <power>power</power>
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index 6490483..8076fe2 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -1,10 +1,11 @@
post_install() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- getent group xbmc > /dev/null || groupadd xbmc
- getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
- usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
- gen_lib_xml.py
+ getent group xbmc > /dev/null || groupadd -r xbmc
+ getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
+ usermod -a -G xbmc,audio,video,network,optical xbmc
+ mkdir -p var/lib/xbmc
+ chown -R xbmc:xbmc var/lib/xbmc
}
post_upgrade() {
@@ -12,6 +13,7 @@ post_upgrade() {
}
post_remove() {
- post_install $1
- echo "You may want to remove xbmc user and group"
+ [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+ [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+ getent passwd xbmc > /dev/null && userdel xbmc
}
diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service
index 431582f..050460f 100644
--- a/abs/extra/xbmc/xbmc.service
+++ b/abs/extra/xbmc/xbmc.service
@@ -1,13 +1,16 @@
[Unit]
Description = Starts instance of XBMC using xinit
-After = remote-fs.target
+After = systemd-user-sessions.service
+Conflicts=getty@tty7.service
[Service]
User = xbmc
Group = xbmc
+PAMName=login
Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
+TTYPath=/dev/tty7
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
+Restart = on-abort
[Install]
WantedBy = multi-user.target
--
cgit v0.12
From ae3af2ed004ffa8a99b9beac8d880f9a2aefe218 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 20 Mar 2014 22:11:28 +0000
Subject: google-chrome: update to 33.0.1750.152
---
abs/extra/google-chrome/PKGBUILD | 30 +++++++++++++++---------------
abs/extra/google-chrome/__changelog | 6 ++----
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index e47a6e0..3e18710 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=32.0.1700.102
+pkgver=33.0.1750.152
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -15,45 +15,45 @@ depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harf
'libgcrypt' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
-provides=("google-chrome=$pkgver")
+provides=("google-chrome=${pkgver}")
conflicts=('google-chrome')
replaces=('chromium')
options=('!emptydirs' '!strip')
-install=$pkgname.install
+install=${pkgname}.install
_channel=stable
_arch=i386
-[ "$CARCH" = 'x86_64' ] && _arch=amd64
+[ "${CARCH}" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
'https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='3f2cdc746980c7b9ac476ec013c80dfc'
-
-#PKGEXT='.pkg.tar'
+[ "${CARCH}" = 'x86_64' ] && md5sums[0]='305fda0487a3e0779d1fd2b4213be1cb'
package() {
msg2 "Extracting the data.tar.lzma"
- bsdtar -xf data.tar.lzma -C "$pkgdir/"
+ bsdtar -xf data.tar.lzma -C "${pkgdir}/"
msg2 "Moving stuff in place"
# Icons
for i in 16 22 24 32 48 64 128 256; do
- install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i}.png "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
+ install -Dm644 "${pkgdir}"/opt/google/chrome/product_logo_${i}.png \
+ "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
done
# Man page
- gzip "$pkgdir"/usr/share/man/man1/google-chrome.1
+ gzip "${pkgdir}"/usr/share/man/man1/google-chrome.1
# License
- install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html
+ install -Dm644 eula_text.html "${pkgdir}"/usr/share/licenses/google-chrome/eula_text.html
msg2 "Symlinking missing Udev lib"
- ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
+ ln -s /usr/lib/libudev.so.1 "${pkgdir}"/opt/google/chrome/libudev.so.0
msg2 "Removing unnecessities (e.g. Debian Cron job)"
- rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
- rm "$pkgdir"/opt/google/chrome/product_logo_*.png
+ rm -r "${pkgdir}"/etc/cron.daily/ "${pkgdir}"/opt/google/chrome/cron/
+ rm "${pkgdir}"/opt/google/chrome/product_logo_*.png
msg2 "Rename google-chrome-stable to google-chrome"
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
+
}
-md5sums=('3f2cdc746980c7b9ac476ec013c80dfc'
+md5sums=('305fda0487a3e0779d1fd2b4213be1cb'
'6d57da7476a4b1b7a81821d9c036425c')
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
index 45a69e8..8e8830a 100644
--- a/abs/extra/google-chrome/__changelog
+++ b/abs/extra/google-chrome/__changelog
@@ -1,7 +1,5 @@
-1/23/14
Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
-- PKGBUILD: comment out PKGEXT so we compress the pkg
- PKGBUILD: add replaces chromium
- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
-- Rename google-chrome-stable to google-chrome"
-- Change dep libgcrypt15 to libgcrypt
+- PKGBUILD: Rename google-chrome-stable to google-chrome"
+- PKGBUILD:Change dep libgcrypt15 to libgcrypt
--
cgit v0.12
From be2b75e03866a6963042cdb79b433f9717ecb35a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:10:27 +0000
Subject: linux: update kernel to 3.13.7
---
abs/core/Kernel_rebuild_list | 10 +-
...-Bluetooth-allocate-static-minor-for-vhci.patch | 76 +
...te-a-new-dummy-pipe-for-gssd-to-hold-open.patch | 241 +
...use-gcc-alias-instead-of-assembler-aliase.patch | 68 +
...ace-sunrpc_net-gssd_running-flag-with-a-m.patch | 143 +
...f-gssd-is-running-before-attempting-to-us.patch | 50 +
...move-the-clntXX-dir-if-creating-the-pipe-.patch | 32 +
...-add-an-info-file-for-the-dummy-gssd-pipe.patch | 100 +
...x-cleanup-of-dummy-gssd-directory-when-no.patch | 50 +
abs/core/linux/3.12-btrfs-relocate-csums.patch | 63 -
abs/core/linux/PKGBUILD | 229 +-
abs/core/linux/config | 173 +-
abs/core/linux/config.x86_64 | 178 +-
abs/core/linux/config.x86_64.last | 6269 --------------------
abs/core/linux/criu-no-expert.patch | 13 +-
abs/core/linux/i8042-fix-aliases.patch | 113 +
abs/core/linux/linux.install | 6 +
abs/core/linux/linux.install.pkg | 8 +-
18 files changed, 1273 insertions(+), 6549 deletions(-)
create mode 100644 abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch
create mode 100644 abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
create mode 100644 abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
create mode 100644 abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
create mode 100644 abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
create mode 100644 abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
create mode 100644 abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
create mode 100644 abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
delete mode 100644 abs/core/linux/3.12-btrfs-relocate-csums.patch
delete mode 100644 abs/core/linux/config.x86_64.last
create mode 100644 abs/core/linux/i8042-fix-aliases.patch
diff --git a/abs/core/Kernel_rebuild_list b/abs/core/Kernel_rebuild_list
index d9136ad..346c2ba 100644
--- a/abs/core/Kernel_rebuild_list
+++ b/abs/core/Kernel_rebuild_list
@@ -1,8 +1,6 @@
-Kernel
+As of 3.13.7
+linux
lirc
+nvidia-utils
nvidia
-rt2500
-tiacx
-madwifi
-ndiswrapper
-oss
+ceton_infinitv
diff --git a/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch b/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch
new file mode 100644
index 0000000..33a3fde
--- /dev/null
+++ b/abs/core/linux/0001-Bluetooth-allocate-static-minor-for-vhci.patch
@@ -0,0 +1,76 @@
+From a62207820fb65f168c8a7f9c0abb71d736f3d7e0 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Tue, 18 Feb 2014 02:19:26 -0300
+Subject: [PATCH] Bluetooth: allocate static minor for vhci
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
+driver) added the module alias to hci_vhci module so it's possible to
+create the /dev/vhci node. However creating an alias without
+specifying the minor doesn't allow us to create the node ahead,
+triggerring module auto-load when it's first accessed.
+
+Starting with depmod from kmod 16 we started to warn if there's a
+devname alias without specifying the major and minor.
+
+Let's do the same done for uhid, kvm, fuse and others, specifying a
+fixed minor. In systems with systemd as the init the following will
+happen: on early boot systemd will call "kmod static-nodes" to read
+/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
+first accessed these "dead" nodes will trigger the module loading.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+---
+ Documentation/devices.txt | 1 +
+ drivers/bluetooth/hci_vhci.c | 3 ++-
+ include/linux/miscdevice.h | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devices.txt b/Documentation/devices.txt
+index 80b7241..fce9398 100644
+--- a/Documentation/devices.txt
++++ b/Documentation/devices.txt
+@@ -353,6 +353,7 @@ Your cooperation is appreciated.
+ 133 = /dev/exttrp External device trap
+ 134 = /dev/apm_bios Advanced Power Management BIOS
+ 135 = /dev/rtc Real Time Clock
++ 137 = /dev/vhci Bluetooth virtual HCI driver
+ 139 = /dev/openprom SPARC OpenBoot PROM
+ 140 = /dev/relay8 Berkshire Products Octal relay card
+ 141 = /dev/relay16 Berkshire Products ISO-16 relay card
+diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
+index 7b16738..59095e6 100644
+--- a/drivers/bluetooth/hci_vhci.c
++++ b/drivers/bluetooth/hci_vhci.c
+@@ -352,7 +352,7 @@ static const struct file_operations vhci_fops = {
+ static struct miscdevice vhci_miscdev= {
+ .name = "vhci",
+ .fops = &vhci_fops,
+- .minor = MISC_DYNAMIC_MINOR,
++ .minor = VHCI_MINOR,
+ };
+
+ static int __init vhci_init(void)
+@@ -378,3 +378,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("devname:vhci");
++MODULE_ALIAS_MISCDEV(VHCI_MINOR);
+diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
+index f7eaf2d..e5db611 100644
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -23,6 +23,7 @@
+ #define TEMP_MINOR 131 /* Temperature Sensor */
+ #define RTC_MINOR 135
+ #define EFI_RTC_MINOR 136 /* EFI Time services */
++#define VHCI_MINOR 137
+ #define SUN_OPENPROM_MINOR 139
+ #define DMAPI_MINOR 140 /* DMAPI */
+ #define NVRAM_MINOR 144
+--
+1.9.0
+
diff --git a/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
new file mode 100644
index 0000000..2d39831
--- /dev/null
+++ b/abs/core/linux/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch
@@ -0,0 +1,241 @@
+From 4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:17 -0500
+Subject: [PATCH 1/6] sunrpc: create a new dummy pipe for gssd to hold open
+
+rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows
+up under rpc_pipefs. That behavior gives us a reliable mechanism to tell
+whether it's actually running or not.
+
+Create a new toplevel "gssd" directory in rpc_pipefs when it's mounted.
+Under that directory create another directory called "clntXX", and then
+within that a pipe called "gssd".
+
+We'll never send an upcall along that pipe, and any downcall written to
+it will just return -EINVAL.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ include/linux/sunrpc/rpc_pipe_fs.h | 3 +-
+ net/sunrpc/netns.h | 1 +
+ net/sunrpc/rpc_pipe.c | 93 ++++++++++++++++++++++++++++++++++++--
+ net/sunrpc/sunrpc_syms.c | 8 +++-
+ 4 files changed, 100 insertions(+), 5 deletions(-)
+
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index a353e03..85f1342 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -84,7 +84,8 @@ enum {
+
+ extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
+ const unsigned char *dir_name);
+-extern void rpc_pipefs_init_net(struct net *net);
++extern int rpc_pipefs_init_net(struct net *net);
++extern void rpc_pipefs_exit_net(struct net *net);
+ extern struct super_block *rpc_get_sb_net(const struct net *net);
+ extern void rpc_put_sb_net(const struct net *net);
+
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 779742c..8a8e841 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
+@@ -14,6 +14,7 @@ struct sunrpc_net {
+ struct cache_detail *rsi_cache;
+
+ struct super_block *pipefs_sb;
++ struct rpc_pipe *gssd_dummy;
+ struct mutex pipefs_sb_lock;
+
+ struct list_head all_clients;
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index bf04b30..c23458b 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -38,7 +38,7 @@
+ #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "")
+
+ static struct file_system_type rpc_pipe_fs_type;
+-
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops;
+
+ static struct kmem_cache *rpc_inode_cachep __read_mostly;
+
+@@ -1159,6 +1159,7 @@ enum {
+ RPCAUTH_nfsd4_cb,
+ RPCAUTH_cache,
+ RPCAUTH_nfsd,
++ RPCAUTH_gssd,
+ RPCAUTH_RootEOF
+ };
+
+@@ -1195,6 +1196,10 @@ static const struct rpc_filelist files[] = {
+ .name = "nfsd",
+ .mode = S_IFDIR | S_IRUGO | S_IXUGO,
+ },
++ [RPCAUTH_gssd] = {
++ .name = "gssd",
++ .mode = S_IFDIR | S_IRUGO | S_IXUGO,
++ },
+ };
+
+ /*
+@@ -1208,13 +1213,25 @@ struct dentry *rpc_d_lookup_sb(const struct super_block *sb,
+ }
+ EXPORT_SYMBOL_GPL(rpc_d_lookup_sb);
+
+-void rpc_pipefs_init_net(struct net *net)
++int rpc_pipefs_init_net(struct net *net)
+ {
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+
++ sn->gssd_dummy = rpc_mkpipe_data(&gssd_dummy_pipe_ops, 0);
++ if (IS_ERR(sn->gssd_dummy))
++ return PTR_ERR(sn->gssd_dummy);
++
+ mutex_init(&sn->pipefs_sb_lock);
+ sn->gssd_running = 1;
+ sn->pipe_version = -1;
++ return 0;
++}
++
++void rpc_pipefs_exit_net(struct net *net)
++{
++ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++
++ rpc_destroy_pipe_data(sn->gssd_dummy);
+ }
+
+ /*
+@@ -1244,11 +1261,73 @@ void rpc_put_sb_net(const struct net *net)
+ }
+ EXPORT_SYMBOL_GPL(rpc_put_sb_net);
+
++static const struct rpc_filelist gssd_dummy_clnt_dir[] = {
++ [0] = {
++ .name = "clntXX",
++ .mode = S_IFDIR | S_IRUGO | S_IXUGO,
++ },
++};
++
++static ssize_t
++dummy_downcall(struct file *filp, const char __user *src, size_t len)
++{
++ return -EINVAL;
++}
++
++static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
++ .upcall = rpc_pipe_generic_upcall,
++ .downcall = dummy_downcall,
++};
++
++/**
++ * rpc_gssd_dummy_populate - create a dummy gssd pipe
++ * @root: root of the rpc_pipefs filesystem
++ * @pipe_data: pipe data created when netns is initialized
++ *
++ * Create a dummy set of directories and a pipe that gssd can hold open to
++ * indicate that it is up and running.
++ */
++static struct dentry *
++rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
++{
++ int ret = 0;
++ struct dentry *gssd_dentry;
++ struct dentry *clnt_dentry = NULL;
++ struct dentry *pipe_dentry = NULL;
++ struct qstr q = QSTR_INIT(files[RPCAUTH_gssd].name,
++ strlen(files[RPCAUTH_gssd].name));
++
++ /* We should never get this far if "gssd" doesn't exist */
++ gssd_dentry = d_hash_and_lookup(root, &q);
++ if (!gssd_dentry)
++ return ERR_PTR(-ENOENT);
++
++ ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL);
++ if (ret) {
++ pipe_dentry = ERR_PTR(ret);
++ goto out;
++ }
++
++ q.name = gssd_dummy_clnt_dir[0].name;
++ q.len = strlen(gssd_dummy_clnt_dir[0].name);
++ clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);
++ if (!clnt_dentry) {
++ pipe_dentry = ERR_PTR(-ENOENT);
++ goto out;
++ }
++
++ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++out:
++ dput(clnt_dentry);
++ dput(gssd_dentry);
++ return pipe_dentry;
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+ struct inode *inode;
+- struct dentry *root;
++ struct dentry *root, *gssd_dentry;
+ struct net *net = data;
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ int err;
+@@ -1266,6 +1345,13 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ return -ENOMEM;
+ if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL))
+ return -ENOMEM;
++
++ gssd_dentry = rpc_gssd_dummy_populate(root, sn->gssd_dummy);
++ if (IS_ERR(gssd_dentry)) {
++ __rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF);
++ return PTR_ERR(gssd_dentry);
++ }
++
+ dprintk("RPC: sending pipefs MOUNT notification for net %p%s\n",
+ net, NET_NAME(net));
+ mutex_lock(&sn->pipefs_sb_lock);
+@@ -1280,6 +1366,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ return 0;
+
+ err_depopulate:
++ dput(gssd_dentry);
+ blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ RPC_PIPEFS_UMOUNT,
+ sb);
+diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
+index 3d6498a..cd30120 100644
+--- a/net/sunrpc/sunrpc_syms.c
++++ b/net/sunrpc/sunrpc_syms.c
+@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(struct net *net)
+ if (err)
+ goto err_unixgid;
+
+- rpc_pipefs_init_net(net);
++ err = rpc_pipefs_init_net(net);
++ if (err)
++ goto err_pipefs;
++
+ INIT_LIST_HEAD(&sn->all_clients);
+ spin_lock_init(&sn->rpc_client_lock);
+ spin_lock_init(&sn->rpcb_clnt_lock);
+ return 0;
+
++err_pipefs:
++ unix_gid_cache_destroy(net);
+ err_unixgid:
+ ip_map_cache_destroy(net);
+ err_ipmap:
+@@ -60,6 +65,7 @@ err_proc:
+
+ static __net_exit void sunrpc_exit_net(struct net *net)
+ {
++ rpc_pipefs_exit_net(net);
+ unix_gid_cache_destroy(net);
+ ip_map_cache_destroy(net);
+ rpc_proc_exit(net);
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch b/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
new file mode 100644
index 0000000..c4242e0
--- /dev/null
+++ b/abs/core/linux/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch
@@ -0,0 +1,68 @@
+From 83460ec8dcac14142e7860a01fa59c267ac4657c Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Tue, 12 Nov 2013 15:08:36 -0800
+Subject: [PATCH] syscalls.h: use gcc alias instead of assembler aliases for
+ syscalls
+
+Use standard gcc __attribute__((alias(foo))) to define the syscall aliases
+instead of custom assembler macros.
+
+This is far cleaner, and also fixes my LTO kernel build.
+
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Cc: Al Viro <viro@ZenIV.linux.org.uk>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/compat.h | 4 ++--
+ include/linux/syscalls.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/linux/compat.h b/include/linux/compat.h
+index 345da00..ada34c9 100644
+--- a/include/linux/compat.h
++++ b/include/linux/compat.h
+@@ -41,14 +41,14 @@
+ COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
+
+ #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
+- asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
++ asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
++ __attribute__((alias(__stringify(compat_SyS##name)))); \
+ static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
+ asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
+ asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
+ { \
+ return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
+ } \
+- SYSCALL_ALIAS(compat_sys##name, compat_SyS##name); \
+ static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+
+ #ifndef compat_user_stack_pointer
+diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
+index 7fac04e..c27f846 100644
+--- a/include/linux/syscalls.h
++++ b/include/linux/syscalls.h
+@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+
+ #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
+ #define __SYSCALL_DEFINEx(x, name, ...) \
+- asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
++ asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
++ __attribute__((alias(__stringify(SyS##name)))); \
+ static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
+ asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
+ asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
+@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
+ __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \
+ return ret; \
+ } \
+- SYSCALL_ALIAS(sys##name, SyS##name); \
+ static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
+
+ asmlinkage long sys_time(time_t __user *tloc);
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch b/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
new file mode 100644
index 0000000..19e04da
--- /dev/null
+++ b/abs/core/linux/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch
@@ -0,0 +1,143 @@
+From 89f842435c630f8426f414e6030bc2ffea0d6f81 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:18 -0500
+Subject: [PATCH 2/6] sunrpc: replace sunrpc_net->gssd_running flag with a more
+ reliable check
+
+Now that we have a more reliable method to tell if gssd is running, we
+can replace the sn->gssd_running flag with a function that will query to
+see if it's up and running.
+
+There's also no need to attempt an upcall that we know will fail, so
+just return -EACCES if gssd isn't running. Finally, fix the warn_gss()
+message not to claim that that the upcall timed out since we don't
+necesarily perform one now when gssd isn't running, and remove the
+extraneous newline from the message.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ include/linux/sunrpc/rpc_pipe_fs.h | 2 ++
+ net/sunrpc/auth_gss/auth_gss.c | 17 +++++++----------
+ net/sunrpc/netns.h | 2 --
+ net/sunrpc/rpc_pipe.c | 14 ++++++++++----
+ 4 files changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
+index 85f1342..7f490be 100644
+--- a/include/linux/sunrpc/rpc_pipe_fs.h
++++ b/include/linux/sunrpc/rpc_pipe_fs.h
+@@ -131,5 +131,7 @@ extern int rpc_unlink(struct dentry *);
+ extern int register_rpc_pipefs(void);
+ extern void unregister_rpc_pipefs(void);
+
++extern bool gssd_running(struct net *net);
++
+ #endif
+ #endif
+diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
+index 42fdfc6..0a2aee0 100644
+--- a/net/sunrpc/auth_gss/auth_gss.c
++++ b/net/sunrpc/auth_gss/auth_gss.c
+@@ -536,8 +536,7 @@ static void warn_gssd(void)
+ unsigned long now = jiffies;
+
+ if (time_after(now, ratelimit)) {
+- printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n"
+- "Please check user daemon is running.\n");
++ pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n");
+ ratelimit = now + 15*HZ;
+ }
+ }
+@@ -600,7 +599,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ struct rpc_pipe *pipe;
+ struct rpc_cred *cred = &gss_cred->gc_base;
+ struct gss_upcall_msg *gss_msg;
+- unsigned long timeout;
+ DEFINE_WAIT(wait);
+ int err;
+
+@@ -608,17 +606,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)
+ __func__, from_kuid(&init_user_ns, cred->cr_uid));
+ retry:
+ err = 0;
+- /* Default timeout is 15s unless we know that gssd is not running */
+- timeout = 15 * HZ;
+- if (!sn->gssd_running)
+- timeout = HZ >> 2;
++ /* if gssd is down, just skip upcalling altogether */
++ if (!gssd_running(net)) {
++ warn_gssd();
++ return -EACCES;
++ }
+ gss_msg = gss_setup_upcall(gss_auth, cred);
+ if (PTR_ERR(gss_msg) == -EAGAIN) {
+ err = wait_event_interruptible_timeout(pipe_version_waitqueue,
+- sn->pipe_version >= 0, timeout);
++ sn->pipe_version >= 0, 15 * HZ);
+ if (sn->pipe_version < 0) {
+- if (err == 0)
+- sn->gssd_running = 0;
+ warn_gssd();
+ err = -EACCES;
+ }
+diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
+index 8a8e841..94e506f 100644
+--- a/net/sunrpc/netns.h
++++ b/net/sunrpc/netns.h
+@@ -33,8 +33,6 @@ struct sunrpc_net {
+ int pipe_version;
+ atomic_t pipe_users;
+ struct proc_dir_entry *use_gssp_proc;
+-
+- unsigned int gssd_running;
+ };
+
+ extern int sunrpc_net_id;
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index c23458b..5cd7ad1 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode)
+ static int
+ rpc_pipe_open(struct inode *inode, struct file *filp)
+ {
+- struct net *net = inode->i_sb->s_fs_info;
+- struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
+ struct rpc_pipe *pipe;
+ int first_open;
+ int res = -ENXIO;
+
+ mutex_lock(&inode->i_mutex);
+- sn->gssd_running = 1;
+ pipe = RPC_I(inode)->pipe;
+ if (pipe == NULL)
+ goto out;
+@@ -1222,7 +1219,6 @@ int rpc_pipefs_init_net(struct net *net)
+ return PTR_ERR(sn->gssd_dummy);
+
+ mutex_init(&sn->pipefs_sb_lock);
+- sn->gssd_running = 1;
+ sn->pipe_version = -1;
+ return 0;
+ }
+@@ -1376,6 +1372,16 @@ err_depopulate:
+ return err;
+ }
+
++bool
++gssd_running(struct net *net)
++{
++ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
++ struct rpc_pipe *pipe = sn->gssd_dummy;
++
++ return pipe->nreaders || pipe->nwriters;
++}
++EXPORT_SYMBOL_GPL(gssd_running);
++
+ static struct dentry *
+ rpc_mount(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch b/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
new file mode 100644
index 0000000..87b54fc
--- /dev/null
+++ b/abs/core/linux/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch
@@ -0,0 +1,50 @@
+From 6aa23d76a7b549521a03b63b6d5b7880ea87eab7 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 14 Nov 2013 07:25:19 -0500
+Subject: [PATCH 3/6] nfs: check if gssd is running before attempting to use
+ krb5i auth in SETCLIENTID call
+
+Currently, the client will attempt to use krb5i in the SETCLIENTID call
+even if rpc.gssd isn't running. When that fails, it'll then fall back to
+RPC_AUTH_UNIX. This introduced a delay when mounting if rpc.gssd isn't
+running, and causes warning messages to pop up in the ring buffer.
+
+Check to see if rpc.gssd is running before even attempting to use krb5i
+auth, and just silently skip trying to do so if it isn't. In the event
+that the admin is actually trying to mount with krb5*, it will still
+fail at a later stage of the mount attempt.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ fs/nfs/nfs4client.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
+index b4a160a..c1b7a80 100644
+--- a/fs/nfs/nfs4client.c
++++ b/fs/nfs/nfs4client.c
+@@ -10,6 +10,7 @@
+ #include <linux/sunrpc/auth.h>
+ #include <linux/sunrpc/xprt.h>
+ #include <linux/sunrpc/bc_xprt.h>
++#include <linux/sunrpc/rpc_pipe_fs.h>
+ #include "internal.h"
+ #include "callback.h"
+ #include "delegation.h"
+@@ -370,7 +371,11 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
+ __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
+ __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
+ __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
+- error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
++
++ error = -EINVAL;
++ if (gssd_running(clp->cl_net))
++ error = nfs_create_rpc_client(clp, timeparms,
++ RPC_AUTH_GSS_KRB5I);
+ if (error == -EINVAL)
+ error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
+ if (error < 0)
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch b/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
new file mode 100644
index 0000000..5f2c3da
--- /dev/null
+++ b/abs/core/linux/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch
@@ -0,0 +1,32 @@
+From 3396f92f8be606ea485b0a82d4e7749a448b013b Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:33:49 -0500
+Subject: [PATCH 4/6] rpc_pipe: remove the clntXX dir if creating the pipe
+ fails
+
+In the event that we create the gssd/clntXX dir, but the pipe creation
+subsequently fails, then we should remove the clntXX dir before
+returning.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5cd7ad1..0b74c61 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ }
+
+ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
++ if (IS_ERR(pipe_dentry))
++ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
+ out:
+ dput(clnt_dentry);
+ dput(gssd_dentry);
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
new file mode 100644
index 0000000..8ef6fe2
--- /dev/null
+++ b/abs/core/linux/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
@@ -0,0 +1,100 @@
+From e2f0c83a9de331d9352185ca3642616c13127539 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Thu, 5 Dec 2013 07:34:44 -0500
+Subject: [PATCH 5/6] sunrpc: add an "info" file for the dummy gssd pipe
+
+rpc.gssd expects to see an "info" file in each clntXX dir. Since adding
+the dummy gssd pipe, users that run rpc.gssd see a lot of these messages
+spamming the logs:
+
+ rpc.gssd[508]: ERROR: can't open /var/lib/nfs/rpc_pipefs/gssd/clntXX/info: No such file or directory
+ rpc.gssd[508]: ERROR: failed to read service info
+
+Add a dummy gssd/clntXX/info file to help silence these messages.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 0b74c61..5d973b2 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -17,6 +17,7 @@
+ #include <linux/fsnotify.h>
+ #include <linux/kernel.h>
+ #include <linux/rcupdate.h>
++#include <linux/utsname.h>
+
+ #include <asm/ioctls.h>
+ #include <linux/poll.h>
+@@ -1275,6 +1276,44 @@ static const struct rpc_pipe_ops gssd_dummy_pipe_ops = {
+ .downcall = dummy_downcall,
+ };
+
++/*
++ * Here we present a bogus "info" file to keep rpc.gssd happy. We don't expect
++ * that it will ever use this info to handle an upcall, but rpc.gssd expects
++ * that this file will be there and have a certain format.
++ */
++static int
++rpc_show_dummy_info(struct seq_file *m, void *v)
++{
++ seq_printf(m, "RPC server: %s\n", utsname()->nodename);
++ seq_printf(m, "service: foo (1) version 0\n");
++ seq_printf(m, "address: 127.0.0.1\n");
++ seq_printf(m, "protocol: tcp\n");
++ seq_printf(m, "port: 0\n");
++ return 0;
++}
++
++static int
++rpc_dummy_info_open(struct inode *inode, struct file *file)
++{
++ return single_open(file, rpc_show_dummy_info, NULL);
++}
++
++static const struct file_operations rpc_dummy_info_operations = {
++ .owner = THIS_MODULE,
++ .open = rpc_dummy_info_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
++static const struct rpc_filelist gssd_dummy_info_file[] = {
++ [0] = {
++ .name = "info",
++ .i_fop = &rpc_dummy_info_operations,
++ .mode = S_IFREG | S_IRUSR,
++ },
++};
++
+ /**
+ * rpc_gssd_dummy_populate - create a dummy gssd pipe
+ * @root: root of the rpc_pipefs filesystem
+@@ -1312,9 +1351,18 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data)
+ goto out;
+ }
+
++ ret = rpc_populate(clnt_dentry, gssd_dummy_info_file, 0, 1, NULL);
++ if (ret) {
++ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++ pipe_dentry = ERR_PTR(ret);
++ goto out;
++ }
++
+ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data);
+- if (IS_ERR(pipe_dentry))
++ if (IS_ERR(pipe_dentry)) {
++ __rpc_depopulate(clnt_dentry, gssd_dummy_info_file, 0, 1);
+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);
++ }
+ out:
+ dput(clnt_dentry);
+ dput(gssd_dentry);
+--
+1.8.5.3
+
diff --git a/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch b/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
new file mode 100644
index 0000000..75505c3
--- /dev/null
+++ b/abs/core/linux/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch
@@ -0,0 +1,50 @@
+From 23e66ba97127ff3b064d4c6c5138aa34eafc492f Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Mon, 9 Dec 2013 09:38:00 -0500
+Subject: [PATCH 6/6] rpc_pipe: fix cleanup of dummy gssd directory when
+ notification fails
+
+Currently, it could leak dentry references in some cases. Make sure
+we clean up properly.
+
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+---
+ net/sunrpc/rpc_pipe.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
+index 5d973b2..b185548 100644
+--- a/net/sunrpc/rpc_pipe.c
++++ b/net/sunrpc/rpc_pipe.c
+@@ -1369,6 +1369,18 @@ out:
+ return pipe_dentry;
+ }
+
++static void
++rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry)
++{
++ struct dentry *clnt_dir = pipe_dentry->d_parent;
++ struct dentry *gssd_dir = clnt_dir->d_parent;
++
++ __rpc_rmpipe(clnt_dir->d_inode, pipe_dentry);
++ __rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1);
++ __rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1);
++ dput(pipe_dentry);
++}
++
+ static int
+ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ {
+@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent)
+ return 0;
+
+ err_depopulate:
+- dput(gssd_dentry);
++ rpc_gssd_dummy_depopulate(gssd_dentry);
+ blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+ RPC_PIPEFS_UMOUNT,
+ sb);
+--
+1.8.5.3
+
diff --git a/abs/core/linux/3.12-btrfs-relocate-csums.patch b/abs/core/linux/3.12-btrfs-relocate-csums.patch
deleted file mode 100644
index 7209276..0000000
--- a/abs/core/linux/3.12-btrfs-relocate-csums.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
-From: Josef Bacik <jbacik@fusionio.com>
-Date: Fri, 27 Sep 2013 13:33:09 +0000
-Subject: Btrfs: relocate csums properly with prealloc extents
-
-A user reported a problem where they were getting csum errors when running a
-balance and running systemd's journal. This is because systemd is awesome and
-fallocate()'s its log space and writes into it. Unfortunately we assume that
-when we read in all the csums for an extent that they are sequential starting at
-the bytenr we care about. This obviously isn't the case for prealloc extents,
-where we could have written to the middle of the prealloc extent only, which
-means the csum would be for the bytenr in the middle of our range and not the
-front of our range. Fix this by offsetting the new bytenr we are logging to
-based on the original bytenr the csum was for. With this patch I no longer see
-the csum errors I was seeing. Thanks,
-
-Cc: stable@vger.kernel.org
-Reported-by: Chris Murphy <lists@colorremedies.com>
-Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-Signed-off-by: Chris Mason <chris.mason@fusionio.com>
----
-diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index dec4f5a..0359eec 100644
---- a/fs/btrfs/relocation.c
-+++ b/fs/btrfs/relocation.c
-@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- struct btrfs_root *root = BTRFS_I(inode)->root;
- int ret;
- u64 disk_bytenr;
-+ u64 new_bytenr;
- LIST_HEAD(list);
-
- ordered = btrfs_lookup_ordered_extent(inode, file_pos);
-@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
- if (ret)
- goto out;
-
-- disk_bytenr = ordered->start;
- while (!list_empty(&list)) {
- sums = list_entry(list.next, struct btrfs_ordered_sum, list);
- list_del_init(&sums->list);
-
-- sums->bytenr = disk_bytenr;
-- disk_bytenr += sums->len;
-+ /*
-+ * We need to offset the new_bytenr based on where the csum is.
-+ * We need to do this because we will read in entire prealloc
-+ * extents but we may have written to say the middle of the
-+ * prealloc extent, so we need to make sure the csum goes with
-+ * the right disk offset.
-+ *
-+ * We can do this because the data reloc inode refers strictly
-+ * to the on disk bytes, so we don't have to worry about
-+ * disk_len vs real len like with real inodes since it's all
-+ * disk length.
-+ */
-+ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
-+ sums->bytenr = new_bytenr;
-
- btrfs_add_ordered_sum(inode, ordered, sums);
- }
---
-cgit v0.9.2
diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD
index 478bc95..1ccdf59 100644
--- a/abs/core/linux/PKGBUILD
+++ b/abs/core/linux/PKGBUILD
@@ -1,41 +1,55 @@
-# $Id: PKGBUILD 202755 2013-12-26 10:19:24Z thomas $
+# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
-_srcname=linux-3.12
-pkgver=3.12.6
+_srcname=linux-3.13
+pkgver=3.13.7
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
options=('!strip')
-source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
- "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
+ "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
# the main kernel config files
'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- 'criu-no-expert.patch')
-md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
- '9e75be8b127e58f1a76c0015eabb12ae'
- '5259c05d5791002e81cb6eca368caa60'
- 'a884d449ea454a75e9d0b6165336734c'
+ 'criu-no-expert.patch'
+ '0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch'
+ '0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch'
+ '0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch'
+ '0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch'
+ '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
+ '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
+ '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
+ '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
+ 'i8042-fix-aliases.patch'
+ )
+md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
+ 'cb33b329d3417846d310c7f58a2614b6'
+ 'ba4468d313adfaf22368add7f58204aa'
+ '035bb27dac306f5c028d96cad14bb249'
'eb14dcfd80c00852ef81ded6e826826a'
'98beb36f9b8cf16e58de2483ea9985e3'
- 'd50c1ac47394e9aec637002ef3392bd1')
+ '989dc54ff8b179b0f80333cc97c0d43f'
+ 'dd2adb99cd3feed6f11022562901965c'
+ 'b00cc399d3797cb0793e18b5bf387a50'
+ '7cbd2349cdf046acc37b652c06ba36be'
+ '10dbaf863e22b2437e68f9190d65c861'
+ 'd5907a721b97299f0685c583499f7820'
+ 'a724515b350b29c53f20e631c6cf9a14'
+ 'e6fa278c092ad83780e2dd0568e24ca6'
+ '06f1751777e0772c18c3fa4fbae91aa5'
+ '93dbf73af819b77f03453a9c6de2bb47'
+ )
_kernelname=${pkgbase#linux}
-# module.symbols md5sums
-# x86_64
-# 23ef8d9dae0c916c9e1a7a07b77f797d /lib/modules/3.12.6-1-ARCH/modules.symbols
-# i686
-# eadbff034e17f92ccb4a7737302f3dbd /lib/modules/3.12.6-1-ARCH/modules.symbols
-
prepare() {
cd "${srcdir}/${_srcname}"
@@ -48,11 +62,35 @@ prepare() {
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
- patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+ patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+ # allow Checkpoint/restore (for criu) without EXPERT=y
+ patch -p1 -i "${srcdir}/criu-no-expert.patch"
+
+ # fix 15 seocnds nfs delay
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=4b9a445e3eeb8bd9278b1ae51c1b3a651e370cd6
+ patch -p1 -i "${srcdir}/0001-sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch"
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=89f842435c630f8426f414e6030bc2ffea0d6f81
+ patch -p1 -i "${srcdir}/0002-sunrpc-replace-sunrpc_net-gssd_running-flag-with-a-m.patch"
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=6aa23d76a7b549521a03b63b6d5b7880ea87eab7
+ patch -p1 -i "${srcdir}/0003-nfs-check-if-gssd-is-running-before-attempting-to-us.patch"
+
+ # fix nfs kernel oops
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=3396f92f8be606ea485b0a82d4e7749a448b013b
+ patch -p1 -i "${srcdir}/0004-rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-.patch"
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=e2f0c83a9de331d9352185ca3642616c13127539
+ patch -p1 -i "${srcdir}/0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch"
+ # http://git.linux-nfs.org/?p=trondmy/linux-nfs.git;a=commitdiff;h=23e66ba97127ff3b064d4c6c5138aa34eafc492f
+ patch -p1 -i "${srcdir}/0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch"
+
+ # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c
+ patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch"
+
+ # Fix i8042 aliases
+ patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
- # allow criu without expert option set
- # patch from fedora
- patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+ # Fix vhci warning in kmod (to restore every kernel maintainer's sanity)
+ patch -p1 -i "${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch"
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
@@ -70,10 +108,6 @@ prepare() {
# don't run depmod on 'make install'. We'll do this ourselves in packaging
sed -i '2iexit 0' scripts/depmod.sh
-}
-
-build() {
- cd "${srcdir}/${_srcname}"
# get kernel version
make prepare
@@ -88,21 +122,11 @@ build() {
# rewrite configuration
yes "" | make config >/dev/null
+}
- # save configuration for later reuse
- if [ "${CARCH}" = "x86_64" ]; then
- cat .config > "${startdir}/config.x86_64.last"
- else
- cat .config > "${startdir}/config.last"
- fi
-
- ####################
- # stop here
- # this is useful to configure the kernel
- #msg "Stopping build"; return 1
- ####################
+build() {
+ cd "${srcdir}/${_srcname}"
- # build!
make ${MAKEFLAGS} LOCALVERSION= bzImage modules
}
@@ -126,14 +150,10 @@ _package() {
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
- echo mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
- # add vmlinux
- install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
-
# set correct depmod command for install
cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
true && install=${install}.pkg
@@ -163,11 +183,15 @@ _package() {
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
- # move module tree /lib -> /usr/lib
- mv "$pkgdir/lib" "$pkgdir/usr"
# Now we call depmod...
- depmod -b "$pkgdir" -F System.map "$_kernver"
+ depmod -b "${pkgdir}" -F System.map "${_kernver}"
+
+ # move module tree /lib -> /usr/lib
+ mkdir -p "${pkgdir}/usr"
+ mv "${pkgdir}/lib" "${pkgdir}/usr/"
+ # add vmlinux
+ install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
}
_package-headers() {
@@ -178,124 +202,121 @@ _package-headers() {
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
- cd "${pkgdir}/usr/lib/modules/${_kernver}"
- ln -sf ../../../src/linux-${_kernver} build
-
cd "${srcdir}/${_srcname}"
install -D -m644 Makefile \
- "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+ "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
install -D -m644 kernel/Makefile \
- "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+ "${pkgdir}/usr/lib/modules/${_kernver}/build/kernel/Makefile"
install -D -m644 .config \
- "${pkgdir}/usr/src/linux-${_kernver}/.config"
+ "${pkgdir}/usr/lib/modules/${_kernver}/build/.config"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
for i in acpi asm-generic config crypto drm generated keys linux math-emu \
media net pcmcia scsi sound trace uapi video xen; do
- cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+ cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
done
# copy arch includes for external modules
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86"
- cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86"
+ cp -a arch/x86/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86/"
# copy files necessary for later builds, like nvidia and vmware
- cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
- cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+ cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
+ cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
# fix permissions on scripts dir
- chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+ chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
- cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+ cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
if [ "${CARCH}" = "i686" ]; then
- cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+ cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
fi
- cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+ cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
# add headers for lirc package
# pci
for i in bt8xx cx88 saa7134; do
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
- cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
+ cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/pci/${i}"
done
# usb
for i in cpia2 em28xx pwc sn9c102; do
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
- cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
+ cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/${i}"
done
# i2c
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
- cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c"
+ cp drivers/media/i2c/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
for i in cx25840; do
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
- cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
+ cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/${i}"
done
# add docbook makefile
install -D -m644 Documentation/DocBook/Makefile \
- "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+ "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
# add dm headers
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
- cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
+ cp drivers/md/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/md"
# add inotify.h
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
- cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux"
+ cp include/linux/inotify.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/linux/"
# add wireless headers
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
- cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
+ cp net/mac80211/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/net/mac80211/"
# add dvb headers for external modules
# in reference to:
# http://bugs.archlinux.org/task/9912
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
- cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core"
+ cp drivers/media/dvb-core/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-core/"
# and...
# http://bugs.archlinux.org/task/11194
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
- cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
+ cp include/config/dvb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/include/config/dvb/"
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
# in reference to:
# http://bugs.archlinux.org/task/13146
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
- cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
- cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+ cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+ cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/i2c/"
# add dvb headers
# in reference to:
# http://bugs.archlinux.org/task/20402
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
- cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
- cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
- cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb"
+ cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/usb/dvb-usb/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends"
+ cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/dvb-frontends/"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners"
+ cp drivers/media/tuners/*.h "${pkgdir}/usr/lib/modules/${_kernver}/build/drivers/media/tuners/"
# add xfs and shmem for aufs building
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
- cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/mm"
+ cp fs/xfs/xfs_sb.h "${pkgdir}/usr/lib/modules/${_kernver}/build/fs/xfs/xfs_sb.h"
# copy in Kconfig files
- for i in `find . -name "Kconfig*"`; do
- mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
- cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+ for i in $(find . -name "Kconfig*"); do
+ mkdir -p "${pkgdir}"/usr/lib/modules/${_kernver}/build/`echo ${i} | sed 's|/Kconfig.*||'`
+ cp ${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/${i}"
done
- chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
- find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+ chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build"
+ find "${pkgdir}/usr/lib/modules/${_kernver}/build" -type d -exec chmod 755 {} \;
# strip scripts directory
- find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+ find "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
case "$(file -bi "${binary}")" in
*application/x-sharedlib*) # Libraries (.so)
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
@@ -307,7 +328,7 @@ _package-headers() {
done
# remove unneeded architectures
- rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+ rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
}
_package-docs() {
@@ -318,13 +339,13 @@ _package-docs() {
cd "${srcdir}/${_srcname}"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
- cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+ mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
+ cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
find "${pkgdir}" -type f -exec chmod 444 {} \;
find "${pkgdir}" -type d -exec chmod 755 {} \;
# remove a file already in linux package
- rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+ rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
}
pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
diff --git a/abs/core/linux/config b/abs/core/linux/config
index 3e9e503..02beec7 100644
--- a/abs/core/linux/config
+++ b/abs/core/linux/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -38,7 +38,6 @@ 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_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
@@ -75,7 +74,6 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
@@ -159,7 +157,7 @@ CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
@@ -240,7 +238,6 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -274,6 +271,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -472,6 +470,7 @@ CONFIG_FRONTSWAP=y
# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -529,13 +528,13 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -550,7 +549,6 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
@@ -565,6 +563,7 @@ CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
CONFIG_SFI=y
CONFIG_X86_APM_BOOT=y
CONFIG_APM=y
@@ -578,7 +577,6 @@ CONFIG_APM_DO_ENABLE=y
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -679,7 +677,7 @@ CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
CONFIG_OLPC_XO15_SCI=y
-# CONFIG_ALIX is not set
+CONFIG_ALIX=y
# CONFIG_NET5501 is not set
# CONFIG_GEOS is not set
CONFIG_AMD_NB=y
@@ -810,7 +808,6 @@ CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -824,6 +821,7 @@ 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_VTI=m
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -886,6 +884,17 @@ CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -979,7 +988,9 @@ 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_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -1030,6 +1041,11 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -1062,6 +1078,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1082,6 +1101,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1218,6 +1238,7 @@ CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
# CONFIG_NET_EMATCH is not set
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
@@ -1247,6 +1268,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -1414,6 +1436,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
CONFIG_RFKILL=m
CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
CONFIG_NET_9P=m
CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
@@ -1425,6 +1448,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
@@ -1437,6 +1461,7 @@ CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1599,6 +1624,7 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
@@ -1618,10 +1644,10 @@ CONFIG_ISAPNP=y
# CONFIG_PNPBIOS is not set
CONFIG_PNPACPI=y
CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
CONFIG_BLK_DEV_DAC960=m
@@ -1716,6 +1742,14 @@ CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -2007,7 +2041,6 @@ CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
@@ -2022,8 +2055,8 @@ CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -2418,6 +2451,7 @@ CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SR9700=m
@@ -2502,6 +2536,8 @@ CONFIG_ATH10K_PCI=m
# CONFIG_ATH10K_DEBUG is not set
CONFIG_ATH10K_DEBUGFS=y
# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
CONFIG_B43_SSB=y
@@ -2611,6 +2647,7 @@ CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
@@ -2824,7 +2861,7 @@ CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2838,7 +2875,7 @@ CONFIG_INPUT_EVDEV=m
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
@@ -2869,7 +2906,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_SENTELIC=y
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
CONFIG_MOUSE_CYAPA=m
@@ -2988,7 +3025,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
# CONFIG_TOUCHSCREEN_TSC2005 is not set
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
@@ -3014,7 +3053,6 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
@@ -3027,19 +3065,20 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
CONFIG_SERIO_SERPORT=m
CONFIG_SERIO_CT82C710=m
CONFIG_SERIO_PARKBD=m
CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_ARC_PS2=m
CONFIG_SERIO_APBPS2=m
CONFIG_SERIO_OLPC_APSP=m
+CONFIG_HYPERV_KEYBOARD=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -3116,7 +3155,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3155,10 +3193,13 @@ CONFIG_NSC_GPIO=m
# CONFIG_RAW_DRIVER is not set
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
@@ -3169,7 +3210,15 @@ CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -3252,7 +3301,6 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -3294,8 +3342,8 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_OF_GPIO=y
CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
@@ -3330,7 +3378,7 @@ CONFIG_GPIO_ARIZONA=m
#
CONFIG_GPIO_CS5535=y
CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_INTEL_MID is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
# CONFIG_GPIO_SODAVILLE is not set
@@ -3347,7 +3395,7 @@ CONFIG_GPIO_AMD8111=m
#
# AC97 GPIO expanders:
#
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
#
# LPC GPIO expanders:
@@ -3356,6 +3404,7 @@ CONFIG_GPIO_UCB1400=y
#
# MODULbus GPIO expanders:
#
+# CONFIG_GPIO_BCM_KONA is not set
#
# USB GPIO expanders:
@@ -3381,6 +3430,7 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_SMB347 is not set
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_GPIO=y
@@ -4112,7 +4162,7 @@ CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
#
-# Miscelaneous helper chips
+# Miscellaneous helper chips
#
CONFIG_VIDEO_M52790=m
@@ -4188,6 +4238,7 @@ CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
@@ -4299,6 +4350,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m
@@ -4318,6 +4370,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
@@ -4436,7 +4489,7 @@ CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
@@ -4655,6 +4708,7 @@ CONFIG_SND_USB_6FIRE=m
CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
CONFIG_SND_SCS1X=m
@@ -4732,6 +4786,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
@@ -4895,18 +4950,6 @@ CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
@@ -4976,7 +5019,6 @@ CONFIG_USB_XUSBATM=m
#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -5019,6 +5061,7 @@ CONFIG_USB_F_NCM=m
CONFIG_USB_F_ECM=m
CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
@@ -5118,6 +5161,7 @@ CONFIG_LEDS_LP5562=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
@@ -5277,9 +5321,9 @@ CONFIG_DMA_OF=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
@@ -5580,7 +5624,6 @@ CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5628,6 +5671,8 @@ CONFIG_APPLE_GMUX=m
CONFIG_INTEL_RST=y
CONFIG_INTEL_SMARTCONNECT=y
CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
#
# Hardware Spinlock drivers
@@ -5681,6 +5726,15 @@ CONFIG_FMC_WRITE_EEPROM=m
CONFIG_FMC_CHARDEV=m
#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
# Firmware Drivers
#
CONFIG_EDD=m
@@ -5698,6 +5752,7 @@ CONFIG_ISCSI_IBFT=m
# EFI (Extensible Firmware Interface) Support
#
# CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
#
# File systems
@@ -5843,6 +5898,11 @@ CONFIG_UBIFS_FS_ZLIB=y
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZO=y
@@ -5872,6 +5932,7 @@ CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5887,6 +5948,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -6024,6 +6086,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
CONFIG_DEBUG_KERNEL=y
#
@@ -6160,6 +6223,7 @@ CONFIG_LKDTM=m
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_TEST_STRING_HELPERS is not set
@@ -6174,6 +6238,7 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
# CONFIG_X86_PTDUMP is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
@@ -6203,6 +6268,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6213,8 +6280,16 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
+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 is not set
+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_SMACK=y
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -6227,6 +6302,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
# CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6266,7 +6343,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
@@ -6360,6 +6437,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6380,6 +6458,7 @@ CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -6416,6 +6495,7 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@@ -6449,6 +6529,7 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
diff --git a/abs/core/linux/config.x86_64 b/abs/core/linux/config.x86_64
index c960527..8a0e906 100644
--- a/abs/core/linux/config.x86_64
+++ b/abs/core/linux/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.1-3 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -39,7 +39,6 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
@@ -76,7 +75,6 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
@@ -143,6 +141,7 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_ARCH_USES_NUMA_PROT_NONE=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -247,7 +246,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
@@ -267,10 +265,12 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
@@ -282,6 +282,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -453,6 +454,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -533,13 +535,13 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -555,7 +557,6 @@ CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
@@ -571,13 +572,13 @@ CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
CONFIG_SFI=y
#
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -790,7 +791,6 @@ CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -804,6 +804,7 @@ 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_VTI=m
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -866,6 +867,17 @@ CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -959,7 +971,9 @@ 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_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -1010,6 +1024,11 @@ CONFIG_IP_VS_PE_SIP=m
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -1042,6 +1061,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1062,6 +1084,7 @@ CONFIG_IP6_NF_SECURITY=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1194,6 +1217,7 @@ CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
# CONFIG_NET_EMATCH is not set
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
@@ -1223,6 +1247,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -1386,6 +1411,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
CONFIG_RFKILL=m
CONFIG_RFKILL_LEDS=y
CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
CONFIG_NET_9P=m
CONFIG_NET_9P_VIRTIO=m
# CONFIG_NET_9P_DEBUG is not set
@@ -1397,6 +1423,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
@@ -1409,6 +1436,7 @@ CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1555,6 +1583,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
# CONFIG_PARPORT_PC_FIFO is not set
@@ -1572,10 +1601,10 @@ CONFIG_PNP=y
#
CONFIG_PNPACPI=y
CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
CONFIG_BLK_DEV_DAC960=m
@@ -1588,6 +1617,7 @@ CONFIG_BLK_DEV_DRBD=m
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM=m
@@ -1672,6 +1702,16 @@ CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1939,7 +1979,6 @@ CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
@@ -1954,8 +1993,8 @@ CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -2336,6 +2375,7 @@ CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SR9700=m
@@ -2420,6 +2460,8 @@ CONFIG_ATH10K_PCI=m
# CONFIG_ATH10K_DEBUG is not set
CONFIG_ATH10K_DEBUGFS=y
# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
CONFIG_B43_SSB=y
@@ -2529,6 +2571,7 @@ CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
@@ -2728,7 +2771,7 @@ CONFIG_INPUT_MATRIXKMAP=m
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2742,7 +2785,7 @@ CONFIG_INPUT_EVDEV=m
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
CONFIG_KEYBOARD_QT1070=m
CONFIG_KEYBOARD_QT2160=m
# CONFIG_KEYBOARD_LKKBD is not set
@@ -2771,8 +2814,8 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y
CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MOUSE_BCM5974=m
CONFIG_MOUSE_CYAPA=m
@@ -2885,7 +2928,9 @@ CONFIG_TOUCHSCREEN_TSC_SERIO=m
# CONFIG_TOUCHSCREEN_TSC2005 is not set
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
@@ -2923,17 +2968,18 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
CONFIG_SERIO_SERPORT=m
CONFIG_SERIO_CT82C710=m
CONFIG_SERIO_PARKBD=m
CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_LIBPS2=m
CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -3008,7 +3054,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3045,10 +3090,13 @@ CONFIG_MWAVE=m
# CONFIG_RAW_DRIVER is not set
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
@@ -3060,7 +3108,14 @@ CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -3139,7 +3194,6 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX_DMA=y
CONFIG_SPI_PXA2XX=m
@@ -3182,8 +3236,8 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3215,7 +3269,7 @@ CONFIG_GPIO_ARIZONA=m
#
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_INTEL_MID is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
# CONFIG_GPIO_RDC321X is not set
@@ -3231,7 +3285,7 @@ CONFIG_GPIO_LANGWELL=y
#
# AC97 GPIO expanders:
#
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
#
# LPC GPIO expanders:
@@ -3264,6 +3318,7 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
+CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_SMB347 is not set
CONFIG_POWER_RESET=y
CONFIG_POWER_AVS=y
@@ -3986,7 +4041,7 @@ CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
#
-# Miscelaneous helper chips
+# Miscellaneous helper chips
#
CONFIG_VIDEO_M52790=m
@@ -4062,6 +4117,7 @@ CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
@@ -4167,6 +4223,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_TTM=m
@@ -4186,6 +4243,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
@@ -4300,7 +4358,7 @@ CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
+CONFIG_BACKLIGHT_LM3630A=m
# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
@@ -4479,6 +4537,7 @@ CONFIG_SND_USB_6FIRE=m
CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
CONFIG_SND_SCS1X=m
@@ -4556,6 +4615,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
@@ -4717,18 +4777,6 @@ CONFIG_USB_SERIAL_IPW=m
CONFIG_USB_SERIAL_IUU=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
@@ -4798,7 +4846,6 @@ CONFIG_USB_XUSBATM=m
#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4840,6 +4887,7 @@ CONFIG_USB_F_NCM=m
CONFIG_USB_F_ECM=m
CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
@@ -4940,6 +4988,7 @@ CONFIG_LEDS_LP5562=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_PCA9685=m
# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
@@ -5094,9 +5143,9 @@ CONFIG_DMA_ACPI=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
@@ -5297,15 +5346,11 @@ CONFIG_FT1000_PCMCIA=m
#
CONFIG_SPEAKUP=m
CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
CONFIG_SPEAKUP_SYNTH_APOLLO=m
CONFIG_SPEAKUP_SYNTH_AUDPTR=m
CONFIG_SPEAKUP_SYNTH_BNS=m
CONFIG_SPEAKUP_SYNTH_DECTLK=m
CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
CONFIG_SPEAKUP_SYNTH_LTLK=m
CONFIG_SPEAKUP_SYNTH_SOFT=m
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
@@ -5371,7 +5416,6 @@ CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5417,6 +5461,8 @@ CONFIG_APPLE_GMUX=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=y
CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
#
# Hardware Spinlock drivers
@@ -5468,6 +5514,14 @@ CONFIG_FMC_WRITE_EEPROM=m
CONFIG_FMC_CHARDEV=m
#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
+#
# Firmware Drivers
#
CONFIG_EDD=m
@@ -5485,6 +5539,7 @@ CONFIG_ISCSI_IBFT=m
# EFI (Extensible Firmware Interface) Support
#
# CONFIG_EFI_VARS is not set
+CONFIG_UEFI_CPER=y
#
# File systems
@@ -5631,6 +5686,11 @@ CONFIG_UBIFS_FS_ZLIB=y
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZO=y
@@ -5660,6 +5720,7 @@ CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5675,6 +5736,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5812,6 +5874,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
CONFIG_DEBUG_KERNEL=y
#
@@ -5948,6 +6011,7 @@ CONFIG_LKDTM=m
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_RBTREE_TEST is not set
# CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_PERCPU_TEST=m
# CONFIG_ATOMIC64_SELFTEST is not set
CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_TEST_STRING_HELPERS is not set
@@ -5962,6 +6026,7 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
# CONFIG_X86_PTDUMP is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
@@ -5992,6 +6057,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6002,8 +6069,16 @@ CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
+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 is not set
+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_SMACK=y
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -6016,6 +6091,8 @@ CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
# CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -6055,7 +6132,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
@@ -6164,6 +6241,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6181,6 +6259,7 @@ CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -6203,7 +6282,6 @@ CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_PERCPU_RWSEM=y
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -6217,6 +6295,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@@ -6250,6 +6329,7 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
diff --git a/abs/core/linux/config.x86_64.last b/abs/core/linux/config.x86_64.last
deleted file mode 100644
index 1412030..0000000
--- a/abs/core/linux/config.x86_64.last
+++ /dev/null
@@ -1,6269 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.6-1 Kernel Configuration
-#
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-ARCH"
-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_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 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_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_RCU_USER_QS is not set
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
-CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
-CONFIG_ARCH_USES_NUMA_PROT_NONE=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_NUMA_BALANCING=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_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
-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_RD_LZ4=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-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_PCI_QUIRKS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-CONFIG_KPROBES_ON_FTRACE=y
-CONFIG_UPROBES=y
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=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_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-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=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_INTEL_LPSS is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=128
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_MICROCODE_INTEL_LIB=y
-# CONFIG_MICROCODE_INTEL_EARLY is not set
-# CONFIG_MICROCODE_AMD_EARLY is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MOVABLE_NODE is not set
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_BALLOON_COMPACTION=y
-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=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-CONFIG_ZBUD=y
-CONFIG_ZSWAP=y
-CONFIG_MEM_SOFT_DIRTY=y
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=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_KEXEC_JUMP=y
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_TRACE=y
-CONFIG_PM_TRACE_RTC=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_BGRT=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_GOV_COMMON=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_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=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_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_REALLOC_ENABLE_AUTO=y
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-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=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DMA_ENGINE=y
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_ENUM_BASIC=m
-
-#
-# RapidIO Switch drivers
-#
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-# CONFIG_X86_SYSFB is not set
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_X86_X32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-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_INET_UDP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-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_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-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_ACCT=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_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=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_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_SYNPROXY=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_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=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_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=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_ECN=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_IPVS=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_NFACCT=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_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT_IPV4=m
-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_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=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=m
-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_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_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-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=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
-CONFIG_IP_SCTP=m
-CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-# 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=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-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_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# 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 is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-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 is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
-CONFIG_OPENVSWITCH_VXLAN=y
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
-CONFIG_NETLINK_DIAG=m
-CONFIG_NET_MPLS_GSO=m
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_NETPRIO_CGROUP=m
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_TCPPROBE=m
-CONFIG_NET_DROP_MONITOR=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-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 is not set
-# 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_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=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CAIF_USB=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_SPI is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_HAVE_BPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=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_DEV_PCIESSD_MTIP32XX=m
-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=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-# CONFIG_AD525X_DPOT_SPI is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-# CONFIG_ATMEL_SSC is not set
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-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_TI_DAC7512 is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
-CONFIG_BMP085_I2C=m
-# CONFIG_BMP085_SPI is not set
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-# CONFIG_EEPROM_93XX46 is not set
-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
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_VMWARE_VMCI=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=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# 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=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-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=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-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=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-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_MPT3SAS=m
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_LOGGING=y
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=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 is not set
-# 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 is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=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_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=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=0
-# 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_ZPODD=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_HIGHBANK=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_RCAR=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_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 is not set
-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_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_CLEANER=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_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-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_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_VXLAN=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-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_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_CADENCE=y
-CONFIG_ARM_AT91_ETHER=m
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_CALXEDA_XGMAC=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-# CONFIG_MLX5_CORE is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-# CONFIG_KS8851 is not set
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_ENC28J60 is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=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_R8169=m
-CONFIG_SH_ETH=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_PLATFORM is not set
-CONFIG_STMMAC_PCI=y
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-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_BCM87XX_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_MDIO_BITBANG=m
-# CONFIG_MDIO_GPIO is not set
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=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_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-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 is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=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_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG 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_IWLWIFI=m
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# 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_SPI is not set
-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=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_MMIO=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_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-# CONFIG_WL1251_SPI is not set
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-# CONFIG_WLCORE_SPI is not set
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_HYPERV_NET=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=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# 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=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# 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_HYSDN_CAPI=y
-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
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# 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 is not set
-# CONFIG_KEYBOARD_GPIO_POLLED is not set
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-CONFIG_KEYBOARD_LM8333=m
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# 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_CYPRESS=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 is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_VSXXXAA=m
-# CONFIG_MOUSE_GPIO is not set
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_IFX6X60 is not set
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-CONFIG_SERIAL_ST_ASC=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=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=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_ST33_I2C=m
-# CONFIG_TCG_XEN is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
-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_ISMT=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_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_GPIO is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=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
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_LM70_LLP is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX_DMA=y
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_ACPI=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers:
-#
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_TS5500 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_VX855 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_ARIZONA=m
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_RDC321X is not set
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# LPC GPIO expanders:
-#
-
-#
-# MODULbus GPIO expanders:
-#
-
-#
-# USB GPIO expanders:
-#
-CONFIG_GPIO_VIPERBOARD=m
-# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_TEST_POWER=m
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_BATTERY_BQ27x00 is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_SMB347 is not set
-CONFIG_POWER_RESET=y
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-# CONFIG_SENSORS_AD7314 is not set
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-# CONFIG_SENSORS_ADCXX is not set
-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_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=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_G762=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_HTU21=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_LM70 is not set
-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_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-# CONFIG_SENSORS_MAX1111 is not set
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NTC_THERMISTOR=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_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=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_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-# CONFIG_SENSORS_ADS7871 is not set
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=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
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_RETU_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_GEODE_WDT=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_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-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_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_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
-CONFIG_MEN_A21_WDT=m
-CONFIG_XEN_WDT=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_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_DRIVER_GPIO=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_DA9052_SPI is not set
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-# CONFIG_MFD_WM8997 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=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_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=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_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-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_JL2005BCD=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_SE401=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_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=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_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_USB_SN9C102=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-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_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_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-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
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SH_VEU=m
-CONFIG_VIDEO_RENESAS_VSP1=m
-# CONFIG_V4L_TEST_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=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_UDA1342=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-CONFIG_VIDEO_SONY_BTF_MPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-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_TVP5150=m
-CONFIG_VIDEO_TW2804=m
-CONFIG_VIDEO_TW9903=m
-CONFIG_VIDEO_TW9906=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7640=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-CONFIG_MEDIA_TUNER=m
-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_MT2063=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_XC4000=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_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=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_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=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
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=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_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-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_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_USB=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_TTM=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_HDMI=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-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 is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# 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 is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_DIRECT_PROCFS=y
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
-# CONFIG_FB_GOLDFISH is not set
-CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_EXYNOS_VIDEO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-CONFIG_LCD_PLATFORM=m
-# CONFIG_LCD_S6E63M0 is not set
-# CONFIG_LCD_LD9040 is not set
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_HX8357 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_SAHARA is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_LOGO is not set
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-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_MAX_CARDS=32
-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_KCTL_JACK=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 is not set
-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_HDA_INTEL=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-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=y
-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_I915=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CA0132=y
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-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_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_SPI=y
-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=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_HUION=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-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=y
-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_PICOLCD_CIR=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FUSBH200_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-# CONFIG_USB_HCD_SSB is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-CONFIG_USB_MUSB_HDRC=m
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_GADGET is not set
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_UX500=m
-# CONFIG_USB_UX500_DMA is not set
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# 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_REALTEK_AUTOPM=y
-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
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_CHIPIDEA is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-# CONFIG_AM335X_PHY_USB is not set
-CONFIG_SAMSUNG_USBPHY=m
-CONFIG_SAMSUNG_USB2PHY=m
-CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-CONFIG_USB_FOTG210_UDC=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_RENESAS_USBHS_UDC=m
-CONFIG_USB_PXA27X=m
-CONFIG_USB_MV_UDC=m
-CONFIG_USB_MV_U3D=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-CONFIG_USB_GOKU=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_LIBCOMPOSITE=m
-CONFIG_USB_F_ACM=m
-CONFIG_USB_U_SERIAL=m
-CONFIG_USB_U_ETHER=m
-CONFIG_USB_U_RNDIS=m
-CONFIG_USB_F_SERIAL=m
-CONFIG_USB_F_OBEX=m
-CONFIG_USB_F_NCM=m
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-# CONFIG_USB_CONFIGFS is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-# CONFIG_GADGET_UAC1 is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-# CONFIG_LEDS_LP8501 is not set
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_EDAC_SBRIDGE=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_SYSTOHC=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=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# 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_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=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
-#
-# CONFIG_RTC_DRV_M41T93 is not set
-# CONFIG_RTC_DRV_M41T94 is not set
-# CONFIG_RTC_DRV_DS1305 is not set
-# CONFIG_RTC_DRV_DS1390 is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_R9701 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_DS3234 is not set
-# CONFIG_RTC_DRV_PCF2123 is not set
-# CONFIG_RTC_DRV_RX4581 is not set
-
-#
-# 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_DS2404=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-# CONFIG_RTC_DRV_MOXART is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_MF624 is not set
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=m
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
-CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-# CONFIG_COMEDI_ISA_DRIVERS is not set
-CONFIG_COMEDI_PCI_DRIVERS=y
-CONFIG_COMEDI_8255_PCI=m
-CONFIG_COMEDI_ADDI_WATCHDOG=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7X3X=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI1724=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200_PCI=m
-CONFIG_COMEDI_AMPLC_PC236_PCI=m
-CONFIG_COMEDI_AMPLC_PC263_PCI=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DAS08_PCI=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC_PCI=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIOCMD=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=y
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=y
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_FC=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_NI_TIO=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_88EU_P2P=y
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_DX_SEP=m
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-CONFIG_VIDEO_GO7007_LOADER=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-# CONFIG_USB_MSI3101 is not set
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
-CONFIG_WIMAX_GDM72XX=m
-CONFIG_WIMAX_GDM72XX_QOS=y
-CONFIG_WIMAX_GDM72XX_K_MODE=y
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-CONFIG_WIMAX_GDM72XX_USB_PM=y
-# CONFIG_LTE_GDM724X is not set
-CONFIG_NET_VENDOR_SILICOM=y
-CONFIG_SBYPASS=m
-CONFIG_BPCTL=m
-CONFIG_CED1401=m
-CONFIG_DGRP=m
-CONFIG_FIREWIRE_SERIAL=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_LUSTRE_FS=m
-CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=y
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-CONFIG_LNET_SELFTEST=m
-CONFIG_USB_BTMTK=m
-# CONFIG_XILLYBUS is not set
-CONFIG_DGNC=m
-CONFIG_DGAP=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-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_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=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_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=y
-CONFIG_PVPANIC=m
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_GPIO=m
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
-# CONFIG_RESET_CONTROLLER is not set
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# 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=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-# CONFIG_EFI_VARS is not set
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# 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_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=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=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 is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-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=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=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=y
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_HFSPLUS_FS_POSIX_ACL=y
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_EFIVAR_FS=y
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DEBUG=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DEBUG=y
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_DYNAMIC_DEBUG=y
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU_DELAY is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
-# CONFIG_RCU_CPU_STALL_INFO is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=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_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENT=y
-CONFIG_UPROBE_EVENT=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-
-#
-# Runtime Testing
-#
-CONFIG_LKDTM=m
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-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 is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_YAMA=y
-CONFIG_SECURITY_YAMA_STACKED=y
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-# CONFIG_DEFAULT_SECURITY_YAMA 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_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=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# 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=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=m
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=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_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CMPXCHG_LOCKREF=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_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_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-CONFIG_DDR=y
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=m
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_AUTOSELECT=y
diff --git a/abs/core/linux/criu-no-expert.patch b/abs/core/linux/criu-no-expert.patch
index 2124427..9bbc028 100644
--- a/abs/core/linux/criu-no-expert.patch
+++ b/abs/core/linux/criu-no-expert.patch
@@ -1,8 +1,8 @@
diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
+index 4e5d96a..4b94ffe 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP
endif # CGROUPS
config CHECKPOINT_RESTORE
@@ -11,12 +11,3 @@ index be8b7f5..7461760 100644
default n
help
Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
- If unsure, say N here.
-
- menuconfig NAMESPACES
-- bool "Namespaces support" if EXPERT
-+ bool "Namespaces support"
- default !EXPERT
- help
- Provides the way to make tasks work with different objects using
diff --git a/abs/core/linux/i8042-fix-aliases.patch b/abs/core/linux/i8042-fix-aliases.patch
new file mode 100644
index 0000000..961968c
--- /dev/null
+++ b/abs/core/linux/i8042-fix-aliases.patch
@@ -0,0 +1,113 @@
+commit 5a420e61e39862c7c3356080eddb23dfe4ccadb7
+Author: Tom Gundersen <teg@jklm.no>
+Date: Sun Jan 26 17:00:32 2014 +0100
+
+ Input: i8042 - fix PNP modaliases when both aux and kdb are enabled
+
+ Commit 78551277e4 exposed the PNP modaliases for the i8042 module. However,
+ when both the aux and the kbd drivers are enabled the aux entries would
+ override the kdb ones.
+
+ Refactor the device_id lists, and unconditionally attempt to load the driver
+ if either a kdb or aux devices is present.
+
+ Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+index 0ec9abb..dbc6958 100644
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -747,25 +747,27 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
+ return 0;
+ }
+
+-static struct pnp_device_id pnp_kbd_devids[] = {
+- { .id = "PNP0300", .driver_data = 0 },
+- { .id = "PNP0301", .driver_data = 0 },
+- { .id = "PNP0302", .driver_data = 0 },
+- { .id = "PNP0303", .driver_data = 0 },
+- { .id = "PNP0304", .driver_data = 0 },
+- { .id = "PNP0305", .driver_data = 0 },
+- { .id = "PNP0306", .driver_data = 0 },
+- { .id = "PNP0309", .driver_data = 0 },
+- { .id = "PNP030a", .driver_data = 0 },
+- { .id = "PNP030b", .driver_data = 0 },
+- { .id = "PNP0320", .driver_data = 0 },
+- { .id = "PNP0343", .driver_data = 0 },
+- { .id = "PNP0344", .driver_data = 0 },
+- { .id = "PNP0345", .driver_data = 0 },
++#define KBD_DEVIDS \
++ { .id = "PNP0300", .driver_data = 0 }, \
++ { .id = "PNP0301", .driver_data = 0 }, \
++ { .id = "PNP0302", .driver_data = 0 }, \
++ { .id = "PNP0303", .driver_data = 0 }, \
++ { .id = "PNP0304", .driver_data = 0 }, \
++ { .id = "PNP0305", .driver_data = 0 }, \
++ { .id = "PNP0306", .driver_data = 0 }, \
++ { .id = "PNP0309", .driver_data = 0 }, \
++ { .id = "PNP030a", .driver_data = 0 }, \
++ { .id = "PNP030b", .driver_data = 0 }, \
++ { .id = "PNP0320", .driver_data = 0 }, \
++ { .id = "PNP0343", .driver_data = 0 }, \
++ { .id = "PNP0344", .driver_data = 0 }, \
++ { .id = "PNP0345", .driver_data = 0 }, \
+ { .id = "CPQA0D7", .driver_data = 0 },
++
++static struct pnp_device_id pnp_kbd_devids[] = {
++ KBD_DEVIDS
+ { .id = "", },
+ };
+-MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
+
+ static struct pnp_driver i8042_pnp_kbd_driver = {
+ .name = "i8042 kbd",
+@@ -773,21 +775,23 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
+ .probe = i8042_pnp_kbd_probe,
+ };
+
+-static struct pnp_device_id pnp_aux_devids[] = {
+- { .id = "AUI0200", .driver_data = 0 },
+- { .id = "FJC6000", .driver_data = 0 },
+- { .id = "FJC6001", .driver_data = 0 },
+- { .id = "PNP0f03", .driver_data = 0 },
+- { .id = "PNP0f0b", .driver_data = 0 },
+- { .id = "PNP0f0e", .driver_data = 0 },
+- { .id = "PNP0f12", .driver_data = 0 },
+- { .id = "PNP0f13", .driver_data = 0 },
+- { .id = "PNP0f19", .driver_data = 0 },
+- { .id = "PNP0f1c", .driver_data = 0 },
++#define AUX_DEVIDS \
++ { .id = "AUI0200", .driver_data = 0 }, \
++ { .id = "FJC6000", .driver_data = 0 }, \
++ { .id = "FJC6001", .driver_data = 0 }, \
++ { .id = "PNP0f03", .driver_data = 0 }, \
++ { .id = "PNP0f0b", .driver_data = 0 }, \
++ { .id = "PNP0f0e", .driver_data = 0 }, \
++ { .id = "PNP0f12", .driver_data = 0 }, \
++ { .id = "PNP0f13", .driver_data = 0 }, \
++ { .id = "PNP0f19", .driver_data = 0 }, \
++ { .id = "PNP0f1c", .driver_data = 0 }, \
+ { .id = "SYN0801", .driver_data = 0 },
++
++static struct pnp_device_id pnp_aux_devids[] = {
++ AUX_DEVIDS
+ { .id = "", },
+ };
+-MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
+
+ static struct pnp_driver i8042_pnp_aux_driver = {
+ .name = "i8042 aux",
+@@ -795,6 +799,13 @@ static struct pnp_driver i8042_pnp_aux_driver = {
+ .probe = i8042_pnp_aux_probe,
+ };
+
++static struct pnp_device_id pnp_kdb_aux_devids[] = {
++ KBD_DEVIDS
++ AUX_DEVIDS
++ { .id = "", },
++};
++MODULE_DEVICE_TABLE(pnp, pnp_kdb_aux_devids);
++
+ static void i8042_pnp_exit(void)
+ {
+ if (i8042_pnp_kbd_registered) {
diff --git a/abs/core/linux/linux.install b/abs/core/linux/linux.install
index a70296f..ef42413 100644
--- a/abs/core/linux/linux.install
+++ b/abs/core/linux/linux.install
@@ -22,6 +22,12 @@ post_upgrade() {
depmod ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME}
+
+ if [ $(vercmp $2 3.13) -lt 0 ]; then
+ echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+ echo ">>> In order to use your keyboard during early init, you MUST"
+ echo ">>> include the 'keyboard' hook in your mkinitcpio.conf."
+ fi
}
post_remove() {
diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg
index a5f68a8..863ef82 100644
--- a/abs/core/linux/linux.install.pkg
+++ b/abs/core/linux/linux.install.pkg
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.12.6-1-ARCH
+KERNEL_VERSION=3.13.7-1-ARCH
post_install () {
# updating module dependencies
@@ -22,6 +22,12 @@ post_upgrade() {
depmod ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME}
+
+ if [ $(vercmp $2 3.13) -lt 0 ]; then
+ echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
+ echo ">>> In order to use your keyboard during early init, you MUST"
+ echo ">>> include the 'keyboard' hook in your mkinitcpio.conf."
+ fi
}
post_remove() {
--
cgit v0.12
From b44e1a9ba42cd543e7f911cbc6102c29420a1fd8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:26:53 +0000
Subject: lirc: rebuild for kernel 3.13
---
abs/core/lirc/PKGBUILD | 14 ++++++------
abs/core/lirc/__changelog | 1 +
abs/core/lirc/irexec.conf | 5 -----
abs/core/lirc/irexecd | 38 --------------------------------
abs/core/lirc/lirc.install | 2 +-
abs/core/lirc/lirc.logrotate | 5 +++++
abs/core/lirc/lircd | 52 --------------------------------------------
abs/core/lirc/lircd.conf | 8 -------
abs/core/lirc/lircmd | 36 ------------------------------
9 files changed, 14 insertions(+), 147 deletions(-)
delete mode 100644 abs/core/lirc/irexec.conf
delete mode 100755 abs/core/lirc/irexecd
create mode 100644 abs/core/lirc/lirc.logrotate
delete mode 100755 abs/core/lirc/lircd
delete mode 100644 abs/core/lirc/lircd.conf
delete mode 100755 abs/core/lirc/lircmd
diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index 666865f..5a9d5e5 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 202757 2013-12-26 13:05:51Z thomas $
+# $Id$
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=67
+pkgrel=70
epoch=1
-_extramodules=extramodules-3.12-ARCH
+_extramodules=extramodules-3.13-ARCH
arch=('i686' 'x86_64')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux>=3.12' 'linux<3.13' 'linux-headers>=3.12' 'linux-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair')
+makedepends=('help2man' 'linux>=3.13' 'linux<3.14' 'linux-headers>=3.13' 'linux-headers<3.14' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
@@ -67,7 +67,7 @@ build() {
cd "${srcdir}/lirc-${pkgver}"
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
- --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
+ --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build \
--with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
--sbindir=/usr/bin --with-transmitter
@@ -82,7 +82,7 @@ build() {
package_lirc() {
pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'linux>=3.12' 'linux<3.13' 'iguanair')
+ depends=('lirc-utils' 'linux>=3.13' 'linux<3.14')
replaces=('lirc+pctv')
install=lirc.install
@@ -97,7 +97,7 @@ package_lirc() {
package_lirc-utils() {
pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair')
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
optdepends=('python2: pronto2lirc utility')
options=('strip')
install=lirc-utils.install
diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog
index 19c9302..c0068c0 100644
--- a/abs/core/lirc/__changelog
+++ b/abs/core/lirc/__changelog
@@ -1 +1,2 @@
added 'iguanair' to make depends and package depends
+change configure kerneldir for 3.13 moving src to --with-kerneldir=/usr/lib/modules/${_kernver}/build
diff --git a/abs/core/lirc/irexec.conf b/abs/core/lirc/irexec.conf
deleted file mode 100644
index f911c75..0000000
--- a/abs/core/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/abs/core/lirc/irexecd b/abs/core/lirc/irexecd
deleted file mode 100755
index a64b033..0000000
--- a/abs/core/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
- start)
- stat_busy "Starting IREXEC Daemon"
- [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon irexecd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping IREXEC Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon irexecd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install
index 31d4bcf..8e5460a 100644
--- a/abs/core/lirc/lirc.install
+++ b/abs/core/lirc/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.12-ARCH
+EXTRAMODULES=extramodules-3.13-ARCH
post_install() {
# updating module dependencies
diff --git a/abs/core/lirc/lirc.logrotate b/abs/core/lirc/lirc.logrotate
new file mode 100644
index 0000000..623c4f3
--- /dev/null
+++ b/abs/core/lirc/lirc.logrotate
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
diff --git a/abs/core/lirc/lircd b/abs/core/lirc/lircd
deleted file mode 100755
index e9739b3..0000000
--- a/abs/core/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
- start)
- stat_busy "Starting LIRC Daemon"
- [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
- rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
- if [ $? -ne 0 ]; then
- stat_fail
- exit 0
- fi
- [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
- [ -z "$PID" ] &&
- if [ -n "$LIRC_DEVICE" ] ; then
- eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
- else
- /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
- fi
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon lircd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping LIRC Daemon"
- rm -f $LIRCD_SYMLINKFILE
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon lircd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/abs/core/lirc/lircd.conf b/abs/core/lirc/lircd.conf
deleted file mode 100644
index 760dab0..0000000
--- a/abs/core/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/abs/core/lirc/lircmd b/abs/core/lirc/lircmd
deleted file mode 100755
index 220c47c..0000000
--- a/abs/core/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
- start)
- stat_busy "Starting lircmd Daemon"
- [ -z "$PID" ] && /usr/sbin/lircmd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon lircmd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping lircmd Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon lircmd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
--
cgit v0.12
From f767daf505cf4f698d41383c378f7b5e425738d9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:35:54 +0000
Subject: nvidia & nvidia-utils: update to 331.49 and build for kernel 3.13
---
abs/core/nvidia-utils/PKGBUILD | 28 ++++++++++++++--------------
abs/core/nvidia/PKGBUILD | 33 +++++++++++++--------------------
abs/core/nvidia/nvidia.install | 6 +++---
3 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 4e5c35c..e38a75a 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 199766 2013-11-15 21:30:02Z svenstaro $
+# $Id$
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Contributor: James Rayner <iphitus@gmail.com>
pkgbase=nvidia-utils
pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=331.20
+pkgver=331.49
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
license=('custom')
options=('!strip')
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+sha1sums=('3ab5c9e3b206cdb93baf6ea17dafe1486dbaa03f'
+ '72f7c25ba94041a80f81a8d8bf025ef680ed1f4f')
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('801aa04a087891690f1cac09575b2ba9')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('28295eed56c2ca996401c0093279620f')
-fi
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
create_links() {
# create soname links
@@ -48,6 +43,9 @@ package_opencl-nvidia() {
install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}"
create_links
+
+ mkdir -p "${pkgdir}/usr/share/licenses"
+ ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia"
}
package_nvidia-libgl() {
@@ -65,6 +63,9 @@ package_nvidia-libgl() {
ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
+
+ mkdir -p "${pkgdir}/usr/share/licenses"
+ ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
}
package_nvidia-utils() {
@@ -121,4 +122,3 @@ package_nvidia-utils() {
create_links
}
-md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index 5c42e7b..cafec22 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,38 +1,32 @@
-# $Id: PKGBUILD 202756 2013-12-26 13:03:42Z thomas $
+# $Id$
# Maintainer : Thomas Baechler <thomas@archlinux.org>
pkgname=nvidia
-pkgver=331.20
-_extramodules=extramodules-3.12-ARCH
-pkgrel=3
+pkgver=331.49
+_extramodules=extramodules-3.13-ARCH
+pkgrel=1
pkgdesc="NVIDIA drivers for linux"
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
-depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
+depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.13' 'linux-headers<3.14')
conflicts=('nvidia-96xx' 'nvidia-173xx')
license=('custom')
install=nvidia.install
options=(!strip)
-#source=('nvidia-linux-3.12.patch')
-#md5sums=('d267069bc456de269424b4e1b46a3745')
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('176c77f9a10eaa652860dbc24042bff2'
+ 'd0c944466a36cae8b1e23330b27a721c')
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('801aa04a087891690f1cac09575b2ba9')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('28295eed56c2ca996401c0093279620f')
-fi
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
prepare() {
cd "${srcdir}"
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
+ # patches here
}
build() {
@@ -49,4 +43,3 @@ package() {
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
-md5sums=('28295eed56c2ca996401c0093279620f')
diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install
index b11a93e..86803bc 100644
--- a/abs/core/nvidia/nvidia.install
+++ b/abs/core/nvidia/nvidia.install
@@ -1,11 +1,11 @@
post_install() {
- EXTRAMODULES='extramodules-3.12-ARCH'
+ EXTRAMODULES='extramodules-3.13-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.12-ARCH'
+ EXTRAMODULES='extramodules-3.13-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@ post_upgrade() {
}
post_remove() {
- EXTRAMODULES='extramodules-3.12-ARCH'
+ EXTRAMODULES='extramodules-3.13-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
--
cgit v0.12
From 23bcf21a63717d1901c646d13580feea10b3ea56 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:41:06 +0000
Subject: linux-api-headers: update to 3.13
---
abs/core/linux-api-headers/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD
index b0dea0b..f5e4810 100644
--- a/abs/core/linux-api-headers/PKGBUILD
+++ b/abs/core/linux-api-headers/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201556 2013-12-15 06:41:30Z allan $
+# $Id$
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=linux-api-headers
-pkgver=3.12.4
-_basever=3.12
+pkgver=3.13.2
+_basever=3.13
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace"
arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
# NOTE: signatures are not automatically verified by makepkg
#http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
-md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
- '511b5a2f0de55b5e91fd293766ce182b')
+md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
+ '352993d23acc5760dafa10ffc9d8881a')
build() {
cd ${srcdir}/linux-${_basever}
--
cgit v0.12
From ff71cd41bd5795e8a0e091edebd2280ba05bfe03 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 25 Mar 2014 22:45:20 +0000
Subject: ceton_infinitv: recompile for kernel 3.13.7
---
abs/core/ceton_infinitv/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD
index 9e5b125..2e73f8c 100755
--- a/abs/core/ceton_infinitv/PKGBUILD
+++ b/abs/core/ceton_infinitv/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Cecil Watson<knoppmyth@gmail.com>
pkgname=ceton_infinitv
-_kernver=3.12.6-1-ARCH
+_kernver=3.13.7-1-ARCH
pkgver=2013_0326_2226
-pkgrel=2
+pkgrel=3
usb_pkgver=0.1.0
pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb "
arch=('i686' 'x86_64')
--
cgit v0.12
From 35e1e2257357e7607c08341de205c8ef302a9fdc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 14:16:13 +0000
Subject: valgrind: update to 3.9.0 for glibc 2.18
---
abs/extra/valgrind/PKGBUILD | 22 +++---
abs/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch | 41 ------------
abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch | 33 +++++++++
.../valgrind/valgrind-3.8.1-ptrace-build-fix.patch | 78 ++++++++++++++++++++++
abs/extra/valgrind/valgrind-3.8.1-xaddb.patch | 34 ++++++++++
5 files changed, 155 insertions(+), 53 deletions(-)
delete mode 100644 abs/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
create mode 100644 abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch
create mode 100644 abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch
create mode 100644 abs/extra/valgrind/valgrind-3.8.1-xaddb.patch
diff --git a/abs/extra/valgrind/PKGBUILD b/abs/extra/valgrind/PKGBUILD
index bf8d65e..1e65355 100644
--- a/abs/extra/valgrind/PKGBUILD
+++ b/abs/extra/valgrind/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $
+# $Id$
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=valgrind
-pkgver=3.7.0
-pkgrel=3
+pkgver=3.9.0
+pkgrel=1
pkgdesc="A tool to help find memory-management problems in programs"
arch=('i686' 'x86_64')
license=('GPL')
url="http://valgrind.org/"
-depends=('glibc>=2.16' 'glibc<2.17' 'perl')
+depends=('glibc>=2.18' 'glibc<2.19' 'perl')
makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
- valgrind-3.7.0-glibc-2.16.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
- '8362c9c10b8d7d08d1be628a717cfba7')
+options=('staticlibs' '!emptydirs')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0947de8112f946b9ce64764af7be6df2')
+
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
- if [ "${CARCH}" = "x86_64" ]; then
+ if [[ ${CARCH} = "x86_64" ]]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
else
./configure --prefix=/usr --mandir=/usr/share/man
fi
+
make
}
diff --git a/abs/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch b/abs/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
deleted file mode 100644
index 4d28ff1..0000000
--- a/abs/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,28 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.15)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
-+
-+ 2.16)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
-+$as_echo "2.16 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_16 1" >>confdefs.h
-+
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
-+
- darwin)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
-- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+ as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
- as_fn_error "or Darwin libc" "$LINENO" 5
- ;;
- esac
diff --git a/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch b/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch
new file mode 100644
index 0000000..9f471ad
--- /dev/null
+++ b/abs/extra/valgrind/valgrind-3.8.1-glibc-2.18.patch
@@ -0,0 +1,33 @@
+diff -Naur valgrind-3.8.1-orig/configure.in valgrind-3.8.1/configure.in
+--- valgrind-3.8.1-orig/configure.in 2013-08-13 22:36:20.201676976 +1000
++++ valgrind-3.8.1/configure.in 2013-08-13 22:38:18.402750093 +1000
+@@ -906,6 +906,20 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.17)
++ AC_MSG_RESULT(2.17 family)
++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
++ 2.18)
++ AC_MSG_RESULT(2.18 family)
++ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +933,7 @@
+
+ *)
+ AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18])
+ AC_MSG_ERROR([or Darwin libc])
+ ;;
+ esac
diff --git a/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch b/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch
new file mode 100644
index 0000000..89af000
--- /dev/null
+++ b/abs/extra/valgrind/valgrind-3.8.1-ptrace-build-fix.patch
@@ -0,0 +1,78 @@
+Index: coregrind/vgdb.c
+===================================================================
+--- coregrind/vgdb.c (revision 13470)
++++ coregrind/vgdb.c (revision 13471)
+@@ -100,11 +100,10 @@
+
+ #if defined(PTRACEINVOKER)
+ #include <sys/user.h>
+ #if defined(VGO_linux)
+ # include <sys/prctl.h>
+-# include <linux/ptrace.h>
+ #endif
+ #endif
+
+
+ // Outputs information for the user about ptrace not working.
+
+Index: coregrind/vgdb.c
+===================================================================
+--- coregrind/vgdb.c (revision 13481)
++++ coregrind/vgdb.c (revision 13482)
+@@ -691,7 +691,7 @@
+ // runtime check not yet done.
+ // 0 : PTRACE_GETREGS runtime check has failed.
+ // 1 : PTRACE_GETREGS defined and runtime check ok.
+-#ifdef PTRACE_GETREGS
++#ifdef HAVE_PTRACE_GETREGS
+ static int has_working_ptrace_getregs = -1;
+ #endif
+
+@@ -702,7 +702,7 @@
+ Bool getregs (int pid, void *regs, long regs_bsz)
+ {
+ DEBUG(1, "getregs regs_bsz %ld\n", regs_bsz);
+-# ifdef PTRACE_GETREGS
++# ifdef HAVE_PTRACE_GETREGS
+ if (has_working_ptrace_getregs) {
+ // Platforms having GETREGS
+ long res;
+@@ -773,7 +773,7 @@
+ DEBUG(1, "setregs regs_bsz %ld\n", regs_bsz);
+ // Note : the below is checking for GETREGS, not SETREGS
+ // as if one is defined and working, the other one should also work.
+-# ifdef PTRACE_GETREGS
++# ifdef HAVE_PTRACE_GETREGS
+ if (has_working_ptrace_getregs) {
+ // Platforms having SETREGS
+ long res;
+Index: configure.in
+===================================================================
+--- configure.in (revision 13481)
++++ configure.in (revision 13482)
+@@ -1040,6 +1040,25 @@
+
+ AM_CONDITIONAL([HAVE_GNU_STPNCPY], [test x$ac_have_gnu_stpncpy = xyes])
+
++# Check for PTRACE_GETREGS
++
++AC_MSG_CHECKING([for PTRACE_GETREGS])
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#include <stddef.h>
++#include <sys/ptrace.h>
++#include <sys/user.h>
++]], [[
++ void *p;
++ long res = ptrace (PTRACE_GETREGS, 0, p, p);
++]])], [
++AC_MSG_RESULT([yes])
++AC_DEFINE([HAVE_PTRACE_GETREGS], 1,
++ [Define to 1 if you have the `PTRACE_GETREGS' ptrace request.])
++], [
++AC_MSG_RESULT([no])
++])
++
++
+ # Check for CLOCK_MONOTONIC
+
+ AC_MSG_CHECKING([for CLOCK_MONOTONIC])
diff --git a/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch b/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch
new file mode 100644
index 0000000..ca5a597
--- /dev/null
+++ b/abs/extra/valgrind/valgrind-3.8.1-xaddb.patch
@@ -0,0 +1,34 @@
+Index: priv/guest_amd64_toIR.c
+===================================================================
+--- VEX/priv/guest_amd64_toIR.c (revision 2580)
++++ VEX/priv/guest_amd64_toIR.c (revision 2581)
+@@ -20268,6 +20268,14 @@
+ delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True );
+ return delta;
+
++ case 0xC0: { /* XADD Gb,Eb */
++ Bool decode_OK = False;
++ delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
++ if (!decode_OK)
++ goto decode_failure;
++ return delta;
++ }
++
+ case 0xC1: { /* XADD Gv,Ev */
+ Bool decode_OK = False;
+ delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta );
+@@ -27143,14 +27151,6 @@
+
+ /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */
+
+- case 0xC0: { /* XADD Gb,Eb */
+- Bool decode_OK = False;
+- delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta );
+- if (!decode_OK)
+- goto decode_failure;
+- break;
+- }
+-
+ /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */
+
+ /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */
--
cgit v0.12
From e29c7b67938ff9384d304c36aa6259d694549933 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 14:48:22 +0000
Subject: libpaper: initial inclusion. dep of cups
---
abs/extra/libpaper/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 abs/extra/libpaper/PKGBUILD
diff --git a/abs/extra/libpaper/PKGBUILD b/abs/extra/libpaper/PKGBUILD
new file mode 100644
index 0000000..2321984
--- /dev/null
+++ b/abs/extra/libpaper/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: royrocks <royrocks13@gmail.com>
+
+pkgname=libpaper
+pkgver=1.1.24
+pkgrel=7
+pkgdesc='Library for handling paper characteristics'
+arch=('x86_64' 'i686')
+url='http://packages.debian.org/unstable/source/libpaper'
+license=('GPL')
+depends=('sh')
+backup=('etc/papersize')
+source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
+sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
+
+build() {
+ cd "$pkgname-$pkgver+nmu2"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver+nmu2"
+ make DESTDIR="$pkgdir" install
+
+ # add systemwide default papersize read by many office applications
+ install -dm 755 $pkgdir/etc
+ echo '# Simply write the paper name. See papersize(5) for possible values' > $pkgdir/etc/papersize
+
+ # add libpaper.d directory other packages can use to store files
+ install -dm 755 $pkgdir/etc/libpaper.d
+
+ # add localisation
+ pushd debian/po
+ for i in `ls *.po`; do
+ install -dm 755 ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/;
+ msgfmt $i -o ${pkgdir}/usr/share/locale/${i%.po}/LC_MESSAGES/${pkgname}.mo;
+ done
+ popd
+}
--
cgit v0.12
From 124b71a11d5478228b9001a22873bdfd18d952aa Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 15:01:49 +0000
Subject: cups: update to 1.7.1
---
abs/extra/cups/PKGBUILD | 161 ++-
abs/extra/cups/PKGBUILD.16 | 146 ---
abs/extra/cups/cups | 68 --
abs/extra/cups/cups-1.6.0-fix-install-perms.patch | 25 +
abs/extra/cups/cups-1.6.2-statedir.patch | 12 +
abs/extra/cups/cups-avahi-1-config.patch | 42 -
abs/extra/cups/cups-avahi-2-backend.patch | 1118 -----------------
abs/extra/cups/cups-avahi-3-timeouts.patch | 381 ------
abs/extra/cups/cups-avahi-4-poll.patch | 529 --------
abs/extra/cups/cups-avahi-5-services.patch | 1272 --------------------
abs/extra/cups/cups-avahi-address.patch | 75 ++
abs/extra/cups/cups-enum-all.patch | 17 +
abs/extra/cups/cups-final-content-type.patch | 18 +
abs/extra/cups/cups-no-export-ssllibs.patch | 8 +-
abs/extra/cups/cups-no-gcrypt.patch | 8 +-
abs/extra/cups/cups-no-gzip-man.patch | 2 +-
abs/extra/cups/cups-no-gzip-man.patch.16 | 18 -
abs/extra/cups/cups-res_init.patch | 26 +
abs/extra/cups/cups-systemd-socket.patch | 262 ++--
abs/extra/cups/cups.install | 21 +-
abs/extra/cups/cups.logrotate | 8 -
...-no-crash-on-avahi-threaded-poll-shutdown.patch | 19 +
...r-statically-configured-ipp-shared-queues.patch | 31 +
abs/extra/cups/ppd-poll-with-client-conf.patch | 23 +
24 files changed, 436 insertions(+), 3854 deletions(-)
delete mode 100644 abs/extra/cups/PKGBUILD.16
delete mode 100755 abs/extra/cups/cups
create mode 100644 abs/extra/cups/cups-1.6.0-fix-install-perms.patch
create mode 100644 abs/extra/cups/cups-1.6.2-statedir.patch
delete mode 100644 abs/extra/cups/cups-avahi-1-config.patch
delete mode 100644 abs/extra/cups/cups-avahi-2-backend.patch
delete mode 100644 abs/extra/cups/cups-avahi-3-timeouts.patch
delete mode 100644 abs/extra/cups/cups-avahi-4-poll.patch
delete mode 100644 abs/extra/cups/cups-avahi-5-services.patch
create mode 100644 abs/extra/cups/cups-avahi-address.patch
create mode 100644 abs/extra/cups/cups-enum-all.patch
create mode 100644 abs/extra/cups/cups-final-content-type.patch
delete mode 100644 abs/extra/cups/cups-no-gzip-man.patch.16
create mode 100644 abs/extra/cups/cups-res_init.patch
delete mode 100644 abs/extra/cups/cups.logrotate
create mode 100644 abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
create mode 100644 abs/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
create mode 100644 abs/extra/cups/ppd-poll-with-client-conf.patch
diff --git a/abs/extra/cups/PKGBUILD b/abs/extra/cups/PKGBUILD
index 9a55d2f..63bb641 100644
--- a/abs/extra/cups/PKGBUILD
+++ b/abs/extra/cups/PKGBUILD
@@ -1,66 +1,104 @@
-# $Id: PKGBUILD 161774 2012-06-13 17:38:37Z andyrtr $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.5.3
-pkgrel=5
+pkgver=1.7.1
+pkgrel=4
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
- 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- cups-avahi-1-config.patch
- cups-avahi-2-backend.patch
- cups-avahi-3-timeouts.patch
- cups-avahi-4-poll.patch
- cups-avahi-5-services.patch
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
+ 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
+ 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
+source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
+ http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
+ cups.logrotate cups.pam
+ # improve build and linking
cups-no-export-ssllibs.patch
cups-no-gcrypt.patch
cups-no-gzip-man.patch
+ # FC
cups-systemd-socket.patch
- cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
- '12c8af5bcd3b8f84240280b3dfaf9e89'
- 'cdc1322c8014297ae349e2db78a03c5a'
- '1a5112f63958643f2888abc9418dbcac'
- 'c37d1bf1bb76acc3fe93362c80d91b7c'
- '5d302860559960042f3b47a91b97c5fe'
- '9b8467a1e51d360096b70e2c3c081e6c'
- '3733c23e77eb503bd94cc368e02830dc'
- 'c9159ba1233902ba6ddbbe6885a46b72'
- '4505b8b2c57a7c28ea79e08388bbbbb9'
- '9657daa21760bb0b5fa3d8b51d5e01a1'
+ cups-res_init.patch
+ cups-avahi-address.patch
+ cups-enum-all.patch
+ cups-final-content-type.patch
+ # Gentoo
+ cups-1.6.0-fix-install-perms.patch
+ cups-1.6.2-statedir.patch
+ # Debian
+ cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+ get-ppd-file-for-statically-configured-ipp-shared-queues.patch
+ ppd-poll-with-client-conf.patch)
+md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
'f861b18f4446c43918c8643dcbbd7f6d'
- '96f82c38f3f540b53f3e5144900acf17')
+ '96f82c38f3f540b53f3e5144900acf17'
+ '3ba9e3410df1dc3015463d615ef91b3b'
+ 'cc4101beccb5ed6deb1c92707a575925'
+ '90c30380d4c8cd48a908cfdadae1ea24'
+ 'cf2f881967b0531ec49bcb5d0e9573a8'
+ '8fe27d4248cacbc02824e7937cab4088'
+ 'df0c367c0022e3c7d8e01827e8a6c5e7'
+ 'f30c2a161caaf27854581507cde8cac6'
+ 'a31b64ba25a985fbae65d8ddf311b08c'
+ '5117f65342fcc69c6a506529e4daca9e'
+ '451609db34f95209d64c38474de27ce1'
+ 'cb58bf4e0b80eaee383712e5c84a1ab4'
+ 'b578bcd17949a7203237ba1e31f78ef9'
+ '0becd6ab8782b97f19a02c1dc174c75e')
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- # http://www.cups.org/str.php?L3066
- # Avahi support in the dnssd backend. patches from upstream/FC RawHide
- patch -Np1 -i ${srcdir}/cups-avahi-1-config.patch
- patch -Np1 -i ${srcdir}/cups-avahi-2-backend.patch
- patch -Np1 -i ${srcdir}/cups-avahi-3-timeouts.patch
- patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch
- patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch
+prepare() {
+ cd ${pkgbase}-${pkgver}
+
# add systemd socket support - Fedora patch, also used in Gentoo
+ # modified now to the changes done by Gentoo in their svn ebuild
+ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-
+
# Do not export SSL libs in cups-config
patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+
# don't zip man pages in make install, let makepkg do that / Fedora
patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+
+
+ # various bugfixes (upstream reports/SVN or Fedora/Debian
+
+ # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
+# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+ # Applications could not get the PPD file for statically-configured IPP-shared print queues
+ patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
+ # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
+ # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
+# patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
+ # fix permissions on some files - alternative: cups-0755.patch by FC
+ patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
+ # move /var/run -> /run for pid file
+ patch -Np1 -i ${srcdir}/cups-1.6.2-statedir.patch
+ # Re-initialise the resolver on failure in httpAddrGetList()
+ patch -Np1 -i ${srcdir}/cups-res_init.patch
+ # Use IP address when resolving DNSSD URIs
+ patch -Np1 -i ${srcdir}/cups-avahi-address.patch
+ # Return from cupsEnumDests() once all records have been returned.
+ patch -Np1 -i ${srcdir}/cups-enum-all.patch
- # Rebuild configure script for --enable-avahi.
+ # Fix printing to some network printers fails - https://bugs.archlinux.org/task/37605
+ patch -Np1 -i ${srcdir}/cups-final-content-type.patch
+
+ # Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --sbindir=/usr/bin \
--libdir=/usr/lib \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-logdir=/var/log/cups \
@@ -68,32 +106,30 @@ build() {
--with-cups-user=daemon \
--with-cups-group=lp \
--enable-pam=yes \
- --disable-ldap \
--enable-raw-printing \
--enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-gnutls \
+ --enable-ssl=yes --enable-openssl \
--enable-threads \
--enable-avahi\
+ --enable-libpaper \
--with-php=/usr/bin/php-cgi \
- --with-pdftops=pdftops \
--with-optim="$CFLAGS"
make
}
check() {
- cd "$srcdir/$pkgbase-$pkgver"
- #httpAddrGetList(workstation64): FAIL
- #1 TESTS FAILED!
- #make[1]: *** [testhttp] Error 1
+ cd ${pkgbase}-${pkgver}
+#./run-stp-tests.sh: line 782: 6307 Aborted (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
+#FAIL: 87 error messages, expected 33.
make -k check || /bin/true
}
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
+depends=('openssl' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
backup=(etc/cups/client.conf)
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-headers install-libs
# put this into the libs pkg to make other software find the libs(no pkg-config file included)
mkdir -p ${pkgdir}/usr/bin
@@ -101,13 +137,12 @@ backup=(etc/cups/client.conf)
# install client.conf man page and config file
install -dm755 ${pkgdir}/usr/share/man/man5
- #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
- install -dm755 ${pkgdir}/etc/cups
+ install -dm755 -g lp ${pkgdir}/etc/cups
touch ${pkgdir}/etc/cups/client.conf
echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
- chgrp lp ${pkgdir}/etc/cups/client.conf
+ chgrp -R lp ${pkgdir}/etc/cups
}
package_cups() {
@@ -117,16 +152,17 @@ backup=(etc/cups/cupsd.conf
etc/cups/snmp.conf
etc/cups/printers.conf
etc/cups/classes.conf
+ etc/cups/cups-files.conf
etc/cups/subscriptions.conf
etc/dbus-1/system.d/cups.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module'
- 'xdg-utils: xdg .desktop file support')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
+ 'libusb' 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
+optdepends=('xdg-utils: xdg .desktop file support')
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd ${pkgbase}-${pkgver}
make BUILDROOT=${pkgdir} install-data install-exec
# this one we ship in the libcups pkg
@@ -135,24 +171,23 @@ optdepends=('php: for included phpcups.so module'
# kill the sysv stuff
rm -rf ${pkgdir}/etc/rc*.d
rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
# fix perms on /var/spool and /etc
chmod 755 ${pkgdir}/var/spool
chmod 755 ${pkgdir}/etc
-
+
# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- # remove directory from package, we create it in cups rc.d file
- rm -rf ${pkgdir}/var/run
+ # remove directory from package, it will be recreated at each server start
+ rm -rf ${pkgdir}/run
# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
touch ${pkgdir}/etc/cups/classes.conf
touch ${pkgdir}/etc/cups/subscriptions.conf
- chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
+ chgrp -R lp ${pkgdir}/etc/cups
# fix .desktop file
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
@@ -163,12 +198,12 @@ optdepends=('php: for included phpcups.so module'
# remove client.conf man page
rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
- # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions
- rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
- rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+ # remove files now part of cups-filters
rm -v ${pkgdir}/usr/share/cups/banners/*
- rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs}
- rm -v ${pkgdir}/usr/share/cups/fonts/*
+ rm -v ${pkgdir}/usr/share/cups/data/testprint
# comment out all conversion rules which use any of the removed filters
- perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs
+ perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
+
+ # Provide native service for arch-daemons generator
+ ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
}
diff --git a/abs/extra/cups/PKGBUILD.16 b/abs/extra/cups/PKGBUILD.16
deleted file mode 100644
index 01faba0..0000000
--- a/abs/extra/cups/PKGBUILD.16
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6b1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord'
- 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- cups-no-export-ssllibs.patch
- cups-no-gcrypt.patch
- cups-no-gzip-man.patch
- cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('468a40755a872d84be89111ce97a69d1'
- '9b8467a1e51d360096b70e2c3c081e6c'
- '3733c23e77eb503bd94cc368e02830dc'
- '90c30380d4c8cd48a908cfdadae1ea24'
- '9657daa21760bb0b5fa3d8b51d5e01a1'
- 'f861b18f4446c43918c8643dcbbd7f6d'
- '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # Do not export SSL libs in cups-config
- patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
- patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
- # don't zip man pages in make install, let makepkg do that / Fedora
- patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-
- # Rebuild configure script for not zipping man-pages.
- aclocal -I config-scripts
- autoconf -I config-scripts
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libdir=/usr/lib \
- --with-logdir=/var/log/cups \
- --with-docdir=/usr/share/cups/doc \
- --with-cups-user=daemon \
- --with-cups-group=lp \
- --enable-pam=yes \
- --enable-raw-printing \
- --enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-gnutls \
- --enable-threads \
- --enable-avahi\
- --with-php=/usr/bin/php-cgi \
- --with-optim="$CFLAGS"
- make
-}
-
-check() {
- cd "$srcdir/$pkgbase-$pkgver"
- #httpAddrGetList(workstation64): FAIL
- #1 TESTS FAILED!
- #make[1]: *** [testhttp] Error 1
- make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make BUILDROOT=${pkgdir} install-headers install-libs
- # put this into the libs pkg to make other software find the libs(no pkg-config file included)
- mkdir -p ${pkgdir}/usr/bin
- install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-
- # install client.conf man page and config file
- install -dm755 ${pkgdir}/usr/share/man/man5
- #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
- install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
- install -dm755 ${pkgdir}/etc/cups
- touch ${pkgdir}/etc/cups/client.conf
- echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
- echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
- chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
- etc/cups/snmp.conf
- etc/cups/printers.conf
- etc/cups/classes.conf
- etc/cups/subscriptions.conf
- etc/dbus-1/system.d/cups.conf
- etc/logrotate.d/cups
- etc/pam.d/cups
- etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make BUILDROOT=${pkgdir} install-data install-exec
-
- # this one we ship in the libcups pkg
- rm -f ${pkgdir}/usr/bin/cups-config
-
- # kill the sysv stuff
- rm -rf ${pkgdir}/etc/rc*.d
- rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
- install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
- install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-
- # fix perms on /var/spool and /etc
- chmod 755 ${pkgdir}/var/spool
- chmod 755 ${pkgdir}/etc
-
- # install ssl directory where to store the certs, solves some samba issues
- install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- # remove directory from package, we create it in cups rc.d file
- rm -rf ${pkgdir}/var/run
-
- # install some more configuration files that will get filled by cupsd
- touch ${pkgdir}/etc/cups/printers.conf
- touch ${pkgdir}/etc/cups/classes.conf
- touch ${pkgdir}/etc/cups/subscriptions.conf
- chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-
- # fix .desktop file
- sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-
- # compress some driver files, adopted from Fedora
- find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-
- # remove client.conf man page
- rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-
- # remove files now part of cups-filters
- rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
- rm -v ${pkgdir}/usr/share/cups/banners/*
- rm -v ${pkgdir}/usr/share/cups/data/testprint
- # comment out all conversion rules which use any of the removed filters
- perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-}
diff --git a/abs/extra/cups/cups b/abs/extra/cups/cups
deleted file mode 100755
index 744c8e6..0000000
--- a/abs/extra/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
- pidof -o %PPID $daemon_name
-}
-
-case "$1" in
- start)
- stat_busy "Starting $daemon_name daemon"
-
- PID=$(get_pid)
- if [ -z "$PID" ]; then
- [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
- # RUN
- $daemon_name
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- echo $(get_pid) > /var/run/$daemon_name.pid
- add_daemon $daemon_name
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping $daemon_name daemon"
- PID=$(get_pid)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/$daemon_name.pid &> /dev/null
- rm_daemon $daemon_name
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/abs/extra/cups/cups-1.6.0-fix-install-perms.patch b/abs/extra/cups/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 0000000..2d7a77c
--- /dev/null
+++ b/abs/extra/cups/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,25 @@
+Index: Makedefs.in
+===================================================================
+--- Makedefs.in (Revision 10520)
++++ Makedefs.in (Arbeitskopie)
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+
+-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA = $(INSTALL) -c -m 444
++INSTALL_DATA = $(INSTALL) -c -m 644
+ INSTALL_DIR = $(INSTALL) -d
+-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN = $(INSTALL) -c -m 444
+-INSTALL_SCRIPT = $(INSTALL) -c -m 555
++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN = $(INSTALL) -c -m 644
++INSTALL_SCRIPT = $(INSTALL) -c -m 755
+
+ #
+ # Default user, group, and system groups for the scheduler...
diff --git a/abs/extra/cups/cups-1.6.2-statedir.patch b/abs/extra/cups/cups-1.6.2-statedir.patch
new file mode 100644
index 0000000..c44ebed
--- /dev/null
+++ b/abs/extra/cups/cups-1.6.2-statedir.patch
@@ -0,0 +1,12 @@
+diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
+--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200
+@@ -420,7 +420,7 @@
+ ;;
+ *)
+ # All others
+- CUPS_STATEDIR="$localstatedir/run/cups"
++ CUPS_STATEDIR="/run/cups"
+ ;;
+ esac])
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
diff --git a/abs/extra/cups/cups-avahi-1-config.patch b/abs/extra/cups/cups-avahi-1-config.patch
deleted file mode 100644
index 304cd26..0000000
--- a/abs/extra/cups/cups-avahi-1-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in
---- cups-1.5.2/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100
-+++ cups-1.5.2/config.h.in 2012-03-14 15:04:51.365347165 +0000
-@@ -390,6 +390,13 @@
-
-
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
- * Do we have <sys/ioctl.h>?
- */
-
-diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4
---- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.2/config-scripts/cups-dnssd.m4 2012-03-14 15:04:51.365347165 +0000
-@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
-
-+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no],
-+ [if test x$enable_avahi = xyes; then
-+ AC_MSG_CHECKING(for Avahi)
-+ if $PKGCONFIG --exists avahi-client; then
-+ AC_MSG_RESULT(yes)
-+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+ DNSSD_BACKEND="dnssd"
-+ AC_DEFINE(HAVE_AVAHI)
-+ enable_dnssd=no
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ fi])
-+
- if test x$enable_dnssd != xno; then
- AC_CHECK_HEADER(dns_sd.h, [
- case "$uname" in
\ No newline at end of file
diff --git a/abs/extra/cups/cups-avahi-2-backend.patch b/abs/extra/cups/cups-avahi-2-backend.patch
deleted file mode 100644
index 00e12a0..0000000
--- a/abs/extra/cups/cups-avahi-2-backend.patch
+++ /dev/null
@@ -1,1118 +0,0 @@
-diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c
---- cups-1.5.3/backend/dnssd.c.avahi-2-backend 2012-05-15 16:53:18.164774446 +0200
-+++ cups-1.5.3/backend/dnssd.c 2012-05-15 17:09:07.684155704 +0200
-@@ -15,14 +15,21 @@
- *
- * Contents:
- *
-+ * next_txt_record() - Get next TXT record from a cups_txt_records_t.
-+ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
- * main() - Browse for printers.
- * browse_callback() - Browse devices.
- * browse_local_callback() - Browse local devices.
- * compare_devices() - Compare two devices.
- * exec_backend() - Execute the backend that corresponds to the
- * resolved service name.
-+ * device_type() - Get DNS-SD type enumeration from string.
- * get_device() - Create or update a device.
- * query_callback() - Process query data.
-+ * avahi_client_callback() - Avahi client callback function.
-+ * avahi_query_callback() - Avahi query callback function.
-+ * avahi_browse_callback() - Avahi browse callback function.
-+ * find_device() - Find a device from its name and domain.
- * sigterm_handler() - Handle termination signals...
- * unquote() - Unquote a name string.
- */
-@@ -33,7 +40,18 @@
-
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+# include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/lookup.h>
-+# include <avahi-common/simple-watch.h>
-+# include <avahi-common/domain.h>
-+# include <avahi-common/error.h>
-+# include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -53,7 +71,12 @@ typedef enum
-
- typedef struct
- {
-+#ifdef HAVE_DNSSD
- DNSServiceRef ref; /* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int resolved; /* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
- char *name, /* Service name */
- *domain, /* Domain name */
- *fullName, /* Full name */
-@@ -65,6 +88,20 @@ typedef struct
- sent; /* Did we list the device? */
- } cups_device_t;
-
-+typedef struct
-+{
-+ char key[256];
-+ char value[256];
-+
-+#ifdef HAVE_DNSSD
-+ const uint8_t *data;
-+ const uint8_t *datanext;
-+ const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+ AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
-
- /*
- * Local globals...
-@@ -78,6 +115,7 @@ static int job_canceled = 0;
- * Local functions...
- */
-
-+#ifdef HAVE_DNSSD
- static void browse_callback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- uint32_t interfaceIndex,
-@@ -95,13 +133,6 @@ static void browse_local_callback(DNSSe
- const char *replyDomain,
- void *context)
- __attribute__((nonnull(1,5,6,7,8)));
--static int compare_devices(cups_device_t *a, cups_device_t *b);
--static void exec_backend(char **argv);
--static cups_device_t *get_device(cups_array_t *devices,
-- const char *serviceName,
-- const char *regtype,
-- const char *replyDomain)
-- __attribute__((nonnull(1,2,3,4)));
- static void query_callback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- uint32_t interfaceIndex,
-@@ -111,10 +142,119 @@ static void query_callback(DNSServiceRe
- const void *rdata, uint32_t ttl,
- void *context)
- __attribute__((nonnull(1,5,9,11)));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void avahi_client_callback (AvahiClient *client,
-+ AvahiClientState state,
-+ void *context);
-+static void avahi_browse_callback (AvahiServiceBrowser *browser,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiBrowserEvent event,
-+ const char *serviceName,
-+ const char *regtype,
-+ const char *replyDomain,
-+ AvahiLookupResultFlags flags,
-+ void *context);
-+#endif /* HAVE_AVAHI */
-+static cups_device_t * find_device (cups_array_t *devices,
-+ cups_txt_records_t *txt,
-+ cups_device_t *dkey);
-+static int compare_devices(cups_device_t *a, cups_device_t *b);
-+static void exec_backend(char **argv);
-+static cups_device_t *get_device(cups_array_t *devices,
-+ const char *serviceName,
-+ const char *regtype,
-+ const char *replyDomain)
-+ __attribute__((nonnull(1,2,3,4)));
- static void sigterm_handler(int sig);
- static void unquote(char *dst, const char *src, size_t dstsize)
- __attribute__((nonnull(1,2)));
-
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+ txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+ txt->txt = avahi_string_list_get_next (txt->txt);
-+ if (txt->txt == NULL)
-+ return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+ return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+ uint8_t datalen;
-+ uint8_t *data = txt->data;
-+ char *ptr;
-+
-+ /*
-+ * Read a key/value pair starting with an 8-bit length. Since the
-+ * length is 8 bits and the size of the key/value buffers is 256, we
-+ * don't need to check for overflow...
-+ */
-+
-+ datalen = *data++;
-+ if (!datalen || (data + datalen) > txt->dataend)
-+ return NULL;
-+ txt->datanext = data + datalen;
-+
-+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+ *ptr++ = *data;
-+ *ptr = '\0';
-+
-+ if (data < txt->datanext && *data == '=')
-+ {
-+ data++;
-+
-+ if (data < datanext)
-+ memcpy (txt->value, data, txt->datanext - data);
-+ value[txt->datanext - data] = '\0';
-+ }
-+ else
-+ return 1;
-+#else /* HAVE_AVAHI */
-+ char *key, *value;
-+ size_t len;
-+ avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+ if (len > sizeof (txt->value) - 1)
-+ len = sizeof (txt->value) - 1;
-+
-+ memcpy (txt->value, value, len);
-+ txt->value[len] = '\0';
-+ len = strlen (key);
-+ if (len > sizeof (txt->key) - 1)
-+ len = sizeof (txt->key) - 1;
-+
-+ memcpy (txt->key, key, len);
-+ txt->key[len] = '\0';
-+ avahi_free (key);
-+ avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+ return 0;
-+}
-+
-
- /*
- * 'main()' - Browse for printers.
-@@ -125,6 +265,13 @@ main(int argc, /* I - Number of comm
- char *argv[]) /* I - Command-line arguments */
- {
- const char *name; /* Backend name */
-+ cups_array_t *devices; /* Device array */
-+ cups_device_t *device; /* Current device */
-+ char uriName[1024]; /* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+ int fd; /* Main file descriptor */
-+ fd_set input; /* Input set for select() */
-+ struct timeval timeout; /* Timeout for select() */
- DNSServiceRef main_ref, /* Main service reference */
- fax_ipp_ref, /* IPP fax service reference */
- ipp_ref, /* IPP service reference */
-@@ -138,12 +285,11 @@ main(int argc, /* I - Number of comm
- pdl_datastream_ref, /* AppSocket service reference */
- printer_ref, /* LPD service reference */
- riousbprint_ref; /* Remote IO service reference */
-- int fd; /* Main file descriptor */
-- fd_set input; /* Input set for select() */
-- struct timeval timeout; /* Timeout for select() */
-- cups_array_t *devices; /* Device array */
-- cups_device_t *device; /* Current device */
-- char uriName[1024]; /* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ AvahiClient *client;
-+ int error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
- struct sigaction action; /* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -203,6 +349,49 @@ main(int argc, /* I - Number of comm
- * Browse for different kinds of printers...
- */
-
-+#ifdef HAVE_AVAHI
-+ if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+ {
-+ perror ("ERROR: Unable to create avahi simple poll object");
-+ return (1);
-+ }
-+
-+ client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+ 0, avahi_client_callback, NULL, &error);
-+ if (!client)
-+ {
-+ perror ("DEBUG: Unable to create avahi client");
-+ return (0);
-+ }
-+
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_fax-ipp._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_ipp._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_ipp-tls._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_pdl-datastream._tcp",
-+ NULL, 0,
-+ avahi_browse_callback,
-+ devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_printer._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_riousbprint._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
- if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
- {
- perror("ERROR: Unable to create service connection");
-@@ -263,6 +452,7 @@ main(int argc, /* I - Number of comm
- riousbprint_ref = main_ref;
- DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
- "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
-
- /*
- * Loop until we are killed...
-@@ -270,6 +460,9 @@ main(int argc, /* I - Number of comm
-
- while (!job_canceled)
- {
-+ int announce = 0;
-+
-+#ifdef HAVE_DNSSD
- FD_ZERO(&input);
- FD_SET(fd, &input);
-
-@@ -289,11 +482,35 @@ main(int argc, /* I - Number of comm
- }
- else
- {
-+ announce = 1;
-+ }
-+#else /* HAVE_AVAHI */
-+ int r;
-+ avahi_got_callback = 0;
-+ r = avahi_simple_poll_iterate (simple_poll, 1);
-+ if (r != 0 && r != EINTR)
-+ {
-+ /*
-+ * We've been told to exit the loop. Perhaps the connection to
-+ * avahi failed.
-+ */
-+
-+ break;
-+ }
-+
-+ if (avahi_got_callback)
-+ announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+ if (announce)
-+ {
- /*
- * Announce any devices we've found...
- */
-
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType status; /* DNS query status */
-+#endif /* HAVE_DNSSD */
- cups_device_t *best; /* Best matching device */
- char device_uri[1024]; /* Device URI */
- int count; /* Number of queries */
-@@ -307,6 +524,7 @@ main(int argc, /* I - Number of comm
- if (device->sent)
- sent ++;
-
-+#ifdef HAVE_DNSSD
- if (device->ref)
- count ++;
-
-@@ -338,14 +556,23 @@ main(int argc, /* I - Number of comm
- count ++;
- }
- }
-- else if (!device->sent)
-+ else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ if (!device->resolved)
-+ continue;
-+ else
-+#endif /* HAVE_AVAHI */
-+ if (!device->sent)
- {
-+#ifdef HAVE_DNSSD
- /*
- * Got the TXT records, now report the device...
- */
-
- DNSServiceRefDeallocate(device->ref);
- device->ref = 0;
-+#endif /* HAVE_DNSSD */
-
- if (!best)
- best = device;
-@@ -406,6 +633,7 @@ main(int argc, /* I - Number of comm
- }
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'browse_callback()' - Browse devices.
- */
-@@ -494,6 +722,7 @@ browse_local_callback(
- device->fullName);
- device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
-
-
- /*
-@@ -574,6 +803,41 @@ exec_backend(char **argv) /* I - Comman
-
-
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+ if (!strcmp(regtype, "_ipp._tcp"))
-+ return (CUPS_DEVICE_IPP);
-+ else if (!strcmp(regtype, "_ipps._tcp") ||
-+ !strcmp(regtype, "_ipp-tls._tcp"))
-+ return (CUPS_DEVICE_IPPS);
-+ else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+ return (CUPS_DEVICE_FAX_IPP);
-+ else if (!strcmp(regtype, "_printer._tcp"))
-+ return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+ if (!strcmp(regtype, "_ipp._tcp."))
-+ return (CUPS_DEVICE_IPP);
-+ else if (!strcmp(regtype, "_ipps._tcp.") ||
-+ !strcmp(regtype, "_ipp-tls._tcp."))
-+ return (CUPS_DEVICE_IPPS);
-+ else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+ return (CUPS_DEVICE_FAX_IPP);
-+ else if (!strcmp(regtype, "_printer._tcp."))
-+ return (CUPS_DEVICE_PRINTER);
-+ else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+ return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+ return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
- * 'get_device()' - Create or update a device.
- */
-
-@@ -594,20 +858,7 @@ get_device(cups_array_t *devices, /* I -
- */
-
- key.name = (char *)serviceName;
--
-- if (!strcmp(regtype, "_ipp._tcp."))
-- key.type = CUPS_DEVICE_IPP;
-- else if (!strcmp(regtype, "_ipps._tcp.") ||
-- !strcmp(regtype, "_ipp-tls._tcp."))
-- key.type = CUPS_DEVICE_IPPS;
-- else if (!strcmp(regtype, "_fax-ipp._tcp."))
-- key.type = CUPS_DEVICE_FAX_IPP;
-- else if (!strcmp(regtype, "_printer._tcp."))
-- key.type = CUPS_DEVICE_PRINTER;
-- else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-- key.type = CUPS_DEVICE_PDL_DATASTREAM;
-- else
-- key.type = CUPS_DEVICE_RIOUSBPRINT;
-+ key.type = device_type (regtype);
-
- for (device = cupsArrayFind(devices, &key);
- device;
-@@ -627,8 +878,14 @@ get_device(cups_array_t *devices, /* I -
- free(device->domain);
- device->domain = strdup(replyDomain);
-
-+#ifdef HAVE_DNSSD
- DNSServiceConstructFullName(fullName, device->name, regtype,
- replyDomain);
-+#else /* HAVE_AVAHI */
-+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+ serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- free(device->fullName);
- device->fullName = strdup(fullName);
- }
-@@ -648,6 +905,9 @@ get_device(cups_array_t *devices, /* I -
- device->domain = strdup(replyDomain);
- device->type = key.type;
- device->priority = 50;
-+#ifdef HAVE_AVAHI
-+ device->resolved = 0;
-+#endif /* HAVE_AVAHI */
-
- cupsArrayAdd(devices, device);
-
-@@ -655,13 +915,20 @@ get_device(cups_array_t *devices, /* I -
- * Set the "full name" of this service, which is used for queries...
- */
-
-+#ifdef HAVE_DNSSD
- DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+ serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- device->fullName = strdup(fullName);
-
- return (device);
- }
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'query_callback()' - Process query data.
- */
-@@ -685,7 +952,7 @@ query_callback(
- *ptr; /* Pointer into string */
- cups_device_t dkey, /* Search key */
- *device; /* Device */
--
-+ cups_txt_records_t txt;
-
- fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
- "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -719,94 +986,233 @@ query_callback(
- if ((ptr = strstr(name, "._")) != NULL)
- *ptr = '\0';
-
-- if (strstr(fullName, "_ipp._tcp."))
-- dkey.type = CUPS_DEVICE_IPP;
-- else if (strstr(fullName, "_ipps._tcp.") ||
-- strstr(fullName, "_ipp-tls._tcp."))
-- dkey.type = CUPS_DEVICE_IPPS;
-- else if (strstr(fullName, "_fax-ipp._tcp."))
-- dkey.type = CUPS_DEVICE_FAX_IPP;
-- else if (strstr(fullName, "_printer._tcp."))
-- dkey.type = CUPS_DEVICE_PRINTER;
-- else if (strstr(fullName, "_pdl-datastream._tcp."))
-- dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+ dkey.type = device_type (fullName);
-+
-+ txt.data = rdata;
-+ txt.dataend = rdata + rdlen;
-+ device = find_device ((cups_array_t *) context, &txt, &dkey);
-+ if (!device)
-+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+ AvahiClientState state,
-+ void *context)
-+{
-+ /*
-+ * If the connection drops, quit.
-+ */
-+
-+ if (state == AVAHI_CLIENT_FAILURE)
-+ {
-+ fprintf (stderr, "ERROR: Avahi connection failed\n");
-+ avahi_simple_poll_quit (simple_poll);
-+ }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ AvahiClient *client;
-+ cups_device_t key,
-+ *device;
-+ char uqname[1024],
-+ *ptr;
-+ cups_txt_records_t txtr;
-+
-+ client = avahi_service_resolver_get_client (resolver);
-+ if (event != AVAHI_RESOLVER_FOUND)
-+ {
-+ if (event == AVAHI_RESOLVER_FAILURE)
-+ {
-+ fprintf (stderr, "ERROR: %s\n",
-+ avahi_strerror (avahi_client_errno (client)));
-+ }
-+
-+ avahi_service_resolver_free (resolver);
-+ return;
-+ }
-+
-+ /*
-+ * Set search key for device.
-+ */
-+
-+ key.name = uqname;
-+ unquote (uqname, name, sizeof (uqname));
-+ if ((ptr = strstr(name, "._")) != NULL)
-+ *ptr = '\0';
-+
-+ key.domain = (char *) domain;
-+ key.type = device_type (type);
-+
-+ /*
-+ * Find the device and the the TXT information.
-+ */
-+
-+ txtr.txt = txt;
-+ device = find_device ((cups_array_t *) context, &txtr, &key);
-+ if (device)
-+ {
-+ /*
-+ * Let the main loop know to announce the device.
-+ */
-+
-+ device->resolved = 1;
-+ avahi_got_callback = 1;
-+ }
- else
-- dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-
-- for (device = cupsArrayFind(devices, &dkey);
-+ avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiBrowserEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+ switch (event)
-+ {
-+ case AVAHI_BROWSER_FAILURE:
-+ fprintf (stderr, "ERROR: %s\n",
-+ avahi_strerror (avahi_client_errno (client)));
-+ avahi_simple_poll_quit (simple_poll);
-+ return;
-+
-+ case AVAHI_BROWSER_NEW:
-+ /*
-+ * This object is new on the network.
-+ */
-+
-+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+ {
-+ /*
-+ * This comes from the local machine so ignore it.
-+ */
-+
-+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+ }
-+ else
-+ {
-+ /*
-+ * Create a device entry for it if it doesn't yet exist.
-+ */
-+
-+ get_device ((cups_array_t *)context, name, type, domain);
-+
-+ /*
-+ * Now look for a TXT entry.
-+ */
-+
-+ if (avahi_service_resolver_new (client, interface, protocol,
-+ name, type, domain,
-+ AVAHI_PROTO_UNSPEC, 0,
-+ avahi_query_callback, context) == NULL)
-+ {
-+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+ name, avahi_strerror (avahi_client_errno (client)));
-+ }
-+ }
-+
-+ break;
-+
-+ case AVAHI_BROWSER_REMOVE:
-+ case AVAHI_BROWSER_ALL_FOR_NOW:
-+ case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+ break;
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+ cups_txt_records_t *txt,
-+ cups_device_t *dkey)
-+{
-+ cups_device_t *device;
-+ char *ptr;
-+
-+ for (device = cupsArrayFind(devices, dkey);
- device;
- device = cupsArrayNext(devices))
- {
-- if (_cups_strcasecmp(device->name, dkey.name) ||
-- _cups_strcasecmp(device->domain, dkey.domain))
-+ if (_cups_strcasecmp(device->name, dkey->name) ||
-+ _cups_strcasecmp(device->domain, dkey->domain))
- {
- device = NULL;
- break;
- }
-- else if (device->type == dkey.type)
-+ else if (device->type == dkey->type)
- {
- /*
- * Found it, pull out the priority and make and model from the TXT
- * record and save it...
- */
-
-- const uint8_t *data, /* Pointer into data */
-- *datanext, /* Next key/value pair */
-- *dataend; /* End of entire TXT record */
-- uint8_t datalen; /* Length of current key/value pair */
-- char key[256], /* Key string */
-- value[256], /* Value string */
-- make_and_model[512],
-+ char make_and_model[512],
- /* Manufacturer and model */
- model[256], /* Model */
-- device_id[2048];/* 1284 device ID */
--
-+ device_id[2048]; /* 1284 device ID */
-
- device_id[0] = '\0';
- make_and_model[0] = '\0';
-
- strcpy(model, "Unknown");
-
-- for (data = rdata, dataend = data + rdlen;
-- data < dataend;
-- data = datanext)
-+ for (;;)
- {
-- /*
-- * Read a key/value pair starting with an 8-bit length. Since the
-- * length is 8 bits and the size of the key/value buffers is 256, we
-- * don't need to check for overflow...
-- */
--
-- datalen = *data++;
--
-- if (!datalen || (data + datalen) > dataend)
-- break;
--
-- datanext = data + datalen;
--
-- for (ptr = key; data < datanext && *data != '='; data ++)
-- *ptr++ = *data;
-- *ptr = '\0';
-+ char *key;
-+ char *value;
-
-- if (data < datanext && *data == '=')
-- {
-- data ++;
--
-- if (data < datanext)
-- memcpy(value, data, datanext - data);
-- value[datanext - data] = '\0';
-+ if (parse_txt_record_pair (txt))
-+ goto next;
-
-- fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
-- key, value);
-- }
-- else
-- {
-- fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
-- key);
-- continue;
-- }
--
-- if (!_cups_strncasecmp(key, "usb_", 4))
-+ key = txt->key;
-+ value = txt->value;
-+ if (!strncasecmp(key, "usb_", 4))
- {
- /*
- * Add USB device ID information...
-@@ -861,6 +1267,10 @@ query_callback(
- if (device->type == CUPS_DEVICE_PRINTER)
- device->sent = 1;
- }
-+
-+ next:
-+ if (next_txt_record (txt) == NULL)
-+ break;
- }
-
- if (device->device_id)
-@@ -917,11 +1327,9 @@ query_callback(
- }
- }
-
-- if (!device)
-- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+ return device;
- }
-
--
- /*
- * 'sigterm_handler()' - Handle termination signals...
- */
-diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c
---- cups-1.5.3/cups/http-support.c.avahi-2-backend 2012-02-15 02:06:12.000000000 +0100
-+++ cups-1.5.3/cups/http-support.c 2012-05-15 17:04:51.045944634 +0200
-@@ -43,6 +43,10 @@
- * http_copy_decode() - Copy and decode a URI.
- * http_copy_encode() - Copy and encode a URI.
- * http_resolve_cb() - Build a device URI for the given service name.
-+ * avahi_resolve_uri_client_cb()
-+ * - Avahi client callback for resolving URI.
-+ * avahi_resolve_uri_resolver_cb()
-+ * - Avahi resolver callback for resolving URI.
- */
-
- /*
-@@ -60,6 +64,11 @@
- # include <sys/select.h>
- # endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/lookup.h>
-+# include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -127,6 +136,24 @@ static void DNSSD_API http_resolve_cb(DN
- void *context);
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+static void avahi_resolve_uri_client_cb(AvahiClient *client,
-+ AvahiClientState state,
-+ void *simple_poll);
-+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context);
-+#endif /* HAVE_AVAHI */
-
- /*
- * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1434,6 +1461,9 @@ _httpResolveURI(
-
- if (strstr(hostname, "._tcp"))
- {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ char *regtype, /* Pointer to type in hostname */
-+ *domain; /* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- # ifdef WIN32
- # pragma comment(lib, "dnssd.lib")
-@@ -1452,6 +1482,17 @@ _httpResolveURI(
- fd_set input_set; /* Input set for select() */
- struct timeval stimeout; /* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+ AvahiSimplePoll *simple_poll;
-+ AvahiClient *client;
-+ int error;
-+ struct
-+ {
-+ AvahiSimplePoll *poll;
-+ _http_uribuf_t uribuf;
-+ } user_data;
-+#endif /* HAVE_DNSSD */
-+
-
- if (options & _HTTP_RESOLVE_STDERR)
- fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1488,9 +1529,16 @@ _httpResolveURI(
- if (domain)
- *domain++ = '\0';
-
-+#ifdef HAVE_DNSSD
- uribuf.buffer = resolved_uri;
- uribuf.bufsize = resolved_size;
- uribuf.options = options;
-+#else
-+ user_data.uribuf.buffer = resolved_uri;
-+ user_data.uribuf.bufsize = resolved_size;
-+ user_data.uribuf.options = options;
-+#endif
-+
- resolved_uri[0] = '\0';
-
- DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1504,6 +1552,7 @@ _httpResolveURI(
-
- uri = NULL;
-
-+#ifdef HAVE_DNSSD
- if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
- {
- localref = ref;
-@@ -1611,6 +1660,36 @@ _httpResolveURI(
-
- DNSServiceRefDeallocate(ref);
- }
-+#else /* HAVE_AVAHI */
-+ if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+ {
-+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+ 0, avahi_resolve_uri_client_cb,
-+ &simple_poll, &error)) != NULL)
-+ {
-+ user_data.poll = simple_poll;
-+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC, hostname,
-+ regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+ avahi_resolve_uri_resolver_cb,
-+ &user_data) != NULL)
-+ {
-+ avahi_simple_poll_loop (simple_poll);
-+
-+ /*
-+ * Collect the result.
-+ */
-+
-+ if (resolved_uri[0])
-+ uri = resolved_uri;
-+ }
-+
-+ avahi_client_free (client);
-+ }
-+
-+ avahi_simple_poll_free (simple_poll);
-+ }
-+#endif /* HAVE_DNSSD */
-
- if (options & _HTTP_RESOLVE_STDERR)
- {
-@@ -1622,13 +1701,13 @@ _httpResolveURI(
- fputs("STATE: -connecting-to-device,offline-report\n", stderr);
- }
-
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
- /*
- * No DNS-SD support...
- */
-
- uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- if ((options & _HTTP_RESOLVE_STDERR) && !uri)
- _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1916,6 +1995,115 @@ http_resolve_cb(
- }
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *simple_poll)
-+{
-+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+ "simple_poll=%p)\n", client, state, simple_poll));
-+
-+ /*
-+ * If the connection drops, quit.
-+ */
-+
-+ if (state == AVAHI_CLIENT_FAILURE)
-+ avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ * URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ const char *scheme; /* URI scheme */
-+ char rp[256]; /* Remote printer */
-+ AvahiStringList *pair;
-+ char *value;
-+ size_t valueLen = 0;
-+ char addr[AVAHI_ADDRESS_STR_MAX];
-+ struct
-+ {
-+ AvahiSimplePoll *poll;
-+ _http_uribuf_t uribuf;
-+ } *poll_uribuf = context;
-+
-+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+ "interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+ "port=%d, txt=%p, flags=%d, context=%p)\n",
-+ resolver, interface, protocol, event, name, type, domain,
-+ host_name, address, port, txt, flags, context));
-+
-+ if (event != AVAHI_RESOLVER_FOUND)
-+ {
-+ avahi_service_resolver_free (resolver);
-+ avahi_simple_poll_quit (poll_uribuf->poll);
-+ return;
-+ }
-+
-+ /*
-+ * Figure out the scheme from the full name...
-+ */
-+
-+ if (strstr(type, "_ipp."))
-+ scheme = "ipp";
-+ else if (strstr(type, "_printer."))
-+ scheme = "lpd";
-+ else if (strstr(type, "_pdl-datastream."))
-+ scheme = "socket";
-+ else
-+ scheme = "riousbprint";
-+
-+ /*
-+ * Extract the "remote printer key from the TXT record...
-+ */
-+
-+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+ {
-+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+ rp[0] = '/';
-+ memcpy (rp + 1, value, valueLen);
-+ rp[valueLen + 1] = '\0';
-+ }
-+ else
-+ rp[0] = '\0';
-+
-+ /*
-+ * Assemble the final device URI...
-+ */
-+
-+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+ poll_uribuf->uribuf.bufsize, scheme, NULL,
-+ addr, port, rp);
-+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+ poll_uribuf->uribuf.buffer));
-+ avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
-
- /*
- * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file
diff --git a/abs/extra/cups/cups-avahi-3-timeouts.patch b/abs/extra/cups/cups-avahi-3-timeouts.patch
deleted file mode 100644
index daf852a..0000000
--- a/abs/extra/cups/cups-avahi-3-timeouts.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h
---- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts 2011-05-11 23:17:34.000000000 +0100
-+++ cups-1.5.2/scheduler/cupsd.h 2012-03-14 15:06:36.509476983 +0000
-@@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int);
-
- typedef void (*cupsd_selfunc_t)(void *data);
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
-
- /*
- * Globals...
-@@ -173,6 +182,11 @@ VAR int Launchd VALUE(0);
- /* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
-
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
-
- /*
- * Prototypes...
-@@ -242,6 +256,20 @@ extern void cupsdStopSelect(void);
- extern void cupsdStartServer(void);
- extern void cupsdStopServer(void);
-
-+#ifdef HAVE_AVAHI
-+extern void cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+ cupsd_timeoutfunc_t cb,
-+ void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+ const struct timeval *tv);
-+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int cupsdRemoveFile(const char *filename);
-+
-
- /*
- * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
-diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-3-timeouts 2012-03-14 15:04:17.655305548 +0000
-+++ cups-1.5.2/scheduler/main.c 2012-03-14 15:06:36.511476986 +0000
-@@ -146,6 +146,10 @@ main(int argc, /* I - Number of comm
- int launchd_idle_exit;
- /* Idle exit on select timeout? */
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */
-+ long tmo_delay; /* Time before it must be called */
-+#endif /* HAVE_AVAHI */
-
-
- #ifdef HAVE_GETEUID
-@@ -535,6 +539,14 @@ main(int argc, /* I - Number of comm
-
- httpInitialize();
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * Initialize timed callback structures.
-+ */
-+
-+ cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
- cupsdStartServer();
-
- /*
-@@ -874,6 +886,16 @@ main(int argc, /* I - Number of comm
- }
- #endif /* __APPLE__ */
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * If a timed callback is due, run it.
-+ */
-+
-+ tmo = cupsdNextTimeout (&tmo_delay);
-+ if (tmo && tmo_delay == 0)
-+ cupsdRunTimeout (tmo);
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
- /*
- * Update the network interfaces once a minute...
-@@ -1787,6 +1809,10 @@ select_timeout(int fds) /* I - Number
- cupsd_job_t *job; /* Job information */
- cupsd_subscription_t *sub; /* Subscription information */
- const char *why; /* Debugging aid */
-+#ifdef HAVE_AVAHI
-+ cupsd_timeout_t *tmo; /* Timed callback */
-+ long tmo_delay; /* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -1829,6 +1855,19 @@ select_timeout(int fds) /* I - Number
- }
- #endif /* __APPLE__ */
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * See if there are any scheduled timed callbacks to run.
-+ */
-+
-+ if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
-+ (now + tmo_delay) < timeout)
-+ {
-+ timeout = tmo_delay;
-+ why = "run a timed callback";
-+ }
-+#endif /* HAVE_AVAHI */
-+
- /*
- * Check whether we are accepting new connections...
- */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts 2012-03-14 15:04:17.685305586 +0000
-+++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:06:36.508476980 +0000
-@@ -39,7 +39,8 @@ CUPSDOBJS = \
- server.o \
- statbuf.o \
- subscriptions.o \
-- sysman.o
-+ sysman.o \
-+ timeout.o
- LIBOBJS = \
- filter.o \
- mime.o \
-diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c
---- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts 2012-03-14 15:06:36.552477037 +0000
-+++ cups-1.5.2/scheduler/timeout.c 2012-03-14 15:06:36.552477037 +0000
-@@ -0,0 +1,235 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ * Copyright (C) 2010, 2011 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ * OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ * cupsdInitTimeouts() - Initialise timeout structure.
-+ * cupsdAddTimeout() - Add a timed callback.
-+ * cupsdNextTimeout() - Find the next enabled timed callback.
-+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ * cupsdRemoveTimeout() - Discard a timed callback.
-+ * compare_timeouts() - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+# include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+ struct timeval when;
-+ int enabled;
-+ cupsd_timeoutfunc_t callback;
-+ void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_addrs (void *p0, void *p1)
-+{
-+ if (p0 == p1)
-+ return (0);
-+ if (p0 < p1)
-+ return (-1);
-+ return (1);
-+}
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+ int addrsdiff = compare_addrs (p0, p1);
-+ int tvdiff;
-+
-+ if (addrsdiff == 0)
-+ return (0);
-+
-+ if (!p0->enabled || !p1->enabled)
-+ {
-+ if (!p0->enabled && !p1->enabled)
-+ return (addrsdiff);
-+
-+ return (p0->enabled ? -1 : 1);
-+ }
-+
-+ tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
-+ if (tvdiff != 0)
-+ return (tvdiff);
-+
-+ return (addrsdiff);
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t * /* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */
-+ cupsd_timeoutfunc_t cb, /* I - Callback function */
-+ void *data) /* I - User data */
-+{
-+ cupsd_timeout_t *timeout;
-+
-+ timeout = malloc (sizeof(cupsd_timeout_t));
-+ if (timeout != NULL)
-+ {
-+ timeout->enabled = (tv != NULL);
-+ if (tv)
-+ {
-+ timeout->when.tv_sec = tv->tv_sec;
-+ timeout->when.tv_usec = tv->tv_usec;
-+ }
-+
-+ timeout->callback = cb;
-+ timeout->data = data;
-+ cupsArrayAdd (Timeouts, timeout);
-+ }
-+
-+ return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t * /* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */
-+{
-+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+ struct timeval curtime;
-+
-+ if (first && !first->enabled)
-+ first = NULL;
-+
-+ if (first && delay)
-+ {
-+ gettimeofday (&curtime, NULL);
-+ if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+ {
-+ *delay = 0;
-+ } else {
-+ *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+ if (first->when.tv_usec < curtime.tv_usec)
-+ (*delay)--;
-+ }
-+ }
-+
-+ return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
-+{
-+ if (!timeout)
-+ return;
-+ timeout->enabled = 0;
-+ if (!timeout->callback)
-+ return;
-+ timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */
-+ const struct timeval *tv) /* I - Absolute time or NULL */
-+{
-+ cupsArrayRemove (Timeouts, timeout);
-+ timeout->enabled = (tv != NULL);
-+ if (tv)
-+ {
-+ timeout->when.tv_sec = tv->tv_sec;
-+ timeout->when.tv_usec = tv->tv_usec;
-+ }
-+ cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
-+{
-+ cupsArrayRemove (Timeouts, timeout);
-+ free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
diff --git a/abs/extra/cups/cups-avahi-4-poll.patch b/abs/extra/cups/cups-avahi-4-poll.patch
deleted file mode 100644
index d7fa5fd..0000000
--- a/abs/extra/cups/cups-avahi-4-poll.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
---- cups-1.5.2/scheduler/avahi.c.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.c 2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,441 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Avahi poll implementation for the CUPS scheduler.
-+ *
-+ * Copyright (C) 2010, 2011 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ * OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ * watch_read_cb - Read callback for file descriptor
-+ * watch_write_cb - Write callback for file descriptor
-+ * watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ * watch_new() - Create a new file descriptor watch
-+ * watch_free() - Free a file descriptor watch
-+ * watch_update() - Update watched events for a file descriptor
-+ * watch_get_events() - Get events that happened for a file descriptor
-+ * timeout_cb() - Run a timed Avahi callback
-+ * timeout_new() - Set a wakeup time
-+ * timeout_update() - Update the expiration time for a timeout
-+ * timeout_free() - Free a timeout
-+ * compare_watched_fds() - Compare watched file descriptors for array sorting
-+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ * avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+# include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+ AvahiCupsPoll *cups_poll;
-+
-+ int fd;
-+ AvahiWatchEvent occurred;
-+ cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+ cupsd_watched_fd_t *watched_fd;
-+
-+ AvahiWatchEvent events;
-+ AvahiWatchCallback callback;
-+ void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+ AvahiCupsPoll *cups_poll;
-+ AvahiTimeoutCallback callback;
-+ void *userdata;
-+ cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch * watch_new(const AvahiPoll *api,
-+ int fd,
-+ AvahiWatchEvent events,
-+ AvahiWatchCallback callback,
-+ void *userdata);
-+static void watch_free(AvahiWatch *watch);
-+static void watch_update(AvahiWatch *watch,
-+ AvahiWatchEvent events);
-+static AvahiWatchEvent watch_get_events(AvahiWatch *watch);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+ AvahiWatch *watch;
-+ cupsd_watched_fd_t *watched_fd = userdata;
-+ watched_fd->occurred |= AVAHI_WATCH_IN;
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+ {
-+ if (watch->events & watched_fd->occurred)
-+ {
-+ (watch->callback) (watch, watched_fd->fd,
-+ AVAHI_WATCH_IN, watch->userdata);
-+ watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+ break;
-+ }
-+ }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+ AvahiWatch *watch;
-+ cupsd_watched_fd_t *watched_fd = userdata;
-+ watched_fd->occurred |= AVAHI_WATCH_OUT;
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+ {
-+ if (watch->events & watched_fd->occurred)
-+ {
-+ (watch->callback) (watch, watched_fd->fd,
-+ AVAHI_WATCH_OUT, watch->userdata);
-+ watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+ break;
-+ }
-+ }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int /* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+ AvahiWatch *watch;
-+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+ int any_watches = 0;
-+
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+ {
-+ any_watches = 1;
-+ if (watch->events & (AVAHI_WATCH_IN |
-+ AVAHI_WATCH_ERR |
-+ AVAHI_WATCH_HUP))
-+ {
-+ read_cb = (cupsd_selfunc_t)watch_read_cb;
-+ if (write_cb != NULL)
-+ break;
-+ }
-+
-+ if (watch->events & AVAHI_WATCH_OUT)
-+ {
-+ write_cb = (cupsd_selfunc_t)watch_write_cb;
-+ if (read_cb != NULL)
-+ break;
-+ }
-+ }
-+
-+ if (read_cb || write_cb)
-+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+ else
-+ cupsdRemoveSelect (watched_fd->fd);
-+
-+ return (any_watches);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+ int fd,
-+ AvahiWatchEvent events,
-+ AvahiWatchCallback callback,
-+ void *userdata)
-+{
-+ cupsd_watched_fd_t key, *watched_fd;
-+ AvahiCupsPoll *cups_poll = api->userdata;
-+ AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+ if (watch == NULL)
-+ return (NULL);
-+
-+ watch->events = events;
-+ watch->callback = callback;
-+ watch->userdata = userdata;
-+
-+ key.fd = fd;
-+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+ if (watched_fd == NULL)
-+ {
-+ watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+ if (watched_fd == NULL)
-+ {
-+ free (watch);
-+ return (NULL);
-+ }
-+
-+ watched_fd->fd = fd;
-+ watched_fd->occurred = 0;
-+ watched_fd->cups_poll = cups_poll;
-+ watched_fd->watches = cupsArrayNew (NULL, NULL);
-+ cupsArrayAdd (cups_poll->watched_fds, watched_fd);
-+ }
-+
-+ watch->watched_fd = watched_fd;
-+ cupsArrayAdd(watched_fd->watches, watch);
-+ watched_fd_add_select (watched_fd);
-+ return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+ cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+ cupsArrayRemove (watched_fd->watches, watch);
-+ free (watch);
-+
-+ if (!watched_fd_add_select (watched_fd))
-+ {
-+ /* No more watches */
-+ cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+ free (watched_fd);
-+ }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+ AvahiWatchEvent events)
-+{
-+ watch->events = events;
-+ watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+ return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+ AvahiTimeout *timeout = userdata;
-+ (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+ const struct timeval *tv,
-+ AvahiTimeoutCallback callback,
-+ void *userdata)
-+{
-+ AvahiTimeout *timeout;
-+ AvahiCupsPoll *cups_poll = api->userdata;
-+
-+ timeout = malloc(sizeof(AvahiTimeout));
-+ if (timeout == NULL)
-+ return (NULL);
-+
-+ timeout->cups_poll = cups_poll;
-+ timeout->callback = callback;
-+ timeout->userdata = userdata;
-+ timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+ (cupsd_timeoutfunc_t)timeout_cb,
-+ timeout);
-+ cupsArrayAdd (cups_poll->timeouts, timeout);
-+ return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+ const struct timeval *tv)
-+{
-+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+ cupsdRemoveTimeout (timeout->cupsd_timeout);
-+ free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+ cupsd_watched_fd_t *p1)
-+{
-+ /*
-+ * Compare by fd (no two elements have the same fd)
-+ */
-+
-+ if (p0->fd == p1->fd)
-+ return 0;
-+
-+ return (p0->fd < p1->fd ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+ if (cups_poll == NULL)
-+ return (NULL);
-+
-+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+ NULL);
-+ cups_poll->timeouts = cupsArrayNew (NULL, NULL);
-+
-+ cups_poll->api.userdata = cups_poll;
-+ cups_poll->api.watch_new = watch_new;
-+ cups_poll->api.watch_free = watch_free;
-+ cups_poll->api.watch_update = watch_update;
-+ cups_poll->api.watch_get_events = watch_get_events;
-+
-+ cups_poll->api.timeout_new = timeout_new;
-+ cups_poll->api.timeout_update = timeout_update;
-+ cups_poll->api.timeout_free = timeout_free;
-+
-+ return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+ cupsd_watched_fd_t *watched_fd;
-+
-+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+ watched_fd;
-+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
-+ cupsArrayClear (watched_fd->watches);
-+
-+ cupsArrayClear (cups_poll->watched_fds);
-+ cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+ return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-4-poll 2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,69 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Avahi poll implementation for the CUPS scheduler.
-+ *
-+ * Copyright (C) 2010, 2011 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ * OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+# include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+ AvahiPoll api;
-+ cups_array_t *watched_fds;
-+ cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll * avahi_cups_poll_new(void);
-+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-4-poll 2012-03-14 15:06:36.508476980 +0000
-+++ cups-1.5.2/scheduler/Makefile 2012-03-14 15:07:29.476542380 +0000
-@@ -17,6 +17,7 @@ include ../Makedefs
-
- CUPSDOBJS = \
- auth.o \
-+ avahi.o \
- banners.o \
- cert.o \
- classes.o \
diff --git a/abs/extra/cups/cups-avahi-5-services.patch b/abs/extra/cups/cups-avahi-5-services.patch
deleted file mode 100644
index 820b3c3..0000000
--- a/abs/extra/cups/cups-avahi-5-services.patch
+++ /dev/null
@@ -1,1272 +0,0 @@
-diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c
---- cups-1.5.2/cgi-bin/admin.c.avahi-5-services 2011-08-17 22:01:53.000000000 +0100
-+++ cups-1.5.2/cgi-bin/admin.c 2012-03-14 15:08:25.701611799 +0000
-@@ -1643,7 +1643,7 @@ do_config_server(http_t *http) /* I - H
- else
- local_protocols[0] = '\0';
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
- {
- if (local_protocols[0])
-@@ -1651,7 +1651,7 @@ do_config_server(http_t *http) /* I - H
- else
- strcat(local_protocols, "dnssd");
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@ do_menu(http_t *http) /* I - HTTP conn
- #endif /* HAVE_GSSAPI */
- cgiSetVariable("KERBEROS", "");
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- cgiSetVariable("HAVE_LDAP", "1");
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-5-services 2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h 2012-03-14 15:08:25.701611799 +0000
-@@ -3,7 +3,7 @@
- *
- * Avahi poll implementation for the CUPS scheduler.
- *
-- * Copyright (C) 2010, 2011 Red Hat, Inc.
-+ * Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
- * Authors:
- * Tim Waugh <twaugh@redhat.com>
- *
-@@ -32,37 +32,40 @@
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
--#include <config.h>
-+#ifndef _CUPS_AVAHI_H_
-+# define _CUPS_AVAHI_H_
-
--#ifdef HAVE_AVAHI
--# include <avahi-client/client.h>
--# include <avahi-client/publish.h>
--#endif /* HAVE_AVAHI */
-+/*
-+ * Include necessary headers...
-+ */
-
--#ifdef HAVE_AUTHORIZATION_H
--# include <Security/Authorization.h>
--#endif /* HAVE_AUTHORIZATION_H */
-+# include <config.h>
-
-+# ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/publish.h>
-+# endif /* HAVE_AVAHI */
-
--#ifdef HAVE_AVAHI
-+# ifdef HAVE_AVAHI
- typedef struct
- {
- AvahiPoll api;
- cups_array_t *watched_fds;
- cups_array_t *timeouts;
- } AvahiCupsPoll;
--#endif /* HAVE_AVAHI */
-+# endif /* HAVE_AVAHI */
-
- /*
- * Prototypes...
- */
-
--#ifdef HAVE_AVAHI
-+# ifdef HAVE_AVAHI
- extern AvahiCupsPoll * avahi_cups_poll_new(void);
- extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
- extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
--#endif /* HAVE_AVAHI */
-+# endif /* HAVE_AVAHI */
-
-+#endif /* !_CUPS_AVAHI_H_ */
-
- /*
- * End of "$Id$".
-diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c
---- cups-1.5.2/scheduler/client.c.avahi-5-services 2012-01-13 23:00:22.000000000 +0000
-+++ cups-1.5.2/scheduler/client.c 2012-03-14 15:08:25.703611797 +0000
-@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con) /* I -
- !strncmp(host, "[::1]:", 6));
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * Check if the hostname is something.local (Bonjour); if so, allow it.
- */
-@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con) /* I -
- (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
- !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
- return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- /*
- * Check if the hostname is an IP address...
-diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c
---- cups-1.5.2/scheduler/conf.c.avahi-5-services 2012-03-14 15:04:17.636305526 +0000
-+++ cups-1.5.2/scheduler/conf.c 2012-03-14 15:08:25.706611803 +0000
-@@ -652,7 +652,7 @@ cupsdReadConfiguration(void)
- Browsing = CUPS_DEFAULT_BROWSING;
- DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
-
-diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c
---- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services 2012-03-14 15:04:17.674305572 +0000
-+++ cups-1.5.2/scheduler/dirsvc.c 2012-03-14 15:08:25.709611806 +0000
-@@ -27,6 +27,7 @@
- * ldap_connect() - Start new LDAP connection
- * ldap_reconnect() - Reconnect to LDAP Server
- * ldap_disconnect() - Disconnect from LDAP Server
-+ * cupsdStartAvahiClient() - Start an Avahi client if needed
- * cupsdStartBrowsing() - Start sending and receiving broadcast
- * information.
- * cupsdStartPolling() - Start polling servers as needed.
-@@ -40,11 +41,12 @@
- * dequote() - Remote quotes from a string.
- * dnssdAddAlias() - Add a DNS-SD alias name.
- * dnssdBuildTxtRecord() - Build a TXT record from printer info.
-- * dnssdComparePrinters() - Compare the registered names of two printers.
- * dnssdDeregisterPrinter() - Stop sending broadcast information for a
- * printer.
- * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT
- * record format.
-+ * avahiPackTxtRecord() - Pack an array of key/value pairs into an
-+ * AvahiStringList.
- * dnssdRegisterCallback() - DNSServiceRegister callback.
- * dnssdRegisterPrinter() - Start sending broadcast information for a
- * printer or update the broadcast contents.
-@@ -83,6 +85,7 @@
- */
-
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
-
- #ifdef HAVE_DNSSD
-@@ -97,6 +100,17 @@
- # endif /* HAVE_SYSTEMCONFIGURATION */
- # endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -159,27 +173,38 @@ static void update_polling(void);
- static void update_smb(int onoff);
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+ int for_lpd);
-+static void dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- # ifdef HAVE_COREFOUNDATION
- static void dnssdAddAlias(const void *key, const void *value,
- void *context);
- # endif /* HAVE_COREFOUNDATION */
--static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-- int for_lpd);
--static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
-- int count);
- static void dnssdRegisterCallback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- DNSServiceErrorType errorCode,
- const char *name, const char *regtype,
- const char *domain, void *context);
--static void dnssdRegisterPrinter(cupsd_printer_t *p);
--static void dnssdStop(void);
- static void dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+ int count);
-+static void avahi_entry_group_cb (AvahiEntryGroup *group,
-+ AvahiEntryGroupState state,
-+ void *userdata);
-+static void avahi_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- {
-@@ -283,10 +308,10 @@ cupsdDeregisterPrinter(
- ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
-
--#ifdef HAVE_DNSSD
-- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
-@@ -702,10 +727,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)
- slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
-
--#ifdef HAVE_DNSSD
-- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if ((BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
-@@ -1419,6 +1444,36 @@ ldap_disconnect(LDAP *ld) /* I - LDAP h
- #endif /* HAVE_LDAP */
-
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+ int error = 0;
-+
-+ if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+ {
-+ if (!AvahiCupsPollHandle)
-+ AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+ if (AvahiCupsPollHandle)
-+ {
-+ if (avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+ AVAHI_CLIENT_NO_FAIL,
-+ avahi_client_cb, NULL,
-+ &error) != NULL)
-+ AvahiCupsClientConnecting = 1;
-+ else
-+ cupsdLogMessage (CUPSD_LOG_WARN, "Avahi client failed: %d", error);
-+ }
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
- * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
- */
-@@ -1542,13 +1597,16 @@ cupsdStartBrowsing(void)
- else
- BrowseSocket = -1;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType error; /* Error from service creation */
-+#endif /* HAVE_DNSSD */
- cupsd_listener_t *lis; /* Current listening socket */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * First create a "master" connection for all registrations...
- */
-@@ -1573,6 +1631,7 @@ cupsdStartBrowsing(void)
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-
- cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
-
- /*
- * Then get the port we use for registrations. If we are not listening
-@@ -1598,17 +1657,23 @@ cupsdStartBrowsing(void)
- */
-
- if (BrowseRemoteProtocols & BROWSE_DNSSD)
-- DNSSDPrinters = cupsArrayNew((cups_array_func_t)dnssdComparePrinters,
-- NULL);
-+ DNSSDPrinters = cupsArrayNew(NULL, NULL);
-
- /*
- * Set the computer name and register the web interface...
- */
-
- cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+ cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
- }
-- }
- #endif /* HAVE_DNSSD */
-+ }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LIBSLP
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1899,10 @@ cupsdStopBrowsing(void)
- BrowseSocket = -1;
- }
-
--#ifdef HAVE_DNSSD
-- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if ((BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LIBSLP
- if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1967,7 @@ cupsdStopPolling(void)
- }
-
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
- */
-@@ -1910,8 +1975,14 @@ cupsdStopPolling(void)
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType error; /* Error from service creation */
- char webif[1024]; /* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int ret; /* Error from service creation */
-+ char webif[AVAHI_LABEL_MAX]; /* Web interface share name */
-+#endif /* HAVE_AVAHI */
- # ifdef HAVE_SYSTEMCONFIGURATION
- SCDynamicStoreRef sc; /* Context for dynamic store */
- CFDictionaryRef btmm; /* Back-to-My-Mac domains */
-@@ -2042,6 +2113,7 @@ cupsdUpdateDNSSDName(void)
- else
- strlcpy(webif, "CUPS Web Interface", sizeof(webif));
-
-+#ifdef HAVE_DNSSD
- if (WebIFRef)
- DNSServiceRefDeallocate(WebIFRef);
-
-@@ -2054,9 +2126,45 @@ cupsdUpdateDNSSDName(void)
- NULL)) != kDNSServiceErr_NoError)
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+ if (!AvahiCupsClient)
-+ /*
-+ * Client not yet running.
-+ */
-+ return;
-+
-+ if (AvahiWebIFGroup)
-+ avahi_entry_group_reset (AvahiWebIFGroup);
-+ else
-+ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+ avahi_entry_group_cb,
-+ NULL);
-+
-+ if (AvahiWebIFGroup)
-+ {
-+ ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, /* flags */
-+ webif, /* name */
-+ "_http._tcp", /* type */
-+ NULL, /* domain */
-+ NULL, /* host */
-+ DNSSDPort, /* port */
-+ "path=/", NULL);
-+ if (ret == 0)
-+ ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+ if (ret != 0)
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Avahi web interface registration failed: %d", ret);
-+ }
-+#endif /* HAVE_AVAHI */
- }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
- #ifdef HAVE_LDAP
-@@ -2334,13 +2442,15 @@ dnssdAddAlias(const void *key, /* I - K
- "Bad Back to My Mac domain in dynamic store!");
- }
- # endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
- */
-
--static char * /* O - TXT record */
-+static cupsd_txt_record_t /* O - TXT record */
- dnssdBuildTxtRecord(
- int *txt_len, /* O - TXT record length */
- cupsd_printer_t *p, /* I - Printer information */
-@@ -2379,7 +2489,12 @@ dnssdBuildTxtRecord(
- keyvalue[i ][0] = "ty";
- keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
-
-- snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+ snprintf(admin_hostname, sizeof(admin_hostname),
-+ "%s.local"
-+#ifdef HAVE_DNSSD
-+ "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+ , DNSSDHostName);
- httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
- "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,19 +2577,12 @@ dnssdBuildTxtRecord(
- * Then pack them into a proper txt record...
- */
-
-+#ifdef HAVE_DNSSD
- return (dnssdPackTxtRecord(txt_len, keyvalue, i));
--}
--
--
--/*
-- * 'dnssdComparePrinters()' - Compare the registered names of two printers.
-- */
--
--static int /* O - Result of comparison */
--dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
-- cupsd_printer_t *b)/* I - Second printer */
--{
-- return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
-
-
-@@ -2489,6 +2597,10 @@ dnssdDeregisterPrinter(
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+
- /*
- * Closing the socket deregisters the service
- */
-@@ -2524,6 +2636,24 @@ dnssdDeregisterPrinter(
- free(p->printer_txt);
- p->printer_txt = NULL;
- }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+ if (p->avahi_group)
-+ {
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+
-+ if (p->ipp_txt)
-+ avahi_string_list_free (p->ipp_txt);
-+
-+ if (p->printer_txt)
-+ avahi_string_list_free (p->printer_txt);
-+
-+ p->ipp_txt = p->printer_txt = NULL;
-+ }
-+#endif /* HAVE_AVAHI */
-
- /*
- * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2663,10 @@ dnssdDeregisterPrinter(
- cupsArrayRemove(DNSSDPrinters, p);
- cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
- * TXT record format.
-@@ -2644,8 +2776,10 @@ dnssdRegisterCallback(
- LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
- }
- }
-+#endif /* HAVE_DNSSD */
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
- * or update the broadcast contents.
-@@ -2654,20 +2788,40 @@ dnssdRegisterCallback(
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType se; /* dnssd errors */
- char *ipp_txt, /* IPP TXT record buffer */
- *printer_txt, /* LPD TXT record buffer */
-- name[1024], /* Service name */
-- *nameptr; /* Pointer into name */
-+ name[1024]; /* Service name */
- int ipp_len, /* IPP TXT record length */
- printer_len, /* LPD TXT record length */
- printer_port; /* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int ret; /* Error code */
-+ AvahiStringList *ipp_txt, /* IPP TXT record */
-+ *printer_txt; /* LPD TXT record */
-+ char name[AVAHI_LABEL_MAX], /* Service name */
-+ fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+ char *regtype_copy, /* Writeable copy of reg type */
-+ *subtype, /* Current service sub type */
-+ *nextsubtype; /* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+ char *nameptr; /* Pointer into name */
- const char *regtype; /* Registration type */
-
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
- !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+ !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
- /*
- * If per-printer sharing was just disabled make sure we're not
- * registered before returning.
-@@ -2686,12 +2840,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
- if (p->info && strlen(p->info) > 0)
- {
- if (DNSSDComputerName)
-- snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+ {
-+ /*
-+ * Make sure there is room for at least 15 characters of
-+ * DNSSDComputerName.
-+ */
-+
-+ assert(sizeof(name) >= 15 + 4);
-+ nameptr = name + strlcpy(name, p->info,
-+ sizeof(name) - 4 -
-+ strnlen(DNSSDComputerName, 15));
-+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+ }
- else
- strlcpy(name, p->info, sizeof(name));
- }
- else if (DNSSDComputerName)
-- snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+ {
-+ /*
-+ * Make sure there is room for at least 15 characters of
-+ * DNSSDComputerName.
-+ */
-+
-+ assert(sizeof(name) >= 15 + 4);
-+ nameptr = name + strlcpy(name, p->info,
-+ sizeof(name) - 4 -
-+ strnlen(DNSSDComputerName, 15));
-+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+ }
- else
- strlcpy(name, p->name, sizeof(name));
-
-@@ -2712,6 +2890,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
- * Register IPP and (optionally) LPD...
- */
-
-+#ifdef HAVE_DNSSD
- ipp_len = 0; /* anti-compiler-warning-code */
- ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
-
-@@ -2884,6 +3063,209 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-
- if (printer_txt)
- free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ if (!AvahiCupsClient)
-+ /*
-+ * Client not running yet. The client callback will call us again later.
-+ */
-+ return;
-+
-+ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+ printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+ if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+ !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+ {
-+ /*
-+ * Update the existing registration...
-+ */
-+
-+ avahi_string_list_free (p->ipp_txt);
-+
-+ if (p->printer_txt)
-+ avahi_string_list_free (p->printer_txt);
-+
-+ /*
-+ * Update the service group entry.
-+ */
-+
-+ regtype_copy = strdup (regtype);
-+ subtype = strchr (regtype_copy, ',');
-+ if (subtype)
-+ *subtype = '\0';
-+
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Updating TXT record for %s (%s)", name, regtype_copy);
-+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ regtype_copy,
-+ NULL, ipp_txt);
-+ free (regtype_copy);
-+
-+ if (ret < 0)
-+ goto update_failed;
-+
-+ p->ipp_txt = ipp_txt;
-+ ipp_txt = NULL;
-+
-+ if (BrowseLocalProtocols & BROWSE_LPD)
-+ {
-+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ "_printer._tcp", NULL,
-+ printer_txt);
-+ if (ret < 0)
-+ goto update_failed;
-+
-+ p->printer_txt = printer_txt;
-+ printer_txt = NULL;
-+ }
-+
-+ ret = avahi_entry_group_commit (p->avahi_group);
-+ if (ret < 0)
-+ {
-+ update_failed:
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Failed to update TXT record for %s: %d",
-+ name, ret);
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+ ipp_txt = p->ipp_txt;
-+ p->ipp_txt = NULL;
-+ }
-+ }
-+
-+ if (!p->avahi_group)
-+ {
-+ /*
-+ * Initial registration. Use the _fax subtype for fax queues...
-+ */
-+
-+ p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+ avahi_entry_group_cb,
-+ p);
-+
-+ cupsdLogMessage(CUPSD_LOG_DEBUG,
-+ "Registering Avahi printer %s with name \"%s\" and "
-+ "type \"%s\"", p->name, name, regtype);
-+
-+ if (!p->avahi_group)
-+ {
-+ ret = 0;
-+ goto add_failed;
-+ }
-+
-+ /*
-+ * Add each service type (DNSSDRegType may contain several,
-+ * separated by commas).
-+ */
-+
-+ subtype = regtype_copy = strdup (regtype);
-+ while (subtype && *subtype)
-+ {
-+ nextsubtype = strchr (subtype, ',');
-+ if (nextsubtype)
-+ *nextsubtype++ = '\0';
-+
-+ if (subtype == regtype_copy)
-+ {
-+ /*
-+ * Main type entry.
-+ */
-+
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Adding TXT record for %s (%s)", name, regtype_copy);
-+ ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name, regtype_copy,
-+ NULL, NULL,
-+ DNSSDPort,
-+ ipp_txt);
-+ }
-+ else
-+ {
-+ /*
-+ * Sub-type entry.
-+ */
-+
-+ snprintf (fullsubtype, sizeof(fullsubtype),
-+ "%s._sub.%s", subtype, regtype_copy);
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Adding TXT record for %s (%s)", name, fullsubtype);
-+ ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ regtype_copy,
-+ NULL, fullsubtype);
-+ }
-+
-+ if (ret < 0)
-+ {
-+ free (regtype_copy);
-+ goto add_failed;
-+ }
-+
-+ subtype = nextsubtype;
-+ }
-+
-+ free (regtype_copy);
-+ p->ipp_txt = ipp_txt;
-+ ipp_txt = NULL;
-+
-+ if (BrowseLocalProtocols & BROWSE_LPD)
-+ {
-+ cupsdLogMessage(CUPSD_LOG_DEBUG,
-+ "Registering Avahi printer %s with name \"%s\" and "
-+ "type \"_printer._tcp\"", p->name, name);
-+
-+ ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ "_printer._tcp", NULL, NULL,
-+ 515,
-+ printer_txt);
-+ if (ret < 0)
-+ goto add_failed;
-+
-+ p->printer_txt = printer_txt;
-+ printer_txt = NULL;
-+ }
-+
-+ ret = avahi_entry_group_commit (p->avahi_group);
-+
-+ if (ret < 0)
-+ {
-+ add_failed:
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Failed to add Avahi entry for %s: %d",
-+ name, ret);
-+ if (p->avahi_group)
-+ {
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+ }
-+ ipp_txt = p->ipp_txt;
-+ p->ipp_txt = NULL;
-+ }
-+ }
-+
-+ if (ipp_txt)
-+ avahi_string_list_free (ipp_txt);
-+
-+ if (printer_txt)
-+ avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
-
-
-@@ -2896,6 +3278,10 @@ dnssdStop(void)
- {
- cupsd_printer_t *p; /* Current printer */
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+#endif /* HAVE_DNSSD */
-
- /*
- * De-register the individual printers
-@@ -2910,12 +3296,23 @@ dnssdStop(void)
- * Shutdown the rest of the service refs...
- */
-
-+#ifdef HAVE_DNSSD
- if (WebIFRef)
- {
- DNSServiceRefDeallocate(WebIFRef);
- WebIFRef = NULL;
- }
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ if (AvahiWebIFGroup)
-+ {
-+ avahi_entry_group_reset (AvahiWebIFGroup);
-+ avahi_entry_group_free (AvahiWebIFGroup);
-+ AvahiWebIFGroup = NULL;
-+ }
-+#endif /* HAVE_AVAHI */
-
-+#ifdef HAVE_DNSSD
- if (RemoteRef)
- {
- DNSServiceRefDeallocate(RemoteRef);
-@@ -2926,14 +3323,17 @@ dnssdStop(void)
-
- DNSServiceRefDeallocate(DNSSDRef);
- DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
-
- cupsArrayDelete(DNSSDPrinters);
- DNSSDPrinters = NULL;
-
- DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'dnssdUpdate()' - Handle DNS-SD queries.
- */
-@@ -2955,6 +3355,153 @@ dnssdUpdate(void)
- #endif /* HAVE_DNSSD */
-
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ * AvahiStringList.
-+ */
-+
-+static AvahiStringList * /* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */
-+ int count) /* I - Number of items in table */
-+{
-+ AvahiStringList *strlst = NULL;
-+ char **elements;
-+ size_t len;
-+ int i = 0;
-+
-+ elements = malloc ((1 + count) * sizeof (char *));
-+ if (!elements)
-+ goto cleanup;
-+
-+ for (i = 0; i < count; i++)
-+ {
-+ len = (1 + strlen (keyvalue[i][0]) +
-+ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+ elements[i] = malloc (len * sizeof (char));
-+ if (!elements[i])
-+ goto cleanup;
-+
-+ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+ }
-+
-+ strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+ while (--i >= 0)
-+ free (elements[i]);
-+
-+ free (elements);
-+ return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+ AvahiEntryGroupState state,
-+ void *userdata)
-+{
-+ char *name;
-+
-+ if (userdata)
-+ name = ((cupsd_printer_t *) userdata)->reg_name;
-+ else
-+ name = "CUPS web interface";
-+
-+ switch (state)
-+ {
-+ case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+ case AVAHI_ENTRY_GROUP_REGISTERING:
-+ break;
-+
-+ case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Avahi entry group established for %s", name);
-+ break;
-+
-+ default:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Avahi entry group %s has state %d",
-+ name, state);
-+ break;
-+ }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *userdata)
-+{
-+ cupsd_printer_t *printer;
-+ switch (state)
-+ {
-+ case AVAHI_CLIENT_S_RUNNING:
-+ /*
-+ * Avahi client started successfully.
-+ */
-+ AvahiCupsClient = client;
-+ AvahiCupsClientConnecting = 0;
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+ cupsdUpdateDNSSDName ();
-+
-+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+ printer;
-+ printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+ if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+ (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+ CUPS_PRINTER_SCANNER))) && printer->shared)
-+ dnssdRegisterPrinter (printer);
-+
-+ break;
-+
-+ case AVAHI_CLIENT_CONNECTING:
-+ /*
-+ * No Avahi daemon, client is waiting.
-+ */
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+ break;
-+
-+ case AVAHI_CLIENT_S_REGISTERING:
-+ /*
-+ * Not yet registered.
-+ */
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client registering");
-+ break;
-+
-+ case AVAHI_CLIENT_FAILURE:
-+ /*
-+ * Avahi client failed, close it to allow a clean restart.
-+ */
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Avahi client failed, "
-+ "closing client to allow a clean restart");
-+
-+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+ printer;
-+ printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+ dnssdDeregisterPrinter (printer);
-+
-+ avahi_client_free(client);
-+ AvahiCupsClientConnecting = 0;
-+ AvahiCupsClient = NULL;
-+
-+ break;
-+
-+ default:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
- * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
- */
-diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h
---- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services 2011-03-21 02:12:14.000000000 +0000
-+++ cups-1.5.2/scheduler/dirsvc.h 2012-03-14 15:08:25.711611808 +0000
-@@ -31,6 +31,10 @@
- # endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
-
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
- * Browse protocols...
- */
-@@ -131,19 +135,22 @@ VAR int PollPipe VALUE(0);
- VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL);
- /* Status buffer for pollers */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char *DNSSDComputerName VALUE(NULL),
- /* Computer/server name */
- *DNSSDHostName VALUE(NULL),
- /* Hostname */
- *DNSSDRegType VALUE(NULL);
- /* Bonjour registration type */
--VAR cups_array_t *DNSSDAlias VALUE(NULL);
-- /* List of dynamic ServerAlias's */
- VAR int DNSSDPort VALUE(0);
- /* Port number to register */
- VAR cups_array_t *DNSSDPrinters VALUE(NULL);
- /* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t *DNSSDAlias VALUE(NULL);
-+ /* List of dynamic ServerAlias's */
- VAR DNSServiceRef DNSSDRef VALUE(NULL),
- /* Master DNS-SD service reference */
- WebIFRef VALUE(NULL),
-@@ -152,6 +159,17 @@ VAR DNSServiceRef DNSSDRef VALUE(NULL),
- /* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL);
-+ /* AvahiCupsPoll object */
-+VAR AvahiClient *AvahiCupsClient VALUE(NULL);
-+ /* AvahiClient object */
-+VAR int AvahiCupsClientConnecting VALUE(0);
-+ /* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL);
-+ /* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle BrowseSLPHandle VALUE(NULL);
- /* SLP API handle */
-@@ -195,13 +213,14 @@ extern void cupsdRegisterPrinter(cupsd_p
- extern void cupsdRestartPolling(void);
- extern void cupsdSaveRemoteCache(void);
- extern void cupsdSendBrowseList(void);
-+extern void cupsdStartAvahiClient(void);
- extern void cupsdStartBrowsing(void);
- extern void cupsdStartPolling(void);
- extern void cupsdStopBrowsing(void);
- extern void cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
-diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c
---- cups-1.5.2/scheduler/ipp.c.avahi-5-services 2012-03-14 15:04:17.665305560 +0000
-+++ cups-1.5.2/scheduler/ipp.c 2012-03-14 15:08:25.715611813 +0000
-@@ -6099,7 +6099,7 @@ copy_printer_attrs(
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
- {
- if (printer->reg_name)
-@@ -6109,7 +6109,7 @@ copy_printer_attrs(
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
- "printer-dns-sd-name", 0);
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- if (!ra || cupsArrayFind(ra, "printer-error-policy"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-5-services 2012-03-14 15:06:36.511476986 +0000
-+++ cups-1.5.2/scheduler/main.c 2012-03-14 15:08:25.718611817 +0000
-@@ -120,6 +120,10 @@ main(int argc, /* I - Number of comm
- cupsd_listener_t *lis; /* Current listener */
- time_t current_time, /* Current time */
- activity, /* Client activity timer */
-+#ifdef HAVE_AVAHI
-+ avahi_client_time, /* Time for next Avahi client
-+ check */
-+#endif /* HAVE_AVAHI */
- browse_time, /* Next browse send time */
- senddoc_time, /* Send-Document time */
- expire_time, /* Subscription expire time */
-@@ -672,6 +676,9 @@ main(int argc, /* I - Number of comm
- */
-
- current_time = time(NULL);
-+#ifdef HAVE_AVAHI
-+ avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
- browse_time = current_time;
- event_time = current_time;
- expire_time = current_time;
-@@ -894,6 +901,16 @@ main(int argc, /* I - Number of comm
- tmo = cupsdNextTimeout (&tmo_delay);
- if (tmo && tmo_delay == 0)
- cupsdRunTimeout (tmo);
-+
-+ /*
-+ * Try to restart the Avahi client every 10 seconds if needed...
-+ */
-+
-+ if ((current_time - avahi_client_time) >= 10)
-+ {
-+ avahi_client_time = current_time;
-+ cupsdStartAvahiClient();
-+ }
- #endif /* HAVE_AVAHI */
-
- #ifndef __APPLE__
-diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c
---- cups-1.5.2/scheduler/printers.c.avahi-5-services 2012-03-14 15:04:17.646305537 +0000
-+++ cups-1.5.2/scheduler/printers.c 2012-03-14 15:08:25.720611819 +0000
-@@ -883,9 +883,9 @@ cupsdDeletePrinter(
- cupsdClearString(&p->alert);
- cupsdClearString(&p->alert_description);
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- cupsArrayDelete(p->filetypes);
-
-@@ -3787,7 +3787,7 @@ add_printer_formats(cupsd_printer_t *p)
- attr->values[i].string.text = _cupsStrAlloc(mimetype);
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- {
- char pdl[1024]; /* Buffer to build pdl list */
- mime_filter_t *filter; /* MIME filter looping var */
-@@ -3843,7 +3843,7 @@ add_printer_formats(cupsd_printer_t *p)
-
- cupsdSetString(&p->pdl, pdl);
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
-diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h
---- cups-1.5.2/scheduler/printers.h.avahi-5-services 2011-03-18 18:42:46.000000000 +0000
-+++ cups-1.5.2/scheduler/printers.h 2012-03-14 15:08:25.721611820 +0000
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- # include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
-
-
-@@ -95,16 +98,23 @@ struct cupsd_printer_s
- time_t marker_time; /* Last time marker attributes were updated */
- _ppd_cache_t *pc; /* PPD cache and mapping data */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- char *reg_name, /* Name used for service registration */
-- *pdl, /* pdl value for TXT record */
-- *ipp_txt, /* IPP TXT record contents */
-+ *pdl; /* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+ char *ipp_txt, /* IPP TXT record contents */
- *printer_txt; /* LPD TXT record contents */
- int ipp_len, /* IPP TXT record length */
- printer_len; /* LPD TXT record length */
- DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */
- printer_ref; /* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ AvahiStringList *ipp_txt, /* IPP TXT record */
-+ *printer_txt; /* LPD TXT record */
-+ AvahiEntryGroup *avahi_group; /* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
-
-
diff --git a/abs/extra/cups/cups-avahi-address.patch b/abs/extra/cups/cups-avahi-address.patch
new file mode 100644
index 0000000..a03d1ad
--- /dev/null
+++ b/abs/extra/cups/cups-avahi-address.patch
@@ -0,0 +1,75 @@
+diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c
+--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000
++++ cups-1.6.2/cups/http-support.c 2013-04-04 15:39:06.651847041 +0100
+@@ -2121,7 +2121,7 @@ http_resolve_cb(
+ const char *type, /* I - Registration type */
+ const char *domain, /* I - Domain (unused) */
+ const char *hostTarget, /* I - Hostname */
+- const AvahiAddress *address, /* I - Address (unused) */
++ const AvahiAddress *address, /* I - Address */
+ uint16_t port, /* I - Port number */
+ AvahiStringList *txt, /* I - TXT record */
+ AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */
+@@ -2253,36 +2253,37 @@ http_resolve_cb(
+
+ DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
+
+- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
+- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
++ int error = getnameinfo(&(address->data),
++ address->proto == AVAHI_PROTO_INET ?
++ sizeof (AvahiIPv4Address) :
++ (address->proto == AVAHI_PROTO_INET6 ?
++ sizeof (AvahiIPv6Address) :
++ sizeof (address->data)),
++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
++
++ if (!error)
+ {
+- for (addr = addrlist; addr; addr = addr->next)
++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
++
++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
++ _cups_strcasecmp(hostptr, ".local"))
+ {
+- int error = getnameinfo(&(addr->addr.addr),
+- httpAddrLength(&(addr->addr)),
+- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+-
+- if (!error)
+- {
+- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
+-
+- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
+- _cups_strcasecmp(hostptr, ".local"))
+- {
+- hostTarget = fqdn;
+- break;
+- }
+- }
++ hostTarget = fqdn;
++ }
++ }
+ #ifdef DEBUG
+- else
+- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
+- error));
++ else
++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
++ httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
++ error));
+ #endif /* DEBUG */
+- }
++ } else {
++ /*
++ * Use the IP address that responded...
++ */
+
+- httpAddrFreeList(addrlist);
+- }
++ avahi_address_snprint (fqdn, sizeof (fqdn), address);
++ hostTarget = fqdn;
+ }
+
+ /*
diff --git a/abs/extra/cups/cups-enum-all.patch b/abs/extra/cups/cups-enum-all.patch
new file mode 100644
index 0000000..0ac3983
--- /dev/null
+++ b/abs/extra/cups/cups-enum-all.patch
@@ -0,0 +1,17 @@
+diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
+--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100
++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100
+@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
+ break;
+
+ case AVAHI_BROWSER_REMOVE:
+- case AVAHI_BROWSER_ALL_FOR_NOW:
+ case AVAHI_BROWSER_CACHE_EXHAUSTED:
+ break;
++
++ case AVAHI_BROWSER_ALL_FOR_NOW:
++ avahi_simple_poll_quit(data->simple_poll);
++ break;
+ }
+ }
+
diff --git a/abs/extra/cups/cups-final-content-type.patch b/abs/extra/cups/cups-final-content-type.patch
new file mode 100644
index 0000000..6ae4010
--- /dev/null
+++ b/abs/extra/cups/cups-final-content-type.patch
@@ -0,0 +1,18 @@
+diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c
+--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100
++++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100
+@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+
+ if (!job->printer->remote)
+ {
+- for (filter = (mime_filter_t *)cupsArrayLast(filters);
+- filter && filter->dst;
+- filter = (mime_filter_t *)cupsArrayPrev(filters))
+- if (strcmp(filter->dst->super, "printer") ||
+- strcmp(filter->dst->type, job->printer->name))
+- break;
++ filter = (mime_filter_t *)cupsArrayLast(filters);
+
+ if (filter && filter->dst)
+ {
+
diff --git a/abs/extra/cups/cups-no-export-ssllibs.patch b/abs/extra/cups/cups-no-export-ssllibs.patch
index 9be3c81..e227bd1 100644
--- a/abs/extra/cups/cups-no-export-ssllibs.patch
+++ b/abs/extra/cups/cups-no-export-ssllibs.patch
@@ -1,7 +1,7 @@
diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
AC_SUBST(SSLFLAGS)
AC_SUBST(SSLLIBS)
@@ -9,4 +9,4 @@ diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/conf
+EXPORT_SSLLIBS=""
AC_SUBST(EXPORT_SSLLIBS)
-
+ dnl
diff --git a/abs/extra/cups/cups-no-gcrypt.patch b/abs/extra/cups/cups-no-gcrypt.patch
index 42f71d0..4eaff67 100644
--- a/abs/extra/cups/cups-no-gcrypt.patch
+++ b/abs/extra/cups/cups-no-gcrypt.patch
@@ -9,12 +9,14 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/
if $PKGCONFIG --exists gnutls; then
have_ssl=1
SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- AC_DEFINE(HAVE_SSL)
+@@ -108,18 +107,6 @@
AC_DEFINE(HAVE_GNUTLS)
fi
--
+
- if test $have_ssl = 1; then
+- CUPS_SERVERCERT="ssl/server.crt"
+- CUPS_SERVERKEY="ssl/server.key"
+-
- if $PKGCONFIG --exists gcrypt; then
- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
diff --git a/abs/extra/cups/cups-no-gzip-man.patch b/abs/extra/cups/cups-no-gzip-man.patch
index 6786c44..69899b9 100644
--- a/abs/extra/cups/cups-no-gzip-man.patch
+++ b/abs/extra/cups/cups-no-gzip-man.patch
@@ -4,7 +4,7 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
@@ -69,10 +69,10 @@ case "$uname" in
;;
Linux* | GNU* | Darwin*)
- # Linux, GNU Hurd, and Mac OS X
+ # Linux, GNU Hurd, and OS X
- MAN1EXT=1.gz
- MAN5EXT=5.gz
- MAN7EXT=7.gz
diff --git a/abs/extra/cups/cups-no-gzip-man.patch.16 b/abs/extra/cups/cups-no-gzip-man.patch.16
deleted file mode 100644
index 69899b9..0000000
--- a/abs/extra/cups/cups-no-gzip-man.patch.16
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- ;;
- Linux* | GNU* | Darwin*)
- # Linux, GNU Hurd, and OS X
-- MAN1EXT=1.gz
-- MAN5EXT=5.gz
-- MAN7EXT=7.gz
-- MAN8EXT=8.gz
-+ MAN1EXT=1
-+ MAN5EXT=5
-+ MAN7EXT=7
-+ MAN8EXT=8
- MAN8DIR=8
- ;;
- *)
diff --git a/abs/extra/cups/cups-res_init.patch b/abs/extra/cups/cups-res_init.patch
new file mode 100644
index 0000000..94a81a4
--- /dev/null
+++ b/abs/extra/cups/cups-res_init.patch
@@ -0,0 +1,26 @@
+diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c
+--- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200
++++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200
+@@ -254,7 +254,8 @@ httpAddrLookup(
+
+ if (error)
+ {
+- if (error == EAI_FAIL)
++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA ||
++ error == EAI_NONAME)
+ cg->need_res_init = 1;
+
+ return (httpAddrString(addr, name, namelen));
+diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c
+--- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200
++++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200
+@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /*
+ }
+ else
+ {
+- if (error == EAI_FAIL)
++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA ||
++ error == EAI_NONAME)
+ cg->need_res_init = 1;
+
+ _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0);
diff --git a/abs/extra/cups/cups-systemd-socket.patch b/abs/extra/cups/cups-systemd-socket.patch
index 09d17d4..ad13a6d 100644
--- a/abs/extra/cups/cups-systemd-socket.patch
+++ b/abs/extra/cups/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in
---- cups-1.5.2/config.h.in.systemd-socket 2012-03-16 14:50:57.089449755 +0000
-+++ cups-1.5.2/config.h.in 2012-03-16 14:50:57.146449787 +0000
-@@ -503,6 +503,13 @@
+diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
+--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
+@@ -451,6 +451,13 @@
/*
@@ -15,9 +15,9 @@ diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in
* Various scripting languages...
*/
-diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/config-scripts/cups-systemd.m4
---- cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket 2012-03-16 14:50:57.146449787 +0000
-+++ cups-1.5.2/config-scripts/cups-systemd.m4 2012-03-16 14:50:57.146449787 +0000
+diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
+--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
++++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl "$Id$"
@@ -55,31 +55,31 @@ diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/con
+dnl
+dnl "$Id$"
+dnl
-diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in
---- cups-1.5.2/configure.in.systemd-socket 2011-08-31 02:36:33.000000000 +0100
-+++ cups-1.5.2/configure.in 2012-03-16 14:50:57.146449787 +0000
-@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
+diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
+--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
++++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
+@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
sinclude(config-scripts/cups-launchd.m4)
+sinclude(config-scripts/cups-systemd.m4)
sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-pdf.m4)
sinclude(config-scripts/cups-scripting.m4)
-@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
+
+@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs
conf/snmp.conf
cups-config
data/testprint
-+ data/cups.service
-+ data/cups.socket
-+ data/cups.path
++ data/cups.service
++ data/cups.socket
++ data/cups.path
desktop/cups.desktop
+ doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html
- doc/help/standard.html
-diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c
---- cups-1.5.2/cups/usersys.c.systemd-socket 2012-03-16 14:50:57.054449734 +0000
-+++ cups-1.5.2/cups/usersys.c 2012-03-16 14:50:57.148449788 +0000
-@@ -778,7 +778,7 @@ cups_read_client_conf(
+diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
+--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
++++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
+@@ -1046,7 +1046,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -88,9 +88,9 @@ diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.in
---- cups-1.5.2/data/cups.path.in.systemd-socket 2012-03-16 14:50:57.148449788 +0000
-+++ cups-1.5.2/data/cups.path.in 2012-03-16 14:50:57.148449788 +0000
+diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
+--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
++++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printer Service Spool
@@ -100,9 +100,9 @@ diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.i
+
+[Install]
+WantedBy=multi-user.target
-diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.service.in
---- cups-1.5.2/data/cups.service.in.systemd-socket 2012-03-16 14:50:57.149449788 +0000
-+++ cups-1.5.2/data/cups.service.in 2012-03-16 14:50:57.149449788 +0000
+diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
+--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
++++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service
@@ -114,25 +114,24 @@ diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.ser
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
-diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in
---- cups-1.5.2/data/cups.socket.in.systemd-socket 2012-03-16 14:50:57.150449788 +0000
-+++ cups-1.5.2/data/cups.socket.in 2012-03-16 14:50:57.150449788 +0000
-@@ -0,0 +1,11 @@
+diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
+--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
++++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
+@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=631
-+ListenDatagram=0.0.0.0:631
++ListenStream=@DEFAULT_IPP_PORT@
+BindIPv6Only=ipv6-only
+
+[Install]
+WantedBy=sockets.target
-diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile
---- cups-1.5.2/data/Makefile.systemd-socket 2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.2/data/Makefile 2012-03-16 14:50:57.151449789 +0000
-@@ -112,6 +112,12 @@ install-data:
+diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
+--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
+@@ -100,6 +100,12 @@ install-data:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done
$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
@@ -145,8 +144,8 @@ diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile
#
-@@ -159,6 +165,9 @@ uninstall:
- -$(RMDIR) $(DATADIR)/charsets
+@@ -143,6 +149,9 @@ uninstall:
+ -$(RMDIR) $(DATADIR)/data
-$(RMDIR) $(DATADIR)/banners
-$(RMDIR) $(DATADIR)
+ for file in $(SYSTEMD_UNITS); do \
@@ -155,10 +154,10 @@ diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile
#
-diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in
---- cups-1.5.2/Makedefs.in.systemd-socket 2012-03-16 14:50:57.081449751 +0000
-+++ cups-1.5.2/Makedefs.in 2012-03-16 14:50:57.152449790 +0000
-@@ -143,6 +143,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
+diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
+--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
++++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
+@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
@@ -166,15 +165,15 @@ diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in
DNSSD_BACKEND = @DNSSD_BACKEND@
DSOFLAGS = -L../cups @DSOFLAGS@
DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
-@@ -151,6 +152,7 @@ FONTS = @FONTS@
- IMGLIBS = @IMGLIBS@
- IMGFILTERS = @IMGFILTERS@
+@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@
+ IPPFIND_BIN = @IPPFIND_BIN@
+ IPPFIND_MAN = @IPPFIND_MAN@
LAUNCHDLIBS = @LAUNCHDLIBS@
+SDLIBS = @SDLIBS@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -267,6 +269,7 @@ PAMFILE = @PAMFILE@
+@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@
@@ -182,10 +181,10 @@ diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in
#
-diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/client.h
---- cups-1.5.2/scheduler/client.h.systemd-socket 2011-03-25 21:25:38.000000000 +0000
-+++ cups-1.5.2/scheduler/client.h 2012-03-16 14:50:57.153449791 +0000
-@@ -75,6 +75,9 @@ typedef struct
+diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
+--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
+@@ -77,6 +77,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */
@@ -195,99 +194,9 @@ diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/clien
} cupsd_listener_t;
-diff -up cups-1.5.2/scheduler/dirsvc.c.systemd-socket cups-1.5.2/scheduler/dirsvc.c
---- cups-1.5.2/scheduler/dirsvc.c.systemd-socket 2012-03-16 14:50:57.112449768 +0000
-+++ cups-1.5.2/scheduler/dirsvc.c 2012-03-16 14:50:57.155449792 +0000
-@@ -1512,7 +1512,7 @@ cupsdStartBrowsing(void)
- }
- }
-
-- if (BrowseSocket >= 0)
-+ if (BrowseSocket >= 0 && !BrowseSocketIsSystemd)
- {
- /*
- * Bind the socket to browse port...
-@@ -1556,13 +1556,17 @@ cupsdStartBrowsing(void)
- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
- strerror(errno));
-
-+ if (!BrowseSocketIsSystemd)
-+ {
- #ifdef WIN32
-- closesocket(BrowseSocket);
-+ closesocket(BrowseSocket);
- #else
-- close(BrowseSocket);
-+ close(BrowseSocket);
- #endif /* WIN32 */
-
-- BrowseSocket = -1;
-+ BrowseSocket = -1;
-+ }
-+
- BrowseLocalProtocols &= ~BROWSE_CUPS;
- BrowseRemoteProtocols &= ~BROWSE_CUPS;
-
-@@ -1885,15 +1889,22 @@ cupsdStopBrowsing(void)
- if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) &&
- BrowseSocket >= 0)
- {
-- /*
-- * Close the socket and remove it from the input selection set.
-- */
-+ if (!BrowseSocketIsSystemd)
-+ {
-+ /*
-+ * Close the socket.
-+ */
-
- #ifdef WIN32
-- closesocket(BrowseSocket);
-+ closesocket(BrowseSocket);
- #else
-- close(BrowseSocket);
-+ close(BrowseSocket);
- #endif /* WIN32 */
-+ }
-+
-+ /*
-+ * Remove it from the input selection set.
-+ */
-
- cupsdRemoveSelect(BrowseSocket);
- BrowseSocket = -1;
-@@ -5693,11 +5704,14 @@ update_cups_browse(void)
- strerror(errno));
- cupsdLogMessage(CUPSD_LOG_ERROR, "CUPS browsing turned off.");
-
-+ if (!BrowseSocketIsSystemd)
-+ {
- #ifdef WIN32
-- closesocket(BrowseSocket);
-+ closesocket(BrowseSocket);
- #else
-- close(BrowseSocket);
-+ close(BrowseSocket);
- #endif /* WIN32 */
-+ }
-
- cupsdRemoveSelect(BrowseSocket);
- BrowseSocket = -1;
-diff -up cups-1.5.2/scheduler/dirsvc.h.systemd-socket cups-1.5.2/scheduler/dirsvc.h
---- cups-1.5.2/scheduler/dirsvc.h.systemd-socket 2012-03-16 14:50:57.113449769 +0000
-+++ cups-1.5.2/scheduler/dirsvc.h 2012-03-16 14:50:57.157449792 +0000
-@@ -100,6 +100,8 @@ VAR int Browsing VALUE(TRUE),
- /* Short names for remote printers? */
- BrowseSocket VALUE(-1),
- /* Socket for browsing */
-+ BrowseSocketIsSystemd VALUE(0),
-+ /* BrowseSocket is systemd-provided? */
- BrowsePort VALUE(IPP_PORT),
- /* Port number for broadcasts */
- BrowseInterval VALUE(DEFAULT_INTERVAL),
-diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/listen.c
---- cups-1.5.2/scheduler/listen.c.systemd-socket 2011-04-16 00:38:13.000000000 +0100
-+++ cups-1.5.2/scheduler/listen.c 2012-03-16 14:50:57.158449792 +0000
+diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
+--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void)
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@@ -301,9 +210,9 @@ diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/liste
{
#ifdef WIN32
closesocket(lis->fd);
-diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.systemd-socket 2012-03-16 14:50:57.121449773 +0000
-+++ cups-1.5.2/scheduler/main.c 2012-03-16 14:51:55.409483636 +0000
+diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
+--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
++++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
@@ -26,6 +26,8 @@
* launchd_checkin() - Check-in with launchd and collect the listening
* fds.
@@ -324,7 +233,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -78,6 +84,9 @@
+@@ -83,6 +89,9 @@
static void launchd_checkin(void);
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
@@ -334,7 +243,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
static void parent_handler(int sig);
static void process_children(void);
static void sigchld_handler(int sig);
-@@ -537,6 +546,13 @@ main(int argc, /* I - Number of comm
+@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -348,7 +257,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
/*
* Startup the server...
*/
-@@ -759,6 +775,15 @@ main(int argc, /* I - Number of comm
+@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -364,7 +273,7 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
/*
* Startup the server...
*/
-@@ -1584,6 +1609,139 @@ launchd_checkout(void)
+@@ -1511,6 +1536,102 @@ launchd_checkout(void)
}
#endif /* HAVE_LAUNCHD */
@@ -406,43 +315,6 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
+
+ if (!r)
+ {
-+ if (Browsing &&
-+ ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS))
-+ {
-+ r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, 0);
-+ if (r < 0)
-+ {
-+ cupsdLogMessage(CUPSD_LOG_ERROR,
-+ "systemd_checkin: Unable to verify socket type - %s",
-+ strerror(-r));
-+ continue;
-+ }
-+
-+ if (r)
-+ {
-+ /*
-+ * This is the browse socket.
-+ */
-+
-+ char addrstr[256];
-+ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+ {
-+ cupsdLogMessage(CUPSD_LOG_ERROR,
-+ "systemd_checkin: Unable to get local address - %s",
-+ strerror(errno));
-+ continue;
-+ }
-+
-+ httpAddrString (&addr, addrstr, sizeof (addrstr));
-+ BrowseSocket = fd;
-+ BrowseSocketIsSystemd = 1;
-+ cupsdLogMessage(CUPSD_LOG_DEBUG,
-+ "systemd_checkin: Matched browse (port %d) with fd %d:%s...",
-+ BrowsePort, fd, addrstr);
-+ continue;
-+ }
-+
-+ }
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "systemd_checkin: Socket not of the right type");
+ continue;
@@ -504,10 +376,10 @@ diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.systemd-socket 2012-03-16 14:50:57.130449778 +0000
-+++ cups-1.5.2/scheduler/Makefile 2012-03-16 14:50:57.160449794 +0000
-@@ -382,7 +382,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
+diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
+--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
+@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
@@ -516,12 +388,12 @@ diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makef
cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
-@@ -390,7 +390,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
+@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
- $(LIBWRAP)
-+ $(LIBWRAP) $(SDLIBS)
++ $(LIBWRAP) $(SDLIBS)
+ tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c
- #
diff --git a/abs/extra/cups/cups.install b/abs/extra/cups/cups.install
index 47c3d9b..121eeb0 100644
--- a/abs/extra/cups/cups.install
+++ b/abs/extra/cups/cups.install
@@ -1,6 +1,6 @@
post_install() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
echo ">> If you use an HTTPS connection to CUPS, the first time you access"
echo ">> the interface it may take a very long time before the site comes up."
@@ -10,17 +10,26 @@ post_install() {
post_upgrade() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
- if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
+
+ if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
# important upgrade notice
- echo "daemon script has been renamed to /etc/rc.d/cupsd"
- echo "change your entry in /etc/rc.conf"
+ echo "* avahi-daemon should now run before you start cupsd for"
+ echo " printer Browsing support"
+ echo "* check your config with cupsd -t"
+ echo " and fix all Browsing related settings"
+ fi
+
+ if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
+ # important upgrade notice
+ echo "> It's now safe to load usblp kernel module."
+ echo "> There's no more need to blacklist it."
fi
}
post_remove() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
}
diff --git a/abs/extra/cups/cups.logrotate b/abs/extra/cups/cups.logrotate
deleted file mode 100644
index 9c49bbd..0000000
--- a/abs/extra/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
- missingok
- notifempty
- delaycompress
- postrotate
- /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch b/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
new file mode 100644
index 0000000..ee36936
--- /dev/null
+++ b/abs/extra/cups/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
@@ -0,0 +1,19 @@
+Description: Fixed crash which sometimes happens on shutdown of the CUPS
+ daemon, caused by a wrong shutdown sequence for shutting down the Avahi
+ threaded poll.
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Upstream: http://cups.org/str.php?L4180
+Bug-Upstream: http://cups.org/str.php?L4213
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045
+Last-Updated: 2012-10-16
+
+--- a/scheduler/dirsvc.c
++++ b/scheduler/dirsvc.c
+@@ -1333,6 +1333,7 @@
+ DNSSDMaster = NULL;
+
+ # else /* HAVE_AVAHI */
++ avahi_threaded_poll_stop(DNSSDMaster);
+ avahi_client_free(DNSSDClient);
+ DNSSDClient = NULL;
+
diff --git a/abs/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/abs/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
new file mode 100644
index 0000000..ed132d7
--- /dev/null
+++ b/abs/extra/cups/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
@@ -0,0 +1,31 @@
+Description: Applications could not get the PPD file for
+ statically-configured IPP-shared print queues
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Bug-Upstream: http://cups.org/str.php?L4178
+Last-Updated: 2012-09-19
+
+--- a/cups/util.c
++++ b/cups/util.c
+@@ -1731,6 +1731,22 @@
+
+ return (1);
+ }
++ else if (device_uri &&
++ (!strncmp(device_uri, "ipp:", 4) != NULL ||
++ !strncmp(device_uri, "ipps:", 5) != NULL))
++ {
++ /*
++ * Statically-configured IPP shared printer.
++ */
++
++ httpSeparateURI(HTTP_URI_CODING_ALL,
++ device_uri,
++ scheme, sizeof(scheme), username, sizeof(username),
++ host, hostsize, port, resource, resourcesize);
++ ippDelete(response);
++
++ return (1);
++ }
+ else if ((attr = ippFindAttribute(response, "member-uris",
+ IPP_TAG_URI)) != NULL)
+ {
diff --git a/abs/extra/cups/ppd-poll-with-client-conf.patch b/abs/extra/cups/ppd-poll-with-client-conf.patch
new file mode 100644
index 0000000..8985fa3
--- /dev/null
+++ b/abs/extra/cups/ppd-poll-with-client-conf.patch
@@ -0,0 +1,23 @@
+Description: If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server
+Bug: http://www.cups.org/str.php?L2763
+
+--- a/cups/util.c
++++ b/cups/util.c
+@@ -1085,11 +1085,13 @@
+ http2 = http;
+ else if ((http2 = httpConnectEncrypt(hostname, port,
+ cupsEncryption())) == NULL)
+- {
+- DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
++ if ((http2 = httpConnectEncrypt(http_hostname, http_port,
++ cupsEncryption())) == NULL)
++ {
++ DEBUG_puts("1cupsGetPPD3: Unable to connect to server");
+
+- return (HTTP_SERVICE_UNAVAILABLE);
+- }
++ return (HTTP_SERVICE_UNAVAILABLE);
++ }
+
+ /*
+ * Get a temp file...
--
cgit v0.12
From 883ebdd4f4076480c75679b5b72e19eea5fc5043 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 15:14:25 +0000
Subject: google-chrome: add libcups dep
---
abs/extra/google-chrome/PKGBUILD | 4 ++--
abs/extra/google-chrome/__changelog | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 3e18710..ec1f344 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -6,13 +6,13 @@
pkgname=google-chrome
pkgver=33.0.1750.152
-pkgrel=1
+pkgrel=2
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
url="https://www.google.com/chrome"
license=('custom:chrome')
depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu'
- 'libgcrypt' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
+ 'libgcrypt' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=${pkgver}")
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
index 8e8830a..4a64955 100644
--- a/abs/extra/google-chrome/__changelog
+++ b/abs/extra/google-chrome/__changelog
@@ -2,4 +2,5 @@ Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
- PKGBUILD: add replaces chromium
- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
- PKGBUILD: Rename google-chrome-stable to google-chrome"
-- PKGBUILD:Change dep libgcrypt15 to libgcrypt
+- PKGBUILD: Change dep libgcrypt15 to libgcrypt
+- PKGBUILD: Add dep libcups
--
cgit v0.12
From 97c77e5d32a9a79d7939c557c63589619bcabbb5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 16:04:24 +0000
Subject: xbmc: restore gen_lib_xml.py in .install. refs #962
---
abs/extra/xbmc/PKGBUILD | 2 +-
abs/extra/xbmc/__changelog | 1 +
abs/extra/xbmc/xbmc.install | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 6b626c6..3d49bee 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -10,7 +10,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=12.3
_codename=Frodo
-pkgrel=12
+pkgrel=13
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index c01c1ea..161a9f6 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,2 +1,3 @@
8/23/12 -jm -Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
brf - keep --disable-external-ffmpeg instead of using external ffmpeg
+brf - xbmc.install: add gen_lib_xml.py to post_install and post_remove
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index 8076fe2..ad3b95a 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -6,6 +6,7 @@ post_install() {
usermod -a -G xbmc,audio,video,network,optical xbmc
mkdir -p var/lib/xbmc
chown -R xbmc:xbmc var/lib/xbmc
+ gen_lib_xml.py
}
post_upgrade() {
@@ -16,4 +17,5 @@ post_remove() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
getent passwd xbmc > /dev/null && userdel xbmc
+ gen_lib_xml.py
}
--
cgit v0.12
From 91ca20376b8010d8ce18e2973f8bd448e051b0d2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 17:17:04 +0000
Subject: linhes-theme: make menu update message look like other elements
---
abs/core/linhes-theme/PKGBUILD | 4 +-
abs/core/linhes-theme/game-ui.xml | 716 -----------------
abs/core/linhes-theme/menu-ui-vert.xml.patch | 28 +-
abs/core/linhes-theme/mytharchive-ui.xml | 1084 --------------------------
abs/core/linhes-theme/mythburn-ui.xml | 976 -----------------------
abs/core/linhes-theme/mythnative-ui.xml | 640 ---------------
6 files changed, 22 insertions(+), 3426 deletions(-)
delete mode 100644 abs/core/linhes-theme/game-ui.xml
delete mode 100644 abs/core/linhes-theme/mytharchive-ui.xml
delete mode 100644 abs/core/linhes-theme/mythburn-ui.xml
delete mode 100644 abs/core/linhes-theme/mythnative-ui.xml
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index b33a911..9c4b77d 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.1
-pkgrel=24
+pkgrel=25
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -79,7 +79,7 @@ package() {
md5sums=('95478bd9bab15e9e4365c1048757c225'
'ed4f8baf431e20babc345e4e2602426f'
'cb8c0d63392f6c8c2d8219243fbf47c6'
- '6a75b0bd0327d25f0e87578c880338b9'
+ 'c75c83b90969fb07755062113f858e88'
'9fe3371a8b964a7028126405cfaa330b'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
'a0201e0aa1608eeab27ee754e4d2c1de'
diff --git a/abs/core/linhes-theme/game-ui.xml b/abs/core/linhes-theme/game-ui.xml
deleted file mode 100644
index ed782e3..0000000
--- a/abs/core/linhes-theme/game-ui.xml
+++ /dev/null
@@ -1,716 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
-<mythuitheme>
-
- <window name="gameui">
- <area>0,0,1280,720</area>
-
- <group name="fanart-group" from="base_fanart_group" />
-
- <textarea name="heading" from="base_heading">
- <value>Games</value>
- </textarea>
-
- <shape name="tree-backdrop" from="base_backdrop">
- <area>20,36,1240,401</area>
- </shape>
-
- <shape name="tree-backdrop-line" from="base_backdrop_line">
- <area>21,37,1238,399</area>
- </shape>
-
- <shape name="tree-top-line" from="base_highlight_line">
- <area>22,38,1236,2</area>
- </shape>
-
- <shape name="tree-bottom-line" from="base_highlight_line">
- <area>22,433,1236,2</area>
- </shape>
-
- <shape name="tree-left-line" from="base_highlight_vertical_line">
- <area>22,40,2,344</area>
- </shape>
-
- <shape name="tree-right-line" from="base_highlight_vertical_line">
- <area>1256,40,2,344</area>
- </shape>
-
- <shape name="tree-arrows-first-list-backdrop" from="base_arrows_backdrop">
- <area>385,436,50,11</area>
- </shape>
-
- <shape name="tree-arrows-second-list-backdrop" from="base_arrows_backdrop">
- <area>796,436,50,11</area>
- </shape>
-
- <shape name="tree-arrows-third-list-backdrop" from="base_arrows_backdrop">
- <area>1207,436,50,11</area>
- </shape>
-
- <shape name="description-backdrop" from="base_backdrop">
- <area>20,447,1240,238</area>
- </shape>
-
- <shape name="description-backdrop-line" from="base_backdrop_line">
- <area>21,448,1238,236</area>
- </shape>
-
- <shape name="description-top-line" from="base_highlight_line">
- <area>22,449,1236,2</area>
- </shape>
-
- <shape name="description-bottom-line" from="base_highlight_line">
- <area>22,681,1236,2</area>
- </shape>
-
- <shape name="description-left-line" from="base_highlight_vertical_line">
- <area>22,451,2,230</area>
- </shape>
-
- <shape name="description-right-line" from="base_highlight_vertical_line">
- <area>1256,451,2,230</area>
- </shape>
-
- <shape name="description-seperator-top-line" from="base_line">
- <area>188,487,684,2</area>
- </shape>
-
- <shape name="description-seperator-bottom-line" from="base_line">
- <area>188,643,684,2</area>
- </shape>
-
- <shape name="coverart-border">
- <area>37,464,136,204</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#AAAAAA" alpha="100" width="2" />
- <cornerradius>6</cornerradius>
- </shape>
-
- <shape name="preview-border">
- <area>887,464,356,204</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#AAAAAA" alpha="100" width="2" />
- <cornerradius>6</cornerradius>
- </shape>
-
- <buttontree name="gametreelist">
- <area>28,51,1224,387</area>
- <numlists>3</numlists>
- <spacing>10</spacing>
- <buttonlist name="listtemplate" from="base_list">
- <searchposition>-1,308</searchposition>
- <buttonarea>0,0,1224,387</buttonarea>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,402,30</area>
- <textarea name="buttontext">
- <area>8,0,378,30</area>
- </textarea>
- <imagetype name="buttonarrow">
- <position>383,7</position>
- </imagetype>
- <statetype name="buttoncheck">
- <area>374,5,20,20</area>
- </statetype>
- </state>
- <state name="selectedactive">
- <area>0,0,402,64</area>
- <textarea name="buttontext">
- <area>8,0,378,64</area>
- </textarea>
- <imagetype name="buttonarrow">
- <position>383,22</position>
- </imagetype>
- <statetype name="buttoncheck">
- <area>374,22,20,20</area>
- </statetype>
- </state>
- <state name="selectedinactive">
- <area>0,0,402,64</area>
- <textarea name="buttontext">
- <area>8,0,378,64</area>
- </textarea>
- <imagetype name="buttonarrow">
- <position>383,22</position>
- </imagetype>
- <statetype name="buttoncheck">
- <area>374,22,20,20</area>
- </statetype>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>364,387</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>384,387</position>
- </statetype>
-
- </buttonlist>
- </buttontree>
-
- <textarea name="title" from="basetextarea">
- <area>189,451,682,36</area>
- <font>basemediumyellow</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="genrelabel" from="basetextarea">
- <area>189,641,50,42</area>
- <font>baseextrasmall</font>
- <value>Genre:</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="genre" from="basetextarea">
- <area>249,641,331,42</area>
- <font>baseextrasmallblue</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="systemlabel" from="genrelabel">
- <area>580,641,60,42</area>
- <value>System:</value>
- </textarea>
-
- <textarea name="system" from="genre">
- <area>650,641,120,42</area>
- </textarea>
-
- <textarea name="favlabel" from="genrelabel">
- <area>770,641,65,42</area>
- <value>Favorite:</value>
- </textarea>
-
- <statetype name="favorite">
- <state name="no">
- <textarea name="favorite" from="basetextarea">
- <font>baseextrasmallblue</font>
- <area>840,641,30,42</area>
- <value>No</value>
- <align>allcenter</align>
- </textarea>
- </state>
- <state name="yes" from="no">
- <textarea name="favorite">
- <value>Yes</value>
- </textarea>
- </state>
- </statetype>
-
- <textarea name="description" from="basetextarea">
- <area>189,498,682,140</area>
- <multiline>yes</multiline>
- <cutdown>yes</cutdown>
- </textarea>
-
- <imagetype name="no_coverart_without_fanart" depends="!fanart">
- <area>41,468,128,196</area>
- <filename>images/masks/watchrecordings_coverart_mask.png</filename>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <imagetype name="coverart">
- <area>41,468,128,196</area>
- <mask>images/masks/watchrecordings_coverart_mask.png</mask>
- <preserveaspect>true</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <imagetype name="no_screenshot_without_fanart" depends="!fanart">
- <area>891,468,348,196</area>
- <filename>images/masks/watchrecordings_preview_mask.png</filename>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <imagetype name="screenshot">
- <area>891,468,348,196</area>
- <mask>images/masks/watchrecordings_preview_mask.png</mask>
- <preserveaspect>true</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
-
- <clock name="clock" from="base_clock" />
-
- </window>
-
- <window name="gamedetailspopup">
-
- <!-- Make window behave as a popup -->
- <area>-1,-1,850,516</area>
-
- <animation trigger="AboutToShow">
- <section>
- <alpha start="0" end="255" easingcurve="OutQuart"/>
- <zoom start="0" end="100" easingcurve="OutQuart"/>
- </section>
- </animation>
-
- <animation trigger="AboutToHide">
- <section>
- <alpha start="255" end="0" easingcurve="InQuart"/>
- <zoom start="100" end="0" easingcurve="InQuart"/>
- </section>
- </animation>
-
- <!--this works around buttons being disabled in the popup-->
- <textarea name="fix" from="basetextarea">
- <area>0,0,1,1</area>
- <scroll direction="left" startdelay="0"/>
- <value>_</value>
- </textarea>
-
- <shape name="detail-popup-backdrop" from="base_popup_backdrop">
- <area>0,0,850,516</area>
- </shape>
-
- <shape name="detail-popup-backdrop-line" from="base_backdrop_line">
- <area>1,1,571,406</area>
- </shape>
-
- <shape name="detail-popup-top-line" from="base_highlight_line">
- <area>2,2,569,2</area>
- </shape>
-
- <shape name="detail-popup-bottom-line" from="base_highlight_line">
- <area>2,404,569,2</area>
- </shape>
-
- <shape name="detail-popup-left-line" from="base_highlight_vertical_line">
- <area>2,4,2,400</area>
- </shape>
-
- <shape name="detail-popup-right-line" from="base_highlight_vertical_line">
- <area>569,4,2,400</area>
- </shape>
-
- <shape name="detail-popup-seperator-first-line" from="base_line">
- <area>22,45,529,2</area>
- </shape>
-
- <shape name="detail-popup-seperator-second-line" from="base_line">
- <area>22,278,529,2</area>
- </shape>
-
- <shape name="detail-popup-seperator-third-line" from="base_line">
- <area>22,303,529,2</area>
- </shape>
-
- <shape name="detail-popup-seperator-fourth-line" from="base_line">
- <area>22,328,529,2</area>
- </shape>
-
- <shape name="detail-popup-seperator-fifth-line" from="base_line">
- <area>22,353,529,2</area>
- </shape>
-
- <shape name="detail-popup-seperator-sixth-line" from="base_line">
- <area>22,378,529,2</area>
- </shape>
-
- <shape name="detail-popup-coverart-backdrop-line" from="base_backdrop_line">
- <area>575,1,274,406</area>
- </shape>
-
- <shape name="detail-popup-coverart-top-line" from="base_highlight_line">
- <area>576,2,272,2</area>
- </shape>
-
- <shape name="detail-popup-coverart-bottom-line" from="base_highlight_line">
- <area>576,404,272,2</area>
- </shape>
-
- <shape name="detail-popup-coverart-left-line" from="base_highlight_vertical_line">
- <area>576,4,2,400</area>
- </shape>
-
- <shape name="detail-popup-coverart-right-line" from="base_highlight_vertical_line">
- <area>846,4,2,400</area>
- </shape>
-
- <shape name="detail-popup-bottom-backdrop-line" from="base_backdrop_line">
- <area>1,411,848,104</area>
- </shape>
-
- <shape name="detail-popup-bottom-top-line" from="base_highlight_line">
- <area>2,412,846,2</area>
- </shape>
-
- <shape name="detail-popup-bottom-bottom-line" from="base_highlight_line">
- <area>2,512,846,2</area>
- </shape>
-
- <shape name="detail-popup-bottom-left-line" from="base_highlight_vertical_line">
- <area>2,414,2,98</area>
- </shape>
-
- <shape name="detail-popup-bottom-right-line" from="base_highlight_vertical_line">
- <area>846,414,2,98</area>
- </shape>
-
- <textarea name="title" from="basetextarea">
- <area>9,4,555,40</area>
- <multiline>no</multiline>
- <font>basesmalldarkyellow</font>
- <scroll direction="left" startdelay="1" />
- <align>allcenter</align>
- </textarea>
-
- <textarea name="description" from="basetextarea">
- <area>23,54,527,214</area>
- <multiline>yes</multiline>
- <font>basesmaller</font>
- </textarea>
-
- <imagetype name="coverart">
- <area>580,6,264,396</area>
- <mask>images/masks/item_detail_popup_coverart_mask.png</mask>
- <preserveaspect>true</preserveaspect>
- </imagetype>
-
- <textarea name="gametype_lab" from="basetextarea">
- <area>23,279,50,24</area>
- <font>basesmaller</font>
- <value>Type:</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="gametype" from="basetextarea">
- <area>83,280,150,24</area>
- <font>basesmallerblue</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="allsystems_lab" from="basetextarea">
- <area>243,279,100,24</area>
- <font>basesmaller</font>
- <value>System(s):</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="allsystems" from="basetextarea">
- <area>353,280,197,24</area>
- <font>basesmallerblue</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="rompath_lab" from="basetextarea">
- <area>23,304,46,24</area>
- <font>basesmaller</font>
- <value>Path:</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="rompath" from="basetextarea">
- <area>79,305,327,24</area>
- <font>basesmallerblue</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="romname_lbl" from="basetextarea">
- <area>390,304,46,24</area>
- <font>basesmaller</font>
- <value>File:</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="romname" from="basetextarea">
- <area>436,305,114,24</area>
- <font>basesmallerblue</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="genre_lab" from="basetextarea">
- <area>23,329,70,24</area>
- <font>basesmaller</font>
- <value>Genre:</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="genre" from="basetextarea">
- <area>103,330,447,24</area>
- <font>basesmallerblue</font>
- <scroll direction="left" startdelay="1" />
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="year_lab" from="basetextarea">
- <area>23,354,46,24</area>
- <font>basesmaller</font>
- <align>left,vcenter</align>
- <value>Year:</value>
- </textarea>
-
- <textarea name="year" from="basetextarea">
- <area>79,356,80,24</area>
- <font>basesmallerblue</font>
- </textarea>
-
- <textarea name="crc_lab" from="basetextarea">
- <area>342,354,84,24</area>
- <font>basesmaller</font>
- <align>right,vcenter</align>
- <value>CRC:</value>
- </textarea>
-
- <textarea name="crc" from="basetextarea">
- <area>436,355,114,24</area>
- <font>basesmallerblue</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="country_lab" from="basetextarea">
- <area>88,382,90,20</area>
- <font>baseextrasmall</font>
- <value>Country:</value>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="country" from="basetextarea">
- <area>188,382,110,20</area>
- <font>baseextrasmallblue</font>
- <align>vcenter</align>
- </textarea>
-
- <textarea name="publisher_lab" from="basetextarea">
- <area>331,382,94,20</area>
- <font>baseextrasmall</font>
- <align>right,vcenter</align>
- <value>Publisher:</value>
- </textarea>
-
- <textarea name="publisher" from="basetextarea">
- <area>435,382,110,20</area>
- <font>baseextrasmallblue</font>
- <align>vcenter</align>
- </textarea>
-
- <button name="play_button">
- <position>435,443</position>
- <statetype name="buttonstate">
- <state name="active">
- <shape name="background" from="base_button_background_active">
- <area>0,0,390,40</area>
- </shape>
- <textarea name="buttontext">
- <area>10,0,370,40</area>
- <align>allcenter</align>
- <font>basesmall</font>
- <value>Play</value>
- </textarea>
- </state>
- <state name="selected" from="active">
- <shape name="background" from="base_button_background_selected">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- <state name="pushed" from="active">
- <shape name="background" from="base_button_background_pushed">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- </statetype>
- </button>
-
- <button name="done_button">
- <position>25,443</position>
- <statetype name="buttonstate">
- <state name="active">
- <shape name="background" from="base_button_background_active">
- <area>0,0,390,40</area>
- </shape>
- <textarea name="buttontext">
- <area>10,0,370,40</area>
- <align>allcenter</align>
- <font>basesmall</font>
- <value>Done</value>
- </textarea>
- </state>
- <state name="selected" from="active">
- <shape name="background" from="base_button_background_selected">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- <state name="pushed" from="active">
- <shape name="background" from="base_button_background_pushed">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- </statetype>
- </button>
-
- </window>
-
- <window name="edit_metadata">
-
- <group name="fanart-group" from="base_fanart_group" />
-
- <textarea name="heading" from="base_heading">
- <value>Edit Game Information</value>
- </textarea>
-
- <shape name="edit-metadata-backdrop" from="base_backdrop">
- <area>190,36,900,648</area>
- </shape>
-
- <shape name="edit-metadata-backdrop-line" from="base_backdrop_line">
- <area>191,37,898,646</area>
- </shape>
-
- <shape name="edit-metadata-top-line" from="base_highlight_line">
- <area>192,38,896,2</area>
- </shape>
-
- <shape name="edit-metadata-bottom-line" from="base_highlight_line">
- <area>192,680,896,2</area>
- </shape>
-
- <shape name="edit-metadata-left-line" from="base_highlight_vertical_line">
- <area>192,40,2,640</area>
- </shape>
-
- <shape name="edit-metadata-right-line" from="base_highlight_vertical_line">
- <area>1086,40,2,640</area>
- </shape>
-
- <shape name="edit-metadata-buttons-top-line" from="base_line">
- <area>213,604,854,2</area>
- </shape>
-
- <textarea name="gamename_label" from="basetextarea">
- <area>164,66,230,32</area>
- <font>basemedium</font>
- <align>right,vcenter</align>
- <value>Title:</value>
- </textarea>
-
- <textedit name="title_edit" from="base_wide_textedit">
- <area>414,66,580,32</area>
- </textedit>
-
- <textarea name="genre_label" from="gamename_label">
- <position>164,123</position>
- <value>Genre:</value>
- </textarea>
-
- <textedit name="genre_edit" from="title_edit">
- <position>414,123</position>
- </textedit>
-
- <textarea name="country_label" from="gamename_label">
- <position>164,180</position>
- <value>Country:</value>
- </textarea>
-
- <textedit name="country_edit" from="title_edit">
- <position>414,180</position>
- </textedit>
-
- <textarea name="publisher_label" from="gamename_label">
- <position>164,237</position>
- <value>Publisher:</value>
- </textarea>
-
- <textedit name="publisher_edit" from="title_edit">
- <position>414,237</position>
- </textedit>
-
- <textarea name="plot_label" from="gamename_label">
- <position>164,294</position>
- <value>Description:</value>
- </textarea>
-
- <textedit name="description_edit" from="title_edit">
- <position>414,294</position>
- </textedit>
-
- <textarea name="year_label" from="gamename_label">
- <position>164,351</position>
- <value>Year:</value>
- </textarea>
-
- <textedit name="year_edit" from="title_edit">
- <area>414,351,120,32</area>
- <textarea name="text">
- <area>0,0,120,32</area>
- <align>allcenter</align>
- </textarea>
- </textedit>
-
- <textarea name="fav_label" from="gamename_label">
- <position>845,351</position>
- <align>left,vcenter</align>
- <value>Favorite:</value>
- </textarea>
-
- <checkbox name="favorite_check" from="base_checkbox">
- <position>960,351</position>
- </checkbox>
-
- <textarea name="coverart_label" from="gamename_label">
- <position>164,408</position>
- <value>Coverart:</value>
- </textarea>
-
- <button name="coverart_button" from="base_searchbutton">
- <area>414,408,30,30</area>
- </button>
-
- <textarea name="coverart_text" from="basetextarea">
- <area>456,408,545,32</area>
- <font>basesmaller</font>
- <cutdown>left</cutdown>
- <value>/path/to/the/thing.jpg</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="fanart_label" from="gamename_label">
- <position>164,465</position>
- <value>Fanart:</value>
- </textarea>
-
- <button name="fanart_button" from="coverart_button">
- <position>414,465</position>
- </button>
-
- <textarea name="fanart_text" from="coverart_text">
- <position>456,465</position>
- </textarea>
-
- <textarea name="screenshot_label" from="gamename_label">
- <position>164,522</position>
- <value>Screenshot:</value>
- </textarea>
-
- <button name="screenshot_button" from="coverart_button">
- <area>414,522,30,30</area>
- </button>
-
- <textarea name="screenshot_text" from="coverart_text">
- <position>456,522</position>
- </textarea>
-
- <button name="done_button" from="base_wide_button">
- <position>400,623</position>
- <value>Done</value>
- </button>
-
- <!-- Widgets -->
-
- <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
-
- <clock name="clock" from="base_clock" />
-
- </window>
-
-</mythuitheme>
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index 812b2be..914ecf7 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,6 +1,6 @@
---- menu-ui-vert.xml.orig 2014-01-02 20:22:20.736627009 +0000
-+++ menu-ui-vert.xml 2014-02-13 21:20:47.574951302 +0000
-@@ -18,6 +18,37 @@
+--- menu-ui-vert.xml.orig 2014-03-26 17:04:48.808874995 +0000
++++ menu-ui-vert.xml 2014-03-26 17:06:18.504013928 +0000
+@@ -18,6 +18,49 @@
<area>394,0,2,720</area>
</shape>
@@ -25,9 +25,21 @@
+ <!--LinHES UPDATE MESSAGE
+ <shape name="update_box" from="base_backdrop">
+ <area>519,593,638,64</area>
-+ <type>roundbox</type>
-+ <line color="#666666" alpha="200" width="2" />
-+ <cornerradius>5</cornerradius>
++ </shape>
++ <shape name="update_box_backdrop_line" from="base_backdrop_line">
++ <area>519,593,638,64</area>
++ </shape>
++ <shape name="update_box_backdrop_top_line" from="base_highlight_line">
++ <area>520,594,636,2</area>
++ </shape>
++ <shape name="update_box_backdrop_bottom_line" from="base_highlight_line">
++ <area>520,654,636,2</area>
++ </shape>
++ <shape name="update_box_backdrop_left_line" from="base_highlight_vertical_line">
++ <area>520,596,2,54</area>
++ </shape>
++ <shape name="update_box_backdrop_right_line" from="base_highlight_vertical_line">
++ <area>1154,596,2,54</area>
+ </shape>
+ <textarea name="update_text" from="description">
+ <area>529,593,628,64</area>
@@ -38,7 +50,7 @@
<statetype name="titles">
<state name="MAIN">
<textarea name="heading">
-@@ -123,6 +154,41 @@
+@@ -123,6 +166,41 @@
<value>Archive Utilities</value>
</textarea>
</state>
@@ -80,7 +92,7 @@
</statetype>
<buttonlist name="menu">
-@@ -162,21 +228,6 @@
+@@ -162,21 +240,6 @@
<cutdown>yes</cutdown>
<case>upper</case>
</textarea>
diff --git a/abs/core/linhes-theme/mytharchive-ui.xml b/abs/core/linhes-theme/mytharchive-ui.xml
deleted file mode 100644
index 81a3fe3..0000000
--- a/abs/core/linhes-theme/mytharchive-ui.xml
+++ /dev/null
@@ -1,1084 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
-
-<mythuitheme>
-
- <window name="selectdestination">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Archive Files</value>
- </textarea>
-
- <shape name="destination-backdrop" from="base_backdrop">
- <area>115,36,1050,649</area>
- </shape>
-
- <shape name="destination-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,506</area>
- </shape>
-
- <shape name="destination-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-line" from="base_highlight_line">
- <area>117,540,1046,2</area>
- </shape>
-
- <shape name="destination-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="destination-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="destination-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,547,1048,137</area>
- </shape>
-
- <shape name="destination-bottom-top-line" from="base_highlight_line">
- <area>117,548,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="destination-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="destination-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <textarea name="destination_label" from="basetextarea">
- <area>128,67,430,32</area>
- <align>right,vcenter</align>
- <value>Destination:</value>
- </textarea>
-
- <buttonlist name="destination_selector" from="base_selector">
- <area>578,67,300,32</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="downscrollarrow">
- <position>304,-2</position>
- </statetype>
- <statetype name="upscrollarrow">
- <position>304,15</position>
- </statetype>
- </buttonlist>
-
- <textarea name="destination_text" from="basetextarea">
- <area>139,552,1003,66</area>
- <font>basesmallerblue</font>
- <cutdown>yes</cutdown>
- <align>allcenter</align>
- <multiline>yes</multiline>
- </textarea>
-
- <button name="find_button" from="base_button">
- <position>408,140</position>
- <value>File...</value>
- </button>
-
- <textedit name="filename_edit" from="base_textedit">
- <area>578,140,450,35</area>
- </textedit>
-
- <textarea name="freespace_label" from="destination_label">
- <position>128,206</position>
- <value>Destination Free Space:</value>
- </textarea>
-
- <textarea name="freespace_text" from="basetextarea">
- <area>578,206,200,32</area>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="iso_label" from="destination_label">
- <position>128,263</position>
- <value>Create ISO Image:</value>
- </textarea>
-
- <checkbox name="makeisoimage_check" from="base_checkbox">
- <position>578,263</position>
- </checkbox>
-
- <textarea name="burntodvdr_text" from="destination_label">
- <position>128,320</position>
- <value>Burn to DVD:</value>
- </textarea>
-
- <checkbox name="burntodvdr_check" from="base_checkbox">
- <position>578,320</position>
- </checkbox>
-
- <textarea name="erasedvdrw_text" from="destination_label">
- <position>128,377</position>
- <value>Overwrite DVD-RW Media:</value>
- </textarea>
-
- <checkbox name="erasedvdrw_check" from="base_checkbox">
- <position>578,377</position>
- </checkbox>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_small_button">
- <position>722,631</position>
- <value>Previous</value>
- </button>
-
- <button name="next_button" from="base_small_button">
- <position>942,631</position>
- <value>Next</value>
- </button>
-
- </window>
-
- <window name="recording_selector">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Add Recordings</value>
- </textarea>
-
- <shape name="groups-backdrop" from="base_backdrop">
- <area>20,36,316,352</area>
- </shape>
-
- <shape name="groups-backdrop-line" from="base_backdrop_line">
- <area>21,37,314,350</area>
- </shape>
-
- <shape name="groups-top-line" from="base_highlight_line">
- <area>22,38,312,2</area>
- </shape>
-
- <shape name="groups-bottom-line" from="base_highlight_line">
- <area>22,384,312,2</area>
- </shape>
-
- <shape name="groups-left-line" from="base_highlight_vertical_line">
- <area>22,40,2,344</area>
- </shape>
-
- <shape name="groups-right-line" from="base_highlight_vertical_line">
- <area>332,40,2,344</area>
- </shape>
-
- <shape name="reclist-backdrop" from="base_backdrop">
- <area>346,36,914,352</area>
- </shape>
-
- <shape name="reclist-backdrop-line" from="base_backdrop_line">
- <area>347,37,912,350</area>
- </shape>
-
- <shape name="reclist-top-line" from="base_highlight_line">
- <area>348,38,910,2</area>
- </shape>
-
- <shape name="reclist-bottom-line" from="base_highlight_line">
- <area>348,384,910,2</area>
- </shape>
-
- <shape name="reclist-left-line" from="base_highlight_vertical_line">
- <area>348,40,2,344</area>
- </shape>
-
- <shape name="reclist-right-line" from="base_highlight_vertical_line">
- <area>1256,40,2,344</area>
- </shape>
-
- <shape name="groups-arrows-backdrop" from="base_arrows_backdrop">
- <area>283,387,50,11</area>
- </shape>
-
- <shape name="relist-arrows-backdrop" from="base_arrows_backdrop">
- <area>1207,387,50,11</area>
- </shape>
-
- <shape name="description-backdrop" from="base_backdrop">
- <area>20,398,1240,287</area>
- </shape>
-
- <shape name="description-backdrop-line" from="base_backdrop_line">
- <area>21,399,1238,285</area>
- </shape>
-
- <shape name="description-top-line" from="base_highlight_line">
- <area>22,400,1236,2</area>
- </shape>
-
- <shape name="description-bottom-line" from="base_highlight_line">
- <area>22,681,1236,2</area>
- </shape>
-
- <shape name="description-left-line" from="base_highlight_vertical_line">
- <area>22,402,2,230</area>
- </shape>
-
- <shape name="description-right-line" from="base_highlight_vertical_line">
- <area>1256,402,2,230</area>
- </shape>
-
- <shape name="description-seperator-top-line" from="base_line">
- <area>188,438,684,2</area>
- </shape>
-
- <shape name="description-seperator-bottom-line" from="base_line">
- <area>188,594,684,2</area>
- </shape>
-
- <shape name="description-seperator-bottom-line2" from="base_line">
- <area>37,632,1206,2</area>
- </shape>
-
- <shape name="coverart-border">
- <area>37,415,136,204</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#AAAAAA" alpha="100" width="2" />
- <cornerradius>6</cornerradius>
- </shape>
-
- <shape name="preview-border">
- <area>887,415,356,204</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#AAAAAA" alpha="100" width="2" />
- <cornerradius>6</cornerradius>
- </shape>
-
- <buttonlist name="category_selector" from="base_list">
- <area>28,44,300,338</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,300,30</area>
- <textarea name="buttontext">
- <area>8,0,284,30</area>
- <font>basesmaller</font>
- <align>allcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,300,64</area>
- <textarea name="buttontext">
- <area>8,0,284,64</area>
- <align>allcenter</align>
- <multiline>yes</multiline>
- </textarea>
- </state>
- <state name="selectedinactive">
- <area>0,0,300,64</area>
- <textarea name="buttontext">
- <area>8,0,284,64</area>
- <align>allcenter</align>
- <multiline>yes</multiline>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>262,345</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>282,345</position>
- </statetype>
- </buttonlist>
-
- <buttonlist name="recordinglist">
- <area>354,44,898,338</area>
- <layout>vertical</layout>
- <spacing>4</spacing>
- <scrollstyle>free</scrollstyle>
- <arrange>stack</arrange>
- <wrapstyle>items</wrapstyle>
- <buttonarea>0,0,100%,100%</buttonarea>
- <align>top</align>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,898,30</area>
- <shape name="buttonbackground" from="base_select_bar_active">
- <area>0,0,100%,100%</area>
- </shape>
- <statetype name="buttoncheck">
- <area>8,5,20,20</area>
- <state type="off">
- <imagetype name="checkoff">
- <filename>images/lb-check-empty.png</filename>
- </imagetype>
- </state>
- <state type="half">
- <imagetype name="checkhalf">
- <filename>images/lb-check-half.png</filename>
- </imagetype>
- </state>
- <state type="full">
- <imagetype name="checkfull">
- <filename>images/lb-check-full.png</filename>
- </imagetype>
- </state>
- </statetype>
- <textarea name="titlesubtitle" from="base_text_font_state_small">
- <area>36,0,694,30</area>
- <font state="normal">basesmallverylightgrey</font>
- </textarea>
- <textarea name="filesize_str" from="base_text_font_state_extrasmall">
- <area>818,0,72,30</area>
- <font state="normal">baseextrasmallverylightgrey</font>
- <cutdown>no</cutdown>
- <align>right,vcenter</align>
- </textarea>
- </state>
- <state name="selectedinactive" from="active" />
- <state name="selectedactive" from="active" >
- <area>0,0,898,64</area>
- <shape name="buttonbackground" from="base_select_bar_selectedactive">
- <area>0,0,100%,100%</area>
- </shape>
- <statetype name="cutlist">
- <state name="no">
- <textarea name="cutlistoff" from="basetextarea">
- <area>600,24,80,20</area>
- <font>basesupersmall</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- <alpha>80</alpha>
- <value>CUTLIST</value>
- </textarea>
- </state>
- <state name="yes">
- <textarea name="cutlist" from="basetextarea">
- <area>600,24,80,20</area>
- <font>basesupersmallblue</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- <value>CUTLIST</value>
- </textarea>
- </state>
- </statetype>
- <textarea name="s00e00" from="base_text_font_state_extrasmall">
- <area>500,42,70,20</area>
- <font state="normal">baseextrasmall</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- </textarea>
- <textarea name="timedate" from="base_text_font_state_extrasmall">
- <area>575,42,315,20</area>
- <font state="normal">baseextrasmall</font>
- <align>right,vcenter</align>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>860,345</position>
- <state type="off">
- <imagetype name="upoff">
- <filename>images/lists_up_arrow.png</filename>
- <alpha>80</alpha>
- </imagetype>
- </state>
- <state type="full">
- <imagetype name="upon">
- <filename>images/lists_up_arrow.png</filename>
- <alpha>200</alpha>
- </imagetype>
- </state>
- </statetype>
- <statetype name="downscrollarrow">
- <position>880,345</position>
- <state type="off">
- <imagetype name="dnoff">
- <filename>images/lists_down_arrow.png</filename>
- <alpha>80</alpha>
- </imagetype>
- </state>
- <state type="full">
- <imagetype name="dnon">
- <filename>images/lists_down_arrow.png</filename>
- <alpha>200</alpha>
- </imagetype>
- </state>
- </statetype>
- </buttonlist>
-
- <textarea name="progtitle" from="basetextarea">
- <area>189,402,682,36</area>
- <font>basemediumyellow</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="progdescription" from="basetextarea">
- <area>189,449,682,140</area>
- <multiline>yes</multiline>
- <cutdown>yes</cutdown>
- </textarea>
-
- <imagetype name="preview_image">
- <area>41,419,128,196</area>
- <filename>images/no_coverart.png</filename>
- <mask>images/masks/watchrecordings_coverart_mask.png</mask>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <imagetype name="no_preview_image_without_fanart">
- <area>891,419,348,196</area>
- <filename>images/no_preview.png</filename>
- <mask>images/masks/watchrecordings_preview_mask.png</mask>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <button name="cancel_button" from="base_button">
- <position>37,640</position>
- <value>Cancel</value>
- </button>
-
- <button name="ok_button" from="base_button">
- <position>1093,640</position>
- <value>OK</value>
- </button>
-
- </window>
-
-
- <window name="file_selector">
- <area>0,0,1280,720</area>
-
- <textarea name="title_text" from="base_heading">
- <value>Select Files</value>
- </textarea>
-
- <shape name="fullpath-backdrop" from="base_backdrop">
- <area>0,37,1280,44</area>
- <type>box</type>
- </shape>
-
- <shape name="fullpath-top-line" from="base_line">
- <area>0,38,1280,2</area>
- </shape>
-
- <shape name="fullpath-bottom-line" from="base_line">
- <area>0,77,1280,2</area>
- </shape>
-
- <shape name="file-browser-preview-backdrop" from="base_backdrop">
- <area>20,92,615,592</area>
- </shape>
-
- <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line">
- <area>21,93,613,590</area>
- </shape>
-
- <shape name="file-browser-preview-top-line" from="base_highlight_line">
- <area>22,94,611,2</area>
- </shape>
-
- <shape name="file-browser-preview-bottom-line" from="base_highlight_line">
- <area>22,680,611,2</area>
- </shape>
-
- <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line">
- <area>22,96,2,584</area>
- </shape>
-
- <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line">
- <area>631,96,2,584</area>
- </shape>
-
- <shape name="file-browser-preview-image-line" from="base_backdrop_line">
- <area>42,158,571,324</area>
- </shape>
-
- <shape name="file-browser-preview-image-top-line" from="base_highlight_line">
- <area>43,159,569,2</area>
- </shape>
-
- <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line">
- <area>43,479,569,2</area>
- </shape>
-
- <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line">
- <area>43,161,2,318</area>
- </shape>
-
- <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line">
- <area>610,161,2,318</area>
- </shape>
-
- <shape name="file-browser-backdrop" from="base_backdrop">
- <area>645,92,615,592</area>
- </shape>
-
- <shape name="file-browser-backdrop-line" from="base_backdrop_line">
- <area>646,93,613,590</area>
- </shape>
-
- <shape name="file-browser-top-line" from="base_highlight_line">
- <area>647,94,611,2</area>
- </shape>
-
- <shape name="file-browser-bottom-line" from="base_highlight_line">
- <area>647,680,611,2</area>
- </shape>
-
- <shape name="file-browser-left-line" from="base_highlight_vertical_line">
- <area>647,96,2,584</area>
- </shape>
-
- <shape name="file-browser-right-line" from="base_highlight_vertical_line">
- <area>1256,96,2,584</area>
- </shape>
-
- <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop">
- <area>1207,684,50,10</area>
- </shape>
-
- <buttonlist name="filelist" from="base_list">
- <area>653,100,599,578</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,599,54</area>
- <statetype name="buttoncheck">
- <area>4,17,20,20</area>
- </statetype>
- <imagetype name="buttonimage">
- <area>28,2,77,50</area>
- <filename>images/file_browser_no_preview.png</filename>
- <preserveaspect>true</preserveaspect>
- </imagetype>
- <textarea name="buttontext">
- <area>115,0,382,54</area>
- <font>basesmaller</font>
- <multiline>yes</multiline>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="size" from="buttontext">
- <area>497,0,100,54</area>
- <align>right,vcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,599,112</area>
- <statetype name="buttoncheck">
- <area>10,46,20,20</area>
- </statetype>
- <imagetype name="buttonimage">
- <area>38,4,138,104</area>
- <filename>images/file_browser_no_preview.png</filename>
- <preserveaspect>true</preserveaspect>
- </imagetype>
- <textarea name="buttontext">
- <area>186,0,307,112</area>
- <font>basesmallyellow</font>
- <multiline>yes</multiline>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="size" from="buttontext">
- <area>493,0,100,112</area>
- <align>right,vcenter</align>
- </textarea>
- </state>
- <state name="selectedinactive" from="selectedactive">
- <shape name="buttonbackground" from="base_select_bar_selectedinactive">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>561,585</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>581,585</position>
- </statetype>
- </buttonlist>
-
- <textedit name="location_edit" from="base_wide_textedit">
- <area>40,107,575,40</area>
- </textedit>
-
- <imagetype name="no_preview">
- <area>46,161,563,318</area>
- <filename>images/file_browser_no_preview.png</filename>
- <mask>images/masks/file_browser_preview_mask.png</mask>
- <preserveaspect>true</preserveaspect>
- </imagetype>
-
- <imagetype name="preview">
- <area>46,161,563,318</area>
- <mask>images/masks/file_browser_preview_mask.png</mask>
- <preserveaspect>true</preserveaspect>
- </imagetype>
-
- <button name="back_button" from="base_button">
- <position>252,493</position>
- <value>Up Level</value>
- </button>
-
- <button name="home_button" from="base_button">
- <position>252,540</position>
- <value>Home</value>
- </button>
-
- <button name="cancel_button" from="base_button">
- <position>252,587</position>
- <value>Cancel</value>
- </button>
-
- <button name="ok_button" from="base_button">
- <position>252,634</position>
- <value>OK</value>
- </button>
-
- </window>
-
-
- <window name="video_selector">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Add Videos</value>
- </textarea>
-
- <shape name="video-tree-directory-backdrop" from="base_backdrop">
- <area>20,36,613,352</area>
- </shape>
-
- <shape name="video-tree-directory-backdrop-line" from="base_backdrop_line">
- <area>21,37,611,350</area>
- </shape>
-
- <shape name="video-tree-top-line" from="base_highlight_line">
- <area>22,38,609,2</area>
- </shape>
-
- <shape name="video-tree-bottom-line" from="base_highlight_line">
- <area>22,384,609,2</area>
- </shape>
-
- <shape name="video-tree-left-line" from="base_highlight_vertical_line">
- <area>22,40,2,384</area>
- </shape>
-
- <shape name="video-tree-right-line" from="base_highlight_vertical_line">
- <area>629,40,2,384</area>
- </shape>
-
- <shape name="video-tree-files-backdrop" from="base_backdrop">
- <area>647,36,613,352</area>
- </shape>
-
- <shape name="video-tree-files-backdrop-line" from="base_backdrop_line">
- <area>648,37,611,350</area>
- </shape>
-
- <shape name="video-tree-files-top-line" from="base_highlight_line">
- <area>649,38,609,2</area>
- </shape>
-
- <shape name="video-tree-files-bottom-line" from="base_highlight_line">
- <area>649,384,609,2</area>
- </shape>
-
- <shape name="video-tree-left-line" from="base_highlight_vertical_line">
- <area>22,40,2,384</area>
- </shape>
-
- <shape name="video-tree-right-line" from="base_highlight_vertical_line">
- <area>629,40,2,384</area>
- </shape>
-
- <shape name="video-tree-files-backdrop" from="base_backdrop">
- <area>647,36,613,352</area>
- </shape>
-
- <shape name="video-tree-files-backdrop-line" from="base_backdrop_line">
- <area>648,37,611,350</area>
- </shape>
-
- <shape name="video-tree-files-top-line" from="base_highlight_line">
- <area>649,38,609,2</area>
- </shape>
-
- <shape name="video-tree-files-bottom-line" from="base_highlight_line">
- <area>649,384,609,2</area>
- </shape>
-
- <shape name="video-tree-files-left-line" from="base_highlight_vertical_line">
- <area>649,40,2,384</area>
- </shape>
-
- <shape name="video-tree-files-right-line" from="base_highlight_vertical_line">
- <area>1256,40,2,384</area>
- </shape>
-
- <shape name="video-tree-arrows-backdrop" from="base_arrows_backdrop">
- <area>580,388,50,11</area>
- </shape>
-
- <shape name="video-tree-files-arrows-backdrop" from="base_arrows_backdrop">
- <area>1207,388,50,11</area>
- </shape>
-
- <shape name="video-bottom-backdrop" from="base_backdrop">
- <area>20,398,1240,287</area>
- </shape>
-
- <shape name="video-bottom-backdrop-line" from="base_backdrop_line">
- <area>21,399,1039,285</area>
- </shape>
-
- <shape name="video-bottom-top-line" from="base_highlight_line">
- <area>22,400,1037,2</area>
- </shape>
-
- <shape name="video-bottom-bottom-line" from="base_highlight_line">
- <area>22,681,1037,2</area>
- </shape>
-
- <shape name="video-bottom-left-line" from="base_highlight_vertical_line">
- <area>22,402,2,279</area>
- </shape>
-
- <shape name="video-bottom-right-line" from="base_highlight_vertical_line">
- <area>1057,402,2,279</area>
- </shape>
-
- <shape name="video-bottom-seperator-first-line" from="base_line">
- <area>39,442,1003,2</area>
- </shape>
-
- <shape name="video-bottom-seperator-second-line" from="base_line">
- <area>39,484,1003,2</area>
- </shape>
-
- <shape name="video-bottom-seperator-third-line" from="base_line">
- <area>39,639,1003,2</area>
- </shape>
-
- <shape name="video-coverart-backdrop-line" from="base_backdrop_line">
- <area>1066,399,193,285</area>
- </shape>
-
- <shape name="video-coverart-top-line" from="base_highlight_line">
- <area>1054,400,204,2</area>
- </shape>
-
- <shape name="video-coverart-bottom-line" from="base_highlight_line">
- <area>1067,681,191,2</area>
- </shape>
-
- <shape name="video-coverart-left-line" from="base_highlight_vertical_line">
- <area>1067,402,2,279</area>
- </shape>
-
- <shape name="video-coverart-right-line" from="base_highlight_vertical_line">
- <area>1256,402,2,279</area>
- </shape>
-
- <buttonlist name="category_selector" from="base_list">
- <buttonarea>28,44,1224,338</buttonarea>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,597,30</area>
- <textarea name="buttontext">
- <area>8,0,581,30</area>
- <align>left,vcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,597,64</area>
- <textarea name="buttontext">
- <area>8,0,561,64</area>
- <align>left,vcenter</align>
- </textarea>
- <imagetype name="buttonarrow">
- <position>577,22</position>
- </imagetype>
- </state>
- <state name="selectedinactive">
- <area>0,0,597,64</area>
- <textarea name="buttontext">
- <area>8,0,581,64</area>
- <align>left,vcenter</align>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>586,389</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>606,389</position>
- </statetype>
- </buttonlist>
-
- <buttonlist name="videolist" from="base_list">
- <buttonarea>655,44,1224,338</buttonarea>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,597,30</area>
- <statetype name="buttoncheck">
- <area>8,5,20,20</area>
- </statetype>
- <textarea name="buttontext">
- <area>36,0,581,30</area>
- <align>left,vcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,597,64</area>
- <statetype name="buttoncheck">
- <area>8,21,20,20</area>
- </statetype>
- <textarea name="buttontext">
- <area>36,0,561,64</area>
- <align>left,vcenter</align>
- </textarea>
- <imagetype name="buttonarrow">
- <position>577,22</position>
- </imagetype>
- </state>
- <state name="selectedinactive">
- <area>0,0,597,64</area>
- <statetype name="buttoncheck">
- <area>8,21,20,20</area>
- </statetype>
- <textarea name="buttontext">
- <area>36,0,581,64</area>
- <align>left,vcenter</align>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>1213,389</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1233,389</position>
- </statetype>
- </buttonlist>
-
- <textarea name="videotitle" from="basetextarea">
- <area>40,402,553,42</area>
- <cutdown>yes</cutdown>
- <font>basemediumyellow</font>
- <align>vcenter</align>
- </textarea>
-
- <textarea name="videoplot" from="basetextarea">
- <area>40,493,1001,140</area>
- <font>basesmall</font>
- <align>justify</align>
- <multiline>yes</multiline>
- <cutdown>yes</cutdown>
- </textarea>
-
- <textarea name="filesizelbl" from="basetextarea">
- <area>847,444,60,42</area>
- <font>basesmall</font>
- <value>Size:</value>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="filesize" from="basetextarea">
- <area>912,444,124,42</area>
- <font>basesmallblue</font>
- <align>allcenter</align>
- </textarea>
-
- <imagetype name="cover_background">
- <area>1070,403,185,277</area>
- <filename>images/no_coverart.png</filename>
- <mask>images/masks/tree_coverart_mask.png</mask>
- <preserveaspect>no</preserveaspect>
- </imagetype>
-
- <imagetype name="cover_image">
- <area>1070,403,185,277</area>
- <mask>images/masks/tree_coverart_mask.png</mask>
- <preserveaspect>no</preserveaspect>
- </imagetype>
-
- <textarea name="parentallabel" from="basetextarea">
- <area>847,411,158,24</area>
- <font>basesmall</font>
- <cutdown>no</cutdown>
- <align>right,vcenter</align>
- <value>Parental Level:</value>
- </textarea>
-
- <textarea name="parentallevel_text" from="basetextarea">
- <area>1002,411,40,24</area>
- <font>basesmallblue</font>
- <align>allcenter</align>
- </textarea>
-
- <textarea name="warning_text" from="basetextarea">
- <area>26,42,601,340</area>
- <multiline>yes</multiline>
- <font>basesmall</font>
- <align>allcenter</align>
- <value>No videos available</value>
- </textarea>
-
- <button name="cancel_button" from="base_button">
- <position>39,643</position>
- <value>Cancel</value>
- </button>
-
- <button name="ok_button" from="base_button">
- <position>892,643</position>
- <value>OK</value>
- </button>
-
- </window>
-
- <window name="logviewer">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Archive Log Viewer</value>
- </textarea>
-
- <shape name="viewer-backdrop" from="base_backdrop">
- <area>115,36,1050,498</area>
- </shape>
-
- <shape name="viewer-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,496</area>
- </shape>
-
- <shape name="viewer-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="viewer-bottom-line" from="base_highlight_line">
- <area>117,531,1046,2</area>
- </shape>
-
- <shape name="viewer-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="viewer-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="viewer-arrows-backdrop" from="base_arrows_backdrop">
- <area>1112,534,50,11</area>
- </shape>
-
- <shape name="viewer-bottom-backdrop" from="base_backdrop">
- <area>115,545,1050,140</area>
- </shape>
-
- <shape name="viewer-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,546,1048,138</area>
- </shape>
-
- <shape name="viewer-bottom-top-line" from="base_highlight_line">
- <area>117,547,1046,2</area>
- </shape>
-
- <shape name="viewer-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="viewer-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="viewer-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="viewer-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <buttonlist name="loglist" from="base_list">
- <area>123,49,1034,488</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,1034,30</area>
- <textarea name="buttontext">
- <area>8,0,1018,30</area>
- <font>basesmaller</font>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,1034,64</area>
- <textarea name="buttontext">
- <area>8,0,1018,64</area>
- <align>vcenter</align>
- <multiline>yes</multiline>
- </textarea>
- </state>
- <state name="selectedinactive">
- <area>0,0,1034,64</area>
- <textarea name="buttontext">
- <area>8,0,1018,64</area>
- <align>vcenter</align>
- <multiline>yes</multiline>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>997,487</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1017,487</position>
- </statetype>
- </buttonlist>
-
- <textarea name="logitem_text" from="basetextarea">
- <area>139,552,1003,66</area>
- <font>basesmallerblue</font>
- <cutdown>yes</cutdown>
- <align>allcenter</align>
- <multiline>yes</multiline>
- </textarea>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel Job</value>
- </button>
-
- <button name="update_button" from="base_small_button">
- <position>540,631</position>
- <value>Update</value>
- </button>
-
- <button name="exit_button" from="base_small_button">
- <position>942,631</position>
- <value>Exit</value>
- </button>
-
- </window>
-
-</mythuitheme>
diff --git a/abs/core/linhes-theme/mythburn-ui.xml b/abs/core/linhes-theme/mythburn-ui.xml
deleted file mode 100644
index af8596d..0000000
--- a/abs/core/linhes-theme/mythburn-ui.xml
+++ /dev/null
@@ -1,976 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
-<!--
-
-MythArchive GUI theme
-
--->
-<mythuitheme>
-
- <window name="profilepopup">
- <area>-1,-1,602,488</area>
-
- <animation trigger="AboutToShow">
- <section>
- <alpha start="0" end="255" easingcurve="OutQuart"/>
- <zoom start="0" end="100" easingcurve="OutQuart"/>
- </section>
- </animation>
-
- <animation trigger="AboutToHide">
- <section>
- <alpha start="255" end="0" easingcurve="InQuart"/>
- <zoom start="100" end="0" easingcurve="InQuart"/>
- </section>
- </animation>
-
- <shape name="profile-popup-backdrop" from="base_popup_backdrop">
- <area>0,0,602,488</area>
- </shape>
-
- <shape name="profile-popup-backdrop-line" from="base_backdrop_line">
- <area>1,1,600,486</area>
- </shape>
-
- <shape name="profile-popup-top-line" from="base_highlight_line">
- <area>2,2,596,2</area>
- </shape>
-
- <shape name="profile-popup-bottom-line" from="base_highlight_line">
- <area>2,484,596,2</area>
- </shape>
-
- <shape name="profile-popup-left-line" from="base_highlight_vertical_line">
- <area>2,4,2,480</area>
- </shape>
-
- <shape name="profile-popup-right-line" from="base_highlight_vertical_line">
- <area>598,4,2,480</area>
- </shape>
-
- <shape name="profile-popup-seperator-first-line" from="base_line">
- <area>23,50,556,2</area>
- </shape>
-
- <shape name="profile-popup-seperator-second-line" from="base_line">
- <area>23,436,556,2</area>
- </shape>
-
- <textarea name="title" from="basetextarea">
- <area>10,4,582,46</area>
- <font>basemediumlargerdarkyellow</font>
- <align>allcenter</align>
- <value>Encoding Profile</value>
- </textarea>
-
- <textarea name="caption_text" from="basetextarea">
- <area>10,80,582,32</area>
- <font>basemedium</font>
- <align>allcenter</align>
- </textarea>
-
- <buttonlist name="profile_list" from="base_selector">
- <area>149,142,300,32</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="downscrollarrow">
- <position>304,-2</position>
- </statetype>
- <statetype name="upscrollarrow">
- <position>304,15</position>
- </statetype>
- </buttonlist>
-
- <textarea name="description_text" from="basetextarea">
- <area>70,204,462,64</area>
- <align>allcenter</align>
- <font>basesmallblue</font>
- <multiline>yes</multiline>
- </textarea>
-
- <textarea name="oldsize_lbl" from="basetextarea">
- <area>10,298,281,32</area>
- <font>basesmall</font>
- <align>right,vcenter</align>
- <value>Original Size:</value>
- </textarea>
-
- <textarea name="oldsize_text" from="basetextarea">
- <area>311,298,281,32</area>
- <font>basesmall</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="newsize_lbl" from="oldsize_lbl">
- <area>10,360,281,32</area>
- <value>Encoded Size:</value>
- </textarea>
-
- <textarea name="newsize_text" from="oldsize_text">
- <area>311,360,281,32</area>
- </textarea>
-
- <button name="ok_button" from="base_medium_button">
- <position>126,441</position>
- <value>OK</value>
- </button>
- </window>
-
- <!--
- theme selector
- -->
-
- <window name="themeselector">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>DVD Menu Theme</value>
- </textarea>
-
- <shape name="theme-backdrop" from="base_backdrop">
- <area>115,36,1050,649</area>
- </shape>
-
- <shape name="theme-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,506</area>
- </shape>
-
- <shape name="theme-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="theme-bottom-line" from="base_highlight_line">
- <area>117,540,1046,2</area>
- </shape>
-
- <shape name="theme-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="theme-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="theme-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,547,1048,137</area>
- </shape>
-
- <shape name="theme-bottom-top-line" from="base_highlight_line">
- <area>117,548,1046,2</area>
- </shape>
-
- <shape name="theme-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="theme-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="theme-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="theme-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <textarea name="themetitle" from="basetextarea">
- <area>208,67,300,32</area>
- <align>right,vcenter</align>
- <value>Theme:</value>
- </textarea>
-
- <buttonlist name="theme_selector" from="base_selector">
- <area>528,67,300,32</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,300,32</area>
- <textarea name="buttontext">
- <area>15,0,270,32</area>
- </textarea>
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="downscrollarrow">
- <position>304,-2</position>
- </statetype>
- <statetype name="upscrollarrow">
- <position>304,15</position>
- </statetype>
- </buttonlist>
-
- <imagetype name="theme_image" >
- <area>0,0,1,1</area>
- </imagetype>
-
- <!--
- theme preview images
- -->
-
- <textarea name="introtitle" from="themetitle">
- <area>207,205,150,32</area>
- <value>Intro --></value>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="intronone" from="themetitle">
- <area>377,189,175,64</area>
- <value>Not available in this theme</value>
- <multiline>yes</multiline>
- <align>allcenter</align>
- </textarea>
-
- <imagetype name="intro_image">
- <area>367,140,195,162</area>
- <preserveaspect>true</preserveaspect>
- </imagetype>
-
- <textarea name="menutitle" from="introtitle">
- <area>922,205,150,32</area>
- <value><-- Main Menu</value>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="menunone" from="intronone">
- <area>727,189,175,64</area>
- <value>Not Available in this Theme</value>
- <multiline>yes</multiline>
- <align>allcenter</align>
- </textarea>
-
- <imagetype name="mainmenu_image" from="intro_image">
- <area>717,140,195,162</area>
- </imagetype>
-
- <textarea name="chaptertitle" from="introtitle">
- <area>177,408,180,32</area>
- <value>Chapter Menu --></value>
- </textarea>
-
- <textarea name="chapternone" from="intronone">
- <area>377,392,175,64</area>
- <value>Not Available in this Theme</value>
- <multiline>yes</multiline>
- <align>allcenter</align>
- </textarea>
-
- <imagetype name="chapter_image" from="intro_image">
- <area>367,343,195,162</area>
- </imagetype>
-
- <textarea name="detailtitle" from="menutitle">
- <area>922,408,150,32</area>
- <value><-- Details</value>
- </textarea>
-
- <textarea name="detailnone" from="intronone">
- <area>727,392,175,64</area>
- <value>Not Available in this Theme</value>
- <multiline>yes</multiline>
- <align>allcenter</align>
- </textarea>
-
- <imagetype name="details_image" from="intro_image">
- <area>717,343,195,162</area>
- </imagetype>
-
- <!--
- theme description
- -->
-
- <textarea name="themedescription" from="basetextarea">
- <area>139,552,1003,66</area>
- <font>basesmallerblue</font>
- <cutdown>yes</cutdown>
- <align>allcenter</align>
- <multiline>yes</multiline>
- </textarea>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_small_button">
- <position>722,631</position>
- <value>Previous</value>
- </button>
-
- <button name="next_button" from="base_small_button">
- <position>942,631</position>
- <value>Next</value>
- </button>
-
- </window>
-
- <!--
- ******************************************************************
- The main mythburn screen
- *******************************************************************
- -->
-
- <window name="mythburn">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Archive Items to DVD</value>
- </textarea>
-
- <shape name="add-backdrop" from="base_backdrop">
- <area>115,36,1050,498</area>
- </shape>
-
- <shape name="add-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,496</area>
- </shape>
-
- <shape name="add-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="add-bottom-line" from="base_highlight_line">
- <area>117,531,1046,2</area>
- </shape>
-
- <shape name="add-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="add-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="add-seperator-first-line" from="base_line">
- <area>138,137,1004,2</area>
- </shape>
-
- <shape name="add-arrows-backdrop" from="base_arrows_backdrop">
- <area>1112,534,50,11</area>
- </shape>
-
- <shape name="add-bottom-backdrop" from="base_backdrop">
- <area>115,545,1050,140</area>
- </shape>
-
- <shape name="add-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,546,1048,138</area>
- </shape>
-
- <shape name="add-bottom-top-line" from="base_highlight_line">
- <area>117,547,1046,2</area>
- </shape>
-
- <shape name="add-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="add-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="add-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="add-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <button name="addrecording_button" from="base_small_button">
- <position>165,67</position>
- <value>Add Recording</value>
- </button>
-
- <button name="addvideo_button" from="base_small_button">
- <position>540,67</position>
- <value>Add Video</value>
- </button>
-
- <button name="addfile_button" from="base_small_button">
- <position>915,67</position>
- <value>Add File</value>
- </button>
-
- <buttonlist name="archivelist" from="base_list">
- <area>123,169,1034,368</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,1034,30</area>
- <textarea name="buttontext" from="basetextarea">
- <area>8,2,433,30</area>
- <font>basesmall</font>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="subtitle" from="buttontext">
- <area>441,0,393,30</area>
- <font>baseextrasmallverylightgrey</font>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="size" from="basetextarea">
- <area>954,0,72,30</area>
- <font>baseextrasmallverylightgrey</font>
- <cutdown>no</cutdown>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="profile" from="size">
- <area>839,0,110,30</area>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,1034,64</area>
- <textarea name="buttontext" from="basetextarea">
- <area>8,2,413,30</area>
- <font>basesmallyellow</font>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="subtitle" from="buttontext">
- <area>8,32,613,30</area>
- <font>basesmalleryellow</font>
- </textarea>
- <textarea name="size" from="basetextarea">
- <area>954,0,72,30</area>
- <font>baseextrasmallverylightgrey</font>
- <cutdown>no</cutdown>
- <align>right,vcenter</align>
- </textarea>
- <textarea name="profile" from="size">
- <area>839,0,110,30</area>
- </textarea>
- <textarea name="date" from="basetextarea">
- <area>711,42,315,20</area>
- <font>baseextrasmall</font>
- <align>right,vcenter</align>
- </textarea>
- <statetype name="cutliststatus">
- <state name="none" />
- <state name="using">
- <textarea name="cutlist" from="basetextarea">
- <area>736,24,80,20</area>
- <font>basesupersmallblue</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- <value>CUTLIST</value>
- </textarea>
- </state>
- <state name="notusing">
- <textarea name="cutlistoff" from="basetextarea">
- <area>736,24,80,20</area>
- <font>basesupersmall</font>
- <cutdown>no</cutdown>
- <align>allcenter</align>
- <alpha>80</alpha>
- <value>CUTLIST</value>
- </textarea>
- </state>
- </statetype>
- <statetype name="movestate" />
- </state>
- <state name="selectedinactive" from="active" />
- </statetype>
- <statetype name="upscrollarrow">
- <position>997,367</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1017,367</position>
- </statetype>
- </buttonlist>
-
- <textarea name="nofiles" from="basetextarea">
- <area>150,169,980,32</area>
- <align>allcenter</align>
- <value>Add a recording, video or file to archive.</value>
- </textarea>
-
- <progressbar name="size_bar" from="baseprogressbar">
- <position>372,590</position>
- </progressbar>
-
- <textarea name="maxsize" from="basetextarea">
- <area>798,560,100,30</area>
- <font>basesmall</font>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="minsize" from="maxsize">
- <area>383,560,100,30</area>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="currentsize" from="maxsize">
- <area>372,560,536,30</area>
- <align>allcenter</align>
- </textarea>
-
- <textarea name="currentsize_error" from="currentsize">
- <font>basesmallred</font>
- </textarea>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_small_button">
- <position>722,631</position>
- <value>Previous</value>
- </button>
-
- <button name="next_button" from="base_small_button">
- <position>942,631</position>
- <value>Finish</value>
- </button>
-
- </window>
-
- <!--
- *******************************************************************
- The editmetadata dialog
- *******************************************************************
- -->
-
- <window name="edit_metadata">
- <area>-1,-1,602,488</area>
-
- <animation trigger="AboutToShow">
- <section>
- <alpha start="0" end="255" easingcurve="OutQuart"/>
- <zoom start="0" end="100" easingcurve="OutQuart"/>
- </section>
- </animation>
-
- <animation trigger="AboutToHide">
- <section>
- <alpha start="255" end="0" easingcurve="InQuart"/>
- <zoom start="100" end="0" easingcurve="InQuart"/>
- </section>
- </animation>
-
- <shape name="popup-backdrop" from="base_popup_backdrop">
- <area>0,0,602,488</area>
- </shape>
-
- <shape name="popup-backdrop-line" from="base_backdrop_line">
- <area>1,1,600,486</area>
- </shape>
-
- <shape name="popup-top-line" from="base_highlight_line">
- <area>2,2,596,2</area>
- </shape>
-
- <shape name="popup-bottom-line" from="base_highlight_line">
- <area>2,484,596,2</area>
- </shape>
-
- <shape name="popup-left-line" from="base_highlight_vertical_line">
- <area>2,4,2,480</area>
- </shape>
-
- <shape name="popup-right-line" from="base_highlight_vertical_line">
- <area>598,4,2,480</area>
- </shape>
-
- <shape name="popup-seperator-first-line" from="base_line">
- <area>23,50,556,2</area>
- </shape>
-
- <shape name="popup-seperator-second-line" from="base_line">
- <area>23,436,556,2</area>
- </shape>
-
- <textarea name="title" from="basetextarea">
- <area>23,4,556,46</area>
- <font>basemediumlargerdarkyellow</font>
- <align>allcenter</align>
- <value>Edit Details</value>
- </textarea>
-
- <textarea name="title_label" from="basetextarea">
- <area>23,100,120,32</area>
- <font>basesmall</font>
- <align>right,vcenter</align>
- <value>Title:</value>
- </textarea>
-
- <textarea name="subtitle_label" from="title_label">
- <area>23,164,120,32</area>
- <value>Subtitle:</value>
- </textarea>
-
- <textarea name="startdate_label" from="title_label">
- <area>23,228,120,32</area>
- <value>Start Date:</value>
- </textarea>
-
- <textarea name="starttime_label" from="title_label">
- <area>23,292,120,32</area>
- <value>Time:</value>
- </textarea>
-
- <textarea name="description_label" from="title_label">
- <area>23,356,120,32</area>
- <value>Description:</value>
- </textarea>
-
- <textedit name="title_edit" from="base_textedit">
- <area>160,100,419,32</area>
- </textedit>
-
- <textedit name="subtitle_edit" from="base_textedit">
- <area>160,164,419,32</area>
- </textedit>
-
- <textedit name="startdate_edit" from="base_textedit">
- <area>160,228,419,32</area>
- </textedit>
-
- <textedit name="starttime_edit" from="base_textedit">
- <area>160,292,419,32</area>
- </textedit>
-
- <textedit name="description_edit" from="base_textedit">
- <area>160,356,419,32</area>
- </textedit>
-
- <button name="cancel_button" from="base_small_button">
- <position>63,441</position>
- <value>Cancel</value>
- </button>
- <button name="ok_button" from="base_small_button">
- <position>325,441</position>
- <value>OK</value>
- </button>
-
- </window>
-
- <window name="thumbfinder">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Edit Thumbnails</value>
- </textarea>
-
- <shape name="thumb-backdrop" from="base_backdrop">
- <area>115,36,1050,498</area>
- </shape>
-
- <shape name="thumb-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,496</area>
- </shape>
-
- <shape name="thumb-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="thumb-bottom-line" from="base_highlight_line">
- <area>117,531,1046,2</area>
- </shape>
-
- <shape name="thumb-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="thumb-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="thumb-seperator-first-line" from="base_line">
- <area>138,279,1004,2</area>
- </shape>
-
- <shape name="thumb-arrows-backdrop" from="base_arrows_backdrop">
- <area>1106,256,45,11</area>
- </shape>
-
- <shape name="thumb-bottom-backdrop" from="base_backdrop">
- <area>115,545,1050,140</area>
- </shape>
-
- <shape name="thumb-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,546,1048,138</area>
- </shape>
-
- <shape name="thumb-bottom-top-line" from="base_highlight_line">
- <area>117,547,1046,2</area>
- </shape>
-
- <shape name="thumb-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="thumb-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="thumb-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="thumb-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <shape name="position-background-line" from="base_backdrop_line">
- <area>521,374,621,66</area>
- </shape>
-
- <shape name="position-top-line" from="base_highlight_line">
- <area>522,375,623,2</area>
- </shape>
-
- <shape name="position-line" from="base_highlight_line">
- <area>522,438,623,2</area>
- </shape>
-
- <shape name="position-left-line" from="base_highlight_vertical_line">
- <area>522,377,2,62</area>
- </shape>
-
- <shape name="position-right-line" from="base_highlight_vertical_line">
- <area>1140,377,2,62</area>
- </shape>
-
- <buttonlist name="thumblist">
- <area>124,59,1032,197</area>
- <layout>grid</layout>
- <spacing>2</spacing>
- <buttonarea>0,0,1032,197</buttonarea>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,205,188</area>
- <shape name="buttonbackground" from="base_backdrop">
- <area>0,0,205,188</area>
- <fill color="#333333" alpha="175" />
- </shape>
- <shape name="buttonbackground-line" from="base_backdrop_line">
- <area>1,1,203,186</area>
- </shape>
- <imagetype name="buttonimage">
- <area>5,5,195,146</area>
- <!--<area>5,21,195,146</area>-->
- <preserveaspect>true</preserveaspect>
- </imagetype>
- <textarea name="buttontext" from="basetextarea">
- <area>5,159,195,24</area>
- <font>basesmallgrey</font>
- <align>allcenter</align>
- </textarea>
- </state>
- <state name="selectedactive" from="active">
- <area>0,0,209,192</area>
- <shape name="buttonbackground">
- <area>-2,-2,209,192</area>
- <type>roundbox</type>
- <fill color="#101017" alpha="255" />
- <cornerradius>8</cornerradius>
- </shape>
- <shape name="buttonbackground-line">
- <area>-2,-2,209,192</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#ffffff" alpha="45" width="4" />
- <cornerradius>4</cornerradius>
- </shape>
- <shape name="buttonbackground-top-highlight-line">
- <area>2,0,201,4</area>
- <type>box</type>
- <fill style="gradient">
- <gradient direction="horizontal" alpha="0">
- <stop position="0" color="#ffffff" />
- <stop position="50" color="#ffffff" alpha="180" />
- <stop position="100" color="#ffffff" />
- </gradient>
- </fill>
- </shape>
- <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line">
- <area>2,184,201,4</area>
- </shape>
- <shape name="buttonbackground-left-highlight-line">
- <area>0,2,4,184</area>
- <type>box</type>
- <fill style="gradient">
- <gradient alpha="0" direction="vertical">
- <stop position="0" color="#ffffff" />
- <stop position="50" color="#ffffff" alpha="220" />
- <stop position="100" color="#ffffff" />
- </gradient>
- </fill>
- </shape>
- <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line">
- <area>201,2,4,184</area>
- </shape>
- <textarea name="buttontext" from="basetextarea">
- <area>5,159,195,24</area>
- <font>basesmallyellow</font>
- <align>allcenter</align>
- </textarea>
- </state>
- <state name="selectedinactive" from="active">
- <shape name="buttonbackground" from="base_backdrop">
- <area>0,0,205,188</area>
- </shape>
- <textarea name="buttontext" from="basetextarea">
- <area>5,159,195,24</area>
- <font>basesmallyellow</font>
- <align>allcenter</align>
- </textarea>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>987,200</position>
- <state type="off">
- <imagetype name="upoff">
- <filename>images/lists_up_arrow.png</filename>
- <alpha>80</alpha>
- </imagetype>
- </state>
- <state type="full">
- <imagetype name="upon">
- <filename>images/lists_up_arrow.png</filename>
- <alpha>200</alpha>
- </imagetype>
- </state>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1007,200</position>
- <state type="off">
- <imagetype name="dnoff">
- <filename>images/lists_down_arrow.png</filename>
- <alpha>80</alpha>
- </imagetype>
- </state>
- <state type="full">
- <imagetype name="dnon">
- <filename>images/lists_down_arrow.png</filename>
- <alpha>200</alpha>
- </imagetype>
- </state>
- </statetype>
-
- </buttonlist>
-
- <shape name="buttonbackground">
- <area>136,300,374,214</area>
- <type>roundbox</type>
- <fill color="#101017" alpha="255" />
- <cornerradius>8</cornerradius>
- </shape>
-
- <imagetype name="frameimage">
- <area>144,306,359,202</area>
- <filename>images/no_preview.png</filename>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <button name="frame_button">
- <area>138,302,370,210</area>
- <statetype name="buttonstate">
- <state name="active">
- <area>0,0,370,210</area>
- <shape name="background-line" from="base_backdrop_line">
- <area>1,1,368,208</area>
- </shape>
- </state>
- <state name="selected" from="active">
- <area>0,0,374,214</area>
- <shape name="buttonbackground-line">
- <area>-2,-2,374,214</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#ffffff" alpha="45" width="4" />
- <cornerradius>4</cornerradius>
- </shape>
- <shape name="buttonbackground-top-highlight-line">
- <area>2,0,366,4</area>
- <type>box</type>
- <fill style="gradient">
- <gradient direction="horizontal" alpha="0">
- <stop position="0" color="#ffffff" />
- <stop position="50" color="#ffffff" alpha="180" />
- <stop position="100" color="#ffffff" />
- </gradient>
- </fill>
- </shape>
- <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line">
- <area>2,206,366,4</area>
- </shape>
- <shape name="buttonbackground-left-highlight-line">
- <area>0,2,4,206</area>
- <type>box</type>
- <fill style="gradient">
- <gradient alpha="0" direction="vertical">
- <stop position="0" color="#ffffff" />
- <stop position="50" color="#ffffff" alpha="220" />
- <stop position="100" color="#ffffff" />
- </gradient>
- </fill>
- </shape>
- <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line">
- <area>366,2,4,206</area>
- </shape>
- </state>
- <state name="disabled" from="active" />
- <state name="pushed" from="active">
- </state>
- </statetype>
- </button>
-
- <textarea name="seekamount" from="basetextarea">
- <area>531,379,601,24</area>
- <align>right,vcenter</align>
- <value>frame</value>
- </textarea>
-
- <imagetype name="positionimage">
- <area>531,403,601,8</area>
- <filename>images/osd/progressbar_background.png</filename>
- </imagetype>
-
- <textarea name="currentpos" from="basetextarea">
- <area>531,411,601,24</area>
- <font>basesmall</font>
- <align>allcenter</align>
- </textarea>
-
- <textarea name="help_text" from="basetextarea">
- <area>139,552,1003,66</area>
- <font>basesmallerblue</font>
- <cutdown>yes</cutdown>
- <align>allcenter</align>
- <multiline>yes</multiline>
- <value>MENU changes focus. Numbers 0-9 jump to that thumb image.\nWhen the preview image has focus, UP/DOWN changes the seek amount, LEFT/RIGHT jumps forward/backward by the seek amount, and SELECT chooses the current preview image for the selected thumb image.</value>
- </textarea>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="save_button" from="base_small_button">
- <position>942,631</position>
- <value>Save</value>
- </button>
-
- </window>
-
-</mythuitheme>
diff --git a/abs/core/linhes-theme/mythnative-ui.xml b/abs/core/linhes-theme/mythnative-ui.xml
deleted file mode 100644
index ba15724..0000000
--- a/abs/core/linhes-theme/mythnative-ui.xml
+++ /dev/null
@@ -1,640 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
-<!--
-
-MythTV Archive GUI theme
-
--->
-<mythuitheme>
-
- <!--
- The export native wizard
- -->
-
- <window name="exportnative">
- <area>0,0,1280,720</area>
-
- <textarea name="heading" from="base_heading">
- <value>Archive Items</value>
- </textarea>
-
- <shape name="add-backdrop" from="base_backdrop">
- <area>115,36,1050,498</area>
- </shape>
-
- <shape name="add-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,496</area>
- </shape>
-
- <shape name="add-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="add-bottom-line" from="base_highlight_line">
- <area>117,531,1046,2</area>
- </shape>
-
- <shape name="add-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="add-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="add-seperator-first-line" from="base_line">
- <area>138,137,1004,2</area>
- </shape>
-
- <shape name="add-arrows-backdrop" from="base_arrows_backdrop">
- <area>1112,534,50,11</area>
- </shape>
-
- <shape name="add-bottom-backdrop" from="base_backdrop">
- <area>115,545,1050,140</area>
- </shape>
-
- <shape name="add-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,546,1048,138</area>
- </shape>
-
- <shape name="add-bottom-top-line" from="base_highlight_line">
- <area>117,547,1046,2</area>
- </shape>
-
- <shape name="add-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="add-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="add-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="add-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <button name="addrecording_button" from="base_small_button">
- <position>165,67</position>
- <value>Add Recording</value>
- </button>
-
- <button name="addvideo_button" from="base_small_button">
- <position>915,67</position>
- <value>Add Video</value>
- </button>
-
- <buttonlist name="archivelist" from="base_list">
- <area>123,169,1034,368</area>
- <scrollstyle>center</scrollstyle>
- <arrange>Fixed</arrange>
- <wrapstyle>selection</wrapstyle>
- <statetype name="buttonitem">
- <area>0,0,1034,283</area>
- <state name="active">
- <area>0,0,1034,64</area>
- <textarea name="buttontext" from="basetextarea">
- <area>8,2,433,30</area>
- <font>basesmall</font>
- <align>left,vcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,1034,64</area>
- <textarea name="buttontext" from="basetextarea">
- <area>0,2,1,30</area>
- <font>basesmallyellow</font>
- <align>left,vcenter</align>
- </textarea>
- </state>
- <state name="selectedinactive" from="active">
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>997,367</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>1017,367</position>
- </statetype>
- </buttonlist>
-
- <textarea name="nofiles" from="basetextarea">
- <area>150,169,980,32</area>
- <align>allcenter</align>
- <value>Add a recording or video to archive.</value>
- </textarea>
-
- <textarea name="progtitle" from="basetextarea">
- <area>131,305,413,30</area>
- <font>basesmallyellow</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="progdescription" from="progtitle">
- <area>131,335,858,30</area>
- <font>basesmalleryellow</font>
- </textarea>
-
- <textarea name="progdatetime">
- <area>999,345,150,20</area>
- <font>baseextrasmall</font>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="filesize" from="basetextarea">
- <area>1077,303,72,30</area>
- <font>baseextrasmallverylightgrey</font>
- <cutdown>no</cutdown>
- <align>right,vcenter</align>
- </textarea>
-
- <progressbar name="size_bar" from="baseprogressbar">
- <position>372,590</position>
- </progressbar>
-
- <textarea name="maxsize" from="basetextarea">
- <area>798,560,100,30</area>
- <font>basesmall</font>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="minsize" from="maxsize">
- <area>383,560,100,30</area>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="currentsize" from="maxsize">
- <area>372,560,536,30</area>
- <align>allcenter</align>
- </textarea>
-
- <textarea name="currentsize_error" from="currentsize">
- <font>basesmallred</font>
- </textarea>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_small_button">
- <position>722,631</position>
- <value>Previous</value>
- </button>
-
- <button name="next_button" from="base_small_button">
- <position>942,631</position>
- <value>Finish</value>
- </button>
-
- </window>
-
- <!--
- Archive File Selector
- -->
-
- <window name="archivefile_selector">
- <area>0,0,1280,720</area>
-
- <textarea name="title" from="base_heading">
- <value>XML File to Import</value>
- </textarea>
-
- <shape name="fullpath-backdrop" from="base_backdrop">
- <area>0,37,1280,44</area>
- <type>box</type>
- </shape>
-
- <shape name="fullpath-top-line" from="base_line">
- <area>0,38,1280,2</area>
- </shape>
-
- <shape name="fullpath-bottom-line" from="base_line">
- <area>0,77,1280,2</area>
- </shape>
-
- <shape name="file-browser-preview-backdrop" from="base_backdrop">
- <area>20,92,615,592</area>
- </shape>
-
- <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line">
- <area>21,93,613,590</area>
- </shape>
-
- <shape name="file-browser-preview-top-line" from="base_highlight_line">
- <area>22,94,611,2</area>
- </shape>
-
- <shape name="file-browser-preview-bottom-line" from="base_highlight_line">
- <area>22,680,611,2</area>
- </shape>
-
- <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line">
- <area>22,96,2,584</area>
- </shape>
-
- <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line">
- <area>631,96,2,584</area>
- </shape>
-
- <shape name="file-browser-preview-image-line" from="base_backdrop_line">
- <area>42,158,571,324</area>
- </shape>
-
- <shape name="file-browser-preview-image-top-line" from="base_highlight_line">
- <area>43,159,569,2</area>
- </shape>
-
- <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line">
- <area>43,479,569,2</area>
- </shape>
-
- <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line">
- <area>43,161,2,318</area>
- </shape>
-
- <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line">
- <area>610,161,2,318</area>
- </shape>
-
- <shape name="file-browser-backdrop" from="base_backdrop">
- <area>645,92,615,592</area>
- </shape>
-
- <shape name="file-browser-backdrop-line" from="base_backdrop_line">
- <area>646,93,613,590</area>
- </shape>
-
- <shape name="file-browser-top-line" from="base_highlight_line">
- <area>647,94,611,2</area>
- </shape>
-
- <shape name="file-browser-bottom-line" from="base_highlight_line">
- <area>647,680,611,2</area>
- </shape>
-
- <shape name="file-browser-left-line" from="base_highlight_vertical_line">
- <area>647,96,2,584</area>
- </shape>
-
- <shape name="file-browser-right-line" from="base_highlight_vertical_line">
- <area>1256,96,2,584</area>
- </shape>
-
- <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop">
- <area>1207,684,50,10</area>
- </shape>
-
- <buttonlist name="filelist" from="base_list">
- <area>653,100,599,578</area>
- <statetype name="buttonitem">
- <state name="active">
- <area>0,0,599,54</area>
- <statetype name="buttoncheck">
- <area>4,17,20,20</area>
- </statetype>
- <imagetype name="buttonimage">
- <area>28,2,77,50</area>
- <filename>images/file_browser_no_preview.png</filename>
- <preserveaspect>true</preserveaspect>
- </imagetype>
- <textarea name="buttontext">
- <area>115,0,382,54</area>
- <font>basesmaller</font>
- <multiline>yes</multiline>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="size" from="buttontext">
- <area>497,0,100,54</area>
- <align>right,vcenter</align>
- </textarea>
- </state>
- <state name="selectedactive">
- <area>0,0,599,112</area>
- <statetype name="buttoncheck">
- <area>10,46,20,20</area>
- </statetype>
- <imagetype name="buttonimage">
- <area>38,4,138,104</area>
- <filename>images/file_browser_no_preview.png</filename>
- <preserveaspect>true</preserveaspect>
- </imagetype>
- <textarea name="buttontext">
- <area>186,0,307,112</area>
- <font>basesmallyellow</font>
- <multiline>yes</multiline>
- <align>left,vcenter</align>
- </textarea>
- <textarea name="size" from="buttontext">
- <area>493,0,100,112</area>
- <align>right,vcenter</align>
- </textarea>
- </state>
- <state name="selectedinactive" from="selectedactive">
- <shape name="buttonbackground" from="base_select_bar_selectedinactive">
- <area>0,0,100%,100%</area>
- </shape>
- </state>
- </statetype>
- <statetype name="upscrollarrow">
- <position>561,585</position>
- </statetype>
- <statetype name="downscrollarrow">
- <position>581,585</position>
- </statetype>
- </buttonlist>
-
- <textedit name="location_edit" from="base_wide_textedit">
- <area>40,107,575,40</area>
- </textedit>
-
- <button name="back_button" from="base_button">
- <position>252,493</position>
- <value>Up Level</value>
- </button>
-
- <button name="home_button" from="base_button">
- <position>252,540</position>
- <value>Home</value>
- </button>
-
- <textarea name="label1" from="basetextarea">
- <area>40,260,160,40</area>
- <font>basesmall</font>
- <value>Title:</value>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="label2" from="label1">
- <area>40,300,160,40</area>
- <value>Subtitle:</value>
- </textarea>
-
- <textarea name="label3" from="label1">
- <area>40,340,160,40</area>
- <value>Start Time:</value>
- </textarea>
-
- <textarea name="title_text" from="basetextarea">
- <area>215,260,388,40</area>
- <font>basesmall</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="subtitle_text" from="title_text">
- <area>215,300,388,40</area>
- </textarea>
-
- <textarea name="starttime_text" from="title_text">
- <area>215,340,388,40</area>
- </textarea>
-
- <button name="cancel_button" from="base_button">
- <position>52,634</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_button">
- <position>252,634</position>
- <value>Previous</value>
- </button>
-
- <button name="next_button" from="base_button">
- <position>452,634</position>
- <value>Next</value>
- </button>
-
- </window>
-
- <!--
- Import Archive
- -->
-
- <window name="importnative">
- <area>0,0,1280,720</area>
-
- <textarea name="title1" from="base_heading">
- <value>Associate Channel</value>
- </textarea>
-
- <shape name="destination-backdrop" from="base_backdrop">
- <area>115,36,1050,649</area>
- </shape>
-
- <shape name="destination-backdrop-line" from="base_backdrop_line">
- <area>116,37,1048,506</area>
- </shape>
-
- <shape name="destination-top-line" from="base_highlight_line">
- <area>117,38,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-line" from="base_highlight_line">
- <area>117,540,1046,2</area>
- </shape>
-
- <shape name="destination-left-line" from="base_highlight_vertical_line">
- <area>117,40,2,500</area>
- </shape>
-
- <shape name="destination-right-line" from="base_highlight_vertical_line">
- <area>1161,40,2,500</area>
- </shape>
-
- <shape name="destination-seperator-first-line" from="base_line">
- <area>138,245,1004,2</area>
- </shape>
-
- <shape name="destination-seperator-second-line" from="base_line">
- <area>138,392,1004,2</area>
- </shape>
-
- <shape name="destination-bottom-backdrop-line" from="base_backdrop_line">
- <area>116,547,1048,137</area>
- </shape>
-
- <shape name="destination-bottom-top-line" from="base_highlight_line">
- <area>117,548,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-bottom-line" from="base_highlight_line">
- <area>117,681,1046,2</area>
- </shape>
-
- <shape name="destination-bottom-left-line" from="base_highlight_vertical_line">
- <area>117,550,2,131</area>
- </shape>
-
- <shape name="destination-bottom-right-line" from="base_highlight_vertical_line">
- <area>1161,550,2,131</area>
- </shape>
-
- <shape name="destination-bottom-seperator-first-line" from="base_line">
- <area>138,620,1004,2</area>
- </shape>
-
- <shape name="coverart-border">
- <area>144,66,104,155</area>
- <type>roundbox</type>
- <fill color="#000000" alpha="0" />
- <line color="#AAAAAA" alpha="100" width="2" />
- <cornerradius>6</cornerradius>
- </shape>
-
- <textarea name="progtitle" from="basetextarea">
- <area>264,70,632,30</area>
- <font>basemediumyellow</font>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="progdatetime" from="basetextarea">
- <area>906,70,226,30</area>
- <font>basesmallyellow</font>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="progdescription" from="basetextarea">
- <area>264,100,868,120</area>
- <multiline>yes</multiline>
- </textarea>
-
- <imagetype name="preview_image">
- <area>148,70,96,147</area>
- <filename>images/no_coverart.png</filename>
- <mask>images/masks/watchrecordings_coverart_mask.png</mask>
- <preserveaspect>false</preserveaspect>
- <alpha>255</alpha>
- </imagetype>
-
- <textarea name="label1" from="basetextarea">
- <area>138,264,1004,30</area>
- <font>basemediumyellow</font>
- <align>allcenter</align>
- <value>Archived Channel</value>
- </textarea>
-
- <textarea name="label2" from="basetextarea">
- <area>148,304,335,30</area>
- <font>basesmall</font>
- <value>Channel ID:</value>
- <align>right,vcenter</align>
- </textarea>
-
- <textarea name="chanid" from="basetextarea">
- <area>493,304,147,30</area>
- <align>left,vcenter</align>
- </textarea>
-
- <textarea name="label3" from="label2">
- <area>148,344,335,30</area>
- <value>Channel Number:</value>
- </textarea>
-
- <textarea name="channo" from="chanid">
- <area>493,344,147,30</area>
- </textarea>
-
- <textarea name="label4" from="label2">
- <area>640,304,147,30</area>
- <value>Callsign:</value>
- </textarea>
-
- <textarea name="callsign" from="chanid">
- <area>797,304,147,30</area>
- </textarea>
-
- <textarea name="label5" from="label2">
- <area>640,344,147,30</area>
- <value>Name:</value>
- </textarea>
-
- <textarea name="name" from="chanid">
- <area>797,344,147,30</area>
- </textarea>
-
- <!--
- local file channel
- -->
-
- <textarea name="label6" from="label1">
- <area>138,411,1004,30</area>
- <value>Local Channel</value>
- </textarea>
-
- <textarea name="label7" from="label2">
- <area>148,441,295,30</area>
- <value>Channel ID:</value>
- </textarea>
-
- <textarea name="local_chanid" from="chanid">
- <area>493,441,147,30</area>
- </textarea>
-
- <button name="searchchanid_button" from="base_searchbutton">
- <area>453,441,30,30</area>
- </button>
-
- <textarea name="labe8" from="label2">
- <area>148,481,295,30</area>
- <value>Channel Number:</value>
- </textarea>
-
- <textarea name="local_channo" from="chanid">
- <area>493,481,147,30</area>
- </textarea>
-
- <button name="searchchanno_button" from="searchchanid_button">
- <position>453,481</position>
- <value>Search Channel</value>
- </button>
-
- <textarea name="label9" from="label2">
- <area>640,441,147,30</area>
- <value>Callsign:</value>
- </textarea>
-
- <textarea name="local_callsign" from="chanid">
- <area>837,441,147,30</area>
- </textarea>
-
- <button name="searchcallsign_button" from="searchchanid_button">
- <position>797,441</position>
- <value>Search Callsign</value>
- </button>
-
- <textarea name="label10" from="label2">
- <area>640,481,147,30</area>
- <value>Name:</value>
- </textarea>
-
- <textarea name="local_name" from="chanid">
- <area>837,481,147,30</area>
- </textarea>
-
- <button name="searchname_button" from="searchchanid_button">
- <position>797,481</position>
- <value>Search Name</value>
- </button>
-
- <button name="cancel_button" from="base_small_button">
- <position>138,631</position>
- <value>Cancel</value>
- </button>
-
- <button name="prev_button" from="base_small_button">
- <position>722,631</position>
- <value>Previous</value>
- </button>
-
- <button name="finish_button" from="base_small_button">
- <position>942,631</position>
- <value>Finish</value>
- </button>
-
- </window>
-
-</mythuitheme>
--
cgit v0.12
From 05bcfc5ee1cb1ee2fcca72a270e1b82b112a84b1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 26 Mar 2014 21:35:39 +0000
Subject: xymon: update to 4.3.17
Change find_orphans missing files and 0 byte recordings to yellow status
---
abs/core/xymon/PKGBUILD | 165 +++++++++++++++++------------------
abs/core/xymon/hbnotes.py | 16 ++--
abs/core/xymon/hobbit-myth-orphan.sh | 26 +++---
3 files changed, 103 insertions(+), 104 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 7293814..69507d4 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,22 +1,24 @@
pkgbase=xymon
-pkgname=(xymonserver xymonclient)
-pkgver=4.3.5
-pkgrel=56
-pkgdesc="Hobbit is a system for monitoring servers and networks. "
+pkgname=('xymonserver' 'xymonclient')
+pkgver=4.3.17
+pkgrel=1
+pkgdesc="Xymon is a system for monitoring of hosts and networks"
license="GPL"
arch=('i686' 'x86_64')
-
url="http://www.xymon.com/"
-
-source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh login_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
-
+source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz"
+ 'hobbitadd.py' 'xymon_ghost_check' 'graph.cfg.diff' 'xymonserver.cfg.diff'
+ 'tasks.d.mv' 'clientlaunch.cfg.patch' 'hobbitstorage.py' 'hbnotes.py'
+ 'hobbit-myth-orphan.sh' 'analysis.cfg' 'hbfunc.py' 'be.png' 'tuner.png'
+ 'tv.png' 'hobbit-mem-myth.sh' 'hobbit_notify.sh' 'login_notify.sh'
+ 'alerts.cfg' 'hobbit_myth_data.py' 'logrotate-server.xymon'
+ 'logrotate-client.xymon' 'log_list.sh' 'client-local.cfg.patch'
+ 'led_themes.tar.gz' 'xymon-server.rules' 'hosts.cfg.patch')
depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5')
-
install=xymon.install
build() {
-
- cd $startdir/src/xymon-$pkgver
+ cd ${srcdir}/xymon-$pkgver
ENABLESSL=n \
ENABLELDAP=n \
ENABLELDAPSSL=n \
@@ -45,72 +47,69 @@ build() {
./configure
make PKGBUILD=1|| return 1
-
}
package_xymonserver(){
- backup=('data/srv/xymon/etc/hosts.cfg')
- cd $startdir/src/xymon-$pkgver
- make PKGBUILD=1 INSTALLROOT=$startdir/pkg/xymonserver install
- cd $startdir/src
- install -D -m400 $startdir/src/xymon-server.rules $startdir/pkg/xymonserver/etc/sudoers.d/xymon_server
- install -D -m755 $startdir/src/hobbitadd.py $startdir/pkg/xymonserver/home/xymon/server/bin/hobbitadd.py
- install -D -m755 $startdir/src/hobbitstorage.py $startdir/pkg/xymonserver/home/xymon/server/ext/hobbitstorage.py
- install -D -m755 $startdir/src/hobbit-myth-orphan.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-myth-orphan.sh
- install -D -m755 $startdir/src/hbfunc.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbfunc.py
- install -D -m755 $startdir/src/hbnotes.py $startdir/pkg/xymonserver/home/xymon/server/ext/hbnotes.py
- install -D -m755 $startdir/src/hobbit_myth_data.py $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit_myth_data.py
- install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonserver/home/xymon/server/ext/hobbit-mem-myth.sh
- install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonserver/home/xymon/client/bin/log_list.sh
-
- install -m755 analysis.cfg $startdir/pkg/xymonserver/home/xymon/etc/analysis.cfg
- cat alerts.cfg >> $startdir/pkg/xymonserver/home/xymon/etc/alerts.cfg
-
- install -m755 hobbit_notify.sh $startdir/pkg/xymonserver/home/xymon/server/bin/hobbit_notify.sh
- install -m755 login_notify.sh $startdir/pkg/xymonserver/home/xymon/server/bin/login_notify.sh
- install -m755 $startdir/src/tv.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tv.png
- install -m755 $startdir/src/tuner.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/tuner.png
- install -m755 $startdir/src/be.png $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/be.png
-
- install -D -m644 $startdir/src/logrotate-server.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon-server
-
- # fix env for mythtb bindingds
- echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg
-
-
- #copy in replacment icon set
- DOCDIR=$startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon
- cp -rp $DOCDIR/gifs $DOCDIR/gifs.orig
- cd $startdir/src/themes
- cp -fp Common/* $DOCDIR/gifs/
- cp -fp ModernLED/* $DOCDIR/gifs/
- #apply patches to conf file
- install -D -m775 $startdir/src/tasks.d.mv $startdir/pkg/xymonserver/home/xymon/etc/tasks.d/mv.cfg
- cd $startdir/pkg/xymonserver/home/xymon/etc
- patch -p0 < $startdir/src/graph.cfg.diff || return 1
- patch -p0 < $startdir/src/xymonserver.cfg.diff || return 1
- patch -p3 < $startdir/src/client-local.cfg.patch || return 1
- patch -p3 < $startdir/src/hosts.cfg.patch || return 1
-
- #make dir for login alerts
- mkdir $startdir/pkg/xymonserver/home/xymon/var/login_alerts
-
- #add custom module descriptions
- COLDOC=$pkgdir/home/xymon/etc/columndoc.csv
- echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC
- echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC
-
- #fix permissions
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/notes/
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/snap/
- chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/rep/
- chmod 750 $startdir/pkg/xymonserver/etc/sudoers.d
- chmod 775 $startdir/pkg/xymonserver/home/xymon/var/login_alerts
-
-
+ backup=('data/srv/xymon/etc/hosts.cfg')
+ cd ${srcdir}/xymon-$pkgver
+ make PKGBUILD=1 INSTALLROOT=${pkgdir} install
+ cd ${srcdir}
+ install -D -m400 ${srcdir}/xymon-server.rules ${pkgdir}/etc/sudoers.d/xymon_server
+ install -D -m755 ${srcdir}/hobbitadd.py ${pkgdir}/home/xymon/server/bin/hobbitadd.py
+ install -D -m755 ${srcdir}/hobbitstorage.py ${pkgdir}/home/xymon/server/ext/hobbitstorage.py
+ install -D -m755 ${srcdir}/hobbit-myth-orphan.sh ${pkgdir}/home/xymon/server/ext/hobbit-myth-orphan.sh
+ install -D -m755 ${srcdir}/hbfunc.py ${pkgdir}/home/xymon/server/ext/hbfunc.py
+ install -D -m755 ${srcdir}/hbnotes.py ${pkgdir}/home/xymon/server/ext/hbnotes.py
+ install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/server/ext/hobbit_myth_data.py
+ install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/server/ext/hobbit-mem-myth.sh
+ install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh
+
+ install -m755 analysis.cfg ${pkgdir}/home/xymon/etc/analysis.cfg
+ cat alerts.cfg >> ${pkgdir}/home/xymon/etc/alerts.cfg
+
+ install -m755 hobbit_notify.sh ${pkgdir}/home/xymon/server/bin/hobbit_notify.sh
+ install -m755 login_notify.sh ${pkgdir}/home/xymon/server/bin/login_notify.sh
+ install -m755 ${srcdir}/tv.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/tv.png
+ install -m755 ${srcdir}/tuner.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/tuner.png
+ install -m755 ${srcdir}/be.png ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/be.png
+
+ install -D -m644 ${srcdir}/logrotate-server.xymon ${pkgdir}/etc/logrotate.d/xymon-server
+
+ # fix env for mythtb bindingds
+ echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/etc/xymonserver.cfg
+
+ #copy in replacment icon set
+ DOCDIR=${pkgdir}/data/srv/httpd/htdocs/xymon
+ cp -rp ${DOCDIR}/gifs ${DOCDIR}/gifs.orig
+ cd ${srcdir}/themes
+ cp -fp Common/* ${DOCDIR}/gifs/
+ cp -fp ModernLED/* ${DOCDIR}/gifs/
+
+ #apply patches to conf file
+ install -D -m775 ${srcdir}/tasks.d.mv ${pkgdir}/home/xymon/etc/tasks.d/mv.cfg
+ cd ${pkgdir}/home/xymon/etc
+ patch -p0 < ${srcdir}/graph.cfg.diff || return 1
+ patch -p0 < ${srcdir}/xymonserver.cfg.diff || return 1
+ patch -p3 < ${srcdir}/client-local.cfg.patch || return 1
+ patch -p3 < ${srcdir}/hosts.cfg.patch || return 1
+
+ #make dir for login alerts
+ mkdir ${pkgdir}/home/xymon/var/login_alerts
+
+ #add custom module descriptions
+ COLDOC=$pkgdir/home/xymon/etc/columndoc.csv
+ echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC
+ echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC
+
+ #fix permissions
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/snap/
+ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/rep/
+ chmod 750 ${pkgdir}/etc/sudoers.d
+ chmod 775 ${pkgdir}/home/xymon/var/login_alerts
}
@@ -120,18 +119,18 @@ package_xymonclient(){
backup=('data/srv/xymon/client/etc/xymonclient.cfg')
install=xymon-client.install
- install -D -m755 $startdir/src/log_list.sh $startdir/pkg/xymonclient/home/xymon/client/bin/log_list.sh
- install -D -m644 $startdir/src/logrotate-client.xymon $startdir/pkg/xymonclient/etc/logrotate.d/xymon-client
- install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/xymonclient/home/xymon/client/ext/hobbit-mem-myth.sh
- cp -rp /$startdir/pkg/xymonserver/home/xymon/client/ $startdir/pkg/xymonclient/home/xymon/
+ install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh
+ install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client
+ install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh
+ cp -rp ${pkgdir}/../xymonserver/home/xymon/client/ ${pkgdir}/home/xymon/
cd -
- cd $startdir/pkg/xymonclient/home/xymon/client/etc
- patch -p0 < $startdir/src/clientlaunch.cfg.patch
+ cd ${pkgdir}/home/xymon/client/etc
+ patch -p0 < ${srcdir}/clientlaunch.cfg.patch
cd -
}
-md5sums=('31923ec126fe1c264fceb459d2175161'
+md5sums=('d8d119a777e7b7204d1292fb27314312'
'a0fbb9cbeb3600a40943e6205790f22f'
'c60b0d59bb39505ee3d62c6dd65429c5'
'a45dd4cdb84817bcf3e51b25cc713799'
@@ -139,8 +138,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
- '1141fc6f846e91f380bbcdb212b44f7d'
- '0f70e76a164f648f0a4a01110137cb20'
+ '9610356bd8c1f0b6d9f4a7a33b385e16'
+ '526c169e020b570b5b02661a831aa4e6'
'166279c006c3ef7bf0c21537cf89fc83'
'80d9cfac86c6d96836e6f406e35e7cf5'
'd210c43fb9ee9ad6cd7648e0c2e0efea'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index b5ad72a..6967aa4 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -176,7 +176,7 @@ def createdropdown(currenthostype):
dir = "/data/storage/disk0/backup/system_backups"
dropdown='''
</br>
- <input name="param2" type="radio" value="Restore" />Restore database </>
+ <input name="param2" type="radio" value="Restore" />Restore Database: </>
<select name="param1">\n'''
os.chdir(dir)
if os.path.exists(dir):
@@ -195,18 +195,18 @@ def createdropdown(currenthostype):
<input type="checkbox" name="param8" >Partial Restore<br>
<br>
- <input name="param2" type="radio" value="Upload" />Upload file to restore </>
+ <input name="param2" type="radio" value="Upload" />Upload File to Restore: </>
<input name="uFile" type="file" size="40">
<br><br>
- <input name="param2" type="radio" value="Backup" checked="checked" />Backup database<br />
+ <input name="param2" type="radio" value="Backup" checked="checked" />Backup System<br />
'''
#This is for the d/l backup option
dropdown+='''
- <input name="param2" type="radio" value="Dbackup" />Download backup </>
+ <input name="param2" type="radio" value="Dbackup" />Download Backup: </>
<select name="param7">\n\n </br>'''
for file in files:
@@ -217,7 +217,7 @@ def createdropdown(currenthostype):
</select>
<br>
- <input name="param2" type="radio" value="Optimize" />Optimize database<br />
+ <input name="param2" type="radio" value="Optimize" />Optimize Database<br />
'''
if currenthostype == "Master_backend":
dropdown+='<input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (except master backend)<br /> \n'
@@ -403,14 +403,14 @@ function Do_it ()
buttonform_bottom='''
- <input name="param2" type="radio" value="Update" />Update System </>
+ <input name="param2" type="radio" value="Update" />Update System: </>
<select name="param3">
<option value="Myth_only">Myth only</option>
<option value="All"> Full System</option>
</select>
</br>
- <input name="param2" type="radio" value="Kill" />Restart interface: </>
+ <input name="param2" type="radio" value="Kill" />Restart Interface: </>
<select name="param6">
<option value="killX">Full UI</option>
<option value="killmyth">MythFrontend</option>
@@ -419,7 +419,7 @@ function Do_it ()
<input name="param2" type="radio" value="Shutdown" />Shutdown System<br />
<input name="param2" type="radio" value="Reboot" />Reboot System<br />
- <input name="param2" type="radio" value="WOL" />Wake on Lan<br />
+ <input name="param2" type="radio" value="WOL" />Wake on LAN<br />
<input name="hiddenparam" type="hidden" value="
'''
diff --git a/abs/core/xymon/hobbit-myth-orphan.sh b/abs/core/xymon/hobbit-myth-orphan.sh
index 5cba136..cc4ca30 100644
--- a/abs/core/xymon/hobbit-myth-orphan.sh
+++ b/abs/core/xymon/hobbit-myth-orphan.sh
@@ -5,34 +5,34 @@ MYTHCONFDIR=/usr/share/mythtv /usr/LH/bin/find_orphans.py --printonly > $TMPFILE
COLUMN=orphan # Name of the column
COLOR=green # By default, everything is OK
-MSG="All OK"
+MSG="No Orphans Found."
#yellow
-for i in "Orphaned video files" "Orphaned snapshots" "Database backups" "Other files"
+for i in "Orphaned video files" "Orphaned snapshots" "Database backups" "Other files" "Recordings with missing files" "Zero byte recordings"
do
grep -q "$i" $TMPFILE
status=$?
if [ $status -eq 0 ]
then
COLOR="yellow"
- MSG="Problems found"
+ MSG="Problems with $i"
fi
done
#red
-for i in "Recordings with missing files" "Zero byte recordings"
-do
- grep -q "$i" $TMPFILE
- status=$?
- if [ $status -eq 0 ]
- then
- COLOR="red"
- MSG="Problems found"
- fi
-done
+#for i in "Recordings with missing files" "Zero byte recordings"
+#do
+# grep -q "$i" $TMPFILE
+# status=$?
+# if [ $status -eq 0 ]
+# then
+# COLOR="red"
+# MSG="Problems with $i"
+# fi
+#done
MSG="
${MSG}
--
cgit v0.12
From fc539f5d4dfd5c641545ba0442431219f63bcbe3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 27 Mar 2014 21:57:25 +0000
Subject: libcl: build for x64. dep of nvidia-utils
---
abs/extra/libcl/PKGBUILD | 38 ++++++++++++++++++++++++++++++++++++++
abs/not_built/core/libcl/PKGBUILD | 38 --------------------------------------
2 files changed, 38 insertions(+), 38 deletions(-)
create mode 100644 abs/extra/libcl/PKGBUILD
delete mode 100644 abs/not_built/core/libcl/PKGBUILD
diff --git a/abs/extra/libcl/PKGBUILD b/abs/extra/libcl/PKGBUILD
new file mode 100644
index 0000000..94f2ca7
--- /dev/null
+++ b/abs/extra/libcl/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id$
+#Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libcl
+pkgver=1.1
+_pkgver=304.37
+pkgrel=3
+pkgdesc="OpenCL library and ICD loader from NVIDIA"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('gcc-libs')
+license=('custom')
+options=('!strip')
+
+if [ "$CARCH" = "i686" ]; then
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${_pkgver}"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
+ md5sums=('ee3e97109201ab954c96860e28ada611')
+elif [ "$CARCH" = "x86_64" ]; then
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
+ md5sums=('65fce562c0df3def06012db9ff6bafa1')
+fi
+build() {
+ cd $srcdir
+ sh ${_pkg}.run --extract-only
+}
+
+package() {
+ cd $srcdir/${_pkg}
+ install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
+ ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1
+ ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+md5sums=('65fce562c0df3def06012db9ff6bafa1')
diff --git a/abs/not_built/core/libcl/PKGBUILD b/abs/not_built/core/libcl/PKGBUILD
deleted file mode 100644
index cd9e82e..0000000
--- a/abs/not_built/core/libcl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libcl
-pkgver=1.0
-_pkgver=275.19
-pkgrel=1
-pkgdesc="OpenCL library and ICD loader from NVIDIA"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('gcc-libs')
-license=('custom')
-options=('!strip')
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${_pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
- md5sums=('9e74b1913ff5eb6786600d47b64ba57d')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
- md5sums=('45a6074db3efe961d025afa7a89fa036')
-fi
-build() {
- cd $srcdir
- sh ${_pkg}.run --extract-only
-}
-
-package() {
- cd $srcdir/${_pkg}
- install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
- ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1
- ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-md5sums=('9e74b1913ff5eb6786600d47b64ba57d')
--
cgit v0.12
From de6718e325ed5fdcb2b15cb567732321ecb14790 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 5 Apr 2014 18:18:39 +0000
Subject: initscripts: update to 2014.03.1
---
abs/core/initscripts/PKGBUILD | 38 ++++++++++++++++-----------
abs/core/initscripts/__changelog | 6 +++++
abs/core/initscripts/initscripts.install | 29 +++++++++++++++++---
abs/core/initscripts/rc.shutdown.patch | 9 -------
abs/core/initscripts/split-hwclock-calls.diff | 21 ---------------
5 files changed, 54 insertions(+), 49 deletions(-)
create mode 100644 abs/core/initscripts/__changelog
delete mode 100644 abs/core/initscripts/rc.shutdown.patch
delete mode 100644 abs/core/initscripts/split-hwclock-calls.diff
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index 14fa502..370c5f4 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -1,33 +1,41 @@
-# $Id: PKGBUILD 168542 2012-10-13 09:29:55Z thomas $
-# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Alexey D. <lq07829icatm@rambler.ru>
+# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=initscripts
-pkgver=2012.10.1
-pkgrel=2
-pkgdesc="System initialization/bootup scripts"
+pkgver=2014.03.1
+pkgrel=1
+pkgdesc="Maintained fork of system initialization/bootup scripts"
arch=('any')
-url="http://www.archlinux.org"
+url="https://bitbucket.org/TZ86/initscripts-fork/overview"
license=('GPL2')
provides=('initscripts-systemd')
conflicts=('initscripts-systemd')
replaces=('initscripts-systemd')
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
+depends=('glibc' 'bash' 'coreutils' 'iproute2' 'ncurses' 'findutils' 'procps-ng' 'kbd')
optdepends=('dhcpcd: DHCP network configuration'
- 'bridge-utils: Legacy network bridging support'
- 'net-tools: Legacy network support'
- 'wireless_tools: Legacy wireless networking'
- 'sysvinit: Legacy init support')
+ 'bridge-utils: Network bridging support'
+ 'net-tools: Network support'
+ 'wireless_tools: Wireless networking'
+ 'systemd: new crypttab format support'
+ 'sysctl-default-conf: additional tweaks for kernel parameters')
makedepends=(asciidoc)
install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz")
+source=(https://bitbucket.org/TZ86/$pkgname-fork/get/$pkgver.tar.bz2)
+md5sums=('f13aab36792429344ff685b64206722d')
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd TZ86-$pkgname-*
make DESTDIR=${pkgdir} install
- mv $pkgdir/usr/sbin $pkgdir/usr/bin
+
+ #comment out some rc.conf options
+ sed -i 's/NETWORK_PERSIST=/#NETWORK_PERSIST=/g' ${pkgdir}/etc/rc.conf
+ sed -i 's/DAEMONS=/#DAEMONS=/g' ${pkgdir}/etc/rc.conf
+ #don't use bootlogd
+ sed -i 's/bootlogd /#bootlogd /g' ${pkgdir}/etc/rc.sysinit
}
-md5sums=('a4a747e73819b81f2218cf5b9bd53703')
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog
new file mode 100644
index 0000000..f6b268d
--- /dev/null
+++ b/abs/core/initscripts/__changelog
@@ -0,0 +1,6 @@
+- from initscripts-fork AUR https://aur.archlinux.org/packages/initscripts-fork/
+- PKGBUILD: changed pkgname to initscripts
+- PKGBUILD: removed initscripts from provides, conflicts, replaces
+- PKGBUILD: remove dep sysvinit
+- PKGBUILD: comment out of rc.conf NETWORK_PERSIST= and DAEMONS=
+- PKGBUILD: comment out of rc.sysinit starting bootlogd
diff --git a/abs/core/initscripts/initscripts.install b/abs/core/initscripts/initscripts.install
index 03519cb..2e7b24f 100644
--- a/abs/core/initscripts/initscripts.install
+++ b/abs/core/initscripts/initscripts.install
@@ -1,3 +1,11 @@
+show_link() {
+ echo "----"
+ echo "> You can find all missed scripts and config files on https://bitbucket.org/TZ86/arch-rcscripts"
+ echo "----"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
post_upgrade() {
if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
echo "Blacklisting of modules is no longer supported in rc.conf,"
@@ -18,9 +26,22 @@ post_upgrade() {
echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
echo "----"
fi
- if [ "$(vercmp $2 2012.10.1)" -lt 0 ]; then
- echo "----"
- echo "> systemd no longer reads MODULES from rc.conf."
- echo "----"
+ if [ "$(vercmp $2 2013.10.1)" -lt 0 ]; then
+ show_link
fi
}
+
+post_install() {
+ echo "----"
+ echo "> All localization parameters, network and kernel modules settings has been"
+ echo "> moved to rc.conf. Systemd configs (such as vconsole.conf) is still supports"
+ echo "> but is not recommended."
+ echo
+ echo "> Please note that now rc.conf overrides systemd configs. If you want keep"
+ echo "> using systemd configs, just leave the corresponding parameter in rc.conf"
+ echo "> commented out."
+ echo "----"
+
+ show_link
+}
+
diff --git a/abs/core/initscripts/rc.shutdown.patch b/abs/core/initscripts/rc.shutdown.patch
deleted file mode 100644
index 407349e..0000000
--- a/abs/core/initscripts/rc.shutdown.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-+#unmount network filesystems for runit
-+INIT=`ps -p1 -o comm=`
-+if [ x$INIT = xrunit ]
-+then
-+ if [ -e /var/services/netfs ]
-+ then
-+ /etc/rc.d/netfs stop
-+ fi
-+fi
diff --git a/abs/core/initscripts/split-hwclock-calls.diff b/abs/core/initscripts/split-hwclock-calls.diff
deleted file mode 100644
index c0a6a4f..0000000
--- a/abs/core/initscripts/split-hwclock-calls.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/rc.sysinit b/rc.sysinit
-index eb49e2b..8f9727b 100755
---- a/rc.sysinit
-+++ b/rc.sysinit
-@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
-
- run_hook sysinit_start
-
--HWCLOCK_PARAMS="--systz"
- case $HARDWARECLOCK in
- "") ;;
- UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
-@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
-
- [[ $TIMEZONE ]] && export TZ=$TIMEZONE
-
-- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
-+ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
-
- unset TZ
- fi
--
cgit v0.12
From bdefc1e81c89dbb12e7e914a9f1f220ee5ed1714 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 5 Apr 2014 19:49:18 +0000
Subject: poweroff-scripts: fix shutdown/reboot issue with /usr/bin move. refs
#961
---
abs/core/poweroff-scripts/PKGBUILD | 24 +++----
abs/core/poweroff-scripts/halt.script | 19 +++---
abs/core/poweroff-scripts/poweroff-scripts.install | 10 +--
abs/core/poweroff-scripts/poweroff.script | 13 ++--
abs/core/poweroff-scripts/reboot.script | 13 ++--
abs/core/poweroff-scripts/shutdown.script | 78 ++++++++++++----------
6 files changed, 81 insertions(+), 76 deletions(-)
diff --git a/abs/core/poweroff-scripts/PKGBUILD b/abs/core/poweroff-scripts/PKGBUILD
index e5cab49..dfe5966 100644
--- a/abs/core/poweroff-scripts/PKGBUILD
+++ b/abs/core/poweroff-scripts/PKGBUILD
@@ -1,7 +1,7 @@
pkgname=poweroff-scripts
pkgver=1.1
-pkgrel=5
-pkgdesc="replacement scripts to work with sysvinit and runit"
+pkgrel=6
+pkgdesc="Replacement power scripts to work with systemd and runit"
license=('GPL')
depends=('systemd-sysvcompat' 'runit>=2.1.1-6')
makedepends=()
@@ -13,15 +13,13 @@ source=(halt.script reboot.script poweroff.script shutdown.script)
arch=('i686' 'x86_64')
package() {
- install -d $pkgdir/sbin/
- install -m0755 $srcdir/reboot.script $pkgdir/sbin/reboot
- install -m0755 $srcdir/halt.script $pkgdir/sbin/halt
- install -m0755 $srcdir/poweroff.script $pkgdir/sbin/poweroff
- install -m0755 $srcdir/shutdown.script $pkgdir/sbin/shutdown
-
+ install -d $pkgdir/usr/bin/
+ install -m0755 $srcdir/reboot.script $pkgdir/usr/bin/reboot
+ install -m0755 $srcdir/halt.script $pkgdir/usr/bin/halt
+ install -m0755 $srcdir/poweroff.script $pkgdir/usr/bin/poweroff
+ install -m0755 $srcdir/shutdown.script $pkgdir/usr/bin/shutdown
}
-
-md5sums=('a3538350e5c8e65a1418d9f1b5ff83c1'
- 'c9cbd22b341cf9e566eeedba7e51ecd2'
- '58c374b2cacabac6728bb09c24e512a5'
- 'c151f7a35acc0db524c290be7594f09e')
+md5sums=('b0af95f1fc03d51a8e40d86ca59749e9'
+ '23d8541b77ab539a2b66cab58f78dcff'
+ 'cd23d47abf536f3874bc24f044dea682'
+ '8898528f9da8458115480bfee0100300')
diff --git a/abs/core/poweroff-scripts/halt.script b/abs/core/poweroff-scripts/halt.script
index b2e8170..223d3e8 100755
--- a/abs/core/poweroff-scripts/halt.script
+++ b/abs/core/poweroff-scripts/halt.script
@@ -2,19 +2,16 @@
MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
-# if [ x$1 = x-w ]
-# then
-# /sbin/halt.init -w
-# exit 0
-# fi
-if [ x$INIT = xrunit ]
+#ignore -w option
+if [ x$1 = x-w ]
then
- echo "System will shutdown NOW" |wall
- chvt 1
- runit-init 0
+ exit 0
+fi
+if [ x$INIT = xrunit ]
+then
+ shutdown -h
else
- systemctrl $@
+ systemctl poweroff $@
fi
-
diff --git a/abs/core/poweroff-scripts/poweroff-scripts.install b/abs/core/poweroff-scripts/poweroff-scripts.install
index 00b4a84..5f631ed 100644
--- a/abs/core/poweroff-scripts/poweroff-scripts.install
+++ b/abs/core/poweroff-scripts/poweroff-scripts.install
@@ -10,11 +10,11 @@ pre_upgrade () {
}
post_install () {
- rm -f /sbin/reboot.init
- rm -f /sbin/poweroff.init
-
- [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/reboot.init
- [ -e /usr/sbin/halt.init ] || ln -sf /usr/sbin/halt.init /usr/sbin/poweroff.init
+ files="/sbin/reboot.init /sbin/poweroff.init /usr/sbin/reboot.init /usr/sbin/poweroff.init"
+ for i in $files
+ do
+ [ -h $i ] && rm -f $i
+ done
}
# arg 1: the new package version
diff --git a/abs/core/poweroff-scripts/poweroff.script b/abs/core/poweroff-scripts/poweroff.script
index 2236983..dc42a14 100644
--- a/abs/core/poweroff-scripts/poweroff.script
+++ b/abs/core/poweroff-scripts/poweroff.script
@@ -2,13 +2,16 @@
MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
-chvt 1
+
+#ignore -d option
+if [ x$1 = x-d ]
+then
+ exit 0
+fi
+
if [ x$INIT = xrunit ]
then
- echo "System will shutdown NOW" |wall
- chvt 1
- runit-init 0
+ shutdown -h
else
systemctl poweroff $@
fi
-
diff --git a/abs/core/poweroff-scripts/reboot.script b/abs/core/poweroff-scripts/reboot.script
index de2651c..f1d4c3f 100755
--- a/abs/core/poweroff-scripts/reboot.script
+++ b/abs/core/poweroff-scripts/reboot.script
@@ -2,13 +2,16 @@
MYTH_RUN_STATUS="1"
. /etc/profile
INIT=`ps -p 1 -o comm=`
-chvt 1
+
+#ignore -d option
+if [ x$1 = x-d ]
+then
+ exit 0
+fi
+
if [ x$INIT = xrunit ]
then
- echo "System will reboot NOW" |wall
- chvt 1
- runit-init 6
+ shutdown -r
else
systemctl reboot $@
fi
-
diff --git a/abs/core/poweroff-scripts/shutdown.script b/abs/core/poweroff-scripts/shutdown.script
index b87b52f..ffc4056 100644
--- a/abs/core/poweroff-scripts/shutdown.script
+++ b/abs/core/poweroff-scripts/shutdown.script
@@ -1,46 +1,50 @@
#!/bin/bash
MYTH_RUN_STATUS="1"
. /etc/profile
+
+usage() { echo "Usage: $0 [-h | -r] [-t <delay> (opt)]" 1>&2; exit 1; }
+
INIT=`ps -p 1 -o comm=`
if [ x$INIT = xrunit ]
then
- reboot=""
- halt=""
- delay=""
- while getopts rht: name
- do
- case $name in
- r) reboot=1 ;;
- h) halt=1 ;;
- t) delay="$OPTARG"
- if [ x$delay = "xnow" ]
- then
- delay=0
- fi
- ;;
- *)
- exit 2;;
- esac
- done
- if [ x$delay = x ]
- then
- delay=0
+ halt=""
+ reboot=""
+ delay=""
+ while getopts hrt: name
+ do
+ case $name in
+ h) halt=1 ;;
+ r) reboot=1 ;;
+ t) delay="$OPTARG"
+ if [ x$delay = "xnow" ]
+ then
+ delay=0
+ fi
+ ;;
+ *) usage ;;
+ esac
+ done
+ if [ x$delay = x ]
+ then
+ delay=0
fi
-
- if [ x$reboot = x1 ]
- then
- echo "System will reboot in $delay seconds" | wall
- sleep $delay
- /sbin/runit-init 6
- fi
-
- if [ x$halt = x1 ]
- then
- echo "System will poweroff in $delay seconds" | wall
- sleep $delay
- /sbin/runit-init 0
- fi
-
+ if [ x$halt = x1 ]
+ then
+ chvt 1
+ echo "System will shutdown in $delay seconds..." | wall
+ sleep $delay
+ runit-init 0
+ exit 0
+ fi
+ if [ x$reboot = x1 ]
+ then
+ chvt 1
+ echo "System will reboot in $delay seconds..." | wall
+ sleep $delay
+ runit-init 6
+ exit 0
+ fi
+ usage
else
- /sbin/shutdown.init $@
+ systemctl poweroff $@
fi
--
cgit v0.12
From 9649ae208248fc14b44dde67d6bc7301127d9f4c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 5 Apr 2014 22:30:31 +0000
Subject: runit-scripts: fix frontend respawn by shutting down all services in
3. refs #961
add pause utility from ignite project
remove power script stuff as it is done in poweroff-scripts
---
abs/core/runit-scripts/PKGBUILD | 18 +++++++++++---
abs/core/runit-scripts/runit.install | 21 +++-------------
abs/core/runit-scripts/runitscripts/1 | 29 ++++++++++++++--------
abs/core/runit-scripts/runitscripts/3 | 16 +++++++++---
.../runitscripts/services/alsa-utils/finish | 4 +--
.../runitscripts/services/alsa-utils/run | 5 ++--
6 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 9b32d76..ed76902 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,20 +1,26 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=10
+pkgrel=11
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
depends=('glibc' 'util-linux' 'initscripts' 'runit' )
-makedepends=('rsync')
+makedepends=('gcc' 'make' 'rsync')
conflicts=()
replaces=()
backup=('etc/runit/1.local' 'etc/runit/3.local')
install=runit.install
-source=('fbsplash-runit.sh')
+source=('fbsplash-runit.sh'
+ 'http://chneukirchen.org/releases/ignite-0.9.0.tar.gz')
arch=('i686' 'x86_64')
build() {
rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $srcdir
+
+ #build pause util from ignite
+ cd $srcdir/ignite-0.9.0/util
+ sed -i 's/musl-gcc/gcc/g' ./Makefile
+ make
}
package() {
@@ -34,5 +40,9 @@ package() {
rsync -a --exclude=.svn services/* $pkgdir/etc/sv
chmod -R 755 $pkgdir/etc/sv
chown -R root:root $pkgdir/etc/sv
+
+ install -D -m0755 $srcdir/ignite-0.9.0/util/pause $pkgdir/usr/bin/pause
+ install -D -m0644 $srcdir/ignite-0.9.0/util/pause.1 $pkgdir/usr/share/man/man1/pause.1
}
-md5sums=('30b944b91aa1f57c5469c8bd210cb497')
+md5sums=('30b944b91aa1f57c5469c8bd210cb497'
+ '1d88cf79d810e7d371e713f724fa2e85')
diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install
index d77c9aa..4ec6a9f 100755
--- a/abs/core/runit-scripts/runit.install
+++ b/abs/core/runit-scripts/runit.install
@@ -8,27 +8,12 @@ post_install () {
do
ln -s /etc/sv/$i /service/$i
done
-
- [ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
- [ -e /sbin/reboot ] || ln -s /sbin/reboot.script /sbin/reboot
- [ -e /sbin/poweroff ] || ln -s /sbin/poweroff.script /sbin/poweroff
- [ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init
- [ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init
-
-
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade(){
-
- [ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt
- [ -e /sbin/reboot ] || ln -s /sbin/reboot.script /sbin/reboot
- [ -e /sbin/poweroff ] || ln -s /sbin/poweroff.script /sbin/poweroff
- [ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init
- [ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init
-
if [ -e /var/service ]
then
if [ ! -e /service ]
@@ -45,9 +30,9 @@ post_upgrade(){
if [ -e /service/lircd ]
then
- /sbin/sv stop lircd
- /sbin/remove_service.sh lircd
- /sbin/add_service.sh remotes
+ sv stop lircd
+ remove_service.sh lircd
+ add_service.sh remotes
fi
if [ -e /etc/sv/lircd ]
diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1
index 9463e60..9f92530 100755
--- a/abs/core/runit-scripts/runitscripts/1
+++ b/abs/core/runit-scripts/runitscripts/1
@@ -1,28 +1,33 @@
#!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
/etc/rc.sysinit
. /etc/rc.conf
. /etc/rc.d/functions
-#no longer needed rc.sysinit takes care of the hostname
-#hostname `cat /etc/hostname`
-/sbin/sysctl -p 2>/dev/null >/dev/null
+
+sysctl -p 2>/dev/null >/dev/null
+
#make sure permissions are right for /etc/systemconfig
chown root:mythtv /etc/systemconfig
chmod 774 /etc/systemconfig
-/usr/bin/setfacl -m u:mythtv:rw- /etc/systemconfig 2>/dev/null >/dev/null
+setfacl -m u:mythtv:rw- /etc/systemconfig 2>/dev/null >/dev/null
-#yes it's needed the 2nd time
/usr/LH/bin/load-modules-mythvantage.sh >/dev/null
rm /etc/dhcpc/dhcpcd*.pid 2>/dev/null
rm -f /service/frontend/.runtime/* 2>/dev/null
rm -f /etc/runit/reboot 2>/dev/null
-/sbin/agetty -8 38400 tty10 linux &
+agetty -8 38400 tty10 linux &
+
stat_busy "Starting network"
-/bin/mkdir -p /var/lock/subsys
+mkdir -p /var/lock/subsys
/etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init
stat_done
-/usr/sbin/ethtool -s eth0 wol g 2>/dev/null
-/usr/sbin/ethtool -s eth1 wol g 2>/dev/null
-/usr/sbin/ethtool -s eth2 wol g 2>/dev/null
+
+ethtool -s eth0 wol g 2>/dev/null
+ethtool -s eth1 wol g 2>/dev/null
+ethtool -s eth2 wol g 2>/dev/null
+
#cleanup of log files
if [ -f /etc/cron.daily/log_care ]
then
@@ -39,13 +44,15 @@ then
/etc/runit/1.local
stat_done
fi
+
#some stuff from rc.multi
run_hook multi_start
+
# Load sysctl config files
/usr/lib/systemd/systemd-sysctl
+
# Load additional binary formats
mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc
/usr/lib/systemd/systemd-binfmt
-bootlogd_stop
rm -f /run/nologin
diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3
index 1a4b384..91617e5 100755
--- a/abs/core/runit-scripts/runitscripts/3
+++ b/abs/core/runit-scripts/runitscripts/3
@@ -1,7 +1,16 @@
#!/bin/sh
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
clear
. /etc/rc.conf
. /etc/rc.d/functions
+
+stat_busy "Waiting for services to stop..."
+sv -w196 force-stop /service/*
+sv exit /service/*
+stat_done
+
for i in `seq 3`
do
echo " " > /dev/tty1
@@ -18,8 +27,9 @@ then
/etc/runit/3.local
stat_done
fi
-/usr/sbin/ethtool -s eth0 wol g 2>/dev/null
-/usr/sbin/ethtool -s eth1 wol g 2>/dev/null
-/usr/sbin/ethtool -s eth2 wol g 2>/dev/null
+
+ethtool -s eth0 wol g 2>/dev/null
+ethtool -s eth1 wol g 2>/dev/null
+ethtool -s eth2 wol g 2>/dev/null
/etc/rc.shutdown
diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish b/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
index d6f3897..84e3f81 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
@@ -1,3 +1,3 @@
#!/bin/sh
-exec 2>&1
-sv down alsa-utils
+set -e
+exec /usr/bin/alsactl store
diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
index 17f5f99..a376059 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
@@ -1,3 +1,4 @@
#!/bin/sh
-exec 2>&1
-exec /etc/rc.d/alsa start
+set -e
+/usr/bin/alsactl restore
+exec chpst -b alsa pause
--
cgit v0.12
From 7285402be560de434c47278d3c6889db2cffdfab Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 5 Apr 2014 23:05:55 +0000
Subject: poweroff-scripts: return true in .install
---
abs/core/poweroff-scripts/PKGBUILD | 2 +-
abs/core/poweroff-scripts/poweroff-scripts.install | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/abs/core/poweroff-scripts/PKGBUILD b/abs/core/poweroff-scripts/PKGBUILD
index dfe5966..3fd7fcc 100644
--- a/abs/core/poweroff-scripts/PKGBUILD
+++ b/abs/core/poweroff-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=poweroff-scripts
pkgver=1.1
-pkgrel=6
+pkgrel=7
pkgdesc="Replacement power scripts to work with systemd and runit"
license=('GPL')
depends=('systemd-sysvcompat' 'runit>=2.1.1-6')
diff --git a/abs/core/poweroff-scripts/poweroff-scripts.install b/abs/core/poweroff-scripts/poweroff-scripts.install
index 5f631ed..1213e9d 100644
--- a/abs/core/poweroff-scripts/poweroff-scripts.install
+++ b/abs/core/poweroff-scripts/poweroff-scripts.install
@@ -10,11 +10,15 @@ pre_upgrade () {
}
post_install () {
- files="/sbin/reboot.init /sbin/poweroff.init /usr/sbin/reboot.init /usr/sbin/poweroff.init"
- for i in $files
+ FILES="/sbin/reboot.init
+ /sbin/poweroff.init
+ /usr/sbin/reboot.init
+ /usr/sbin/poweroff.init"
+ for i in $FILES
do
[ -h $i ] && rm -f $i
done
+ true
}
# arg 1: the new package version
--
cgit v0.12
From 8821f4948b460a8b5a4921ea45b5c9b450968022 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:00:00 +0000
Subject: wget: update to 1.15
---
abs/core/wget/PKGBUILD | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/abs/core/wget/PKGBUILD b/abs/core/wget/PKGBUILD
index 9b12440..d218e4e 100644
--- a/abs/core/wget/PKGBUILD
+++ b/abs/core/wget/PKGBUILD
@@ -1,36 +1,43 @@
-# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=wget
-pkgver=1.14
-pkgrel=2
+pkgver=1.15
+pkgrel=1
pkgdesc="A network utility to retrieve files from the Web"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/wget/wget.html"
license=('GPL3')
-depends=('openssl' 'libidn' 'pcre' 'util-linux')
+depends=('openssl' 'libidn' 'util-linux')
+checkdepends=('perl-http-daemon' 'perl-io-socket-ssl')
optdepends=('ca-certificates: HTTPS downloads')
backup=('etc/wgetrc')
install=wget.install
source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('316f6f59292c9098ad81fd54f658c579'
- '3e121933d69f32fa58776bff76bcebd0')
+sha1sums=('e9fb1d25fa04f9c69e74e656a3174dca02700ba1'
+ 'SKIP')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ cat >> doc/sample.wgetrc <<EOF
+
+# default root certs location
+ca_certificate=/etc/ssl/certs/ca-certificates.crt
+EOF
+}
- ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-nls --with-ssl=openssl
make
}
+check() {
+ cd ${pkgname}-${pkgver}
+ make check
+}
+
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
-
- cat >> "$pkgdir/etc/wgetrc" <<EOF
-
-# default root certs location
-ca_certificate=/etc/ssl/certs/ca-certificates.crt
-EOF
}
--
cgit v0.12
From 666d9ffbfd0244bfda3fddd9841a2749f26a979b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:21:38 +0000
Subject: dri3proto: initial inclusion. dep of mesa. refs #964
---
abs/extra/dri3proto/COPYING | 21 +++++++++++++++++++++
abs/extra/dri3proto/PKGBUILD | 30 ++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 abs/extra/dri3proto/COPYING
create mode 100644 abs/extra/dri3proto/PKGBUILD
diff --git a/abs/extra/dri3proto/COPYING b/abs/extra/dri3proto/COPYING
new file mode 100644
index 0000000..313c8f1
--- /dev/null
+++ b/abs/extra/dri3proto/COPYING
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
diff --git a/abs/extra/dri3proto/PKGBUILD b/abs/extra/dri3proto/PKGBUILD
new file mode 100644
index 0000000..02e81e4
--- /dev/null
+++ b/abs/extra/dri3proto/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=dri3proto
+pkgver=1.0
+pkgrel=1
+pkgdesc="X11 DRI3 protocol"
+arch=('any')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2
+ COPYING)
+sha256sums=('01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074'
+ '5e46864ede2fda46c3cb7cfe3a7b9f9e4bd36d8d21d8010a284caa64b81d465a')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+
+ # license is still missing
+ # COPYING is taken from top of /usr/include/X11/extensions/dri3proto.h
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ${srcdir}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
--
cgit v0.12
From f27f10c676f4e212ce4001959b240551203502c9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:24:29 +0000
Subject: presentproto: initial inclusion. dep of mesa. refs #964
---
abs/extra/presentproto/COPYING | 21 +++++++++++++++++++++
abs/extra/presentproto/PKGBUILD | 30 ++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 abs/extra/presentproto/COPYING
create mode 100644 abs/extra/presentproto/PKGBUILD
diff --git a/abs/extra/presentproto/COPYING b/abs/extra/presentproto/COPYING
new file mode 100644
index 0000000..313c8f1
--- /dev/null
+++ b/abs/extra/presentproto/COPYING
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
diff --git a/abs/extra/presentproto/PKGBUILD b/abs/extra/presentproto/PKGBUILD
new file mode 100644
index 0000000..53597f8
--- /dev/null
+++ b/abs/extra/presentproto/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=presentproto
+pkgver=1.0
+pkgrel=1
+pkgdesc="X11 Present protocol specification"
+arch=('any')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2
+ COPYING)
+sha256sums=('812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce'
+ '5e46864ede2fda46c3cb7cfe3a7b9f9e4bd36d8d21d8010a284caa64b81d465a')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+
+ # license is still missing
+ # COPYING is taken from top of /usr/include/X11/extensions/presentproto.h
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ${srcdir}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
--
cgit v0.12
From b1867d052392c33cedc5c4f1f3e93b54dbf1dffc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:26:27 +0000
Subject: libxshmfence: initial inclusion. dep of mesa. refs #964
---
abs/extra/libxshmfence/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 abs/extra/libxshmfence/PKGBUILD
diff --git a/abs/extra/libxshmfence/PKGBUILD b/abs/extra/libxshmfence/PKGBUILD
new file mode 100644
index 0000000..eed460e
--- /dev/null
+++ b/abs/extra/libxshmfence/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=libxshmfence
+pkgver=1.1
+pkgrel=1
+pkgdesc="a library that exposes a event API on top of Linux futexes"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('GPL')
+#groups=()
+depends=('glibc')
+makedepends=('xorg-util-macros' 'xproto')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe')
+
+build() {
+ cd $pkgname-$pkgver
+
+ # fix some libtools errors
+ #autoreconf -vfi
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir/" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
--
cgit v0.12
From 786e7d1d83da5b492a9ff78554b336da966660ab Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:28:52 +0000
Subject: wayland: initial inclusion. dep of mesa. refs #964
---
abs/extra/wayland/PKGBUILD | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 abs/extra/wayland/PKGBUILD
diff --git a/abs/extra/wayland/PKGBUILD b/abs/extra/wayland/PKGBUILD
new file mode 100644
index 0000000..65d50f3
--- /dev/null
+++ b/abs/extra/wayland/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Sébastien Luttringer
+# Contributor: Joel Teichroeb <joel@teichroeb.net>
+
+pkgname=wayland
+pkgver=1.4.0
+pkgrel=1
+pkgdesc='A computer display server protocol'
+arch=('i686' 'x86_64')
+url='http://wayland.freedesktop.org'
+license=('MIT')
+depends=('libffi' 'expat')
+makedepends=('doxygen')
+source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
+sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
--
cgit v0.12
From dbb7a452156d0ab29d00647421d0ebf3138a7920 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 00:55:53 +0000
Subject: xcb-proto: update to 1.10, dep of libxcb
---
abs/core/xcb-proto/PKGBUILD | 16 ++++++++--------
abs/core/xcb-proto/__changelog | 1 +
2 files changed, 9 insertions(+), 8 deletions(-)
create mode 100644 abs/core/xcb-proto/__changelog
diff --git a/abs/core/xcb-proto/PKGBUILD b/abs/core/xcb-proto/PKGBUILD
index fb64c90..a6c995e 100644
--- a/abs/core/xcb-proto/PKGBUILD
+++ b/abs/core/xcb-proto/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 168377 2012-10-09 16:18:36Z andyrtr $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xcb-proto
-pkgver=1.8
-pkgrel=1
+pkgver=1.10
+pkgrel=2
pkgdesc="XML-XCB protocol descriptions"
arch=(any)
url="http://xcb.freedesktop.org/"
license=('custom')
makedepends=('python2' 'libxml2')
source=($url/dist/$pkgname-$pkgver.tar.bz2)
-sha1sums=('a8e71b9a09066870ff12049f45e8bccaaf83fc31')
+sha256sums=('7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05')
build() {
- cd "$srcdir/$pkgname-$pkgver"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/abs/core/xcb-proto/__changelog b/abs/core/xcb-proto/__changelog
new file mode 100644
index 0000000..8bae7de
--- /dev/null
+++ b/abs/core/xcb-proto/__changelog
@@ -0,0 +1 @@
+- PKGBUILD: change dep python to python2
--
cgit v0.12
From f79a2ecd618927f642f36d4d5f827ac208a6528c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 01:09:51 +0000
Subject: libxcb: initial inclusion. dep of mesa. refs #964
---
abs/core/libxcb/PKGBUILD | 34 +++++++++++++++--------
abs/core/libxcb/__changelog | 1 +
abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch | 4 +--
3 files changed, 25 insertions(+), 14 deletions(-)
create mode 100644 abs/core/libxcb/__changelog
diff --git a/abs/core/libxcb/PKGBUILD b/abs/core/libxcb/PKGBUILD
index c656433..990dbe8 100644
--- a/abs/core/libxcb/PKGBUILD
+++ b/abs/core/libxcb/PKGBUILD
@@ -1,34 +1,44 @@
-# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=libxcb
-pkgver=1.9
+pkgver=1.10
pkgrel=1
pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
+depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau')
makedepends=('pkgconfig' 'libxslt' 'python2')
-options=('!libtool')
license=('custom')
source=($url/dist/$pkgname-$pkgver.tar.bz2
libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
- 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
+sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5'
+ '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
+ autoreconf -vfi
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
- PYTHON=/usr/bin/python2
- ./autogen.sh --prefix=/usr \
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr \
--enable-xinput \
+ --enable-xkb \
--disable-static
make
}
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/abs/core/libxcb/__changelog b/abs/core/libxcb/__changelog
new file mode 100644
index 0000000..8bae7de
--- /dev/null
+++ b/abs/core/libxcb/__changelog
@@ -0,0 +1 @@
+- PKGBUILD: change dep python to python2
diff --git a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch
index 8e8162f..52c22ab 100644
--- a/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ b/abs/core/libxcb/libxcb-1.1-no-pthread-stubs.patch
@@ -1,9 +1,9 @@
--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100
+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
+@@ -43,7 +43,7 @@
# Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10)
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
--
cgit v0.12
From 83677c88646f9e234a6f90d01c054e0b7617e21a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 01:48:02 +0000
Subject: libdrm: update 2.4.52. dep of mesa. refs #964
---
abs/core/libdrm/PKGBUILD | 22 +++----
abs/core/libdrm/no-pthread-stubs.patch | 104 ---------------------------------
2 files changed, 9 insertions(+), 117 deletions(-)
delete mode 100644 abs/core/libdrm/no-pthread-stubs.patch
diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD
index f4e43d2..e93b0ac 100644
--- a/abs/core/libdrm/PKGBUILD
+++ b/abs/core/libdrm/PKGBUILD
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD 170783 2012-11-11 10:23:15Z andyrtr $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.40
+pkgver=2.4.52
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
license=('custom')
depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
+makedepends=('valgrind')
+checkdepends=('cairo')
replaces=('libdrm-new' 'libdrm-nouveau')
-options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
- no-pthread-stubs.patch
COPYING)
-sha256sums=('48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f'
- '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
+sha256sums=('fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1'
'9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
build() {
cd $pkgname-$pkgver
- patch -Np1 -i ../no-pthread-stubs.patch
- #libtoolize --force
+ # pthread is useless in Linux
+ sed -i "/pthread-stubs/d" configure.ac
autoreconf --force --install
- ./configure --prefix=/usr \
- --enable-udev \
- --enable-omap-experimental-api \
- --enable-exynos-experimental-api
+
+ ./configure --prefix=/usr --enable-udev
make
}
diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 3b05ce1..0000000
--- a/abs/core/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
-
-
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/intel \
-- $(PTHREADSTUBS_CFLAGS) \
- $(PCIACCESS_CFLAGS) \
- $(VALGRIND_CFLAGS) \
- -I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
-- @PTHREADSTUBS_LIBS@ \
- @PCIACCESS_LIBS@ \
- @CLOCK_LIB@
-
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/nouveau \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm \
- -DDEBUG
-
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
-
- libdrm_nouveau_la_SOURCES = nouveau.c \
- pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/radeon \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
-
- libdrm_radeon_la_SOURCES = \
- radeon_bo_gem.c \
---- libdrm-2.4.40/omap/Makefile.am 2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/omap/Makefile.am 2012-11-06 19:24:44.183224706 +0100
-@@ -2,13 +2,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/omap \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
- libdrm_omap_ladir = $(libdir)
- libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_omap_la_LIBADD = ../libdrm.la
-
- libdrm_omap_la_SOURCES = omap_drm.c
-
---- libdrm-2.4.40/exynos/Makefile.am 2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/exynos/Makefile.am 2012-11-06 19:26:01.975323106 +0100
-@@ -2,13 +2,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/exynos \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
- libdrm_exynos_ladir = $(libdir)
- libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_exynos_la_LIBADD = ../libdrm.la
-
- libdrm_exynos_la_SOURCES = exynos_drm.c
-
--
cgit v0.12
From 82f1ac842f18bec939cde31353c9e9911db7abe9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 21:53:06 +0000
Subject: scons: update to 2.3.1
---
abs/extra/scons/PKGBUILD | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/abs/extra/scons/PKGBUILD b/abs/extra/scons/PKGBUILD
index 6563bf2..b02b39d 100644
--- a/abs/extra/scons/PKGBUILD
+++ b/abs/extra/scons/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 151216 2012-02-25 08:28:41Z pierre $
+# $Id$
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Lukas Sabota <punkrockguy318@comcast.net>
# Contributor: Brice Carpentier <brice@dlfp.org>
+# reminder: scons moving towards py3 as of Mar 2014 and 2.3.1
+
pkgname=scons
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
pkgdesc="Extensible Python-based build utility"
arch=('any')
url="http://scons.org"
license=('MIT')
depends=('python2')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('47daf989e303a045b76c11236df719df')
+md5sums=('60a3cfb98b661df9f4406c61b5686bd7')
package() {
cd "$srcdir/$pkgname-$pkgver"
@@ -25,9 +27,11 @@ package() {
--root="$pkgdir"
# fix for python 2.7
- sed -i 's:^#!.*bin/env python:#!/usr/bin/env python2:' "$pkgdir"/usr/bin/*
+ sed -i 's:^#!.*bin/env python:#!/usr/bin/env python2:' \
+ "$pkgdir"/usr/bin/*
- install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 LICENSE.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 55bca972d1559f6874e8098297d7e1485068ef04 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 22:03:34 +0000
Subject: fceux: update to 2.2.2. closes #964
---
abs/extra/fceux/PKGBUILD | 61 +++++++++++++++++++++---------------------
abs/extra/fceux/__changelog | 2 ++
abs/extra/fceux/fceux.desktop | 9 -------
abs/extra/fceux/fceux.install | 10 ++++---
abs/extra/fceux/fceux.png | Bin 583 -> 0 bytes
5 files changed, 38 insertions(+), 44 deletions(-)
create mode 100644 abs/extra/fceux/__changelog
delete mode 100644 abs/extra/fceux/fceux.desktop
delete mode 100644 abs/extra/fceux/fceux.png
diff --git a/abs/extra/fceux/PKGBUILD b/abs/extra/fceux/PKGBUILD
index 3d18d67..f27f3d5 100644
--- a/abs/extra/fceux/PKGBUILD
+++ b/abs/extra/fceux/PKGBUILD
@@ -1,45 +1,44 @@
-# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $
+# $Id$
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
+# Contriutor: Eric Belanger <eric@archlinux.org>
# Contributor: Jo Christian Bergskås <jcberg@gmail.com>
+
pkgname=fceux
-pkgver=2.1.5
-pkgrel=3
+pkgver=2.2.2
+pkgrel=1
+url='http://www.fceux.com/'
+pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
arch=('x86_64' 'i686')
-url="http://fceux.com/"
-pkgdesc="Fast and ultra-compatible NES/Famicom emulator"
license=('GPL')
-depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils')
-makedepends=('scons' 'mesa' 'lua')
-optdepends=('xchm: for viewing the manual')
-provides=('fceu' 'gfceux')
-replaces=('fceu' 'gfceux')
-install=fceux.install
-source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2"
- "fceux.desktop"
- "fceux.png")
+depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua' 'libgl' 'shared-mime-info')
+makedepends=('scons' 'mesa' 'glu')
+install='fceux.install'
+source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz")
+sha256sums=('804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1')
build() {
- cd "$srcdir/fceu${pkgver}"
+ cd "$pkgname-$pkgver"
- sed -i "s|/usr/local|$pkgdir/usr|" SConstruct
- scons OPENGL=0 install
+ scons
}
package() {
- cd "$srcdir/fceu${pkgver}"
-
- install -Dm644 bin/$pkgname.chm \
- "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm"
- install -Dm644 $srcdir/fceux.desktop \
- "$pkgdir/usr/share/applications/fceux.desktop"
- install -Dm644 $srcdir/fceux.png \
- "$pkgdir/usr/share/pixmaps/fceux.png"
- install -Dm644 COPYING \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ cd "$pkgname-$pkgver"
+
+ scons install -i --prefix="$pkgdir/usr"
+
+ # scons install creates usr/share/pixmaps as a regular file, wtf?
+ rm -f "$pkgdir/usr/share/pixmaps"
+
+ install -d "$pkgdir/usr/share/doc/$pkgname"
+ cp -r documentation/* "$pkgdir/usr/share/doc/$pkgname/"
+ install -Dm644 changelog.txt "$pkgdir/usr/share/doc/$pkgname/"
+
+ # desktop shortcut
+ install -Dm644 "$pkgname.desktop" \
+ "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "$pkgname.png" \
+ "$pkgdir/usr/share/pixmaps/$pkgname.png"
}
# vim:set ts=2 sw=2 et:
-md5sums=('e8b20e62bbbb061b1a59d51b47c827bd'
- '3c6a259d88825ff1b9387d191a6c970e'
- '3fe753731ac46b5fee528b1f73abd3e3')
diff --git a/abs/extra/fceux/__changelog b/abs/extra/fceux/__changelog
new file mode 100644
index 0000000..135adfc
--- /dev/null
+++ b/abs/extra/fceux/__changelog
@@ -0,0 +1,2 @@
+- PKGBUILD: change dep lua51 to lua
+- PKGBUILD: change makedep mesa-libgl to mesa
diff --git a/abs/extra/fceux/fceux.desktop b/abs/extra/fceux/fceux.desktop
deleted file mode 100644
index c20271a..0000000
--- a/abs/extra/fceux/fceux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Fceux
-GenericName=NES/Famicom emulator
-Exec=fceux
-Icon=fceux
-Type=Application
-Categories=Game;Emulator;
-Encoding=UTF-8
-MimeType=application/x-nes;application/x-nes-rom
diff --git a/abs/extra/fceux/fceux.install b/abs/extra/fceux/fceux.install
index ad97d7b..6af331e 100644
--- a/abs/extra/fceux/fceux.install
+++ b/abs/extra/fceux/fceux.install
@@ -1,13 +1,15 @@
-post_upgrade() {
+post_install() {
update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+# xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
-post_install() {
- post_upgrade
+post_upgrade() {
+ post_install
}
post_remove() {
- post_upgrade
+ post_install
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/fceux/fceux.png b/abs/extra/fceux/fceux.png
deleted file mode 100644
index 1cf27b1..0000000
Binary files a/abs/extra/fceux/fceux.png and /dev/null differ
--
cgit v0.12
From d497ddcaf2064b008b39b291e4b1b1055ebde402 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 22:43:48 +0000
Subject: runit-scripts: frontend finish: continue plymouthd. refs #891
---
abs/core/runit-scripts/PKGBUILD | 2 +-
.../runitscripts/services/frontend/finish | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index ed76902..ea41c96 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=11
+pkgrel=12
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish
index 417488d..702b543 100755
--- a/abs/core/runit-scripts/runitscripts/services/frontend/finish
+++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish
@@ -1,14 +1,23 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
function cleanup(){
rm -f /etc/sv/frontend/.runtime/*
printhl " Cleaning up /etc/sv/frontend/.runtime/"
}
+#unpause plymouthd that was paused in /etc/X11/Sessions/Linhes
+pidfile=/run/plymouth.pid
+if [ -e "$pidfile" ]; then
+ plypid=`cat "$pidfile"`
+ if [ -n "$plypid" ]; then
+ kill -s CONT "$plypid"
+ fi
+fi
+
grep -q nox /proc/cmdline
STATUS=$?
if [ $STATUS = 0 ]
@@ -42,4 +51,3 @@ else
fi
fi
fi
-
--
cgit v0.12
From 18a16759c1ed3a84519ecb05e3601290bd91c0f1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Apr 2014 23:00:22 +0000
Subject: LinHES-system: LinHES-session: stop plymouthd. refs #891
---
abs/core/LinHES-system/LinHES-session | 17 ++++++++++++++---
abs/core/LinHES-system/PKGBUILD | 6 +++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 14606fb..870428d 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -55,13 +55,13 @@ function keylaunch(){
fi
echo "Checking if keylaunch is running"
- if [ "$(pidof keylaunch)" ]
+ if [ "$(pidof keylaunch)" ]
then
echo "keylaunch is already running"
else
echo "Starting keylaunch"
/usr/bin/keylaunch &
- fi
+ fi
fi
}
@@ -317,7 +317,6 @@ function start_myth() {
fi
done
sleep 3 #give time for MBE to be fully operational
-
fi
#continue on with starting mythtv
@@ -396,6 +395,17 @@ function set_background()
}
+function stop_plymouth()
+{
+ #pause plymouthd and continue in /etc/sv/frontend/finish
+ pidfile=/run/plymouth.pid
+ if [ -e "$pidfile" ]; then
+ plypid=`cat "$pidfile"`
+ if [ -n "$plypid" ]; then
+ sudo kill -s STOP "$plypid"
+ fi
+ fi
+}
if [ x"$WM" = "fluxbox" ]
@@ -418,6 +428,7 @@ start_screensaver
notify_scan &
auto_start &
update_apple_trailers
+stop_plymouth &
first_configure
show_help_tip
start_myth
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index f0253f0..9cf066a 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=20
+pkgrel=21
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -9,7 +9,7 @@ depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo'
'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu'
'ethtool' 'gnu-netcat' 'normalize' 'ttf-overlock'
- 'handbrake-cli' 'mkvtoolnix' 'mplayer')
+ 'handbrake-cli' 'mkvtoolnix' 'mplayer' 'runit-scripts>=8.1-12')
backup=('etc/modprobe.d/alsa-base.conf')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
@@ -75,7 +75,7 @@ package() {
}
-md5sums=('7ab2a2c643d2b286811d8303d08982ad'
+md5sums=('2b69f7f632203f7196714b8855f962b1'
'de32a1c50101265dd7f6ca5037f7a26a'
'301884fb60521627fffd1160b2cf5181'
'76b2637cac0452b3acdbeeb4e8a5474b'
--
cgit v0.12
From 4a914dde9929428b8b05ffe6e176ef177563f329 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Apr 2014 16:55:39 +0000
Subject: runit-scripts: handle stopped plymouth a bit better. refs #891
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/3 | 12 ++++++++++++
abs/core/runit-scripts/runitscripts/services/frontend/finish | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index ea41c96..64eeff7 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=12
+pkgrel=13
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3
index 91617e5..062f2c6 100755
--- a/abs/core/runit-scripts/runitscripts/3
+++ b/abs/core/runit-scripts/runitscripts/3
@@ -6,6 +6,16 @@ clear
. /etc/rc.conf
. /etc/rc.d/functions
+#continue plymouthd that was stopped in /etc/X11/Sessions/Linhes
+cp -f /run/plymouth.pid /tmp/plymouthd
+pidfile=/run/plymouth.pid
+if [ -e "$pidfile" ]; then
+ plypid=`cat "$pidfile"`
+ if [ -n "$plypid" ]; then
+ kill -s CONT "$plypid"
+ fi
+fi
+
stat_busy "Waiting for services to stop..."
sv -w196 force-stop /service/*
sv exit /service/*
@@ -32,4 +42,6 @@ ethtool -s eth0 wol g 2>/dev/null
ethtool -s eth1 wol g 2>/dev/null
ethtool -s eth2 wol g 2>/dev/null
+plymouth quit --retain-splash
+
/etc/rc.shutdown
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish
index 702b543..d96bcf0 100755
--- a/abs/core/runit-scripts/runitscripts/services/frontend/finish
+++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish
@@ -9,7 +9,7 @@ function cleanup(){
printhl " Cleaning up /etc/sv/frontend/.runtime/"
}
-#unpause plymouthd that was paused in /etc/X11/Sessions/Linhes
+#continue plymouthd that was stopped in /etc/X11/Sessions/Linhes
pidfile=/run/plymouth.pid
if [ -e "$pidfile" ]; then
plypid=`cat "$pidfile"`
--
cgit v0.12
From c4ff23fa885a374dfa82b2e6fc17c2ca57966fca Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Apr 2014 21:59:27 +0000
Subject: LinHES-system: mythwelcome-config.py: idleTimeoutSecs should be set a
global and check if setting doesn't exist
LinHES-session: don't run mythwelcome-config.py on every boot, just first.
---
abs/core/LinHES-system/LinHES-session | 45 ++++++++++++++--------------
abs/core/LinHES-system/PKGBUILD | 6 ++--
abs/core/LinHES-system/mythwelcome-config.py | 5 ++--
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 870428d..ae702cf 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -198,7 +198,6 @@ function first_mythwelcome_config(){
function first_configure(){
- first_mythwelcome_config
if [ ! x$STARTUP_STYLE = xlegacy ]
then
first_configure_mv
@@ -209,6 +208,7 @@ function first_configure(){
function first_configure_default(){
+ echo "First configure: legacy..."
if [ ! $SystemType = "Frontend_only" ]
then
if [ -f ~/.configure ]
@@ -224,19 +224,18 @@ function first_configure_default(){
else
rm -f ~/.no_meth
fi
-
- sudo sv stop mythbackend
- xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
- sudo sv start mythbackend
- sudo chown -R mythtv.mythtv /home/mythtv
- # only run mythfilldatabase for masterbackends
- if [ $SystemType = "Master_backend" ]
- then
- nice -n 19 mythfilldatabase --quiet &
- msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
- fi
-
- rm ~/.configure
+ first_mythwelcome_config
+ sudo sv stop mythbackend
+ xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
+ sudo sv start mythbackend
+ sudo chown -R mythtv.mythtv /home/mythtv
+ # only run mythfilldatabase for masterbackends
+ if [ $SystemType = "Master_backend" ]
+ then
+ nice -n 19 mythfilldatabase --quiet &
+ msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide."
+ fi
+ rm ~/.configure
fi
else
if [ -f ~/.configure ]
@@ -248,6 +247,7 @@ function first_configure_default(){
function first_configure_mv(){
+ echo "First configure..."
if [ ! $SystemType = "Frontend_only" ]
then
if [ -f ~/.configure ]
@@ -259,9 +259,10 @@ function first_configure_mv(){
#0 yes
#1 yes/autodetech
#2 no
+ first_mythwelcome_config
while [ -e '/var/run/autocard.lock' ]
do
- msg "Waiting for capture card detection to complete"
+ msg "Waiting for capture card detection to complete..."
sleep 5
done
STATUS=$?
@@ -273,13 +274,13 @@ function first_configure_mv(){
/usr/bin/taskset -c 0 /usr/bin/mythtv-setup
/usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1
fi
- # only run mythfilldatabase for masterbackends
- if [ $SystemType = "Master_backend" ]
- then
- nice -n 19 mythfilldatabase --quiet &
- msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
- fi
- rm -f ~/.configure
+ # only run mythfilldatabase for masterbackends
+ if [ $SystemType = "Master_backend" ]
+ then
+ nice -n 19 mythfilldatabase --quiet &
+ msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as unknown\nin the program guide."
+ fi
+ rm -f ~/.configure
fi
else
if [ -f ~/.configure ]
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 9cf066a..cc3ec38 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=21
+pkgrel=22
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -75,7 +75,7 @@ package() {
}
-md5sums=('2b69f7f632203f7196714b8855f962b1'
+md5sums=('a10cb96850951ae835c46f41f92463b2'
'de32a1c50101265dd7f6ca5037f7a26a'
'301884fb60521627fffd1160b2cf5181'
'76b2637cac0452b3acdbeeb4e8a5474b'
@@ -126,7 +126,7 @@ md5sums=('2b69f7f632203f7196714b8855f962b1'
'28f29578e5b3ba84fdf2aa57cf475bcf'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
- '20dd97b614cab2454794416a3601c497'
+ '6e95aa86413abdb568ed157cf11dd69f'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
'eb879fee9603a05d5420d4ce8ed9e450'
diff --git a/abs/core/LinHES-system/mythwelcome-config.py b/abs/core/LinHES-system/mythwelcome-config.py
index 8cf78c2..01638a2 100755
--- a/abs/core/LinHES-system/mythwelcome-config.py
+++ b/abs/core/LinHES-system/mythwelcome-config.py
@@ -16,10 +16,9 @@ mythdb.settings[localhostname].MythShutdownPowerOff = u'sudo /sbin/poweroff'
mythdb.settings[localhostname].MythShutdownXTermCmd = u'xterm'
mythdb.settings[localhostname].MythWelcomeStartFECmd = u'/usr/LH/bin/mythfrontend-start'
-
# mythtv-setup Shutdown/Wakeup options
-if mythdb.settings[localhostname].idleTimeoutSecs == u'0':
- mythdb.settings[localhostname].idleTimeoutSecs = u'40'
+if mythdb.settings.NULL.idleTimeoutSecs == u'0' or mythdb.settings.NULL.idleTimeoutSecs == None:
+ mythdb.settings.NULL.idleTimeoutSecs = u'40'
mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'
--
cgit v0.12
From e69026e1a93793f3f410c19cd79a1d79db8f66e4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 7 Apr 2014 22:36:47 +0000
Subject: LinHES-config: mv_hostype.py: when Run MythWelcome is enabled
mythwelcome-config.py is run
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_hostype.py | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 4e1486c..3c3c06f 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=15
+pkgrel=16
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -166,7 +166,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'fe5e31b833cc6707209e9d656b6eb53c'
'71b4860bbc8b7d94311acee7efa7269c'
'087a0ef743bc8af915503f8773536ce4'
- '6721f0283850db684a61773bc95d18c5'
+ '38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index df0ec1a..880c0b9 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -351,6 +351,10 @@ def hostypeprint(systemconfig):
if data_config.SYSTEMTYPE == "MythVantage":
mv_common.remove_service("ghosd")
+ if systemconfig.get("UseMythWelcome") == "1":
+ logging.debug(" Running mythwelcome-config.py")
+ cmd="/usr/LH/bin/mythwelcome-config.py"
+ mv_common.runcmd(cmd)
if restart_mbe == True :
setup_mysql_connection(systemconfig)
--
cgit v0.12
From a5aa0c0ffebe9c381a2f9bc161696189aff51598 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 8 Apr 2014 22:13:09 +0000
Subject: mythtv, mythplugins, mythweb, mythinstall: update to latest -fixes
---
abs/core/mythinstall/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash_web | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 4 ++--
abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml | 2 +-
abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml | 4 ++--
abs/core/mythtv/stable-0.27/mythweb/PKGBUILD | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 50e4bca..1a64fd3 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=12
+pkgrel=13
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index bb67190..108ebdf 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-6b14852a6a3750e1d5c1bf7d461a5338ef535cbb
+39686c6c6800053fe25764d2f27cfdfc2dd21fab
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
index fbb64a1..64220c6 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
@@ -1 +1 @@
-6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+b4983f178bc847bfe7647ce5b9f235f5d2cbe362
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index f7b75ff..3deb3ee 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=11
+pkgrel=12
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 8dce5df..815f74b 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=11
+pkgrel=12
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('avahi' 'faad2' 'fftw' 'glew' 'lame' 'libass' 'libavc1394' 'libcdio'
'mysql-clients' 'mysql-python' 'openssl' 'perl-date-manip' 'perl-dbd-mysql'
'perl-io-socket-inet6' 'perl-libwww' 'perl-math-round'
'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python-pycurl'
- 'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'x264' 'xmltv')
+ 'python2-lxml' 'qt' 'qtwebkit' 'taglib' 'urlgrabber' 'wget' 'x264' 'xmltv')
makedepends=('mesa' 'libgl' 'yasm' 'git' 'rsync')
replaces=()
groups=('pvr')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
index 2d47e7d..0b13a8f 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
@@ -5,7 +5,7 @@
<text>Check for Updates</text>
<description>Search for LinHES system updates</description>
<action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
- <action>JUMP Reload Theme</action>
+<!-- <action>JUMP Reload Theme</action> -->
</button>
</mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
index 4eee8cc..25102b9 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
@@ -5,7 +5,7 @@
<text>Install Updates</text>
<description>Install updates for the LinHES system</description>
<action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
- <action>JUMP Reload Theme</action>
+<!-- <action>JUMP Reload Theme</action> -->
</button>
<button>
@@ -13,7 +13,7 @@
<text>Cancel Updates</text>
<description>Return to Main Menu</description>
<action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
- <action>JUMP Reload Theme</action>
+<!-- <action>JUMP Reload Theme</action> -->
</button>
<button>
diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
index 75e8d47..d2d0808 100644
--- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.27
-pkgrel=2
+pkgrel=3
commit_hash=`cat ../git_src/git_hash_web`
pkgdesc="Web interface for MythTV's backend, $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 66d3cf95dc04e21960ff817600cfb651feea2df9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 8 Apr 2014 22:22:15 +0000
Subject: filesystem: os-release: update with LinHES info
---
abs/core/filesystem/PKGBUILD | 4 ++--
abs/core/filesystem/__changelog | 1 +
abs/core/filesystem/os-release | 12 ++++++------
3 files changed, 9 insertions(+), 8 deletions(-)
create mode 100644 abs/core/filesystem/__changelog
diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD
index ad62704..7b0ca08 100644
--- a/abs/core/filesystem/PKGBUILD
+++ b/abs/core/filesystem/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=filesystem
pkgver=2013.05
-pkgrel=3
+pkgrel=4
pkgdesc='Base filesystem'
arch=('i686' 'x86_64')
license=('GPL')
@@ -116,7 +116,7 @@ md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
'1745349eb24ed21b4cfaa6f423bddb76'
'7bc65f234dfb6abf24e7c3b03e86f4ff'
'd41d8cd98f00b204e9800998ecf8427e'
- 'b16a4674ccf3a932ff34c6c8393a4f33'
+ '3d96b9f0f4ea7b583261682a20283c46'
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
'f45389e116ab0b9e9968287617d27c7d'
diff --git a/abs/core/filesystem/__changelog b/abs/core/filesystem/__changelog
new file mode 100644
index 0000000..d7c7072
--- /dev/null
+++ b/abs/core/filesystem/__changelog
@@ -0,0 +1 @@
+os-release: update for LinHES info
diff --git a/abs/core/filesystem/os-release b/abs/core/filesystem/os-release
index 09bc7de..8d5f2b2 100644
--- a/abs/core/filesystem/os-release
+++ b/abs/core/filesystem/os-release
@@ -1,8 +1,8 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
+NAME="LinHES"
+ID=linhes
+PRETTY_NAME="LinHES The Home Entertainment System"
ANSI_COLOR="0;36"
-HOME_URL="https://www.archlinux.org/"
-SUPPORT_URL="https://bbs.archlinux.org/"
-BUG_REPORT_URL="https://bugs.archlinux.org/"
+HOME_URL="http://linhes.org/"
+SUPPORT_URL="http://forum.linhes.org/"
+BUG_REPORT_URL="http://linhes.org/"
--
cgit v0.12
From e862aec05c29727e451afd552db546d5be573c5c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 8 Apr 2014 22:42:23 +0000
Subject: openssl: update to 1.0.1.g refs #966
---
abs/core/openssl/PKGBUILD | 44 +-
abs/core/openssl/fix-manpages.patch | 1920 -----------------------
abs/core/openssl/openssl-1.0.1f-perl-5.18.patch | 356 +++++
3 files changed, 379 insertions(+), 1941 deletions(-)
delete mode 100644 abs/core/openssl/fix-manpages.patch
create mode 100644 abs/core/openssl/openssl-1.0.1f-perl-5.18.patch
diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD
index 29fd885..68efbf5 100644
--- a/abs/core/openssl/PKGBUILD
+++ b/abs/core/openssl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158833 2012-05-11 23:33:03Z pierre $
+# $Id$
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
-_ver=1.0.1c
+_ver=1.0.1g
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
#pkgver=$_ver
@@ -11,20 +11,31 @@ pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Se
arch=('i686' 'x86_64')
url='https://www.openssl.org'
license=('custom:BSD')
-depends=('perl')
+depends=('zlib' 'perl')
optdepends=('ca-certificates')
options=('!makeflags')
backup=('etc/ssl/openssl.cnf')
source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
"https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
- 'fix-manpages.patch'
'no-rpath.patch'
- 'ca-dir.patch')
-md5sums=('ae412727c8c15b67880aef7bd2999b2e'
- 'a3d90bc42253def61cd1c4237f1ce5f7'
- '5bbc0655bda2af95bc8eb568963ce8ba'
+ 'ca-dir.patch'
+ 'openssl-1.0.1f-perl-5.18.patch')
+md5sums=('de62b43dfcd858e66a74bee1c834e959'
+ 'SKIP'
'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90')
+ '3bf51be3a1bbd262be46dc619f92aa90'
+ 'ea2a61c8bd43788d81d98f1ac36c98ac')
+
+prepare() {
+ cd $srcdir/$pkgname-$_ver
+
+ # remove rpath: http://bugs.archlinux.org/task/14367
+ patch -p0 -i $srcdir/no-rpath.patch
+ # set ca dir to /etc/ssl by default
+ patch -p0 -i $srcdir/ca-dir.patch
+
+ patch -p1 -i $srcdir/openssl-1.0.1f-perl-5.18.patch
+}
build() {
cd $srcdir/$pkgname-$_ver
@@ -37,20 +48,11 @@ build() {
optflags=''
fi
- # avoid conflicts with other man pages
- # see http://www.linuxfromscratch.org/patches/downloads/openssl/
- patch -p1 -i $srcdir/fix-manpages.patch
- # remove rpath: http://bugs.archlinux.org/task/14367
- patch -p0 -i $srcdir/no-rpath.patch
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
- # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
- shared zlib enable-md2 ${optflags} \
+ shared zlib ${optflags} \
"${openssltarget}" \
- -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
- -DOPENSSL_NO_TLS1_2_CLIENT
+ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make depend
make
@@ -67,6 +69,6 @@ check() {
package() {
cd $srcdir/$pkgname-$_ver
- make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install
+ make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install
install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/abs/core/openssl/fix-manpages.patch b/abs/core/openssl/fix-manpages.patch
deleted file mode 100644
index 0a300f3..0000000
--- a/abs/core/openssl/fix-manpages.patch
+++ /dev/null
@@ -1,1920 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org>
-Date: 2005-11-13
-Initial Package Version: 0.9.8a
-Upstream Status: Submitted upstream
-Origin: Anderson Lizardo
-Description: This patch fixes conflicts between man pages
- installed by OpenSSL and those found on other
- packages (particulary Shadow, Perl, and
- Man-pages). It also fixes syntax errors on some
- POD files that generates slightly broken man
- pages. Rediffed for 1.0.0a by Ken Moffat
-
-diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c
---- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000
-+++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100
-@@ -196,7 +196,7 @@
- int do_not_lock;
-
- /*
-- * (Based on the rand(3) manpage)
-+ * (Based on the openssl_rand(3) manpage)
- *
- * The input is chopped up into units of 20 bytes (or less for
- * the last block). Each of these blocks is run through the hash
-@@ -361,7 +361,7 @@
- num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2);
-
- /*
-- * (Based on the rand(3) manpage:)
-+ * (Based on the openssl_rand(3) manpage)
- *
- * For each group of 10 bytes (or less), we do the following:
- *
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod
---- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -0,0 +1,82 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl-passwd - compute password hashes
-+
-+=head1 SYNOPSIS
-+
-+B<openssl passwd>
-+[B<-crypt>]
-+[B<-1>]
-+[B<-apr1>]
-+[B<-salt> I<string>]
-+[B<-in> I<file>]
-+[B<-stdin>]
-+[B<-noverify>]
-+[B<-quiet>]
-+[B<-table>]
-+{I<password>}
-+
-+=head1 DESCRIPTION
-+
-+The B<passwd> command computes the hash of a password typed at
-+run-time or the hash of each password in a list. The password list is
-+taken from the named file for option B<-in file>, from stdin for
-+option B<-stdin>, or from the command line, or from the terminal otherwise.
-+The Unix standard algorithm B<crypt> and the MD5-based BSD password
-+algorithm B<1> and its Apache variant B<apr1> are available.
-+
-+=head1 OPTIONS
-+
-+=over 4
-+
-+=item B<-crypt>
-+
-+Use the B<crypt> algorithm (default).
-+
-+=item B<-1>
-+
-+Use the MD5 based BSD password algorithm B<1>.
-+
-+=item B<-apr1>
-+
-+Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
-+
-+=item B<-salt> I<string>
-+
-+Use the specified salt.
-+When reading a password from the terminal, this implies B<-noverify>.
-+
-+=item B<-in> I<file>
-+
-+Read passwords from I<file>.
-+
-+=item B<-stdin>
-+
-+Read passwords from B<stdin>.
-+
-+=item B<-noverify>
-+
-+Don't verify when reading a password from the terminal.
-+
-+=item B<-quiet>
-+
-+Don't output warnings when passwords given at the command line are truncated.
-+
-+=item B<-table>
-+
-+In the output list, prepend the cleartext password and a TAB character
-+to each password hash.
-+
-+=back
-+
-+=head1 EXAMPLES
-+
-+B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
-+
-+B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
-+
-+B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod
---- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000
-+++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -163,7 +163,7 @@
-
- Online Certificate Status Protocol utility.
-
--=item L<B<passwd>|passwd(1)>
-+=item L<B<passwd>|openssl-passwd(1)>
-
- Generation of hashed passwords.
-
-@@ -401,7 +401,7 @@
- L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
- L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>,
- L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
--L<passwd(1)|passwd(1)>,
-+L<openssl-passwd(1)|openssl-passwd(1)>,
- L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
- L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
- L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
-diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod
---- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,82 +0,0 @@
--=pod
--
--=head1 NAME
--
--passwd - compute password hashes
--
--=head1 SYNOPSIS
--
--B<openssl passwd>
--[B<-crypt>]
--[B<-1>]
--[B<-apr1>]
--[B<-salt> I<string>]
--[B<-in> I<file>]
--[B<-stdin>]
--[B<-noverify>]
--[B<-quiet>]
--[B<-table>]
--{I<password>}
--
--=head1 DESCRIPTION
--
--The B<passwd> command computes the hash of a password typed at
--run-time or the hash of each password in a list. The password list is
--taken from the named file for option B<-in file>, from stdin for
--option B<-stdin>, or from the command line, or from the terminal otherwise.
--The Unix standard algorithm B<crypt> and the MD5-based BSD password
--algorithm B<1> and its Apache variant B<apr1> are available.
--
--=head1 OPTIONS
--
--=over 4
--
--=item B<-crypt>
--
--Use the B<crypt> algorithm (default).
--
--=item B<-1>
--
--Use the MD5 based BSD password algorithm B<1>.
--
--=item B<-apr1>
--
--Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
--
--=item B<-salt> I<string>
--
--Use the specified salt.
--When reading a password from the terminal, this implies B<-noverify>.
--
--=item B<-in> I<file>
--
--Read passwords from I<file>.
--
--=item B<-stdin>
--
--Read passwords from B<stdin>.
--
--=item B<-noverify>
--
--Don't verify when reading a password from the terminal.
--
--=item B<-quiet>
--
--Don't output warnings when passwords given at the command line are truncated.
--
--=item B<-table>
--
--In the output list, prepend the cleartext password and a TAB character
--to each password hash.
--
--=back
--
--=head1 EXAMPLES
--
--B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
--
--B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
--
--B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod
---- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -167,7 +167,7 @@
- =head1 SEE ALSO
-
- L<bn_internal(3)|bn_internal(3)>,
--L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>,
- L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>,
- L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -45,7 +45,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -37,7 +37,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_modules_load_file(3), CONF_modules_load_file(3)>
-+L<CONF_modules_load_file(3)|CONF_modules_load_file(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -51,7 +51,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)>
-+L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod
---- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -46,7 +46,7 @@
-
- =item AUXILIARY FUNCTIONS
-
--L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
-
- =item INPUT/OUTPUT, DATA ENCODING
-diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod
---- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -115,7 +115,7 @@
- the key; it is used to speed the encryption process.
-
- DES_random_key() generates a random key. The PRNG must be seeded
--prior to using this function (see L<rand(3)|rand(3)>). If the PRNG
-+prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG
- could not generate a secure key, 0 is returned.
-
- Before a DES key can be used, it must be converted into the
-@@ -317,7 +317,7 @@
-
- =head1 SEE ALSO
-
--crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
-+crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -40,7 +40,7 @@
-
- =head1 SEE ALSO
-
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)>
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DH_free(3)|DH_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod
---- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -67,8 +67,8 @@
-
- =head1 SEE ALSO
-
--L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
-+L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
- L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>,
- L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>,
- L<DH_generate_parameters(3)|DH_generate_parameters(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -36,7 +36,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_SIG_new(3)|DSA_SIG_new(3)>,
- L<DSA_sign(3)|DSA_sign(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -24,7 +24,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_generate_parameters(3)|DSA_generate_parameters(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_free(3)|DSA_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod
---- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -100,7 +100,7 @@
-
- =head1 SEE ALSO
-
--L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>,
- L<DSA_new(3)|DSA_new(3)>,
- L<DSA_size(3)|DSA_size(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100
-@@ -55,7 +55,7 @@
-
- =head1 SEE ALSO
-
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_do_sign(3)|DSA_do_sign(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod
---- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -594,6 +594,6 @@
-
- =head1 SEE ALSO
-
--L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -20,7 +20,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -60,7 +60,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
- L<ERR_print_errors(3)|ERR_print_errors(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -61,7 +61,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -41,7 +41,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -35,7 +35,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -43,7 +43,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod
---- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,187 +0,0 @@
--=pod
--
--=head1 NAME
--
--err - error codes
--
--=head1 SYNOPSIS
--
-- #include <openssl/err.h>
--
-- unsigned long ERR_get_error(void);
-- unsigned long ERR_peek_error(void);
-- unsigned long ERR_get_error_line(const char **file, int *line);
-- unsigned long ERR_peek_error_line(const char **file, int *line);
-- unsigned long ERR_get_error_line_data(const char **file, int *line,
-- const char **data, int *flags);
-- unsigned long ERR_peek_error_line_data(const char **file, int *line,
-- const char **data, int *flags);
--
-- int ERR_GET_LIB(unsigned long e);
-- int ERR_GET_FUNC(unsigned long e);
-- int ERR_GET_REASON(unsigned long e);
--
-- void ERR_clear_error(void);
--
-- char *ERR_error_string(unsigned long e, char *buf);
-- const char *ERR_lib_error_string(unsigned long e);
-- const char *ERR_func_error_string(unsigned long e);
-- const char *ERR_reason_error_string(unsigned long e);
--
-- void ERR_print_errors(BIO *bp);
-- void ERR_print_errors_fp(FILE *fp);
--
-- void ERR_load_crypto_strings(void);
-- void ERR_free_strings(void);
--
-- void ERR_remove_state(unsigned long pid);
--
-- void ERR_put_error(int lib, int func, int reason, const char *file,
-- int line);
-- void ERR_add_error_data(int num, ...);
--
-- void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-- unsigned long ERR_PACK(int lib, int func, int reason);
-- int ERR_get_next_error_library(void);
--
--=head1 DESCRIPTION
--
--When a call to the OpenSSL library fails, this is usually signalled
--by the return value, and an error code is stored in an error queue
--associated with the current thread. The B<err> library provides
--functions to obtain these error codes and textual error messages.
--
--The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
--access error codes.
--
--Error codes contain information about where the error occurred, and
--what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
--extract this information. A method to obtain human-readable error
--messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
--
--L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
--error queue.
--
--Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
--avoid memory leaks when threads are terminated.
--
--=head1 ADDING NEW ERROR CODES TO OPENSSL
--
--See L<ERR_put_error(3)> if you want to record error codes in the
--OpenSSL error system from within your application.
--
--The remainder of this section is of interest only if you want to add
--new error codes to OpenSSL or add error codes from external libraries.
--
--=head2 Reporting errors
--
--Each sub-library has a specific macro XXXerr() that is used to report
--errors. Its first argument is a function code B<XXX_F_...>, the second
--argument is a reason code B<XXX_R_...>. Function codes are derived
--from the function names; reason codes consist of textual error
--descriptions. For example, the function ssl23_read() reports a
--"handshake failure" as follows:
--
-- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
--
--Function and reason codes should consist of upper case characters,
--numbers and underscores only. The error file generation script translates
--function codes into function names by looking in the header files
--for an appropriate function name, if none is found it just uses
--the capitalized form such as "SSL23_READ" in the above example.
--
--The trailing section of a reason code (after the "_R_") is translated
--into lower case and underscores changed to spaces.
--
--When you are using new function or reason codes, run B<make errors>.
--The necessary B<#define>s will then automatically be added to the
--sub-library's header file.
--
--Although a library will normally report errors using its own specific
--XXXerr macro, another library's macro can be used. This is normally
--only done when a library wants to include ASN1 code which must use
--the ASN1err() macro.
--
--=head2 Adding new libraries
--
--When adding a new sub-library to OpenSSL, assign it a library number
--B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
--name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
--C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
--(in B<crypto/err/err_all.c>). Finally, add an entry
--
-- L XXX xxx.h xxx_err.c
--
--to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
--Running B<make errors> will then generate a file B<xxx_err.c>, and
--add all error codes used in the library to B<xxx.h>.
--
--Additionally the library include file must have a certain form.
--Typically it will initially look like this:
--
-- #ifndef HEADER_XXX_H
-- #define HEADER_XXX_H
--
-- #ifdef __cplusplus
-- extern "C" {
-- #endif
--
-- /* Include files */
--
-- #include <openssl/bio.h>
-- #include <openssl/x509.h>
--
-- /* Macros, structures and function prototypes */
--
--
-- /* BEGIN ERROR CODES */
--
--The B<BEGIN ERROR CODES> sequence is used by the error code
--generation script as the point to place new error codes, any text
--after this point will be overwritten when B<make errors> is run.
--The closing #endif etc will be automatically added by the script.
--
--The generated C error code file B<xxx_err.c> will load the header
--files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
--header file must load any additional header files containing any
--definitions it uses.
--
--=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
--
--It is also possible to use OpenSSL's error code scheme in external
--libraries. The library needs to load its own codes and call the OpenSSL
--error code insertion script B<mkerr.pl> explicitly to add codes to
--the header file and generate the C error code file. This will normally
--be done if the external library needs to generate new ASN1 structures
--but it can also be used to add more general purpose error code handling.
--
--TBA more details
--
--=head1 INTERNALS
--
--The error queues are stored in a hash table with one B<ERR_STATE>
--entry for each pid. ERR_get_state() returns the current thread's
--B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
--codes. When more error codes are added, the old ones are overwritten,
--on the assumption that the most recent errors are most important.
--
--Error strings are also stored in hash table. The hash tables can
--be obtained by calling ERR_get_err_state_table(void) and
--ERR_get_string_table(void) respectively.
--
--=head1 SEE ALSO
--
--L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
--L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
--L<ERR_get_error(3)|ERR_get_error(3)>,
--L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
--L<ERR_clear_error(3)|ERR_clear_error(3)>,
--L<ERR_error_string(3)|ERR_error_string(3)>,
--L<ERR_print_errors(3)|ERR_print_errors(3)>,
--L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
--L<ERR_remove_state(3)|ERR_remove_state(3)>,
--L<ERR_put_error(3)|ERR_put_error(3)>,
--L<ERR_load_strings(3)|ERR_load_strings(3)>,
--L<SSL_get_error(3)|SSL_get_error(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -38,7 +38,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -34,7 +34,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -25,7 +25,7 @@
-
- =head1 SEE ALSO
-
--L<err(3)|err(3)>
-+L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -54,7 +54,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_SealInit(3)|EVP_SealInit(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100
-@@ -74,7 +74,7 @@
-
- =head1 SEE ALSO
-
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_OpenInit(3)|EVP_OpenInit(3)>
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -89,7 +89,7 @@
- =head1 SEE ALSO
-
- L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -80,7 +80,7 @@
-
- L<evp(3)|evp(3)>,
- L<EVP_SignInit(3)|EVP_SignInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod
---- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -73,7 +73,7 @@
- =head1 SEE ALSO
-
- L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>,
--L<CONF_modules_free(3),CONF_modules_free(3)>
-+L<CONF_modules_free(3)|CONF_modules_free(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,187 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_err - error codes
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/err.h>
-+
-+ unsigned long ERR_get_error(void);
-+ unsigned long ERR_peek_error(void);
-+ unsigned long ERR_get_error_line(const char **file, int *line);
-+ unsigned long ERR_peek_error_line(const char **file, int *line);
-+ unsigned long ERR_get_error_line_data(const char **file, int *line,
-+ const char **data, int *flags);
-+ unsigned long ERR_peek_error_line_data(const char **file, int *line,
-+ const char **data, int *flags);
-+
-+ int ERR_GET_LIB(unsigned long e);
-+ int ERR_GET_FUNC(unsigned long e);
-+ int ERR_GET_REASON(unsigned long e);
-+
-+ void ERR_clear_error(void);
-+
-+ char *ERR_error_string(unsigned long e, char *buf);
-+ const char *ERR_lib_error_string(unsigned long e);
-+ const char *ERR_func_error_string(unsigned long e);
-+ const char *ERR_reason_error_string(unsigned long e);
-+
-+ void ERR_print_errors(BIO *bp);
-+ void ERR_print_errors_fp(FILE *fp);
-+
-+ void ERR_load_crypto_strings(void);
-+ void ERR_free_strings(void);
-+
-+ void ERR_remove_state(unsigned long pid);
-+
-+ void ERR_put_error(int lib, int func, int reason, const char *file,
-+ int line);
-+ void ERR_add_error_data(int num, ...);
-+
-+ void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-+ unsigned long ERR_PACK(int lib, int func, int reason);
-+ int ERR_get_next_error_library(void);
-+
-+=head1 DESCRIPTION
-+
-+When a call to the OpenSSL library fails, this is usually signalled
-+by the return value, and an error code is stored in an error queue
-+associated with the current thread. The B<err> library provides
-+functions to obtain these error codes and textual error messages.
-+
-+The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
-+access error codes.
-+
-+Error codes contain information about where the error occurred, and
-+what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
-+extract this information. A method to obtain human-readable error
-+messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
-+
-+L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
-+error queue.
-+
-+Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
-+avoid memory leaks when threads are terminated.
-+
-+=head1 ADDING NEW ERROR CODES TO OPENSSL
-+
-+See L<ERR_put_error(3)> if you want to record error codes in the
-+OpenSSL error system from within your application.
-+
-+The remainder of this section is of interest only if you want to add
-+new error codes to OpenSSL or add error codes from external libraries.
-+
-+=head2 Reporting errors
-+
-+Each sub-library has a specific macro XXXerr() that is used to report
-+errors. Its first argument is a function code B<XXX_F_...>, the second
-+argument is a reason code B<XXX_R_...>. Function codes are derived
-+from the function names; reason codes consist of textual error
-+descriptions. For example, the function ssl23_read() reports a
-+"handshake failure" as follows:
-+
-+ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
-+
-+Function and reason codes should consist of upper case characters,
-+numbers and underscores only. The error file generation script translates
-+function codes into function names by looking in the header files
-+for an appropriate function name, if none is found it just uses
-+the capitalized form such as "SSL23_READ" in the above example.
-+
-+The trailing section of a reason code (after the "_R_") is translated
-+into lower case and underscores changed to spaces.
-+
-+When you are using new function or reason codes, run B<make errors>.
-+The necessary B<#define>s will then automatically be added to the
-+sub-library's header file.
-+
-+Although a library will normally report errors using its own specific
-+XXXerr macro, another library's macro can be used. This is normally
-+only done when a library wants to include ASN1 code which must use
-+the ASN1err() macro.
-+
-+=head2 Adding new libraries
-+
-+When adding a new sub-library to OpenSSL, assign it a library number
-+B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
-+name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
-+C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
-+(in B<crypto/err/err_all.c>). Finally, add an entry
-+
-+ L XXX xxx.h xxx_err.c
-+
-+to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
-+Running B<make errors> will then generate a file B<xxx_err.c>, and
-+add all error codes used in the library to B<xxx.h>.
-+
-+Additionally the library include file must have a certain form.
-+Typically it will initially look like this:
-+
-+ #ifndef HEADER_XXX_H
-+ #define HEADER_XXX_H
-+
-+ #ifdef __cplusplus
-+ extern "C" {
-+ #endif
-+
-+ /* Include files */
-+
-+ #include <openssl/bio.h>
-+ #include <openssl/x509.h>
-+
-+ /* Macros, structures and function prototypes */
-+
-+
-+ /* BEGIN ERROR CODES */
-+
-+The B<BEGIN ERROR CODES> sequence is used by the error code
-+generation script as the point to place new error codes, any text
-+after this point will be overwritten when B<make errors> is run.
-+The closing #endif etc will be automatically added by the script.
-+
-+The generated C error code file B<xxx_err.c> will load the header
-+files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
-+header file must load any additional header files containing any
-+definitions it uses.
-+
-+=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
-+
-+It is also possible to use OpenSSL's error code scheme in external
-+libraries. The library needs to load its own codes and call the OpenSSL
-+error code insertion script B<mkerr.pl> explicitly to add codes to
-+the header file and generate the C error code file. This will normally
-+be done if the external library needs to generate new ASN1 structures
-+but it can also be used to add more general purpose error code handling.
-+
-+TBA more details
-+
-+=head1 INTERNALS
-+
-+The error queues are stored in a hash table with one B<ERR_STATE>
-+entry for each pid. ERR_get_state() returns the current thread's
-+B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
-+codes. When more error codes are added, the old ones are overwritten,
-+on the assumption that the most recent errors are most important.
-+
-+Error strings are also stored in hash table. The hash tables can
-+be obtained by calling ERR_get_err_state_table(void) and
-+ERR_get_string_table(void) respectively.
-+
-+=head1 SEE ALSO
-+
-+L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
-+L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
-+L<ERR_clear_error(3)|ERR_clear_error(3)>,
-+L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<ERR_print_errors(3)|ERR_print_errors(3)>,
-+L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
-+L<ERR_remove_state(3)|ERR_remove_state(3)>,
-+L<ERR_put_error(3)|ERR_put_error(3)>,
-+L<ERR_load_strings(3)|ERR_load_strings(3)>,
-+L<SSL_get_error(3)|SSL_get_error(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_rand - pseudo-random number generator
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/rand.h>
-+
-+ int RAND_set_rand_engine(ENGINE *engine);
-+
-+ int RAND_bytes(unsigned char *buf, int num);
-+ int RAND_pseudo_bytes(unsigned char *buf, int num);
-+
-+ void RAND_seed(const void *buf, int num);
-+ void RAND_add(const void *buf, int num, int entropy);
-+ int RAND_status(void);
-+
-+ int RAND_load_file(const char *file, long max_bytes);
-+ int RAND_write_file(const char *file);
-+ const char *RAND_file_name(char *file, size_t num);
-+
-+ int RAND_egd(const char *path);
-+
-+ void RAND_set_rand_method(const RAND_METHOD *meth);
-+ const RAND_METHOD *RAND_get_rand_method(void);
-+ RAND_METHOD *RAND_SSLeay(void);
-+
-+ void RAND_cleanup(void);
-+
-+ /* For Win32 only */
-+ void RAND_screen(void);
-+ int RAND_event(UINT, WPARAM, LPARAM);
-+
-+=head1 DESCRIPTION
-+
-+Since the introduction of the ENGINE API, the recommended way of controlling
-+default implementations is by using the ENGINE API functions. The default
-+B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
-+RAND_get_rand_method(), is only used if no ENGINE has been set as the default
-+"rand" implementation. Hence, these two functions are no longer the recommened
-+way to control defaults.
-+
-+If an alternative B<RAND_METHOD> implementation is being used (either set
-+directly or as provided by an ENGINE module), then it is entirely responsible
-+for the generation and management of a cryptographically secure PRNG stream. The
-+mechanisms described below relate solely to the software PRNG implementation
-+built in to OpenSSL and used by default.
-+
-+These functions implement a cryptographically secure pseudo-random
-+number generator (PRNG). It is used by other library functions for
-+example to generate random keys, and applications can use it when they
-+need randomness.
-+
-+A cryptographic PRNG must be seeded with unpredictable data such as
-+mouse movements or keys pressed at random by the user. This is
-+described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
-+(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
-+seeding process whenever the application is started.
-+
-+L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
-+PRNG.
-+
-+=head1 INTERNALS
-+
-+The RAND_SSLeay() method implements a PRNG based on a cryptographic
-+hash function.
-+
-+The following description of its design is based on the SSLeay
-+documentation:
-+
-+First up I will state the things I believe I need for a good RNG.
-+
-+=over 4
-+
-+=item 1
-+
-+A good hashing algorithm to mix things up and to convert the RNG 'state'
-+to random numbers.
-+
-+=item 2
-+
-+An initial source of random 'state'.
-+
-+=item 3
-+
-+The state should be very large. If the RNG is being used to generate
-+4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
-+If your RNG state only has 128 bits, you are obviously limiting the
-+search space to 128 bits, not 2048. I'm probably getting a little
-+carried away on this last point but it does indicate that it may not be
-+a bad idea to keep quite a lot of RNG state. It should be easier to
-+break a cipher than guess the RNG seed data.
-+
-+=item 4
-+
-+Any RNG seed data should influence all subsequent random numbers
-+generated. This implies that any random seed data entered will have
-+an influence on all subsequent random numbers generated.
-+
-+=item 5
-+
-+When using data to seed the RNG state, the data used should not be
-+extractable from the RNG state. I believe this should be a
-+requirement because one possible source of 'secret' semi random
-+data would be a private key or a password. This data must
-+not be disclosed by either subsequent random numbers or a
-+'core' dump left by a program crash.
-+
-+=item 6
-+
-+Given the same initial 'state', 2 systems should deviate in their RNG state
-+(and hence the random numbers generated) over time if at all possible.
-+
-+=item 7
-+
-+Given the random number output stream, it should not be possible to determine
-+the RNG state or the next random number.
-+
-+=back
-+
-+The algorithm is as follows.
-+
-+There is global state made up of a 1023 byte buffer (the 'state'), a
-+working hash value ('md'), and a counter ('count').
-+
-+Whenever seed data is added, it is inserted into the 'state' as
-+follows.
-+
-+The input is chopped up into units of 20 bytes (or less for
-+the last block). Each of these blocks is run through the hash
-+function as follows: The data passed to the hash function
-+is the current 'md', the same number of bytes from the 'state'
-+(the location determined by in incremented looping index) as
-+the current 'block', the new key data 'block', and 'count'
-+(which is incremented after each use).
-+The result of this is kept in 'md' and also xored into the
-+'state' at the same locations that were used as input into the
-+hash function. I
-+believe this system addresses points 1 (hash function; currently
-+SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
-+function and xor).
-+
-+When bytes are extracted from the RNG, the following process is used.
-+For each group of 10 bytes (or less), we do the following:
-+
-+Input into the hash function the local 'md' (which is initialized from
-+the global 'md' before any bytes are generated), the bytes that are to
-+be overwritten by the random bytes, and bytes from the 'state'
-+(incrementing looping index). From this digest output (which is kept
-+in 'md'), the top (up to) 10 bytes are returned to the caller and the
-+bottom 10 bytes are xored into the 'state'.
-+
-+Finally, after we have finished 'num' random bytes for the caller,
-+'count' (which is incremented) and the local and global 'md' are fed
-+into the hash function and the results are kept in the global 'md'.
-+
-+I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
-+into the 'state' the 'old' data from the caller that is about to be
-+overwritten) and 7 (by not using the 10 bytes given to the caller to
-+update the 'state', but they are used to update 'md').
-+
-+So of the points raised, only 2 is not addressed (but see
-+L<RAND_add(3)|RAND_add(3)>).
-+
-+=head1 SEE ALSO
-+
-+L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<RAND_bytes(3)|RAND_bytes(3)>,
-+L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
-+L<RAND_cleanup(3)|RAND_cleanup(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks,
-+CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
-+CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
-+CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/crypto.h>
-+
-+ void CRYPTO_set_locking_callback(void (*locking_function)(int mode,
-+ int n, const char *file, int line));
-+
-+ void CRYPTO_set_id_callback(unsigned long (*id_function)(void));
-+
-+ int CRYPTO_num_locks(void);
-+
-+
-+ /* struct CRYPTO_dynlock_value needs to be defined by the user */
-+ struct CRYPTO_dynlock_value;
-+
-+ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
-+ (*dyn_create_function)(char *file, int line));
-+ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-+ (int mode, struct CRYPTO_dynlock_value *l,
-+ const char *file, int line));
-+ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-+ (struct CRYPTO_dynlock_value *l, const char *file, int line));
-+
-+ int CRYPTO_get_new_dynlockid(void);
-+
-+ void CRYPTO_destroy_dynlockid(int i);
-+
-+ void CRYPTO_lock(int mode, int n, const char *file, int line);
-+
-+ #define CRYPTO_w_lock(type) \
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_w_unlock(type) \
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_lock(type) \
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_unlock(type) \
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_add(addr,amount,type) \
-+ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-+
-+=head1 DESCRIPTION
-+
-+OpenSSL can safely be used in multi-threaded applications provided
-+that at least two callback functions are set.
-+
-+locking_function(int mode, int n, const char *file, int line) is
-+needed to perform locking on shared data structures.
-+(Note that OpenSSL uses a number of global data structures that
-+will be implicitly shared whenever multiple threads use OpenSSL.)
-+Multi-threaded applications will crash at random if it is not set.
-+
-+locking_function() must be able to handle up to CRYPTO_num_locks()
-+different mutex locks. It sets the B<n>-th lock if B<mode> &
-+B<CRYPTO_LOCK>, and releases it otherwise.
-+
-+B<file> and B<line> are the file number of the function setting the
-+lock. They can be useful for debugging.
-+
-+id_function(void) is a function that returns a thread ID, for example
-+pthread_self() if it returns an integer (see NOTES below). It isn't
-+needed on Windows nor on platforms where getpid() returns a different
-+ID for each thread (see NOTES below).
-+
-+Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
-+of OpenSSL need it for better performance. To enable this, the following
-+is required:
-+
-+=over 4
-+
-+=item *
-+Three additional callback function, dyn_create_function, dyn_lock_function
-+and dyn_destroy_function.
-+
-+=item *
-+A structure defined with the data that each lock needs to handle.
-+
-+=back
-+
-+struct CRYPTO_dynlock_value has to be defined to contain whatever structure
-+is needed to handle locks.
-+
-+dyn_create_function(const char *file, int line) is needed to create a
-+lock. Multi-threaded applications might crash at random if it is not set.
-+
-+dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
-+is needed to perform locking off dynamic lock numbered n. Multi-threaded
-+applications might crash at random if it is not set.
-+
-+dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
-+needed to destroy the lock l. Multi-threaded applications might crash at
-+random if it is not set.
-+
-+CRYPTO_get_new_dynlockid() is used to create locks. It will call
-+dyn_create_function for the actual creation.
-+
-+CRYPTO_destroy_dynlockid() is used to destroy locks. It will call
-+dyn_destroy_function for the actual destruction.
-+
-+CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield
-+describing what should be done with the lock. n is the number of the
-+lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
-+from the following values. These values are pairwise exclusive, with
-+undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
-+should not be used together):
-+
-+ CRYPTO_LOCK 0x01
-+ CRYPTO_UNLOCK 0x02
-+ CRYPTO_READ 0x04
-+ CRYPTO_WRITE 0x08
-+
-+=head1 RETURN VALUES
-+
-+CRYPTO_num_locks() returns the required number of locks.
-+
-+CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
-+
-+The other functions return no values.
-+
-+=head1 NOTES
-+
-+You can find out if OpenSSL was configured with thread support:
-+
-+ #define OPENSSL_THREAD_DEFINES
-+ #include <openssl/opensslconf.h>
-+ #if defined(OPENSSL_THREADS)
-+ // thread support enabled
-+ #else
-+ // no thread support
-+ #endif
-+
-+Also, dynamic locks are currently not used internally by OpenSSL, but
-+may do so in the future.
-+
-+Defining id_function(void) has it's own issues. Generally speaking,
-+pthread_self() should be used, even on platforms where getpid() gives
-+different answers in each thread, since that may depend on the machine
-+the program is run on, not the machine where the program is being
-+compiled. For instance, Red Hat 8 Linux and earlier used
-+LinuxThreads, whose getpid() returns a different value for each
-+thread. Red Hat 9 Linux and later use NPTL, which is
-+Posix-conformant, and has a getpid() that returns the same value for
-+all threads in a process. A program compiled on Red Hat 8 and run on
-+Red Hat 9 will therefore see getpid() returning the same value for
-+all threads.
-+
-+There is still the issue of platforms where pthread_self() returns
-+something other than an integer. This is a bit unusual, and this
-+manual has no cookbook solution for that case.
-+
-+=head1 EXAMPLES
-+
-+B<crypto/threads/mttest.c> shows examples of the callback functions on
-+Solaris, Irix and Win32.
-+
-+=head1 HISTORY
-+
-+CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are
-+available in all versions of SSLeay and OpenSSL.
-+CRYPTO_num_locks() was added in OpenSSL 0.9.4.
-+All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
-+
-+=head1 SEE ALSO
-+
-+L<crypto(3)|crypto(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -65,7 +65,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
- L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -38,7 +38,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<RAND_add(3)|RAND_add(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -20,7 +20,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>
-+L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -72,7 +72,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
- L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -43,7 +43,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod
---- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,175 +0,0 @@
--=pod
--
--=head1 NAME
--
--rand - pseudo-random number generator
--
--=head1 SYNOPSIS
--
-- #include <openssl/rand.h>
--
-- int RAND_set_rand_engine(ENGINE *engine);
--
-- int RAND_bytes(unsigned char *buf, int num);
-- int RAND_pseudo_bytes(unsigned char *buf, int num);
--
-- void RAND_seed(const void *buf, int num);
-- void RAND_add(const void *buf, int num, int entropy);
-- int RAND_status(void);
--
-- int RAND_load_file(const char *file, long max_bytes);
-- int RAND_write_file(const char *file);
-- const char *RAND_file_name(char *file, size_t num);
--
-- int RAND_egd(const char *path);
--
-- void RAND_set_rand_method(const RAND_METHOD *meth);
-- const RAND_METHOD *RAND_get_rand_method(void);
-- RAND_METHOD *RAND_SSLeay(void);
--
-- void RAND_cleanup(void);
--
-- /* For Win32 only */
-- void RAND_screen(void);
-- int RAND_event(UINT, WPARAM, LPARAM);
--
--=head1 DESCRIPTION
--
--Since the introduction of the ENGINE API, the recommended way of controlling
--default implementations is by using the ENGINE API functions. The default
--B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
--RAND_get_rand_method(), is only used if no ENGINE has been set as the default
--"rand" implementation. Hence, these two functions are no longer the recommened
--way to control defaults.
--
--If an alternative B<RAND_METHOD> implementation is being used (either set
--directly or as provided by an ENGINE module), then it is entirely responsible
--for the generation and management of a cryptographically secure PRNG stream. The
--mechanisms described below relate solely to the software PRNG implementation
--built in to OpenSSL and used by default.
--
--These functions implement a cryptographically secure pseudo-random
--number generator (PRNG). It is used by other library functions for
--example to generate random keys, and applications can use it when they
--need randomness.
--
--A cryptographic PRNG must be seeded with unpredictable data such as
--mouse movements or keys pressed at random by the user. This is
--described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
--(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
--seeding process whenever the application is started.
--
--L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
--PRNG.
--
--=head1 INTERNALS
--
--The RAND_SSLeay() method implements a PRNG based on a cryptographic
--hash function.
--
--The following description of its design is based on the SSLeay
--documentation:
--
--First up I will state the things I believe I need for a good RNG.
--
--=over 4
--
--=item 1
--
--A good hashing algorithm to mix things up and to convert the RNG 'state'
--to random numbers.
--
--=item 2
--
--An initial source of random 'state'.
--
--=item 3
--
--The state should be very large. If the RNG is being used to generate
--4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
--If your RNG state only has 128 bits, you are obviously limiting the
--search space to 128 bits, not 2048. I'm probably getting a little
--carried away on this last point but it does indicate that it may not be
--a bad idea to keep quite a lot of RNG state. It should be easier to
--break a cipher than guess the RNG seed data.
--
--=item 4
--
--Any RNG seed data should influence all subsequent random numbers
--generated. This implies that any random seed data entered will have
--an influence on all subsequent random numbers generated.
--
--=item 5
--
--When using data to seed the RNG state, the data used should not be
--extractable from the RNG state. I believe this should be a
--requirement because one possible source of 'secret' semi random
--data would be a private key or a password. This data must
--not be disclosed by either subsequent random numbers or a
--'core' dump left by a program crash.
--
--=item 6
--
--Given the same initial 'state', 2 systems should deviate in their RNG state
--(and hence the random numbers generated) over time if at all possible.
--
--=item 7
--
--Given the random number output stream, it should not be possible to determine
--the RNG state or the next random number.
--
--=back
--
--The algorithm is as follows.
--
--There is global state made up of a 1023 byte buffer (the 'state'), a
--working hash value ('md'), and a counter ('count').
--
--Whenever seed data is added, it is inserted into the 'state' as
--follows.
--
--The input is chopped up into units of 20 bytes (or less for
--the last block). Each of these blocks is run through the hash
--function as follows: The data passed to the hash function
--is the current 'md', the same number of bytes from the 'state'
--(the location determined by in incremented looping index) as
--the current 'block', the new key data 'block', and 'count'
--(which is incremented after each use).
--The result of this is kept in 'md' and also xored into the
--'state' at the same locations that were used as input into the
--hash function. I
--believe this system addresses points 1 (hash function; currently
--SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
--function and xor).
--
--When bytes are extracted from the RNG, the following process is used.
--For each group of 10 bytes (or less), we do the following:
--
--Input into the hash function the local 'md' (which is initialized from
--the global 'md' before any bytes are generated), the bytes that are to
--be overwritten by the random bytes, and bytes from the 'state'
--(incrementing looping index). From this digest output (which is kept
--in 'md'), the top (up to) 10 bytes are returned to the caller and the
--bottom 10 bytes are xored into the 'state'.
--
--Finally, after we have finished 'num' random bytes for the caller,
--'count' (which is incremented) and the local and global 'md' are fed
--into the hash function and the results are kept in the global 'md'.
--
--I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
--into the 'state' the 'old' data from the caller that is about to be
--overwritten) and 7 (by not using the 10 bytes given to the caller to
--update the 'state', but they are used to update 'md').
--
--So of the points raised, only 2 is not addressed (but see
--L<RAND_add(3)|RAND_add(3)>).
--
--=head1 SEE ALSO
--
--L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
--L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
--L<RAND_bytes(3)|RAND_bytes(3)>,
--L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
--L<RAND_cleanup(3)|RAND_cleanup(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -67,7 +67,7 @@
-
- =head1 SEE ALSO
-
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -34,7 +34,7 @@
-
- =head1 SEE ALSO
-
--L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100
-@@ -59,7 +59,7 @@
-
- =head1 SEE ALSO
-
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_free(3)|RSA_free(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod
---- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100
-@@ -108,7 +108,7 @@
- =head1 SEE ALSO
-
- L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>,
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
- L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>,
- L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>,
- L<RSA_generate_key(3)|RSA_generate_key(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -73,7 +73,7 @@
-
- =head1 SEE ALSO
-
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_size(3)|RSA_size(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -48,7 +48,7 @@
- =head1 SEE ALSO
-
- L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
- L<RSA_verify(3)|RSA_verify(3)>
-
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod
---- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100
-@@ -1,210 +0,0 @@
--=pod
--
--=head1 NAME
--
--CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback,
--CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy,
--CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks,
--CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
--CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
--CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
--
--=head1 SYNOPSIS
--
-- #include <openssl/crypto.h>
--
-- /* Don't use this structure directly. */
-- typedef struct crypto_threadid_st
-- {
-- void *ptr;
-- unsigned long val;
-- } CRYPTO_THREADID;
-- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
-- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-- void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a,
-- const CRYPTO_THREADID *b);
-- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest,
-- const CRYPTO_THREADID *src);
-- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
--
-- int CRYPTO_num_locks(void);
--
-- /* struct CRYPTO_dynlock_value needs to be defined by the user */
-- struct CRYPTO_dynlock_value;
--
-- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
-- (*dyn_create_function)(char *file, int line));
-- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-- (int mode, struct CRYPTO_dynlock_value *l,
-- const char *file, int line));
-- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-- (struct CRYPTO_dynlock_value *l, const char *file, int line));
--
-- int CRYPTO_get_new_dynlockid(void);
--
-- void CRYPTO_destroy_dynlockid(int i);
--
-- void CRYPTO_lock(int mode, int n, const char *file, int line);
--
-- #define CRYPTO_w_lock(type) \
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_w_unlock(type) \
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_r_lock(type) \
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_r_unlock(type) \
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_add(addr,amount,type) \
-- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
--
--=head1 DESCRIPTION
--
--OpenSSL can safely be used in multi-threaded applications provided
--that at least two callback functions are set, locking_function and
--threadid_func.
--
--locking_function(int mode, int n, const char *file, int line) is
--needed to perform locking on shared data structures.
--(Note that OpenSSL uses a number of global data structures that
--will be implicitly shared whenever multiple threads use OpenSSL.)
--Multi-threaded applications will crash at random if it is not set.
--
--locking_function() must be able to handle up to CRYPTO_num_locks()
--different mutex locks. It sets the B<n>-th lock if B<mode> &
--B<CRYPTO_LOCK>, and releases it otherwise.
--
--B<file> and B<line> are the file number of the function setting the
--lock. They can be useful for debugging.
--
--threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing
--thread's identifier into B<id>. The implementation of this callback should not
--fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread
--IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based.
--If the application does not register such a callback using
--CRYPTO_THREADID_set_callback(), then a default implementation is used - on
--Windows and BeOS this uses the system's default thread identifying APIs, and on
--all other platforms it uses the address of B<errno>. The latter is satisfactory
--for thread-safety if and only if the platform has a thread-local error number
--facility.
--
--Once threadid_func() is registered, or if the built-in default implementation is
--to be used;
--
--=over 4
--
--=item *
--CRYPTO_THREADID_current() records the currently-executing thread ID into the
--given B<id> object.
--
--=item *
--CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie.
--the same semantics as memcmp()).
--
--=item *
--CRYPTO_THREADID_cpy() duplicates a thread ID value,
--
--=item *
--CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This
--is usually the exact numeric or pointer-based thread ID used internally, however
--this also handles the unusual case where pointers are larger than 'long'
--variables and the platform's thread IDs are pointer-based - in this case, mixing
--is done to attempt to produce a unique numeric value even though it is not as
--wide as the platform's true thread IDs.
--
--=back
--
--Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
--of OpenSSL need it for better performance. To enable this, the following
--is required:
--
--=over 4
--
--=item *
--Three additional callback function, dyn_create_function, dyn_lock_function
--and dyn_destroy_function.
--
--=item *
--A structure defined with the data that each lock needs to handle.
--
--=back
--
--struct CRYPTO_dynlock_value has to be defined to contain whatever structure
--is needed to handle locks.
--
--dyn_create_function(const char *file, int line) is needed to create a
--lock. Multi-threaded applications might crash at random if it is not set.
--
--dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
--is needed to perform locking off dynamic lock numbered n. Multi-threaded
--applications might crash at random if it is not set.
--
--dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
--needed to destroy the lock l. Multi-threaded applications might crash at
--random if it is not set.
--
--CRYPTO_get_new_dynlockid() is used to create locks. It will call
--dyn_create_function for the actual creation.
--
--CRYPTO_destroy_dynlockid() is used to destroy locks. It will call
--dyn_destroy_function for the actual destruction.
--
--CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield
--describing what should be done with the lock. n is the number of the
--lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined
--from the following values. These values are pairwise exclusive, with
--undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
--should not be used together):
--
-- CRYPTO_LOCK 0x01
-- CRYPTO_UNLOCK 0x02
-- CRYPTO_READ 0x04
-- CRYPTO_WRITE 0x08
--
--=head1 RETURN VALUES
--
--CRYPTO_num_locks() returns the required number of locks.
--
--CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
--
--The other functions return no values.
--
--=head1 NOTES
--
--You can find out if OpenSSL was configured with thread support:
--
-- #define OPENSSL_THREAD_DEFINES
-- #include <openssl/opensslconf.h>
-- #if defined(OPENSSL_THREADS)
-- // thread support enabled
-- #else
-- // no thread support
-- #endif
--
--Also, dynamic locks are currently not used internally by OpenSSL, but
--may do so in the future.
--
--=head1 EXAMPLES
--
--B<crypto/threads/mttest.c> shows examples of the callback functions on
--Solaris, Irix and Win32.
--
--=head1 HISTORY
--
--CRYPTO_set_locking_callback() is
--available in all versions of SSLeay and OpenSSL.
--CRYPTO_num_locks() was added in OpenSSL 0.9.4.
--All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
--B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0
--to replace (actually, deprecate) the previous CRYPTO_set_id_callback(),
--CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed
--thread IDs to always be represented by 'unsigned long'.
--
--=head1 SEE ALSO
--
--L<crypto(3)|crypto(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod
---- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100
-@@ -65,7 +65,7 @@
- =head1 SEE ALSO
-
- L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
--L<OBJ_nid2obj(3),OBJ_nid2obj(3)>
-+L<OBJ_nid2obj(3)|OBJ_nid2obj(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100
-@@ -105,7 +105,7 @@
-
- =head1 SEE ALSO
-
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>
-
- =head1 HISTORY
-
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100
-@@ -72,6 +72,6 @@
-
- =head1 SEE ALSO
-
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
-
- =cut
-diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ
---- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100
-+++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100
-@@ -724,7 +724,7 @@
- CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
- including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
- and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
--and friends. This is described in the threads(3) manpage.
-+and friends. This is described in the openssl_threads(3) manpage.
-
- * I've compiled a program under Windows and it crashes: why?
-
diff --git a/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch b/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch
new file mode 100644
index 0000000..c662096
--- /dev/null
+++ b/abs/core/openssl/openssl-1.0.1f-perl-5.18.patch
@@ -0,0 +1,356 @@
+Forward-ported from openssl-1.0.1e-perl-5.18.patch
+Fixes install with perl-5.18.
+
+https://bugs.gentoo.org/show_bug.cgi?id=497286
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- openssl-1.0.1f/doc/apps/cms.pod
++++ openssl-1.0.1f/doc/apps/cms.pod
+@@ -450,28 +450,28 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ the operation was completely successfully.
+
+-=item 1
++=item C<1>
+
+ an error occurred parsing the command options.
+
+-=item 2
++=item C<2>
+
+ one of the input files could not be read.
+
+-=item 3
++=item C<3>
+
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+
+-=item 4
++=item C<4>
+
+ an error occurred decrypting or verifying the message.
+
+-=item 5
++=item C<5>
+
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1f/doc/apps/smime.pod
++++ openssl-1.0.1f/doc/apps/smime.pod
+@@ -308,28 +308,28 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ the operation was completely successfully.
+
+-=item 1
++=item C<1>
+
+ an error occurred parsing the command options.
+
+-=item 2
++=item C<2>
+
+ one of the input files could not be read.
+
+-=item 3
++=item C<3>
+
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+
+-=item 4
++=item C<4>
+
+ an error occurred decrypting or verifying the message.
+
+-=item 5
++=item C<5>
+
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1f/doc/ssl/SSL_accept.pod
++++ openssl-1.0.1f/doc/ssl/SSL_accept.pod
+@@ -44,13 +44,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_clear.pod
++++ openssl-1.0.1f/doc/ssl/SSL_clear.pod
+@@ -56,12 +56,12 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+
+-=item 1
++=item C<1>
+
+ The SSL_clear() operation was successful.
+
+--- openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
++++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
+@@ -53,11 +53,11 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The operation succeeded.
+
+-=item 1
++=item C<1>
+
+ The operation failed. Check the error queue to find out the reason.
+
+--- openssl-1.0.1f/doc/ssl/SSL_connect.pod
++++ openssl-1.0.1f/doc/ssl/SSL_connect.pod
+@@ -41,13 +41,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
+@@ -52,13 +52,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The operation failed. In case of the add operation, it was tried to add
+ the same (identical) session twice. In case of the remove operation, the
+ session was not found in the cache.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
+@@ -100,13 +100,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,13 +66,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+ to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
+@@ -64,13 +64,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
+@@ -42,11 +42,11 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The new choice failed, check the error stack to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -96,7 +96,7 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+
+-=item 0
++=item C<0>
+
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+--- openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
++++ openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
+@@ -45,13 +45,13 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_read.pod
++++ openssl-1.0.1f/doc/ssl/SSL_read.pod
+@@ -86,7 +86,7 @@
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+
+-=item 0
++=item C<0>
+
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+--- openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
++++ openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
+@@ -27,11 +27,11 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ A new session was negotiated.
+
+-=item 1
++=item C<1>
+
+ A session was reused.
+
+--- openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
+@@ -35,11 +35,11 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The operation failed. Check the error stack to find out why.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_set_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_session.pod
+@@ -37,11 +37,11 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The operation failed; check the error stack to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
++++ openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
+@@ -92,14 +92,14 @@
+
+ =over 4
+
+-=item 0
++=item C<0>
+
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+
+-=item 1
++=item C<1>
+
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+--- openssl-1.0.1f/doc/ssl/SSL_write.pod
++++ openssl-1.0.1f/doc/ssl/SSL_write.pod
+@@ -79,7 +79,7 @@
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+
+-=item 0
++=item C<0>
+
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
--
cgit v0.12
From e3d4bd5ca8402ac7b4f53555f12d2d58dd8f0ee5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 15:13:13 +0000
Subject: dmidecode: update to 2.12. refs #961
---
abs/core/dmidecode/PKGBUILD | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/abs/core/dmidecode/PKGBUILD b/abs/core/dmidecode/PKGBUILD
index 40723eb..56ef823 100644
--- a/abs/core/dmidecode/PKGBUILD
+++ b/abs/core/dmidecode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143727 2011-11-28 17:28:42Z giovanni $
+# $Id$
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=dmidecode
-pkgver=2.11
+pkgver=2.12
pkgrel=2
pkgdesc="Desktop Management Interface table related utilities"
arch=('i686' 'x86_64')
@@ -11,16 +11,17 @@ url="http://www.nongnu.org/dmidecode"
license=('GPL')
depends=('glibc')
source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a406f3cbb27736491698697beeddb781')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i "s:sbin:bin:g" Makefile
make prefix=/usr
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix=/usr DESTDIR=${pkgdir} install
+ make prefix=/usr DESTDIR="${pkgdir}" install
}
-md5sums=('535487cc041f2db746587cf40a2059f0')
--
cgit v0.12
From d14da8dc6a524942b6a7b8585fd53c127ea74efd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 16:26:53 +0000
Subject: libbsd: initial inclusion. dep of samba. refs #961
---
abs/extra/libbsd/PKGBUILD | 39 ++++++++++++++++++++++++++++++++++++
abs/extra/libbsd/spt.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
create mode 100644 abs/extra/libbsd/PKGBUILD
create mode 100644 abs/extra/libbsd/spt.patch
diff --git a/abs/extra/libbsd/PKGBUILD b/abs/extra/libbsd/PKGBUILD
new file mode 100644
index 0000000..2e9b745
--- /dev/null
+++ b/abs/extra/libbsd/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=libbsd
+pkgver=0.6.0
+pkgrel=2
+pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
+arch=('i686' 'x86_64')
+url="http://libbsd.freedesktop.org"
+license=('custom')
+depends=('glibc')
+options=('staticlibs')
+source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc})
+md5sums=('f6c75f0a9818e323a589bcbd560a0eb4'
+ 'SKIP')
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+ rm "${pkgdir}"/usr/lib/libbsd.a
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/libbsd/spt.patch b/abs/extra/libbsd/spt.patch
new file mode 100644
index 0000000..b19dc9b
--- /dev/null
+++ b/abs/extra/libbsd/spt.patch
@@ -0,0 +1,50 @@
+diff -u -r libbsd-0.5.2-orig/src/setproctitle.c libbsd-0.5.2/src/setproctitle.c
+--- libbsd-0.5.2-orig/src/setproctitle.c 2013-06-08 18:26:04.000000000 +0200
++++ libbsd-0.5.2/src/setproctitle.c 2013-06-18 02:35:59.441393418 +0200
+@@ -86,7 +86,7 @@
+ if (environ != envp)
+ return 0;
+
+- /* Make a copy of the old environ array of pointers, in case
++ /* Make a deep copy of the old environ array of pointers, in case
+ * clearenv() or setenv() is implemented to free the internal
+ * environ array, because we will need to access the old environ
+ * contents to make the new copy. */
+@@ -94,11 +94,13 @@
+ envcopy = malloc(envsize);
+ if (envcopy == NULL)
+ return errno;
+- memcpy(envcopy, envp, envsize);
++ for (i = 0; envp[i]; i++) envcopy[i] = strdup(envp[i]);
++ envcopy[i] = NULL;
+
+ error = spt_clearenv();
+ if (error) {
+ environ = envp;
++ for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ free(envcopy);
+ return error;
+ }
+@@ -116,18 +118,20 @@
+ if (error) {
+ #ifdef HAVE_CLEARENV
+ /* Because the old environ might not be available
+- * anymore we will make do with the shallow copy. */
++ * anymore we will make do with the deep copy. */
+ environ = envcopy;
+ #else
+ environ = envp;
++ for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ free(envcopy);
+ #endif
+ return error;
+ }
+ }
+
+- /* Dispose of the shallow copy, now that we've finished transfering
++ /* Dispose of the deep copy, now that we've finished transfering
+ * the old environment. */
++ for(i = 0; envcopy[i]; i++) free(envcopy[i]);
+ free(envcopy);
+
+ return 0;
--
cgit v0.12
From b97a12870468d65695a17b0060fdbd3ba83cc067 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 16:29:16 +0000
Subject: tevent: initial inclusion. dep of samba. refs #961
---
abs/extra/tevent/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 abs/extra/tevent/PKGBUILD
diff --git a/abs/extra/tevent/PKGBUILD b/abs/extra/tevent/PKGBUILD
new file mode 100644
index 0000000..c9dcc03
--- /dev/null
+++ b/abs/extra/tevent/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Marco A Rojas <marquicus at gmail dot com>
+# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com>
+# Contributor: Thomas Burdick <thomas.burdick@gmail.com>
+
+pkgname=tevent
+pkgver=0.9.21
+pkgrel=2
+pkgdesc="An event system based on the talloc memory management library"
+arch=('i686' 'x86_64')
+url="https://tevent.samba.org/"
+source=("http://samba.org/ftp/tevent/${pkgname}-${pkgver}.tar.gz")
+license=('GPL3')
+depends=('talloc')
+makedepends=('python2')
+optdepends=('python2: for python bindings')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # change to use python2
+ sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf
+ export PYTHON=/usr/bin/python2
+
+ ./configure --prefix=/usr
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make
+ make DESTDIR=${pkgdir}/ install
+}
+md5sums=('3d5a76c0a1b5f724842d785fd055633f')
--
cgit v0.12
From 2753f03d78b6a448484e945d470349bd697c86dd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 16:50:05 +0000
Subject: talloc: update to 2.1. refs #961
---
abs/core/talloc/PKGBUILD | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/abs/core/talloc/PKGBUILD b/abs/core/talloc/PKGBUILD
index 903de2d..c19a0fc 100644
--- a/abs/core/talloc/PKGBUILD
+++ b/abs/core/talloc/PKGBUILD
@@ -1,26 +1,35 @@
-# $Id: PKGBUILD 63108 2010-01-14 18:54:03Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# $Id$
+# Maintainer:
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=talloc
-pkgver=2.0.1
+pkgver=2.1.0
pkgrel=1
-pkgdesc="talloc is a hierarchical pool based memory allocator with destructors"
-arch=(i686 x86_64)
+pkgdesc="Hierarchical pool based memory allocator with destructors"
+arch=('i686' 'x86_64')
license=('GPL3')
-url="http://tdb.samba.org/"
-source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+url="http://talloc.samba.org/"
depends=('glibc')
+makedepends=('python2' 'docbook-xsl')
+optdepends=('python2: for python bindings')
+source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's#python#python2#g' buildtools/bin/waf
+}
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
- --sysconfdir=/etc/samba \
- --localstatedir=/var \
- --enable-talloc-compat1 \
- --enable-largefile
- make || return 1
- make DESTDIR=$pkgdir/ install
- # fix permission
- chmod 644 $pkgdir/usr/lib/libtalloc.a
+ --sysconfdir=/etc/samba \
+ --localstatedir=/var \
+ --enable-talloc-compat1
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
-md5sums=('c6e736540145ca58cb3dcb42f91cf57b')
+md5sums=('85a69bfb5808fcadf378bd9eadb1f9c2')
--
cgit v0.12
From 1886538365cf7709da0188dda18f05ce5327e0b0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 17:07:13 +0000
Subject: tdb: update to 1.2.12. dep of ldb. refs #961
---
abs/core/tdb/PKGBUILD | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/abs/core/tdb/PKGBUILD b/abs/core/tdb/PKGBUILD
index ffa330b..d0e3a79 100644
--- a/abs/core/tdb/PKGBUILD
+++ b/abs/core/tdb/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 116933 2011-03-26 14:55:24Z tpowa $
+# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=tdb
-pkgver=1.2.9
+pkgver=1.2.12
pkgrel=1
-pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits"
+pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
arch=(i686 x86_64)
license=('GPL3')
url="http://tdb.samba.org/"
source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
makedepends=('python2' 'libxslt' 'docbook-xsl')
optdepends=('python2: for python bindings')
-epoch=1
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -22,6 +21,7 @@ build() {
# Use system docbook.xsl
#_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
#sed -i "s#http.*xsl#$_manstyle#" tdb.mk
+ export PYTHON=/usr/bin/python2
./configure --prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc/samba
@@ -30,6 +30,7 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
+ export PYTHON=/usr/bin/python2
make DESTDIR=$pkgdir/ install
}
-md5sums=('4d97d18bbe9040038d4e003495bb8cd1')
+md5sums=('53e6168a7c2c93735a1c024fd2c3a7b4')
--
cgit v0.12
From b5b6b297d572ed222d16407aa127e4ca9b5bdd5b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 17:10:02 +0000
Subject: ldb: initial inclusion. dep of samba. refs #961
---
abs/extra/ldb/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 abs/extra/ldb/PKGBUILD
diff --git a/abs/extra/ldb/PKGBUILD b/abs/extra/ldb/PKGBUILD
new file mode 100644
index 0000000..9717290
--- /dev/null
+++ b/abs/extra/ldb/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Marco A Rojas <marquicus at gmail dot com>
+
+pkgname=ldb
+pkgver=1.1.16
+pkgrel=1
+pkgdesc="A schema-less, ldap like, API and database"
+arch=('i686' 'x86_64')
+url="http://ldb.samba.org/"
+source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+license=('GPL3')
+depends=('talloc' 'tevent' 'tdb' 'popt')
+makedepends=('python2')
+optdepends=('python2: for python bindings')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # change to use python2
+ sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf
+ export PYTHON=/usr/bin/python2
+
+ ./configure --prefix=/usr \
+ --disable-rpath \
+ --disable-rpath-install \
+ --bundled-libraries=NONE \
+ --builtin-libraries=replace \
+ --with-modulesdir=/usr/lib/ldb/modules \
+ --with-privatelibdir=/usr/lib/ldb
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir}/ install
+}
+md5sums=('60865c0b5704469ee2e59703087c8ec8')
--
cgit v0.12
From 22b2ce74724dcd4bcef56c29b2e27e3e5faa2db2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 18:01:25 +0000
Subject: samba: update to 4.1.6. refs #961
---
abs/extra/samba/PKGBUILD | 339 +++++++++++++--------
abs/extra/samba/nmbd.service | 6 +-
abs/extra/samba/readline-6.3.patch | 26 ++
abs/extra/samba/samba | 54 ----
.../samba/samba-4.0.3-fix_pidl_with_gcc48.patch | 60 ++++
abs/extra/samba/samba.conf | 1 +
abs/extra/samba/samba.conf.d | 25 +-
abs/extra/samba/samba.install | 9 +-
abs/extra/samba/samba.service | 14 +
abs/extra/samba/smbd.service | 5 +-
abs/extra/samba/smbd.socket | 9 +
abs/extra/samba/smbd@.service | 7 +
abs/extra/samba/swat.xinetd | 10 -
abs/extra/samba/winbindd.service | 5 +-
14 files changed, 375 insertions(+), 195 deletions(-)
create mode 100644 abs/extra/samba/readline-6.3.patch
delete mode 100755 abs/extra/samba/samba
create mode 100644 abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch
create mode 100644 abs/extra/samba/samba.service
create mode 100644 abs/extra/samba/smbd.socket
create mode 100644 abs/extra/samba/smbd@.service
delete mode 100644 abs/extra/samba/swat.xinetd
diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD
index 63d943d..4209761 100644
--- a/abs/extra/samba/PKGBUILD
+++ b/abs/extra/samba/PKGBUILD
@@ -1,168 +1,267 @@
-# $Id: PKGBUILD 162373 2012-06-26 05:39:58Z tpowa $
+
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+# Contributor: Marco A Rojas <marquicus at gmail.com>
+# Contributor: Netanel Shine <netanel at archlinux.org.il >
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
+# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com>
+
pkgbase=samba
pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.6
+pkgver=4.1.6
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=3.6.6
+_realver=4.1.6
pkgrel=1
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
+ 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam'
+ 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus')
source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
- samba samba.logrotate
- swat.xinetd
+ samba.logrotate
samba.pam
+ samba.service
samba.conf.d
smbd.service
+ smbd.socket
nmbd.service
+ smbd@.service
winbindd.service
- samba.conf)
+ samba.conf
+ readline-6.3.patch)
### UNINSTALL dmapi package before building!!!
build() {
- cd ${srcdir}/${pkgbase}-${_realver}/source3
- ./configure --prefix=/usr \
- --libdir=/usr/lib/ \
+ # Use samba-pkg as a staging directory for the split packages
+ # (This is so RPATHS and symlinks are generated correctly via
+ # make install, but the otherwise unsplit pieces can be split)
+ _pkgsrc=${srcdir}/samba-pkg
+ rm -rf ${_pkgsrc}
+ cd ${srcdir}/samba-${_realver}
+ # change to use python2
+ SAVEIFS=${IFS}
+ IFS=$(echo -en "\n\b")
+ PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py')
+$(find ${srcdir}/samba-${_realver} -name 'wscript*')
+$(find ${srcdir}/samba-${_realver} -name 'configure.ac')
+$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3')
+$(find ${srcdir}/samba-${_realver}/buildtools -type f)
+$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)"
+ sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+ -e "s|python-config|python2-config|" \
+ -e "s|bin/python|bin/python2|" \
+ ${PYTHON_CALLERS}
+ IFS=${SAVEIFS}
+
+ export PYTHON=/usr/bin/python2
+_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
+_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
+_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
+ cd ${srcdir}/samba-${_realver}
+ patch -Np1 -i ${srcdir}/readline-6.3.patch
+ ./configure --enable-fhs \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libdir=/usr/lib \
--localstatedir=/var \
--with-configdir=/etc/samba \
--with-lockdir=/var/cache/samba \
- --with-piddir=/var/run/samba \
- --with-fhs \
- --with-pam \
- --with-pam_smbpass \
- --with-pammodulesdir=/usr/lib/security \
- --with-dnsupdate \
- --with-automount \
- --with-quotas \
+ --with-sockets-dir=/var/run/samba \
+ --with-piddir=/var/run \
--with-ads \
+ --with-ldap \
+ --with-winbind \
--with-acl-support \
- --with-libsmbclient \
- --with-syslog \
- --enable-external-libtalloc \
- --disable-dnssd \
- --disable-avahi \
- --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
- --enable-external-libtdb
+ --enable-gnutls \
+ --with-pam \
+ --with-pammodulesdir=/usr/lib/security \
+ --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \
+ --disable-rpath-install
+
+ # Add this to the options once it's working...
+ #--with-system-mitkrb5 /opt/heimdal
make
+ make DESTDIR="${_pkgsrc}/" install
+
+ # This gets skipped somehow
+ if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then
+ install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/
+ fi
}
-package_libwbclient () {
+package_libwbclient() {
pkgdesc="Samba winbind client library"
-depends=('glibc')
- cd ${srcdir}/${pkgbase}-${_realver}/source3
- mkdir -p ${pkgdir}/usr/lib
- for i in libwbclient*; do
- cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
- done
+depends=('glibc' 'libbsd')
+ # Use samba-pkg as a staging directory for the split packages
+ # (This is so RPATHS and symlinks are generated correctly via
+ # make install, but the otherwise unsplit pieces can be split)
+ _pkgsrc=${srcdir}/samba-pkg
+ install -d -m755 ${pkgdir}/usr/lib
+ mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/
+
+ install -d -m755 ${pkgdir}/usr/lib/samba
+ mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/
+ mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/
+
+ install -d -m755 ${pkgdir}/usr/lib/pkgconfig
+ mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/
+
+ install -d -m755 ${pkgdir}/usr/include/samba-4.0
+ mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/
}
-package_smbclient () {
+package_smbclient() {
pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
- cd ${srcdir}/${pkgbase}-${_realver}/source3
- mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
- install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
- for i in libnetapi* libsmbclient*;do
- cp -a bin/${i}*.so* ${pkgdir}/usr/lib/
- done
- install -m755 script/smbtar ${pkgdir}/usr/bin/
- mkdir -p ${pkgdir}/usr/lib/cups/backend
- ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
- mkdir -p ${pkgdir}/usr/include
- install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
- install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
- mkdir -p ${pkgdir}/usr/share/man/man{1,7}
- for man in rpcclient smbcacls smbclient smbcquotas smbget \
- smbtree smbtar nmblookup; do
- install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
- done
- install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb'
+ 'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls'
+ 'libbsd' 'libldap' 'libcups')
+
+ _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool'
+ 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net'
+ 'nmblookup' 'nmblookup4' 'smbtar')
+ # Use samba-pkg as a staging directory for the split packages
+ # (This is so RPATHS and symlinks are generated correctly via
+ # make install, but the otherwise unsplit pieces can be split)
+ _pkgsrc=${srcdir}/samba-pkg
+ install -d -m755 ${pkgdir}/usr/bin
+ for bin in ${_smbclient_bins[@]}; do
+ mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/
+ done
+
+ # smbclient binaries link to the majority of the samba
+ # libs, so this is a shortcut instead of resolving the
+ # whole dependency tree by hand
+ install -d -m755 ${pkgdir}/usr/lib
+ for lib in ${_pkgsrc}/usr/lib/lib*.so*; do
+ mv ${lib} ${pkgdir}/usr/lib/
+ done
+
+ install -d -m755 ${pkgdir}/usr/lib/samba
+ for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do
+ mv ${lib} ${pkgdir}/usr/lib/samba/
+ done
+
+ install -d -m755 ${pkgdir}/usr/lib/pkgconfig
+ mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/
+ mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/
+ mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/
+
+ install -d -m755 ${pkgdir}/usr/share/man/man1
+ install -d -m755 ${pkgdir}/usr/share/man/man7
+ install -d -m755 ${pkgdir}/usr/share/man/man8
+ for bin in ${_smbclient_bins[@]}; do
+ if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then
+ mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/
+ fi
+ if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then
+ mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/
+ fi
+ done
+ mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+
+ install -d -m755 ${pkgdir}/usr/include/samba-4.0
+ mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/
+ mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/
+
+ mkdir -p ${pkgdir}/usr/lib/cups/backend
+ ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
}
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
+package_samba() {
+pkgdesc="SMB Fileserver and AD Domain server"
+depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gnutls>=2.4.1'
+ 'talloc' 'ldb' 'libbsd' 'python2' 'iniparser' 'tdb' 'libaio' "smbclient>=$pkgver")
backup=(etc/logrotate.d/samba
etc/pam.d/samba
etc/samba/smb.conf
etc/xinetd.d/swat
etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
-install='samba.install'
- cd ${srcdir}/samba-${_realver}/source3
+install=samba.install
+ # Use samba-pkg as a staging directory for the split packages
+ # (This is so RPATHS and symlinks are generated correctly via
+ # make install, but the otherwise unsplit pieces can be split)
+ _pkgsrc=${srcdir}/samba-pkg
+ # Everything that libwbclient and smbclient didn't install goes
+ # into the samba package...
+ mv ${_pkgsrc}/* ${pkgdir}/
+ rmdir ${_pkgsrc}
+
+ _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+ find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+ find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \
+ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+
+ # Make admin scripts look in the right place for the samba python module
+ for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \
+ bin/samba_upgradedns bin/samba-tool
+ do
+ sed -i "/^sys\.path\.insert/ a\
+sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
+ ${pkgdir}/usr/${script}
+ done
+
+ # install systemd files
+ install -d -m755 ${pkgdir}/usr/lib/systemd/system
+ #for i in smbd nmbd winbindd; do
+ install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/
+ install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/
+ install -d -m755 ${pkgdir}/etc/conf.d
+ install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba
+ #done
+ # create ephemeral dirs via tmpfiles rather than shipping them in package
+ install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
+ # install sample smb.conf
+ install -d -m755 ${pkgdir}/etc/samba
+ install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default
+
mkdir -p ${pkgdir}/etc/samba/private
chmod 700 ${pkgdir}/etc/samba/private
- make DESTDIR=${pkgdir} install
- chmod 644 ${pkgdir}/usr/include/*.h
- rm -rf ${pkgdir}/usr/var
- rm -rf ${pkgdir}/var/run/samba
- (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
- install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
- install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
- mkdir -p ${pkgdir}/etc/samba
- cat ../examples/smb.conf.default | sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
- install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
- install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
- install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
- # spool directory
- install -d -m1777 ${pkgdir}/var/spool/samba
- sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
- # fix logrotate
- sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
- # nsswitch libraries
- install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so
- ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2
- install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so
- ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2
+
+ install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+ install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba
+
# winbind krb5 locator
mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
- install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
- install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
- # remove conflict files of smbclient
- for man in libsmbclient smbspool \
- mount.cifs net cifs.upcall; do
- rm -f ${pkgdir}/usr/share/man/man8/${man}.8
- done
- for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
- rm -f ${pkgdir}/usr/lib/$i
- done
- for bin in net \
- nmblookup rpcclient smbcacls smbclient \
- smbcquotas smbget smbspool smbtar smbtree; do
- rm -f ${pkgdir}/usr/bin/$bin
- done
- rm -f ${pkgdir}/usr/sbin/cifs.upcall
- rm -f ${pkgdir}/usr/include/netapi.h
- for man in rpcclient smbcacls smbclient smbcquotas \
- smbtree smbtar nmblookup smbget; do
- rm -f ${pkgdir}/usr/share/man/man1/${man}.1
- done
- for man in tdbbackup tdbdump tdbtool; do
- rm -f ${pkgdir}/usr/share/man/man8/${man}.8
- done
- rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
- rm -f ${pkgdir}/usr/include/libsmbclient.h
+ mv ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/
+
+ # fix logrotate
+ sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+
+ # spool directory
+ install -d -m1777 ${pkgdir}/var/spool/samba
+
+ rm -rf ${pkgdir}/var/run
+
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
- # install systemd files
- for i in smbd nmbd winbindd; do
- install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service
- done
- # create ephemeral dirs via tmpfiles rather than shipping them in package
- install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
- rm -rf ${pkgdir}/var/run
}
-md5sums=('0bea52842d172231c0c0e23ee570d7af'
- 'a45a4283723be2b0ae32439dc4496a09'
+md5sums=('9dc64658c0cc81e7637f9b975c19638c'
+ '5697da77590ec092cc8a883bae06093c'
+ '96f82c38f3f540b53f3e5144900acf17'
+ 'ee4763a656cf00d92bfda31b6bb2c5cb'
+ '6c447748a064d631435dbef0a3dcf32f'
+ 'e4ae6a3cac080602120aa151918c4a36'
+ 'a78b9aa93eb14b0ac445897395693225'
+ 'df6380c73cb73163968eabc8650f7358'
+ '70afd2db60a2e8eff7615dbdecd887ac'
+ 'd5f56f43e1280bba20f6bbd88d16fa41'
+ '49abd7b719e3713a3f75a8a50958e381')
+md5sums=('9dc64658c0cc81e7637f9b975c19638c'
'5697da77590ec092cc8a883bae06093c'
- 'a4bbfa39fee95bba2e7ad6b535fae7e6'
'96f82c38f3f540b53f3e5144900acf17'
- 'f2f2e348acd1ccb566e95fa8a561b828'
- '389cc4fa3b459360feaa1b3d93274693'
- 'ea6a1251be979cb30c6098a28b270d2d'
- '455f106ce7a4f983975b3a686eaa85e5'
- '8e7ed39b54968e427f9506e9107bfb45')
+ 'ee4763a656cf00d92bfda31b6bb2c5cb'
+ '6c447748a064d631435dbef0a3dcf32f'
+ 'e4ae6a3cac080602120aa151918c4a36'
+ 'a78b9aa93eb14b0ac445897395693225'
+ 'df6380c73cb73163968eabc8650f7358'
+ '70afd2db60a2e8eff7615dbdecd887ac'
+ 'd5f56f43e1280bba20f6bbd88d16fa41'
+ '49abd7b719e3713a3f75a8a50958e381'
+ '1179c1dcdb95f79b0d5813698d010d2c')
diff --git a/abs/extra/samba/nmbd.service b/abs/extra/samba/nmbd.service
index 6e22ef2..e138225 100644
--- a/abs/extra/samba/nmbd.service
+++ b/abs/extra/samba/nmbd.service
@@ -1,8 +1,12 @@
[Unit]
Description=Samba NetBIOS name server
+After=network.target
[Service]
-ExecStart=/usr/sbin/nmbd -F
+Type=forking
+PIDFile=/var/run/nmbd.pid
+ExecStart=/usr/bin/nmbd -D
+ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/abs/extra/samba/readline-6.3.patch b/abs/extra/samba/readline-6.3.patch
new file mode 100644
index 0000000..0dcb1cf
--- /dev/null
+++ b/abs/extra/samba/readline-6.3.patch
@@ -0,0 +1,26 @@
+Function, CPFunction, CPPFunction and VFunction typedefs are considered
+old-style (deprecated) starting from readline 4.2.
+Compatibility typedefs have been in place up to readline 6.2 but were
+removed with the 6.3 release thus causing builds to break.
+Swtich to the new-style specific prototyped typedef.
+
+Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
+---
+ libcli/smbreadline/smbreadline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
+index cff25a7..80e10b0 100644
+--- a/libcli/smbreadline/smbreadline.c
++++ b/libcli/smbreadline/smbreadline.c
+@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
+
+ #if HAVE_DECL_RL_EVENT_HOOK
+ if (callback)
+- rl_event_hook = (Function *)callback;
++ rl_event_hook = (rl_hook_func_t *)callback;
+ #endif
+ ret = readline(prompt);
+ if (ret && *ret)
+--
+1.8.3.2
diff --git a/abs/extra/samba/samba b/abs/extra/samba/samba
deleted file mode 100755
index 6098ee0..0000000
--- a/abs/extra/samba/samba
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
- start)
- rc=0
- stat_busy "Starting Samba Server"
- if [ ! -x /var/log/samba ] ; then
- install -m755 -d /var/log/samba
- fi
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] && /usr/sbin/$d -D
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- add_daemon samba
- stat_done
- fi
- ;;
- stop)
- rc=0
- stat_busy "Stopping Samba Server"
- for d in ${SAMBA_DAEMONS[@]}; do
- PID=`pidof -o %PPID /usr/sbin/$d`
- [ -z "$PID" ] || kill $PID &> /dev/null
- rc=$(($rc+$?))
- done
- if [ $rc -gt 0 ]; then
- stat_fail
- else
- rm /run/samba/smbd.pid &>/dev/null
- rm /run/samba/nmbd.pid &>/dev/null
- rm /run/samba/winbindd.pid &>/dev/null
- rm_daemon samba
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch b/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch
new file mode 100644
index 0000000..cb2378a
--- /dev/null
+++ b/abs/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch
@@ -0,0 +1,60 @@
+From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <ab@samba.org>
+Date: Wed, 6 Feb 2013 10:17:57 +0200
+Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output
+
+When PIDL calls out to C preprocessor to expand IDL files
+and parse the output, it filters out linemarkers and line control
+information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control
+
+With gcc 4.8 stdc-predef.h is included automatically and linemarker for the
+file has extended flags that PIDL couldn't parse ('system header that needs to
+be extern "C" protected for C++')
+
+Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format.
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517
+
+Reviewed-by: Andreas Schneider <asn@samba.org>
+(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526)
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ pidl/idl.yp | 4 +++-
+ pidl/lib/Parse/Pidl/IDL.pm | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/pidl/idl.yp b/pidl/idl.yp
+index b5c5185..c8a65f6 100644
+--- a/pidl/idl.yp
++++ b/pidl/idl.yp
+@@ -610,7 +610,9 @@ again:
+
+ for ($parser->YYData->{INPUT}) {
+ if (/^\#/) {
+- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
++ # Linemarker format is described at
++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
+ $parser->YYData->{LINE} = $1-1;
+ $parser->YYData->{FILE} = $2;
+ goto again;
+diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
+index d4820ff..6927c89 100644
+--- a/pidl/lib/Parse/Pidl/IDL.pm
++++ b/pidl/lib/Parse/Pidl/IDL.pm
+@@ -2576,7 +2576,9 @@ again:
+
+ for ($parser->YYData->{INPUT}) {
+ if (/^\#/) {
+- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
++ # Linemarker format is described at
++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
+ $parser->YYData->{LINE} = $1-1;
+ $parser->YYData->{FILE} = $2;
+ goto again;
+--
+1.8.1.1
+
diff --git a/abs/extra/samba/samba.conf b/abs/extra/samba/samba.conf
index c12610d..32e7228 100644
--- a/abs/extra/samba/samba.conf
+++ b/abs/extra/samba/samba.conf
@@ -1 +1,2 @@
D /run/samba 0755 - - -
+d /var/log/samba 0755 - - -
\ No newline at end of file
diff --git a/abs/extra/samba/samba.conf.d b/abs/extra/samba/samba.conf.d
index 8721f95..7607426 100644
--- a/abs/extra/samba/samba.conf.d
+++ b/abs/extra/samba/samba.conf.d
@@ -1,7 +1,18 @@
-#
-# Configuration for the samba init script
-#
-
-# space separated list of daemons to launch
-SAMBA_DAEMONS=(smbd nmbd)
-#SAMBA_DAEMONS=(smbd nmbd winbindd)
+## Path: Network/Samba
+## Description: Samba process options
+## Type: string
+## Default: ""
+## ServiceRestart: samba
+SAMBAOPTIONS=""
+## Type: string
+## Default: ""
+## ServiceRestart: smb
+SMBDOPTIONS=""
+## Type: string
+## Default: ""
+## ServiceRestart: nmb
+NMBDOPTIONS=""
+## Type: string
+## Default: ""
+## ServiceRestart: winbind
+WINBINDOPTIONS=""
diff --git a/abs/extra/samba/samba.install b/abs/extra/samba/samba.install
index d9baeac..420643f 100644
--- a/abs/extra/samba/samba.install
+++ b/abs/extra/samba/samba.install
@@ -1,7 +1,14 @@
#!/bin/sh
post_install() {
- systemd-tmpfiles --create /usr/lib/tmpfiles.d/samba.conf
+ systemd-tmpfiles --create samba.conf
}
+post_upgrade() {
+ if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then
+ echo "Major upgrade from samba 3.x to 4.x,"
+ echo "please read the Samba4 migration guide:"
+ echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO"
+ fi
+}
# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/samba/samba.service b/abs/extra/samba/samba.service
new file mode 100644
index 0000000..562d425
--- /dev/null
+++ b/abs/extra/samba/samba.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Samba AD Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba.pid
+LimitNOFILE=16384
+EnvironmentFile=-/etc/conf.d/samba
+ExecStart=/usr/bin/samba $SAMBAOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/extra/samba/smbd.service b/abs/extra/samba/smbd.service
index beb9bfa..0a8125d 100644
--- a/abs/extra/samba/smbd.service
+++ b/abs/extra/samba/smbd.service
@@ -1,8 +1,11 @@
[Unit]
Description=Samba SMB/CIFS server
+After=network.target nmbd.service winbindd.service
[Service]
-ExecStart=/usr/sbin/smbd -F
+Type=forking
+PIDFile=/var/run/smbd.pid
+ExecStart=/usr/bin/smbd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
diff --git a/abs/extra/samba/smbd.socket b/abs/extra/samba/smbd.socket
new file mode 100644
index 0000000..833bf43
--- /dev/null
+++ b/abs/extra/samba/smbd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Samba SMB/CIFS server socket
+
+[Socket]
+ListenStream=445
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/abs/extra/samba/smbd@.service b/abs/extra/samba/smbd@.service
new file mode 100644
index 0000000..071eb57
--- /dev/null
+++ b/abs/extra/samba/smbd@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Samba SMB/CIFS server instance
+
+[Service]
+ExecStart=/usr/bin/smbd -F
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
diff --git a/abs/extra/samba/swat.xinetd b/abs/extra/samba/swat.xinetd
deleted file mode 100644
index 2e62a82..0000000
--- a/abs/extra/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/swat
- log_on_success += HOST DURATION
- log_on_failure += HOST
- disable = yes
-}
diff --git a/abs/extra/samba/winbindd.service b/abs/extra/samba/winbindd.service
index 509c896..41ecbfd 100644
--- a/abs/extra/samba/winbindd.service
+++ b/abs/extra/samba/winbindd.service
@@ -1,8 +1,11 @@
[Unit]
Description=Samba Winbind daemon
+After=network.target nmbd.service
[Service]
-ExecStart=/usr/sbin/winbindd -F
+Type=forking
+PIDFile=/var/run/winbindd.pid
+ExecStart=/usr/bin/winbindd -D
ExecReload=/bin/kill -HUP $MAINPID
[Install]
--
cgit v0.12
From cc7bcb1cb6630056983940f0761b0bd4458ff793 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 18:24:07 +0000
Subject: libaio: initial inclusion. dep of samba. refs #961
---
abs/extra/libaio/PKGBUILD | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 abs/extra/libaio/PKGBUILD
diff --git a/abs/extra/libaio/PKGBUILD b/abs/extra/libaio/PKGBUILD
new file mode 100644
index 0000000..41ca5d6
--- /dev/null
+++ b/abs/extra/libaio/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Thomas S Hatch <thatch45 at gmail dot com>
+
+pkgname=libaio
+pkgver=0.3.109
+pkgrel=7
+pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
+arch=('i686' 'x86_64')
+url="http://lse.sourceforge.net/io/aio.html"
+license=('LGPL')
+source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz)
+md5sums=('435a5b16ca6198eaf01155263d855756')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make prefix="$pkgdir/usr" install
+}
+
--
cgit v0.12
From a7f7a5acda2da4c00448d672c55ca143c5c15bb9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 18:26:33 +0000
Subject: chrpath: initial inclusion. dep of iniparser. refs #961
---
abs/extra/chrpath/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 abs/extra/chrpath/PKGBUILD
diff --git a/abs/extra/chrpath/PKGBUILD b/abs/extra/chrpath/PKGBUILD
new file mode 100644
index 0000000..4c5d2a2
--- /dev/null
+++ b/abs/extra/chrpath/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=chrpath
+pkgver=0.16
+pkgrel=1
+pkgdesc="Change or delete the rpath or runpath in ELF files"
+arch=('i686' 'x86_64')
+url="http://directory.fsf.org/project/chrpath/"
+license=('GPL2')
+depends=('glibc')
+source=("https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-$pkgver.tar.gz")
+md5sums=('2bf8d1d1ee345fc8a7915576f5649982')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+# rm -f config.guess
+# aclocal
+# libtoolize
+# automake --add-missing
+# autoconf
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ make DESTDIR="${pkgdir}" docdir=/usr/share/doc/chrpath install
+}
--
cgit v0.12
From 7c3606924e87e8c63cce5f9051cabfedfaebf13b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 18:27:34 +0000
Subject: iniparser: initial inclusion. dep of samba. refs #961
---
abs/extra/iniparser/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 abs/extra/iniparser/PKGBUILD
diff --git a/abs/extra/iniparser/PKGBUILD b/abs/extra/iniparser/PKGBUILD
new file mode 100644
index 0000000..8f36631
--- /dev/null
+++ b/abs/extra/iniparser/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+
+pkgname=iniparser
+pkgver=3.1
+pkgrel=4
+pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C"
+arch=('i686' 'x86_64')
+url="http://ndevilla.free.fr/iniparser/"
+license=('MIT')
+depends=('glibc')
+makedepends=('chrpath')
+source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz)
+md5sums=('0aa4f995468ed390caf323f50a285bc3')
+
+build() {
+ cd $srcdir/$pkgname
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname
+ install -Dm644 src/iniparser.h $pkgdir/usr/include/iniparser.h
+ install -Dm644 src/dictionary.h $pkgdir/usr/include/dictionary.h
+ install -Dm644 libiniparser.a $pkgdir/usr/lib/libiniparser.a
+ install -Dm644 libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so.0
+ install -Dm644 LICENSE $pkgdir/usr/share/licenses/iniparser/LICENSE
+ ln -sf libiniparser.so.0 $pkgdir/usr/lib/libiniparser.so
+ chrpath -d $pkgdir/usr/lib/libiniparser.so
+}
--
cgit v0.12
From a70c8f95c4f0cc69f3f358482c628eccf0aaf198 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 10 Apr 2014 23:15:00 +0000
Subject: system-templates: update smb.conf.template for samba 4.1
---
abs/core/system-templates/PKGBUILD | 2 +-
.../templates/samba/smb.conf.template | 127 +++++++++++++++------
2 files changed, 92 insertions(+), 37 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 7a66e82..0013ab4 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=27
+pkgrel=28
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/samba/smb.conf.template b/abs/core/system-templates/templates/samba/smb.conf.template
index 478ea6b..773315a 100644
--- a/abs/core/system-templates/templates/samba/smb.conf.template
+++ b/abs/core/system-templates/templates/samba/smb.conf.template
@@ -1,14 +1,24 @@
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not made any basic syntactic errors.
#
#======================= Global Settings =====================================
[global]
+# workgroup = NT-Domain-Name or Workgroup-Name
workgroup = home_lan
- server string = MythVantage
-# Security mode. Defines in which mode Samba will operate. Possible
-# values are share, user, server, domain and ads. Most people will want
-# user level security. See the Samba-HOWTO-Collection for details.
- security = share
+# server string is the equivalent of the NT Description field
+ server string = LinHES
# This option is important for security. It allows you to restrict
# connections to machines which are on your local network. The
@@ -17,49 +27,73 @@
# the smb.conf man page
; hosts allow = 192.168.1. 192.168.2. 127.
- load printers = no
- printing = bsd
+# if you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
printcap name = /dev/null
-# you may wish to override the location of the printcap file
-; printcap name = /etc/printcap
+ load printers = no
+
+# It should not be necessary to spell out the print system type unless
+# yours is non-standard. Currently supported print systems include:
+# bsd, sysv, plp, lprng, aix, hpux, qnx
+; printing = bsd
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
; guest account = pcguest
# this tells Samba to use a separate log file for each machine
# that connects
- log file = /var/log/samba/log.%m
+ log file = /var/log/samba/%m.log
# Put a capping on the size of the log files (in Kb).
max log size = 50
+# Security mode. Most people will want user level security. See
+# security_level.txt for details.
+ security = user
# Use password server option only with security = server
-# The argument list may include:
-# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-# password server = *
; password server = <NT-Server-Name>
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-; realm = MY_REALM
-
-# Backend to store user information in. New installations should
-# use either tdbsam or ldapsam. smbpasswd is available for backwards
-# compatibility. tdbsam requires no further configuration.
-; passdb backend = tdbsam
+# Password Level allows matching of _n_ characters of the password for
+# all combinations of upper and lower case.
+; username level = 8
+
+# You may wish to use password encryption. Please read
+# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
+# Do not enable this option unless you have read those documents
+; encrypt passwords = yes
+; smb passwd file = /etc/samba/smbpasswd
+
+# The following are needed to allow password changing from Windows to
+# update the Linux sytsem password also.
+# NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above.
+# NOTE2: You do NOT need these to allow workstations to change only
+# the encrypted SMB passwords. They allow the Unix password
+# to be kept in sync with the SMB password.
+; unix password sync = Yes
+; passwd program = /usr/bin/passwd %u
+; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
+
+# Unix users can map to different SMB User names
+; username map = /etc/samba/smbusers
# Using the following line enables you to customise your configuration
# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-# this line. The included file is read at that point.
-; include = /usr/local/samba/lib/smb.conf.%m
+# of the machine that is connecting
+; include = /etc/samba/smb.conf.%m
# Configure Samba to use multiple interfaces
# If you have multiple network interfaces then you must list them
# here. See the man page for details.
; interfaces = 192.168.12.2/24 192.168.13.2/24
+# Configure remote browse list synchronisation here
+# request announcement to, or browse list sync from:
+# a specific host or from / to a whole subnet (see below)
+; remote browse sync = 192.168.3.25 192.168.5.255
+# Cause this host to announce itself to local subnets here
+; remote announce = 192.168.1.255 192.168.2.44
+
# Browser Control Options:
# set local master to no if you don't want Samba to become a master
# browser on your network. Otherwise the normal election rules apply
@@ -78,6 +112,10 @@
# and gives it a slightly higher chance of winning the election
; preferred master = yes
+# Use only if you have an NT server on your network that has been
+# configured at install time to be a primary domain controller.
+; domain controller = <NT-Domain-Controller-SMBName>
+
# Enable this if you want Samba to be a domain logon server for
# Windows95 workstations.
; domain logons = yes
@@ -94,6 +132,19 @@
# You must uncomment the [Profiles] share below
; logon path = \\%L\Profiles\%U
+# All NetBIOS names must be resolved to IP Addresses
+# 'Name Resolve Order' allows the named resolution mechanism to be specified
+# the default order is "host lmhosts wins bcast". "host" means use the unix
+# system gethostbyname() function call that will use either /etc/hosts OR
+# DNS or NIS depending on the settings of /etc/host.config, /etc/nsswitch.conf
+# and the /etc/resolv.conf file. "host" therefore is system configuration
+# dependant. This parameter is most often of use to prevent DNS lookups
+# in order to resolve NetBIOS names to IP Addresses. Use with care!
+# The example below excludes use of name resolution for machines that are NOT
+# on the local network segment
+# - OR - are not deliberately to be known via lmhosts or via WINS.
+; name resolve order = wins lmhosts bcast
+
# Windows Internet Name Serving Support Section:
# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
; wins support = yes
@@ -108,18 +159,22 @@
; wins proxy = yes
# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
+# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
+# this has been changed in version 1.9.18 to no.
dns proxy = no
-# These scripts are used on a domain controller or stand-alone
-# machine to add or delete corresponding unix accounts
-; add user script = /usr/sbin/useradd %u
-; add group script = /usr/sbin/groupadd %g
-; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-; delete user script = /usr/sbin/userdel %u
-; delete user from group script = /usr/sbin/deluser %u %g
-; delete group script = /usr/sbin/groupdel %g
-
+# Case Preservation can be handy - system default is _no_
+# NOTE: These can be set on a per share basis
+; preserve case = no
+; short preserve case = no
+# Default case is normally upper case for all DOS files
+; default case = lower
+# Be very careful with case sensitivity - it can break things!
+; case sensitive = no
+
+ map to guest = bad user
+ unix extensions = no
+ wide links = yes
#============================ Share Definitions ==============================
--
cgit v0.12
From f99b659f10f2d6016b115da7ae6d8af4ff75d585 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 11 Apr 2014 14:11:59 +0000
Subject: LinHES-system: idle.py: add to check if mythfrontends are in menus
and if not system busy.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/idle.py | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index cc3ec38..d151b48 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=22
+pkgrel=23
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -119,7 +119,7 @@ md5sums=('a10cb96850951ae835c46f41f92463b2'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
- '1118e7982ba77cb5be9b2391b7cdfd38'
+ 'b08a9c9aa1215e9aa3aa7d2e654e72e5'
'a94fe6d980f4b810f2e2ae5352084b39'
'384956b4fd9bf40907856bab0e67b169'
'f4ce577e2ab1b6dbf9def46a8ab86e2d'
diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py
index 40bbb16..16dc873 100755
--- a/abs/core/LinHES-system/idle.py
+++ b/abs/core/LinHES-system/idle.py
@@ -207,13 +207,18 @@ def mythfe_check(cmdargs,cursor,mythDB):
return False
else:
msg(cmdargs," %s's mythfrontend is NOT playing." %i)
+ if '.xml' in location or 'mainmenu' in location:
+ msg(cmdargs," %s's mythfrontend is in MENUS." %i)
+ else:
+ msg(cmdargs," %s's mythfrontend is NOT in menus." %i)
+ return False
except:
msg(cmdargs," Could not connect to %s's mythfrontend." %i)
if ( cmdargs.runningfe ):
- msg(cmdargs," No mythfrontends are running or playing.")
+ msg(cmdargs," mythfrontends are not running or playing or are in menus.")
else:
- msg(cmdargs," No mythfrontends are playing.")
+ msg(cmdargs," mythfrontends are not playing or are in menus.")
return True
@@ -235,8 +240,9 @@ def usage():
- mythtv-setup is running return busy
- There are upcoming recordings return busy
checks the next 15 minutes. -t TIME changes time
- - mythfrontends playing back a recording or video
- (option -r) mythfrontends running
+ - mythfrontends playing back a recording or video
+ - mythfrontends not in menus
idle.py stops checking and returns false (busy) when the first busy is found.
'''
--
cgit v0.12
From a8ffca317c742720af2d83a33e11623a4fd36265 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 11 Apr 2014 21:59:03 +0000
Subject: runit-scripts: shellinaboxd: update run
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/shellinaboxd/run | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 64eeff7..7bc5103 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=13
+pkgrel=14
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
index bc94a73..cddfe08 100755
--- a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -6,4 +6,4 @@ export TERM=linux
stat_runit "Starting shellinabox"
-exec su - mythtv -c "shellinaboxd -c /etc/lighttpd/ --no-beep"
+exec shellinaboxd -u 1000 -c /etc/lighttpd/ --no-beep
--
cgit v0.12
From 7cb1f208092542b48a22398ef04b84ea02fd0ac0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 16:55:32 +0000
Subject: samba: run systemconfig.py on update
---
abs/extra/samba/PKGBUILD | 2 +-
abs/extra/samba/samba.install | 1 +
abs/extra/samba/samba.logrotate | 9 +++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 abs/extra/samba/samba.logrotate
diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD
index 4209761..18aebfc 100644
--- a/abs/extra/samba/PKGBUILD
+++ b/abs/extra/samba/PKGBUILD
@@ -15,7 +15,7 @@ pkgver=4.1.6
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=4.1.6
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
diff --git a/abs/extra/samba/samba.install b/abs/extra/samba/samba.install
index 420643f..26dbfa4 100644
--- a/abs/extra/samba/samba.install
+++ b/abs/extra/samba/samba.install
@@ -10,5 +10,6 @@ post_upgrade() {
echo "please read the Samba4 migration guide:"
echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO"
fi
+ systemconfig.py -m fileshare
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/samba/samba.logrotate b/abs/extra/samba/samba.logrotate
new file mode 100644
index 0000000..581f4c3
--- /dev/null
+++ b/abs/extra/samba/samba.logrotate
@@ -0,0 +1,9 @@
+/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
+ notifempty
+ missingok
+ sharedscripts
+ copytruncate
+ postrotate
+ /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
+ endscript
+}
--
cgit v0.12
From b93628bae449bd9c92aa465b9fb4e13405ae2c19 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 17:01:22 +0000
Subject: system-templates: remove comment workgroup and server string
---
abs/core/system-templates/PKGBUILD | 2 +-
abs/core/system-templates/templates/samba/smb.conf.template | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 0013ab4..2494b3e 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=28
+pkgrel=29
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/samba/smb.conf.template b/abs/core/system-templates/templates/samba/smb.conf.template
index 773315a..590b01b 100644
--- a/abs/core/system-templates/templates/samba/smb.conf.template
+++ b/abs/core/system-templates/templates/samba/smb.conf.template
@@ -14,10 +14,8 @@
#======================= Global Settings =====================================
[global]
-# workgroup = NT-Domain-Name or Workgroup-Name
workgroup = home_lan
-# server string is the equivalent of the NT Description field
server string = LinHES
# This option is important for security. It allows you to restrict
--
cgit v0.12
From c06b231cb8d754b8b39efc26f15226fc57e70e54 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 18:55:08 +0000
Subject: LinHES-config: mv_network.py: add network fixed name link
mv_install.py: remove devpts and shm from fstab
---
abs/core/LinHES-config/PKGBUILD | 8 ++++----
abs/core/LinHES-config/mv_fileshare.py | 4 ++--
abs/core/LinHES-config/mv_install.py | 16 ----------------
abs/core/LinHES-config/mv_network.py | 8 ++++++++
4 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 3c3c06f..23d3057 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=16
+pkgrel=17
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -133,7 +133,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('e4faaa3d5f180d796e200b701048b008'
+md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
'3f6855b7bb860a44f96a972c2e80f497'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
@@ -161,7 +161,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'6356c271bf6639002d4c59406250a1f6'
'8b7dce4a3a0a281fa6656aa8781a648e'
- 'f7f2dc11d1ba454cd25eeaa133104b62'
+ '8903d2e17a6955ba59e6f17a65bfc082'
'824e49d9b01fed295c704ab68908b464'
'fe5e31b833cc6707209e9d656b6eb53c'
'71b4860bbc8b7d94311acee7efa7269c'
@@ -169,7 +169,7 @@ md5sums=('e4faaa3d5f180d796e200b701048b008'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
- 'cf51cb22e23218ae7e9b55cac1ba3a7f'
+ '73ed13881c748375296454746c865cd2'
'781f161a79c3188a31c8615b8258b241'
'18370d92ba6b467bcc4996c377e1fa1f'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_fileshare.py b/abs/core/LinHES-config/mv_fileshare.py
index 746dbbf..14ce26b 100755
--- a/abs/core/LinHES-config/mv_fileshare.py
+++ b/abs/core/LinHES-config/mv_fileshare.py
@@ -196,11 +196,11 @@ def setup_samba(systemconfig,data_config):
outline = line
if re.match("^.*workgroup", line):
logging.debug(" Setting workgroup to %s",domain)
- outline="workgroup = %s\n" %domain
+ outline=" workgroup = %s\n" %domain
logging.debug(" %s",outline)
if re.match("^.* server string",line):
logging.debug(" Setting server name to %s",servername)
- outline="server string = %s\n" %servername
+ outline=" server string = %s\n" %servername
logging.debug(" %s",outline)
f.write(outline)
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index fe4a395..4abdaa7 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -946,10 +946,6 @@ def create_fstab(extralines):
f = open(fstabfile, 'w')
line = '''# <file system> <dir> <type> <options> <dump> <pass> \n'''
fstab_list.append(line)
- line = '''devpts /dev/pts devpts defaults 0 0 \n'''
- fstab_list.append(line)
- line = '''shm /dev/shm tmpfs nodev,nosuid 0 0 \n'''
- fstab_list.append(line)
line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n'''
fstab_list.append(line)
line = '''UUID=ROOTUID / %s defaults,noatime 0 1\n''' %(hostoptions["rootfs"])
@@ -1162,18 +1158,6 @@ def fstab_it(install_type):
newfstab.append(line)
- elif line.startswith("none"):
- templine = line.split()
- if ( templine[1] == "/dev/pts" ):
- newline = '''devpts /dev/pts devpts defaults 0 0 \n'''
- logging.debug(" New fstab line (converted):")
- logging.debug( newline)
- newfstab.append(newline)
- if ( templine[1] == "/dev/shm" ):
- newline = '''shm /dev/shm tmpfs nodev,nosuid 0 0 \n'''
- logging.debug(" New fstab line(converted):")
- logging.debug( newline)
- newfstab.append(newline)
else:
logging.debug(" Line didn't match, adding to newfstab:")
logging.debug( line)
diff --git a/abs/core/LinHES-config/mv_network.py b/abs/core/LinHES-config/mv_network.py
index f011970..cf01c31 100755
--- a/abs/core/LinHES-config/mv_network.py
+++ b/abs/core/LinHES-config/mv_network.py
@@ -385,6 +385,14 @@ def devcheck(netdev):
return False
def udev_rules(netdev):
+ logging.info(" Disable network fixed name assignment")
+ mv_common.remove_file("/etc/udev/rules.d/80-net-setup-link.rules") #systemd v209+
+ mv_common.remove_file("/etc/udev/rules.d/80-net-name-slot.rules") #systemd v197-v208
+ cmd = "ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules"
+ mv_common.runcmd(cmd)
+ cmd = "ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules"
+ mv_common.runcmd(cmd)
+
filename = "/etc/udev/rules.d/net.rules"
if devcheck(netdev):
logging.info(" Finding macaddress for %s",netdev)
--
cgit v0.12
From af658fc3757d37b3b3ceff716f05571db5250cf7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 19:43:42 +0000
Subject: system-templates: fstab remove pts and shm
---
abs/core/system-templates/PKGBUILD | 2 +-
abs/core/system-templates/templates/fstab.conf.template | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 2494b3e..aec22f1 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=29
+pkgrel=30
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/fstab.conf.template b/abs/core/system-templates/templates/fstab.conf.template
index 2bf5547..e2f5278 100755
--- a/abs/core/system-templates/templates/fstab.conf.template
+++ b/abs/core/system-templates/templates/fstab.conf.template
@@ -2,13 +2,6 @@
# /etc/fstab: static file system information
#
# <file system> <dir> <type> <options> <dump> <pass>
-#none /dev/pts devpts defaults 0 0
-#none /dev/shm tmpfs defaults 0 0
-
-# <file system> <dir> <type> <options> <dump> <pass>
-devpts /dev/pts devpts defaults 0 0
-shm /dev/shm tmpfs nodev,nosuid 0 0
-
/dev/cdrom /mnt/cd iso9660 ro,user,noauto,unhide 0 0
/dev/dvd /mnt/dvd udf ro,user,noauto,unhide 0 0
--
cgit v0.12
From 7b9062c07f9dfdaa08858820774207a12ac9324b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 20:30:35 +0000
Subject: LinHES-config: in .install remove pts and shm from fstab
---
abs/core/LinHES-config/PKGBUILD | 2 +-
abs/core/LinHES-config/config.install | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 23d3057..4a891db 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.1
-pkgrel=17
+pkgrel=18
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install
index 4c99e03..0b7060e 100644
--- a/abs/core/LinHES-config/config.install
+++ b/abs/core/LinHES-config/config.install
@@ -21,7 +21,7 @@ post_install() {
# arg 1: the new package version
# arg 2: the old package version
pre_upgrade() {
- /bin/true
+ /usr/bin/true
}
# arg 1: the new package version
@@ -41,16 +41,21 @@ post_upgrade() {
fi
/usr/MythVantage/bin/systemconfig.py -m locale
+ echo " Removing pts and shm from fstab..."
+ cp -a /etc/fstab /etc/fstab.backup.pre_pts_shm
+ sed -i '/\/dev\/pts/d' /etc/fstab
+ sed -i '/\/dev\/shm/d' /etc/fstab
+
}
# arg 1: the old package version
pre_remove() {
- /bin/true
+ /usr/bin/true
}
# arg 1: the old package version
post_remove() {
- /bin/true
+ /usr/bin/true
}
op=$1
--
cgit v0.12
From 2069df55aaf31a2b9903f72120645586caf4871b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 22:05:48 +0000
Subject: mythtv & mythplugins: update to latest fixes
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml | 2 +-
abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 108ebdf..065c8e2 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-39686c6c6800053fe25764d2f27cfdfc2dd21fab
+ad2f1ffebde4fcb05856584a3411a45487cc4cf5
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 3deb3ee..45c4187 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=12
+pkgrel=13
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 815f74b..fe05903 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=12
+pkgrel=13
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
index 0b13a8f..2d47e7d 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update.xml
@@ -5,7 +5,7 @@
<text>Check for Updates</text>
<description>Search for LinHES system updates</description>
<action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
-<!-- <action>JUMP Reload Theme</action> -->
+ <action>JUMP Reload Theme</action>
</button>
</mythmenu>
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
index 25102b9..4eee8cc 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/update2.xml
@@ -5,7 +5,7 @@
<text>Install Updates</text>
<description>Install updates for the LinHES system</description>
<action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
-<!-- <action>JUMP Reload Theme</action> -->
+ <action>JUMP Reload Theme</action>
</button>
<button>
@@ -13,7 +13,7 @@
<text>Cancel Updates</text>
<description>Return to Main Menu</description>
<action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
-<!-- <action>JUMP Reload Theme</action> -->
+ <action>JUMP Reload Theme</action>
</button>
<button>
--
cgit v0.12
From cf0235e1c17c11a80c20c1a1f40b009c270659bc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 12 Apr 2014 22:28:00 +0000
Subject: google-chrome: update to 34.0.1847.116
---
abs/extra/google-chrome/PKGBUILD | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index ec1f344..ca4ae42 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,18 +5,18 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=33.0.1750.152
-pkgrel=2
+pkgver=34.0.1847.116
+pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
url="https://www.google.com/chrome"
license=('custom:chrome')
-depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu'
+depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu'
'libgcrypt' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=${pkgver}")
-conflicts=('google-chrome')
+conflicts=('google-chrome<35')
replaces=('chromium')
options=('!emptydirs' '!strip')
install=${pkgname}.install
@@ -25,7 +25,7 @@ _arch=i386
[ "${CARCH}" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
'https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html')
-[ "${CARCH}" = 'x86_64' ] && md5sums[0]='305fda0487a3e0779d1fd2b4213be1cb'
+[ "${CARCH}" = 'x86_64' ] && md5sums[0]='f0186cc5b1f6ceb0166abb0628182663'
package() {
msg2 "Extracting the data.tar.lzma"
@@ -55,5 +55,5 @@ package() {
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
}
-md5sums=('305fda0487a3e0779d1fd2b4213be1cb'
+md5sums=('f0186cc5b1f6ceb0166abb0628182663'
'6d57da7476a4b1b7a81821d9c036425c')
--
cgit v0.12
From fd92e5feaf57f1f245e4daeb83e8c165ee728561 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 13 Apr 2014 19:27:58 +0000
Subject: perl-perl4-corelibs: initial inclusion: dep of webmin
---
abs/extra/perl-perl4-corelibs/PKGBUILD | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 abs/extra/perl-perl4-corelibs/PKGBUILD
diff --git a/abs/extra/perl-perl4-corelibs/PKGBUILD b/abs/extra/perl-perl4-corelibs/PKGBUILD
new file mode 100644
index 0000000..7ff205c
--- /dev/null
+++ b/abs/extra/perl-perl4-corelibs/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:
+
+pkgname=perl-perl4-corelibs
+pkgver=0.003
+pkgrel=2
+pkgdesc="Libraries historically supplied with Perl 4"
+arch=('any')
+url="https://metacpan.org/release/Perl4-CoreLibs"
+license=('PerlArtistic' 'GPL')
+depends=('perl')
+options=('!emptydirs')
+source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Perl4-CoreLibs-$pkgver.tar.gz")
+sha1sums=('ad4c5a9fa8da4f461dc774e5c53136a55413ef2f')
+
+build() {
+ cd Perl4-CoreLibs-$pkgver
+ perl Build.PL
+ ./Build
+}
+
+check() {
+ cd Perl4-CoreLibs-$pkgver
+ ./Build test
+}
+
+package() {
+ cd Perl4-CoreLibs-$pkgver
+ ./Build install installdirs=vendor destdir="$pkgdir"
+}
--
cgit v0.12
From 525f7158871222ee7011c122900351451506c48b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 13 Apr 2014 20:31:31 +0000
Subject: webmin: update to 1.680. closes #965
runit-scripts: add webmin service
---
abs/core/runit-scripts/PKGBUILD | 2 +-
.../runit-scripts/runitscripts/services/webmin/run | 11 +++
abs/extra/webmin/PKGBUILD | 108 ++++++++++-----------
abs/extra/webmin/__changelog | 2 +
abs/extra/webmin/changelog | 3 -
abs/extra/webmin/run | 11 ---
abs/extra/webmin/webmin-config.tar.bz2 | Bin 3021 -> 3125 bytes
abs/extra/webmin/webmin.rc | 44 ---------
abs/extra/webmin/webmin.service | 11 +++
9 files changed, 74 insertions(+), 118 deletions(-)
create mode 100644 abs/core/runit-scripts/runitscripts/services/webmin/run
create mode 100644 abs/extra/webmin/__changelog
delete mode 100644 abs/extra/webmin/changelog
delete mode 100644 abs/extra/webmin/run
delete mode 100644 abs/extra/webmin/webmin.rc
create mode 100644 abs/extra/webmin/webmin.service
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 7bc5103..d97d14f 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=14
+pkgrel=15
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/webmin/run b/abs/core/runit-scripts/runitscripts/services/webmin/run
new file mode 100644
index 0000000..659c6cd
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/webmin/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo Starting Webmin server in /opt/webmin
+trap '' 1
+LANG=
+export LANG
+#PERLIO=:raw
+unset PERLIO
+export PERLIO
+PERLLIB=/opt/webmin
+export PERLLIB
+exec '/opt/webmin/miniserv.pl' /etc/webmin/miniserv.conf
diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index f022902..bf05a4f 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,13 +1,13 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
-pkgver=1.570
+pkgver=1.680
pkgrel=1
pkgdesc="a web-based interface for system administration"
arch=(i686 x86_64)
license=('custom:webmin')
url="http://www.webmin.com/"
-depends=('perl')
+depends=('perl' 'perl-perl4-corelibs')
makedepends=('perl-net-ssleay')
backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
'etc/webmin/pacman/config' \
@@ -83,18 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi
'etc/webmin/pserver/config' \
'etc/webmin/dnsadmin/config' )
install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
- ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2
- ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
- webmin.rc
- run)
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
+ ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2
+ ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
+ webmin.service)
options=(!strip)
-build() {
+package() {
# NOTE: USE --asroot build option to avoid fakeroot error!
- cd $startdir/src/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
# add patches from webmin.com
- #for i in ../*.wbm
+ #for i in ../*.wbm
#do tar xvf $i
#done
#for i in ../*.wbt
@@ -104,13 +103,13 @@ build() {
rm -f mount/freebsd-mounts*
rm -f mount/openbsd-mounts*
rm -f mount/macos-mounts*
-
+
# remove modules we do not support
rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-
+
#remove config files from other distros
rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-
+
# remove caldera theme
rm -rf caldera
@@ -125,33 +124,33 @@ build() {
rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
# remove modules add because we don't want files installed without pacman control
- rm -f webmin/{install_mod.cgi,delete_mod.cgi}
+ rm -f webmin/{install_mod.cgi,delete_mod.cgi}
# setting perl path
(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-
+
# create dirs
- mkdir -p $startdir/pkg/opt/webmin
- mkdir -p $startdir/pkg/var/log/webmin
- mkdir -p $startdir/pkg/etc/webmin
-
+ mkdir -p "$pkgdir"/opt/webmin
+ mkdir -p "$pkgdir"/var/log/webmin
+ mkdir -p "$pkgdir"/etc/webmin
+
# install pam stuff
- install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin
-
+ install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
+
# remove other distros and add only Archlinux don't change next line else it will not work!
rm os_list.txt
- echo 'Archlinux Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt
-
+ echo 'LinHES Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt
+
# Add rc.conf support to boot and shutdown menu and lock editing of this module
cd init/
sed -i -e 's:^local_down=.*:local_down=Archlinux RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
- sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
+ sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
sed -i -e 's:^index_downscript=.*:index_downscript=Archlinux RC.CONF:g' lang/*
sed -i -e 's:^index_script=.*:index_script=Archlinux RC.LOCAL:g' lang/*
sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl
# Add pacman menu
- cd $startdir/src/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
cp -rf custom/ pacman
cp -rf mscstyle3/custom mscstyle3/pacman
sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
@@ -162,14 +161,14 @@ build() {
sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
# copy stuff to right dirs
- cd $startdir/src/$pkgname-$pkgver
- cp -rp * $startdir/pkg/opt/webmin
- cd $startdir/src/webmin-config
- cp -rfp * $startdir/pkg/opt/webmin
+ cd "$srcdir"/$pkgname-$pkgver
+ cp -rp * "$pkgdir"/opt/webmin
+ cd "$srcdir"/webmin-config
+ cp -rfp * "$pkgdir"/opt/webmin
# define parameters for setup.sh
- config_dir=$startdir/pkg/etc/webmin
- var_dir=$startdir/pkg/var/log/webmin
+ config_dir="$pkgdir"/etc/webmin
+ var_dir="$pkgdir"/var/log/webmin
perl=/usr/bin/perl
autoos=1
port=10000
@@ -183,44 +182,35 @@ build() {
nouninstall=1
noperlpath=1
atbootyn=n
- tempdir=$startdir/pkg/tmp
+ tempdir="$pkgdir"/tmp
export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-
+
# Fix setup.sh
- sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh
- $startdir/pkg/opt/webmin/setup.sh
-
+ sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
+ "$pkgdir"/opt/webmin/setup.sh
+
# Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf
- find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \;
-
- # make it only accessible by localhost and private networks
- echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> $startdir/pkg/etc/webmin/miniserv.conf
-
- # Let's not fork this bad boy. We need to control it w/ runit.
- echo 'nofork=1' >> $startdir/pkg/etc/webmin/miniserv.conf
-
- # runit
- mkdir -p $startdir/pkg/etc/sv/webmin/supervise
- install -D -m 755 $startdir/src/run $startdir/pkg/etc/sv/webmin
+ sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+ find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
+
+ # make it only accessible by localhost
+ echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> "$pkgdir"/etc/webmin/miniserv.conf
# install pacman menu
- cd $startdir/src/webmin-pacman/config
- cp -rfp * $startdir/pkg/etc/webmin/pacman
+ cd "$srcdir"/webmin-pacman/config
+ cp -rfp * "$pkgdir"/etc/webmin/pacman
- #install rc file
- install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
+ # install systemd files
+ install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
# delete temp dir
- rm -r $startdir/pkg/tmp
+ rm -r "$pkgdir"/tmp
# change sticky bit
chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
# install license
- install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
+ install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
}
-
-md5sums=('20b4f488637366c39458b9b93162eff3'
- 'da6bea412a5be8cf82a813078fec5847'
+md5sums=('52654bd0fe36e9cace00fa74e49d41d8'
+ 'b0b3e3fb231a12e60165b6b4d604dcfa'
'bfebb75bb94029b48c46b7f1ba1aa811'
- '0673e51af0e81418b4a6c1e205f7e5cd'
- 'bc578b249e2090deb84119a626c53c48')
+ 'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/abs/extra/webmin/__changelog b/abs/extra/webmin/__changelog
new file mode 100644
index 0000000..9f14075
--- /dev/null
+++ b/abs/extra/webmin/__changelog
@@ -0,0 +1,2 @@
+PKGBUILD: Added private networks
+PKGBUILD: Change OS name to LinHES
diff --git a/abs/extra/webmin/changelog b/abs/extra/webmin/changelog
deleted file mode 100644
index 68b499a..0000000
--- a/abs/extra/webmin/changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-7/10/11 Britney Fransen
--Added runit support to PKGBUILD
--Added private networks to PKGBUILD
diff --git a/abs/extra/webmin/run b/abs/extra/webmin/run
deleted file mode 100644
index 659c6cd..0000000
--- a/abs/extra/webmin/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-echo Starting Webmin server in /opt/webmin
-trap '' 1
-LANG=
-export LANG
-#PERLIO=:raw
-unset PERLIO
-export PERLIO
-PERLLIB=/opt/webmin
-export PERLLIB
-exec '/opt/webmin/miniserv.pl' /etc/webmin/miniserv.conf
diff --git a/abs/extra/webmin/webmin-config.tar.bz2 b/abs/extra/webmin/webmin-config.tar.bz2
index a51b43d..c7869ee 100644
Binary files a/abs/extra/webmin/webmin-config.tar.bz2 and b/abs/extra/webmin/webmin-config.tar.bz2 differ
diff --git a/abs/extra/webmin/webmin.rc b/abs/extra/webmin/webmin.rc
deleted file mode 100644
index ee83fbe..0000000
--- a/abs/extra/webmin/webmin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/webmin/start
-stop=/etc/webmin/stop
-lockfile=/var/lock/webmin
-
-case "$1" in
-'start')
- stat_busy "Starting Webmin daemon"
- $start >/dev/null 2>&1 </dev/null
- RETVAL=$?
- if [ "$RETVAL" = "0" ]; then
- touch $lockfile >/dev/null 2>&1
- stat_done
- else
- stat_fail
-fi
-;;
-
-'stop')
- stat_busy "Stopping Webmin daemon"
- $stop >/dev/null 2>&1 </dev/null
- RETVAL=$?
- if [ "$RETVAL" = "0" ]; then
- rm -f $lockfile
- stat_done
- else
- stat_fail
-fi
-;;
-
-'restart')
- $stop && $start
- RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/abs/extra/webmin/webmin.service b/abs/extra/webmin/webmin.service
new file mode 100644
index 0000000..a8a384a
--- /dev/null
+++ b/abs/extra/webmin/webmin.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Webmin
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/webmin/start
+ExecStop=/etc/webmin/stop
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 65d03c778c0dc7e1dc89839eb563410ae99d7c8b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 13 Apr 2014 21:28:23 +0000
Subject: linhes-theme: update to pick upstream changes
---
abs/core/linhes-theme/PKGBUILD | 8 ++++----
abs/core/linhes-theme/readme.txt.patch | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 9c4b77d..0047d36 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
-pkgver=8.1
-pkgrel=25
+pkgver=8.2
+pkgrel=1
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.42 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.50 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
'LHLogoAndText.png')
@@ -76,7 +76,7 @@ package() {
sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
-md5sums=('95478bd9bab15e9e4365c1048757c225'
+md5sums=('025442908211ee2a2a3ab5a9fed0a929'
'ed4f8baf431e20babc345e4e2602426f'
'cb8c0d63392f6c8c2d8219243fbf47c6'
'c75c83b90969fb07755062113f858e88'
diff --git a/abs/core/linhes-theme/readme.txt.patch b/abs/core/linhes-theme/readme.txt.patch
index 15ac146..3f66992 100644
--- a/abs/core/linhes-theme/readme.txt.patch
+++ b/abs/core/linhes-theme/readme.txt.patch
@@ -1,5 +1,5 @@
---- readme.txt.orig 2014-01-02 21:51:10.099789520 +0000
-+++ readme.txt 2014-01-02 21:52:11.045337937 +0000
+--- readme.txt.orig 2014-04-13 21:06:06.302600752 +0000
++++ readme.txt 2014-04-13 21:07:53.282168214 +0000
@@ -1,26 +1,9 @@
-Backgrounds.
-
@@ -24,6 +24,6 @@
-To use just backup main-ui.xml. Example cp menu-ui.xml menu-ui.xml.bak.
-Then cp menu-ui-vert.xml to menu-ui.xml.
-
- Color text in lists.
-
- There are two types of lists in the theme.
+ Old solid select bar.
+ If you liked the old select bar look you can still get it by copying base.xml_solid_select_bar to base.xml
+ and copying osd.xml_solid_select_bar osd.xml.
--
cgit v0.12
From f6a8a30973a96a67f4a89e705d3128e24e5d87e1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Apr 2014 00:23:59 +0000
Subject: samba: rebuilt with updated deps
---
abs/extra/samba/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD
index 18aebfc..c65cf93 100644
--- a/abs/extra/samba/PKGBUILD
+++ b/abs/extra/samba/PKGBUILD
@@ -15,7 +15,7 @@ pkgver=4.1.6
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=4.1.6
-pkgrel=2
+pkgrel=3
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
--
cgit v0.12
From 0196df179d5fa1319bbf0b17f7f2234b9e0204e1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Apr 2014 21:04:56 +0000
Subject: ca-certificates: update to 20140325
---
abs/core/ca-certificates/PKGBUILD | 12 ++++++------
abs/core/ca-certificates/ca-certificates.install | 3 ---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD
index 7409989..3c293a7 100644
--- a/abs/core/ca-certificates/PKGBUILD
+++ b/abs/core/ca-certificates/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 195211 2013-09-27 20:33:15Z pierre $
+# $Id$
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=ca-certificates
-pkgver=20130906
+pkgver=20140325
pkgrel=1
pkgdesc='Common CA certificates'
arch=('any')
url='http://packages.qa.debian.org/c/ca-certificates.html'
license=('MPL' 'GPL')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz")
depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
makedepends=('python2')
install='ca-certificates.install'
backup=('etc/ca-certificates.conf')
-sha256sums=('dd10520091d469e95e11e5fafb7422d3be0a66071984d09009ed3e0232cb277d')
+sha256sums=('c0e3d8c517995db2737f7f1a9b69d654b8823fa6d337871c6ce111fcf083454a')
prepare() {
cd ${srcdir}/${pkgname}
@@ -23,13 +23,13 @@ prepare() {
build() {
cd ${srcdir}/${pkgname}
- make
+ make SUBDIRS=mozilla
}
package() {
cd ${srcdir}/${pkgname}
install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
- make install DESTDIR=${pkgdir}
+ make install SUBDIRS=mozilla DESTDIR=${pkgdir}
mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
diff --git a/abs/core/ca-certificates/ca-certificates.install b/abs/core/ca-certificates/ca-certificates.install
index 4e90c2e..cbd88e6 100644
--- a/abs/core/ca-certificates/ca-certificates.install
+++ b/abs/core/ca-certificates/ca-certificates.install
@@ -5,9 +5,6 @@ post_install() {
}
post_upgrade() {
- if [ $(vercmp $2 20110421-1) -lt 0 ]; then
- echo 'Updating certificates. This might take a while...'
- fi
usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
}
--
cgit v0.12
From 5f34035c95ab2310ddcad8b3e9a3c7971ee8c9e0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Apr 2014 21:48:14 +0000
Subject: heimdal: update to 1.5.2. refs #961
---
abs/core/heimdal/001_all_heimdal-no_libedit.patch | 10 --
abs/core/heimdal/002_all_heimal-fPIC.patch | 12 --
abs/core/heimdal/002_all_heimdal-no_libedit.patch | 10 --
abs/core/heimdal/003_all_heimdal-fPIC.patch | 12 --
abs/core/heimdal/003_all_heimdal-rxapps.patch | 22 ----
abs/core/heimdal/004_all_heimdal-rxapps.patch | 19 ---
abs/core/heimdal/005_all_heimdal-suid_fix.patch | 20 ---
abs/core/heimdal/006_all_heimdal-suid_fix.patch | 20 ---
.../heimdal/010_all_heimdal-system-libss.patch | 40 ------
abs/core/heimdal/012_all_heimdal-berkdb.patch | 124 ------------------
abs/core/heimdal/013_all_heimdal-pthread-lib.patch | 11 --
abs/core/heimdal/014_all_heimdal-path.patch | 50 --------
abs/core/heimdal/PKGBUILD | 142 ++++++++++-----------
abs/core/heimdal/base-version-script.map | 28 ++++
abs/core/heimdal/heimdal-aur.install | 4 +
abs/core/heimdal/heimdal-kadmind | 41 ++++++
abs/core/heimdal/heimdal-kdc | 41 ++++++
abs/core/heimdal/heimdal-kdc.rc | 40 ------
abs/core/heimdal/heimdal-kpasswd | 40 ++++++
abs/core/heimdal/heimdal.install | 20 ---
abs/core/heimdal/heimdal.sh | 5 +
abs/core/heimdal/kadmind.rc | 40 ------
abs/core/heimdal/kpasswd.rc | 40 ------
23 files changed, 227 insertions(+), 564 deletions(-)
delete mode 100644 abs/core/heimdal/001_all_heimdal-no_libedit.patch
delete mode 100644 abs/core/heimdal/002_all_heimal-fPIC.patch
delete mode 100644 abs/core/heimdal/002_all_heimdal-no_libedit.patch
delete mode 100644 abs/core/heimdal/003_all_heimdal-fPIC.patch
delete mode 100644 abs/core/heimdal/003_all_heimdal-rxapps.patch
delete mode 100644 abs/core/heimdal/004_all_heimdal-rxapps.patch
delete mode 100644 abs/core/heimdal/005_all_heimdal-suid_fix.patch
delete mode 100644 abs/core/heimdal/006_all_heimdal-suid_fix.patch
delete mode 100644 abs/core/heimdal/010_all_heimdal-system-libss.patch
delete mode 100644 abs/core/heimdal/012_all_heimdal-berkdb.patch
delete mode 100644 abs/core/heimdal/013_all_heimdal-pthread-lib.patch
delete mode 100644 abs/core/heimdal/014_all_heimdal-path.patch
create mode 100644 abs/core/heimdal/base-version-script.map
create mode 100644 abs/core/heimdal/heimdal-aur.install
create mode 100644 abs/core/heimdal/heimdal-kadmind
create mode 100644 abs/core/heimdal/heimdal-kdc
delete mode 100644 abs/core/heimdal/heimdal-kdc.rc
create mode 100644 abs/core/heimdal/heimdal-kpasswd
delete mode 100644 abs/core/heimdal/heimdal.install
create mode 100755 abs/core/heimdal/heimdal.sh
delete mode 100644 abs/core/heimdal/kadmind.rc
delete mode 100644 abs/core/heimdal/kpasswd.rc
diff --git a/abs/core/heimdal/001_all_heimdal-no_libedit.patch b/abs/core/heimdal/001_all_heimdal-no_libedit.patch
deleted file mode 100644
index a551bdc..0000000
--- a/abs/core/heimdal/001_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200
-+++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200
-@@ -6,7 +6,6 @@
- dnl el_init
-
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
diff --git a/abs/core/heimdal/002_all_heimal-fPIC.patch b/abs/core/heimdal/002_all_heimal-fPIC.patch
deleted file mode 100644
index c67dbae..0000000
--- a/abs/core/heimdal/002_all_heimal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200
-+++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200
-@@ -41,6 +41,9 @@
-
- EXTRA_DIST = $(man_MANS)
-
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- $(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/abs/core/heimdal/002_all_heimdal-no_libedit.patch b/abs/core/heimdal/002_all_heimdal-no_libedit.patch
deleted file mode 100644
index 7806597..0000000
--- a/abs/core/heimdal/002_all_heimdal-no_libedit.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cf/krb-readline.m4 2004-09-15 13:24:15.000000000 +0000
-+++ cf/krb-readline.m4 2004-09-17 16:11:39.610756024 +0000
-@@ -6,7 +6,6 @@
- dnl el_init
-
- AC_DEFUN([KRB_READLINE],[
--AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
- if test "$ac_cv_func_el_init" = yes ; then
- AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
- AC_TRY_COMPILE([#include <stdio.h>
diff --git a/abs/core/heimdal/003_all_heimdal-fPIC.patch b/abs/core/heimdal/003_all_heimdal-fPIC.patch
deleted file mode 100644
index ee01e34..0000000
--- a/abs/core/heimdal/003_all_heimdal-fPIC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/editline/Makefile.am 2004-05-10 09:27:21.442490749 +0000
-+++ lib/editline/Makefile.am 2004-05-10 09:27:38.876209101 +0000
-@@ -47,6 +47,9 @@
-
- EXTRA_DIST = $(man_MANS)
-
-+$(libeditline_la_OBJECTS): %.lo: %.c
-+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
- snprintf.c:
- $(LN_S) $(srcdir)/../roken/snprintf.c .
- strdup.c:
diff --git a/abs/core/heimdal/003_all_heimdal-rxapps.patch b/abs/core/heimdal/003_all_heimdal-rxapps.patch
deleted file mode 100644
index 40fc05f..0000000
--- a/abs/core/heimdal/003_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/kx/rxtelnet.in 2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxtelnet.in 2005-06-27 23:21:34.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
- while true
---- appl/kx/rxterm.in 2005-06-16 18:29:10.000000000 +0200
-+++ appl/kx/rxterm.in 2005-06-27 23:21:55.000000000 +0200
-@@ -2,7 +2,7 @@
- # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
diff --git a/abs/core/heimdal/004_all_heimdal-rxapps.patch b/abs/core/heimdal/004_all_heimdal-rxapps.patch
deleted file mode 100644
index d6142a7..0000000
--- a/abs/core/heimdal/004_all_heimdal-rxapps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- appl/kx/rxterm.in 2004-02-21 21:49:23.893934354 +0000
-+++ appl/kx/rxterm.in 2004-02-21 21:49:34.617299076 +0000
-@@ -2,6 +2,6 @@
- #
- usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
--binary=rsh
-+binary=krsh
- term=xterm
- while true
- do
---- appl/kx/rxtelnet.in 2005-06-16 16:29:10.000000000 +0000
-+++ appl/kx/rxtelnet.in 2005-07-11 20:33:10.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
--binary=telnet
-+binary=ktelnet
- term=
- kx_args=-P
diff --git a/abs/core/heimdal/005_all_heimdal-suid_fix.patch b/abs/core/heimdal/005_all_heimdal-suid_fix.patch
deleted file mode 100644
index 35a9ed9..0000000
--- a/abs/core/heimdal/005_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/su/Makefile.am 2005-06-16 18:27:46.000000000 +0200
-+++ appl/su/Makefile.am 2005-06-27 23:25:21.000000000 +0200
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c supaths.h
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
-
- LDADD = $(LIB_kafs) \
---- appl/otp/Makefile.am 2005-06-16 18:28:46.000000000 +0200
-+++ appl/otp/Makefile.am 2005-06-27 23:25:40.000000000 +0200
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
-
- man_MANS = otp.1 otpprint.1
-
diff --git a/abs/core/heimdal/006_all_heimdal-suid_fix.patch b/abs/core/heimdal/006_all_heimdal-suid_fix.patch
deleted file mode 100644
index 0f7d281..0000000
--- a/abs/core/heimdal/006_all_heimdal-suid_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- appl/otp/Makefile.am 2004-09-17 22:22:54.046301075 +0000
-+++ appl/otp/Makefile.am 2004-09-17 22:23:15.293145945 +0000
-@@ -8,6 +8,7 @@
- bin_SUIDS = otp
- otp_SOURCES = otp.c otp_locl.h
- otpprint_SOURCES = otpprint.c otp_locl.h
-+otp_LDFLAGS = -Wl,-z,now
-
- man_MANS = otp.1 otpprint.1
-
---- appl/su/Makefile.am 2005-06-16 16:27:46.000000000 +0000
-+++ appl/su/Makefile.am 2005-07-11 20:34:21.000000000 +0000
-@@ -7,6 +7,7 @@
- bin_PROGRAMS = su
- bin_SUIDS = su
- su_SOURCES = su.c
-+su_LDFLAGS = -Wl,-z,now
- man_MANS = su.1
-
- LDADD = $(LIB_kafs) \
diff --git a/abs/core/heimdal/010_all_heimdal-system-libss.patch b/abs/core/heimdal/010_all_heimdal-system-libss.patch
deleted file mode 100644
index 5cd4d9d..0000000
--- a/abs/core/heimdal/010_all_heimdal-system-libss.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- lib/sl/Makefile.am~ 2007-06-01 09:48:09.000000000 +0200
-+++ lib/sl/Makefile.am 2007-06-01 09:49:30.000000000 +0200
-@@ -12,36 +12,24 @@
-
- include_HEADERS = sl.h
-
--lib_LTLIBRARIES = libsl.la libss.la
-+lib_LTLIBRARIES = libsl.la
- libsl_la_LDFLAGS = -version-info 2:0:2
--libss_la_LDFLAGS = -version-info 1:5:1
-
- libsl_la_LIBADD = @LIB_readline@
--libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
-
- libsl_la_SOURCES = sl_locl.h sl.c $(ES)
--libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
-
- TESTS = test_sl
- check_PROGRAMS = $(TESTS)
-
- # install these?
-
--bin_PROGRAMS = mk_cmds
- noinst_PROGRAMS = slc
-
--mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
--mk_cmds_LDADD = libsl.la $(LDADD)
--
- slc_SOURCES = slc-gram.y slc-lex.l slc.h
-
--ssincludedir = $(includedir)/ss
--ssinclude_HEADERS = ss.h
--
- CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c getprogname.c
-
--$(mk_cmds_OBJECTS): parse.h parse.c
--
- LDADD = \
- libsl.la \
- $(LIB_roken) \
diff --git a/abs/core/heimdal/012_all_heimdal-berkdb.patch b/abs/core/heimdal/012_all_heimdal-berkdb.patch
deleted file mode 100644
index 46762c2..0000000
--- a/abs/core/heimdal/012_all_heimdal-berkdb.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ
-Index: heimdal/cf/db.m4
-===================================================================
---- heimdal.orig/cf/db.m4
-+++ heimdal/cf/db.m4
-@@ -18,24 +18,13 @@ db_type=unknown
-
- if test "$enable_berkeley_db" != no; then
-
-- AC_CHECK_HEADERS([ \
-- db4/db.h \
-- db3/db.h \
-- db.h \
-- db_185.h \
-- ])
-+ AC_CHECK_HEADERS([db.h])
-
- dnl db_create is used by db3 and db4
-
-- AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
-+ AC_FIND_FUNC_NO_LIBS(db_create, db, [
- #include <stdio.h>
-- #ifdef HAVE_DB4_DB_H
-- #include <db4/db.h>
-- #elif defined(HAVE_DB3_DB_H)
-- #include <db3/db.h>
-- #else
- #include <db.h>
-- #endif
- ],[NULL, NULL, 0])
-
- if test "$ac_cv_func_db_create" = "yes"; then
-@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4
-
- dnl dbopen is used by db1/db2
-
-- AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [
-+ AC_FIND_FUNC_NO_LIBS(dbopen, db, [
- #include <stdio.h>
-- #if defined(HAVE_DB2_DB_H)
-- #include <db2/db.h>
-- #elif defined(HAVE_DB_185_H)
-- #include <db_185.h>
-- #elif defined(HAVE_DB_H)
- #include <db.h>
-- #else
-- #error no db.h
-- #endif
- ],[NULL, 0, 0, 0, NULL])
-
- if test "$ac_cv_func_dbopen" = "yes"; then
-Index: heimdal/lib/hdb/db.c
-===================================================================
---- heimdal.orig/lib/hdb/db.c
-+++ heimdal/lib/hdb/db.c
-@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59:
-
- #if HAVE_DB1
-
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
- #include <db.h>
--#endif
-
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/hdb/db3.c
-===================================================================
---- heimdal.orig/lib/hdb/db3.c
-+++ heimdal/lib/hdb/db3.c
-@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10
-
- #if HAVE_DB3
-
--#ifdef HAVE_DB4_DB_H
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
-
- static krb5_error_code
- DB_close(krb5_context context, HDB *db)
-Index: heimdal/lib/roken/getcap.c
-===================================================================
---- heimdal.orig/lib/roken/getcap.c
-+++ heimdal/lib/roken/getcap.c
-@@ -38,11 +38,13 @@
- #include "roken.h"
- RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $");
-
-+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
-+#define USE_DB
-+#endif
-+
- #include <sys/types.h>
- #include <ctype.h>
--#if defined(HAVE_DB_185_H)
--#include <db_185.h>
--#elif defined(HAVE_DB_H)
-+#ifdef USE_DB
- #include <db.h>
- #endif
- #include <errno.h>
-Index: heimdal/lib/roken/ndbm_wrap.c
-===================================================================
---- heimdal.orig/lib/roken/ndbm_wrap.c
-+++ heimdal/lib/roken/ndbm_wrap.c
-@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17
- #endif
-
- #include "ndbm_wrap.h"
--#if defined(HAVE_DB4_DB_H)
--#include <db4/db.h>
--#elif defined(HAVE_DB3_DB_H)
--#include <db3/db.h>
--#else
- #include <db.h>
--#endif
-
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/abs/core/heimdal/013_all_heimdal-pthread-lib.patch b/abs/core/heimdal/013_all_heimdal-pthread-lib.patch
deleted file mode 100644
index 19f8794..0000000
--- a/abs/core/heimdal/013_all_heimdal-pthread-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-0.7.1/cf/pthreads.m4.old 2005-09-09 12:12:28.000000000 +0000
-+++ heimdal-0.7.1/cf/pthreads.m4 2005-09-17 22:23:23.000000000 +0000
-@@ -32,7 +32,7 @@
- 2.*)
- native_pthread_support=yes
- PTHREADS_CFLAGS=-pthread
-- PTHREADS_LIBS=-pthread
-+ PTHREADS_LIBS=-lpthread
- ;;
- esac
- ;;
diff --git a/abs/core/heimdal/014_all_heimdal-path.patch b/abs/core/heimdal/014_all_heimdal-path.patch
deleted file mode 100644
index 36a86f1..0000000
--- a/abs/core/heimdal/014_all_heimdal-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/rcp/rcp.c.old 2006-05-03 13:31:59.398493625 +0200
-+++ appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200
-@@ -34,7 +34,7 @@
- #include "rcp_locl.h"
- #include <getarg.h>
-
--#define RSH_PROGRAM "rsh"
-+#define RSH_PROGRAM "krsh"
-
- struct passwd *pwd;
- uid_t userid;
---- appl/rcp/rcp_locl.h.old 2006-05-03 02:30:31.602025409 +0200
-+++ appl/rcp/rcp_locl.h 2006-05-03 02:30:35.886018983 +0200
-@@ -64,4 +64,4 @@
- #define _PATH_CP "/bin/cp"
- #endif
- #undef _PATH_RSH
--#define _PATH_RSH BINDIR "/rsh"
-+#define _PATH_RSH BINDIR "/krsh"
---- appl/telnet/telnetd/telnetd.h.old 2006-05-03 02:23:14.582680939 +0200
-+++ appl/telnet/telnetd/telnetd.h 2006-05-03 02:23:23.746667193 +0200
-@@ -192,7 +192,7 @@
- #endif
-
- #undef _PATH_LOGIN
--#define _PATH_LOGIN BINDIR "/login"
-+#define _PATH_LOGIN BINDIR "/klogin"
-
- /* fallbacks */
-
---- appl/login/shadow.c.old 2006-05-05 06:31:29.517138115 +0200
-+++ appl/login/shadow.c 2006-05-05 06:32:26.433052741 +0200
-@@ -38,7 +38,7 @@
- #ifdef HAVE_SHADOW_H
-
- #ifndef _PATH_CHPASS
--#define _PATH_CHPASS "/usr/bin/passwd"
-+#define _PATH_CHPASS "/usr/bin/kpasswd"
- #endif
-
- static int
-@@ -52,7 +52,7 @@
- printf("fork /bin/passwd");
- exit(1);
- case 0:
-- execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0);
-+ execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0);
- exit(1);
- default:
- waitpid(pid, &status, 0);
diff --git a/abs/core/heimdal/PKGBUILD b/abs/core/heimdal/PKGBUILD
index ae21f30..1457c39 100644
--- a/abs/core/heimdal/PKGBUILD
+++ b/abs/core/heimdal/PKGBUILD
@@ -1,66 +1,48 @@
-# $Id: PKGBUILD 81228 2010-05-27 15:14:39Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-#
-### Attention: remove old pkg before building - it links against itself! ###
-#
+# Maintainer: xhochy <uwelk@xhochy.org>
+# need to choose anonther name since heimdal is still blacklisted
pkgname=heimdal
-pkgver=1.3.3
-pkgrel=3
+# Do not install the config as this will conflict with krb5
+pkgver=1.5.2
+pkgrel=1
pkgdesc="Implementation of Kerberos V5 libraries"
arch=('i686' 'x86_64')
url="http://www.h5l.org/"
license=('custom')
-depends=('db' 'openssl' 'sqlite3' 'e2fsprogs')
-backup=(etc/krb5.conf)
+depends=('sqlite3' 'libldap')
+# Do not install the config as this will conflict with krb5
+# backup=(etc/krb5/krb5.conf)
options=('!libtool' '!emptydirs')
-install=heimdal.install
-source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz
- 001_all_heimdal-no_libedit.patch
- 002_all_heimal-fPIC.patch
- 003_all_heimdal-rxapps.patch
- 005_all_heimdal-suid_fix.patch
- 012_all_heimdal-berkdb.patch
- 013_all_heimdal-pthread-lib.patch
- 014_all_heimdal-path.patch
- heimdal-kdc.rc
- kadmind.rc
- kpasswd.rc)
-md5sums=('963c09f1b14c41660be70b55fae9f163'
- '98e28f11f906c967aac22d6184102c9e'
- '6d5571bdedba2e2423b90bccdbac2c0a'
- '2feec3924ee5230b54175b4d4000c872'
- '45aeb207f360f9f4e9e0fabc8bfeecbc'
- '56f5d10d0ec40f2fda82ef144ffac1e0'
- '1b8665b771c4eb6b56ea8582c96e56e3'
- '8208ae8c0b6ff5ab4f64af1693e9e396'
- 'e59650992b9541a30dfce727a194f6e0'
- '1f2f86a67bbfddb7af581d35fdca9627'
- 'f8f1eca95b9d3f2b4ebf2417b71b81cf')
+source=(http://www.h5l.org/dist/src/heimdal-${pkgver}.tar.gz
+ heimdal-kdc
+ heimdal-kadmind
+ heimdal-kpasswd
+ base-version-script.map
+ heimdal.sh
+ heimdal-aur.install
+)
+md5sums=('bb23d9dbdafd395d816f7abc598481a1' # heimdal-1.5.tar.gz
+ '16c3a485ef7c6d6c83ad9cd225cd88aa' # heimdal-kdc
+ '22213df54d72df0ee949d3dc13b4cc47' # heimdal-kadmind
+ '3c0aa4790eed0b75db4160d4442452e2' # heimdal-kpasswd
+ '8dfdaa919df2be48fa181db646cd8a9b' # base-version-script.map
+ 'a222ad606aadfdceb6816da0551628fe' # heimdal.sh
+ '132eb74789d83dbd623ba7b5dd14c792' # heimdal-aur.install
+)
+install='heimdal-aur.install'
build() {
+ cp base-version-script.map ${srcdir}/heimdal-${pkgver}/base/version-script.map
cd ${srcdir}/heimdal-${pkgver}
- patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1
- patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1
- patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch || return 1
- patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch || return 1
- patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1
- patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
- patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
-
- sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
- doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
- lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
- libtoolize --force || return 1
- aclocal -I cf || return 1
- autoconf || return 1
- automake || return 1
+ sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am
- ./configure --prefix=/usr --enable-shared=yes --without-x \
- --sysconfdir=/etc --mandir=/usr/share/man \
+ # TODO Include man pages in /usr/share/man but add a heimdal suffix
+ ./configure --prefix=/opt/heimdal --enable-shared=yes --without-x \
+ --sysconfdir=/etc/krb5 \
+ --libdir=/usr/heimdal/lib \
+ --includedir=/usr/heimdal/include \
+ --mandir=/opt/heimdal/share/man \
--datadir=/var/lib/heimdal \
--localstatedir=/var/lib/heimdal \
--with-openssl=/usr \
@@ -68,39 +50,51 @@ build() {
--with-readline-include=/usr/include/readline \
--with-sqlite3-lib=/usr/lib \
--with-sqlite3-include=/usr/include \
- --libexecdir=/usr/sbin
-
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ --with-openldap=/usr \
+ --libexecdir=/opt/heimdal/sbin \
+ --enable-kcm \
+ --disable-heimdal-documentation
+ make
+}
+
+package() {
+ cd ${srcdir}/heimdal-${pkgver}
+ make DESTDIR=${pkgdir} install
# Rename daemons and their manpages
for i in telnetd ftpd rshd; do
- mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1
- mv ${pkgdir}/usr/sbin/{,k}${i} || return 1
+ mv ${pkgdir}/opt/heimdal/share/man/man8/{,k}${i}.8
+ mv ${pkgdir}/opt/heimdal/sbin/{,k}${i}
done
-
+
# Rename clients and their manpages
for i in rcp rsh telnet ftp su login; do
- if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
- mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1
+ if [ -f ${pkgdir}/opt/heimdal/share/man/man1/${i}.1 ]; then
+ mv ${pkgdir}/opt/heimdal/share/man/man1/{,k}${i}.1
fi
- mv ${pkgdir}/usr/bin/{,k}${i} || return 1
- done
- rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
-
- # Arch could be a KDC too
- install -d ${pkgdir}/etc/rc.d
- install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ || return 1
- for i in heimdal-kdc kadmind kpasswd; do
- install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1
+ mv ${pkgdir}/opt/heimdal/bin/{,k}${i}
done
+ rm -rf ${pkgdir}/opt/heimdal/share/man/cat{1,3,5,8}
+
+ # install config
+ # Do not install the config as this will conflict with krb5
+ # install -D -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/krb5/krb5.conf
+
+ # install init scripts
+ mkdir -p ${pkgdir}/etc/rc.d/
+ install -m755 ${srcdir}/heimdal-kdc ${pkgdir}/etc/rc.d/heimdal-kdc
+ install -m755 ${srcdir}/heimdal-kadmind ${pkgdir}/etc/rc.d/heimdal-kadmind
+ install -m755 ${srcdir}/heimdal-kpasswd ${pkgdir}/etc/rc.d/heimdal-kpasswd
+
+ mkdir -p ${pkgdir}/etc/profile.d/
+ install -m755 ${srcdir}/heimdal.sh ${pkgdir}/etc/profile.d/heimdal.sh
# Remove conflicts
- rm ${pkgdir}/usr/share/man/man5/ftpusers.5* # man-pages
- rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl (a bit overzealous...)
- rm ${pkgdir}/usr/share/man/man3/os.3* # erlang
+ rm -rf ${pkgdir}/opt/heimdal/share/man/man5/ftpusers.5* # man-pages
+ rm -rf ${pkgdir}/opt/heimdal/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl
+ rm -rf ${pkgdir}/opt/heimdal/share/man/man3/os.3* # erlang
# Install the license
- install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+ install -Dm644 ${srcdir}/heimdal-${pkgver}/LICENSE \
+ ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/abs/core/heimdal/base-version-script.map b/abs/core/heimdal/base-version-script.map
new file mode 100644
index 0000000..007052b
--- /dev/null
+++ b/abs/core/heimdal/base-version-script.map
@@ -0,0 +1,28 @@
+HEIMDAL_BASE_1.0 {
+ global:
+ heim_abort;
+ heim_alloc;
+ heim_array_append_value;
+ heim_array_copy_value;
+ heim_array_create;
+ heim_array_delete_value;
+ heim_array_get_length;
+ heim_array_iterate_f;
+ heim_auto_release;
+ heim_auto_release_create;
+ heim_auto_release_drain;
+ heim_base_once_f;
+ heim_cmp;
+ heim_dict_add_value;
+ heim_dict_copy_value;
+ heim_dict_create;
+ heim_dict_delete_key;
+ heim_dict_iterate_f;
+ heim_release;
+ heim_retain;
+ heim_string_create;
+ heim_string_get_utf8;
+ heim_number_create;
+ local:
+ *;
+};
diff --git a/abs/core/heimdal/heimdal-aur.install b/abs/core/heimdal/heimdal-aur.install
new file mode 100644
index 0000000..31ccd95
--- /dev/null
+++ b/abs/core/heimdal/heimdal-aur.install
@@ -0,0 +1,4 @@
+post_install() {
+ echo "Run `source /etc/profile.d/heimdal.sh` to source environment variables"
+ echo "needed to run heimdal and use heimdal libraries."
+}
diff --git a/abs/core/heimdal/heimdal-kadmind b/abs/core/heimdal/heimdal-kadmind
new file mode 100644
index 0000000..9479b63
--- /dev/null
+++ b/abs/core/heimdal/heimdal-kadmind
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /opt/heimdal/sbin/kadmind`
+case "$1" in
+ start)
+ stat_busy "Starting Heimdal KDC"
+ if [ -z "$PID" ]; then
+ /opt/heimdal/sbin/kadmind &
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon heimdal-kadmind
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Heimdal KDC"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon heimdal-kadmind
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+ ;;
+esac
+exit 0
+
diff --git a/abs/core/heimdal/heimdal-kdc b/abs/core/heimdal/heimdal-kdc
new file mode 100644
index 0000000..82a11b9
--- /dev/null
+++ b/abs/core/heimdal/heimdal-kdc
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /opt/heimdal/sbin/kdc`
+case "$1" in
+ start)
+ stat_busy "Starting Heimdal KDC"
+ if [ -z "$PID" ]; then
+ /opt/heimdal/sbin/kdc --detach
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon heimdal-kdc
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Heimdal KDC"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon heimdal-kdc
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+ ;;
+esac
+exit 0
+
diff --git a/abs/core/heimdal/heimdal-kdc.rc b/abs/core/heimdal/heimdal-kdc.rc
deleted file mode 100644
index b2a3b5f..0000000
--- a/abs/core/heimdal/heimdal-kdc.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kdc`
-case "$1" in
- start)
- stat_busy "Starting heimdal kdc"
- if [ -z "$PID" ]; then
- /usr/sbin/kdc --detach
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon heimdal-kdc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal kdc"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon heimdal-kdc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/abs/core/heimdal/heimdal-kpasswd b/abs/core/heimdal/heimdal-kpasswd
new file mode 100644
index 0000000..9a7766d
--- /dev/null
+++ b/abs/core/heimdal/heimdal-kpasswd
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /opt/heimdal/sbin/kpasswdd`
+case "$1" in
+ start)
+ stat_busy "Starting Heimdal KDC"
+ if [ -z "$PID" ]; then
+ /opt/heimdal/sbin/kpasswdd &
+ fi
+ if [ ! -z "$PID" -o $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon heimdal-kpasswdd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Heimdal KDC"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon heimdal-kpasswdd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+ ;;
+esac
+exit 0
diff --git a/abs/core/heimdal/heimdal.install b/abs/core/heimdal/heimdal.install
deleted file mode 100644
index 499d216..0000000
--- a/abs/core/heimdal/heimdal.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(heimdal hx509)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file.info.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.info.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/heimdal/heimdal.sh b/abs/core/heimdal/heimdal.sh
new file mode 100755
index 0000000..574fd4b
--- /dev/null
+++ b/abs/core/heimdal/heimdal.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=/usr/heimdal/lib:$LD_LIBRARY_PATH
+export PATH=/opt/heimdal/bin:/opt/heimdal/sbin:$PATH
+
diff --git a/abs/core/heimdal/kadmind.rc b/abs/core/heimdal/kadmind.rc
deleted file mode 100644
index 0f3b8c7..0000000
--- a/abs/core/heimdal/kadmind.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
- start)
- stat_busy "Starting heimdal admin server"
- if [ -z "$PID" ]; then
- /usr/sbin/kadmind &
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kadmind
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal admin server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kadmind
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/abs/core/heimdal/kpasswd.rc b/abs/core/heimdal/kpasswd.rc
deleted file mode 100644
index 3697322..0000000
--- a/abs/core/heimdal/kpasswd.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpasswdd`
-case "$1" in
- start)
- stat_busy "Starting heimdal kpasswdd"
- if [ -z "$PID" ]; then
- /usr/sbin/kpasswdd &
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kpasswd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping heimdal kpasswdd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kpasswd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
--
cgit v0.12
From 1800cede0b0cbc2368123df8cf0663e45bc991b4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Apr 2014 21:54:18 +0000
Subject: imap: update to 2007f. refs #961
---
abs/core/imap/PKGBUILD | 27 +++++++++++++++------------
abs/core/imap/imap | 2 +-
abs/core/imap/ipop2 | 2 +-
abs/core/imap/ipop3 | 2 +-
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/abs/core/imap/PKGBUILD b/abs/core/imap/PKGBUILD
index 7e00106..b251daf 100644
--- a/abs/core/imap/PKGBUILD
+++ b/abs/core/imap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 132404 2011-07-24 11:35:43Z pierre $
+# $Id$
pkgname=imap
pkgver=2007f
-pkgrel=1
+pkgrel=4
pkgdesc="An IMAP/POP server"
arch=('i686' 'x86_64')
license=('APACHE')
@@ -12,25 +12,28 @@ provides=('imap-server' 'pop3-server')
conflicts=('courier-mta' 'courier-imap')
source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
'imap' 'ipop2' 'ipop3')
+options=('staticlibs')
backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
md5sums=('2126fd125ea26b73b20f01fcd5940369'
- 'e77dedb80c2fec9bf2ef784ed5f976fb'
- 'cc3eba6453242aa0b1bc8881160b2136'
- '0a5e27183a9b7e8ec5f6703125371e0a')
+ '3ae5b3b333bc8ea2da106f6a97d7bd8d'
+ '448f988dc5f9bdb2223dcea3abc4f5f1'
+ '1499b13015075f0aafba04324a6f523a')
-build() {
+prepare() {
sed \
-e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
-e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
-e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
-i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile
+}
+build() {
cd $srcdir/$pkgname-$pkgver
# NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
if [ "$CARCH" == "x86_64" ]; then
- yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1
- else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
+ yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC"
+ else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix
fi
# create ssl certs for secure imap
@@ -58,10 +61,10 @@ EOF
package() {
cd $srcdir/$pkgname-$pkgver
- install -d $pkgdir/usr/sbin
- install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
- install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d
- install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d
+ install -d $pkgdir/usr/bin
+ install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd
+ install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d
+ install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d
for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h
diff --git a/abs/core/imap/imap b/abs/core/imap/imap
index da45739..fc83095 100644
--- a/abs/core/imap/imap
+++ b/abs/core/imap/imap
@@ -3,7 +3,7 @@ service imap2
socket_type = stream
wait = no
user = root
- server = /usr/sbin/imapd
+ server = /usr/bin/imapd
log_on_success += HOST DURATION
log_on_failure += HOST
disable = yes
diff --git a/abs/core/imap/ipop2 b/abs/core/imap/ipop2
index bd74c83..0eee384 100644
--- a/abs/core/imap/ipop2
+++ b/abs/core/imap/ipop2
@@ -3,7 +3,7 @@ service pop2
socket_type = stream
wait = no
user = root
- server = /usr/sbin/ipop2d
+ server = /usr/bin/ipop2d
log_on_success += HOST DURATION
log_on_failure += HOST
disable = yes
diff --git a/abs/core/imap/ipop3 b/abs/core/imap/ipop3
index 410a45a..44565b0 100644
--- a/abs/core/imap/ipop3
+++ b/abs/core/imap/ipop3
@@ -3,7 +3,7 @@ service pop3
socket_type = stream
wait = no
user = root
- server = /usr/sbin/ipop3d
+ server = /usr/bin/ipop3d
log_on_success += HOST DURATION
log_on_failure += HOST
disable = yes
--
cgit v0.12
From 7c996d3dbc7f8609f7dedbf0928305930d86c9cf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 14 Apr 2014 22:54:39 +0000
Subject: openldap: update to 2.4.39. refs #961
---
abs/core/openldap/PKGBUILD | 78 +++---
.../openldap/mutex-end-of-struct-sigsegv.patch | 293 ---------------------
abs/core/openldap/ntlm.patch | 230 ----------------
abs/core/openldap/openldap-ntlm.patch | 230 ++++++++++++++++
abs/core/openldap/openldap.install | 1 +
abs/core/openldap/slapd | 49 ----
abs/core/openldap/slapd.default | 6 -
abs/core/openldap/slapd.service | 2 +-
abs/core/openldap/slapd.tmpfiles | 2 +-
9 files changed, 277 insertions(+), 614 deletions(-)
delete mode 100644 abs/core/openldap/mutex-end-of-struct-sigsegv.patch
delete mode 100644 abs/core/openldap/ntlm.patch
create mode 100644 abs/core/openldap/openldap-ntlm.patch
delete mode 100755 abs/core/openldap/slapd
delete mode 100644 abs/core/openldap/slapd.default
diff --git a/abs/core/openldap/PKGBUILD b/abs/core/openldap/PKGBUILD
index b7af129..0131552 100644
--- a/abs/core/openldap/PKGBUILD
+++ b/abs/core/openldap/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $
+# $Id$
# Maintainer:
pkgbase=openldap
pkgname=('libldap' 'openldap')
-pkgver=2.4.31
-pkgrel=4
+pkgver=2.4.39
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.openldap.org/"
license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
+#options=('!makeflags')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
- slapd slapd.default slapd.service slapd.tmpfiles
- ntlm.patch
- mutex-end-of-struct-sigsegv.patch)
-sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765'
- 'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
- 'd89b8a533045123f1ab46c9c430cf132d58a20a4'
- 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4'
- 'f86a82e35ebe15026980467c9dee4007e686b795'
- 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
- '694269dad78c7a806649c2d7f57bb7e503df3af1')
+ slapd.service slapd.tmpfiles openldap-ntlm.patch)
+sha1sums=('2b8e8401214867c361f7212e7058f95118b5bd6c'
+ '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
+ '59241a813d7508294e4ef1cec3bfe1f5495e109d'
+ 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -Np1 -i "${srcdir}"/ntlm.patch
- patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch
+# see http://www.openldap.org/faq/data/cache/756.html
+# there's no proper backend support for anything apart from
+# BerkeleyDB, if we don't want to drop local backend server support
+# we are forced to keep Berkeley DB here
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/openldap-ntlm.patch
sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
- sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
+ sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif}
sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
+}
- LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib"
+build() {
+ cd ${pkgbase}-${pkgver}
./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
- --sysconfdir=/etc --localstatedir=/var/lib/openldap \
+ --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \
--enable-ipv6 --enable-syslog --enable-local \
--enable-bdb --enable-hdb \
--enable-crypt --enable-dynamic \
@@ -42,10 +43,14 @@ build() {
--enable-spasswd --with-cyrus-sasl \
--enable-overlays=mod --enable-modules=yes
make
+
+ cd contrib/slapd-modules/nssov
+ make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap
+ chrpath -d .libs/nssov.so
}
check() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
+ cd ${pkgbase}-${pkgver}
make test
}
@@ -53,9 +58,8 @@ package_libldap() {
pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
depends=('libsasl' 'e2fsprogs')
backup=('etc/openldap/ldap.conf')
- options=('!libtool')
- cd "${srcdir}"/${pkgbase}-${pkgver}
+ cd ${pkgbase}-${pkgver}
for dir in include libraries doc/man/man3 ; do
pushd ${dir}
make DESTDIR="${pkgdir}" install
@@ -74,32 +78,38 @@ package_libldap() {
package_openldap() {
pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
- depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
- backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
- options=('!libtool' 'emptydirs')
+ depends=("libldap>=${pkgver}" 'libltdl')
+ backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
+ options=('emptydirs')
install=openldap.install
- cd "${srcdir}"/${pkgbase}-${pkgver}
- for dir in clients servers doc/man/man{1,5,8} ; do
+ cd ${pkgbase}-${pkgver}
+ for dir in clients servers doc/man/man{1,5,8}; do
pushd ${dir}
make DESTDIR="${pkgdir}" install
popd
done
+
+ pushd contrib/slapd-modules/nssov
+ install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so
+ ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0
+ install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema
+ popd
+
rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
rm -r "${pkgdir}"/run
# get rid of duplicate default conf files
rm "${pkgdir}"/etc/openldap/*.default
- ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
+ ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd
- chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
- chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
+ chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
+ chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}
install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
- install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
- install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/abs/core/openldap/mutex-end-of-struct-sigsegv.patch b/abs/core/openldap/mutex-end-of-struct-sigsegv.patch
deleted file mode 100644
index e899638..0000000
--- a/abs/core/openldap/mutex-end-of-struct-sigsegv.patch
+++ /dev/null
@@ -1,293 +0,0 @@
- libraries/libldap/init.c | 8 ++-
- libraries/libldap/ldap-int.h | 198 ++++++++++++++++++++++--------------------
- 2 files changed, 110 insertions(+), 96 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 39292d2..9d37e64 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -36,7 +36,13 @@
- #include "lutil.h"
-
- struct ldapoptions ldap_int_global_options =
-- { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };
-+ { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
-+ LDAP_LDO_NULLARG
-+ LDAP_LDO_CONNECTIONLESS_NULLARG
-+ LDAP_LDO_TLS_NULLARG
-+ LDAP_LDO_SASL_NULLARG
-+ LDAP_LDO_GSSAPI_NULLARG
-+ LDAP_LDO_MUTEX_NULLARG };
-
- #define ATTR_NONE 0
- #define ATTR_BOOL 1
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index f8e6126..ac6c9e5 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -185,29 +185,59 @@ struct ldapoptions {
- #define LDAP_TRASHED_SESSION 0xFF
- int ldo_debug;
-
--#ifdef LDAP_R_COMPILE
-- ldap_pvt_thread_mutex_t ldo_mutex;
--#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL
--#else
--#define LDAP_LDO_MUTEX_NULLARG
--#endif
-+ ber_int_t ldo_version;
-+ ber_int_t ldo_deref;
-+ ber_int_t ldo_timelimit;
-+ ber_int_t ldo_sizelimit;
-+
-+ /* per API call timeout */
-+ struct timeval ldo_tm_api;
-+ struct timeval ldo_tm_net;
-+
-+ LDAPURLDesc *ldo_defludp;
-+ int ldo_defport;
-+ char* ldo_defbase;
-+ char* ldo_defbinddn; /* bind dn */
-+
-+ /*
-+ * Per connection tcp-keepalive settings (Linux only,
-+ * ignored where unsupported)
-+ */
-+ ber_int_t ldo_keepalive_idle;
-+ ber_int_t ldo_keepalive_probes;
-+ ber_int_t ldo_keepalive_interval;
-+
-+ int ldo_refhoplimit; /* limit on referral nesting */
-+
-+ /* LDAPv3 server and client controls */
-+ LDAPControl **ldo_sctrls;
-+ LDAPControl **ldo_cctrls;
-+
-+ /* LDAP rebind callback function */
-+ LDAP_REBIND_PROC *ldo_rebind_proc;
-+ void *ldo_rebind_params;
-+ LDAP_NEXTREF_PROC *ldo_nextref_proc;
-+ void *ldo_nextref_params;
-+ LDAP_URLLIST_PROC *ldo_urllist_proc;
-+ void *ldo_urllist_params;
-+
-+ /* LDAP connection callback stack */
-+ ldaplist *ldo_conn_cbs;
-+
-+ LDAP_BOOLEANS ldo_booleans; /* boolean options */
-+
-+#define LDAP_LDO_NULLARG ,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
-
- #ifdef LDAP_CONNECTIONLESS
- #define LDAP_IS_UDP(ld) ((ld)->ld_options.ldo_is_udp)
- void* ldo_peer; /* struct sockaddr* */
- char* ldo_cldapdn;
- int ldo_is_udp;
-+#define LDAP_LDO_CONNECTIONLESS_NULLARG ,0,0,0
-+#else
-+#define LDAP_LDO_CONNECTIONLESS_NULLARG
- #endif
-
-- /* per API call timeout */
-- struct timeval ldo_tm_api;
-- struct timeval ldo_tm_net;
--
-- ber_int_t ldo_version;
-- ber_int_t ldo_deref;
-- ber_int_t ldo_timelimit;
-- ber_int_t ldo_sizelimit;
--
- #ifdef HAVE_TLS
- /* tls context */
- void *ldo_tls_ctx;
-@@ -226,16 +256,12 @@ struct ldapoptions {
- int ldo_tls_mode;
- int ldo_tls_require_cert;
- int ldo_tls_impl;
--#ifdef HAVE_OPENSSL_CRL
- int ldo_tls_crlcheck;
--#endif
-+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
-+#else
-+#define LDAP_LDO_TLS_NULLARG
- #endif
-
-- LDAPURLDesc *ldo_defludp;
-- int ldo_defport;
-- char* ldo_defbase;
-- char* ldo_defbinddn; /* bind dn */
--
- #ifdef HAVE_CYRUS_SASL
- char* ldo_def_sasl_mech; /* SASL Mechanism(s) */
- char* ldo_def_sasl_realm; /* SASL realm */
-@@ -244,6 +270,9 @@ struct ldapoptions {
-
- /* SASL Security Properties */
- struct sasl_security_properties ldo_sasl_secprops;
-+#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
-+#else
-+#define LDAP_LDO_SASL_NULLARG
- #endif
-
- #ifdef HAVE_GSSAPI
-@@ -253,34 +282,17 @@ struct ldapoptions {
- #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT 0x0001
- #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL 0x0002
- unsigned ldo_gssapi_options;
-+#define LDAP_LDO_GSSAPI_NULLARG ,0,0
-+#else
-+#define LDAP_LDO_GSSAPI_NULLARG
- #endif
-
-- /*
-- * Per connection tcp-keepalive settings (Linux only,
-- * ignored where unsupported)
-- */
-- ber_int_t ldo_keepalive_idle;
-- ber_int_t ldo_keepalive_probes;
-- ber_int_t ldo_keepalive_interval;
--
-- int ldo_refhoplimit; /* limit on referral nesting */
--
-- /* LDAPv3 server and client controls */
-- LDAPControl **ldo_sctrls;
-- LDAPControl **ldo_cctrls;
--
-- /* LDAP rebind callback function */
-- LDAP_REBIND_PROC *ldo_rebind_proc;
-- void *ldo_rebind_params;
-- LDAP_NEXTREF_PROC *ldo_nextref_proc;
-- void *ldo_nextref_params;
-- LDAP_URLLIST_PROC *ldo_urllist_proc;
-- void *ldo_urllist_params;
--
-- /* LDAP connection callback stack */
-- ldaplist *ldo_conn_cbs;
--
-- LDAP_BOOLEANS ldo_booleans; /* boolean options */
-+#ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_t ldo_mutex;
-+#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL
-+#else
-+#define LDAP_LDO_MUTEX_NULLARG
-+#endif
- };
-
-
-@@ -375,6 +387,46 @@ struct ldap_common {
- Sockbuf *ldc_sb; /* socket descriptor & buffer */
- #define ld_sb ldc->ldc_sb
-
-+ unsigned short ldc_lberoptions;
-+#define ld_lberoptions ldc->ldc_lberoptions
-+
-+ /* protected by msgid_mutex */
-+ ber_len_t ldc_msgid;
-+#define ld_msgid ldc->ldc_msgid
-+
-+ /* do not mess with these */
-+ /* protected by req_mutex */
-+ LDAPRequest *ldc_requests; /* list of outstanding requests */
-+ /* protected by res_mutex */
-+ LDAPMessage *ldc_responses; /* list of outstanding responses */
-+#define ld_requests ldc->ldc_requests
-+#define ld_responses ldc->ldc_responses
-+
-+ /* protected by abandon_mutex */
-+ ber_len_t ldc_nabandoned;
-+ ber_int_t *ldc_abandoned; /* array of abandoned requests */
-+#define ld_nabandoned ldc->ldc_nabandoned
-+#define ld_abandoned ldc->ldc_abandoned
-+
-+ /* unused by libldap */
-+ LDAPCache *ldc_cache; /* non-null if cache is initialized */
-+#define ld_cache ldc->ldc_cache
-+
-+ /* do not mess with the rest though */
-+
-+ /* protected by conn_mutex */
-+ LDAPConn *ldc_defconn; /* default connection */
-+#define ld_defconn ldc->ldc_defconn
-+ LDAPConn *ldc_conns; /* list of server connections */
-+#define ld_conns ldc->ldc_conns
-+ void *ldc_selectinfo;/* platform specifics for select */
-+#define ld_selectinfo ldc->ldc_selectinfo
-+
-+ /* ldap_common refcnt - free only if 0 */
-+ /* protected by ldc_mutex */
-+ unsigned int ldc_refcnt;
-+#define ld_ldcrefcnt ldc->ldc_refcnt
-+
- /* protected by ldo_mutex */
- struct ldapoptions ldc_options;
- #define ld_options ldc->ldc_options
-@@ -403,66 +455,22 @@ struct ldap_common {
- #define ld_urllist_params ld_options.ldo_urllist_params
-
- #define ld_version ld_options.ldo_version
--#ifdef LDAP_R_COMPILE
--#define ld_ldopts_mutex ld_options.ldo_mutex
--#endif
--
-- unsigned short ldc_lberoptions;
--#define ld_lberoptions ldc->ldc_lberoptions
--
-- /* protected by msgid_mutex */
-- ber_len_t ldc_msgid;
--#define ld_msgid ldc->ldc_msgid
--
-- /* do not mess with these */
-- /* protected by req_mutex */
-- LDAPRequest *ldc_requests; /* list of outstanding requests */
-- /* protected by res_mutex */
-- LDAPMessage *ldc_responses; /* list of outstanding responses */
--#define ld_requests ldc->ldc_requests
--#define ld_responses ldc->ldc_responses
-
- #ifdef LDAP_R_COMPILE
-+ ldap_pvt_thread_mutex_t ldc_mutex;
- ldap_pvt_thread_mutex_t ldc_msgid_mutex;
- ldap_pvt_thread_mutex_t ldc_conn_mutex;
- ldap_pvt_thread_mutex_t ldc_req_mutex;
- ldap_pvt_thread_mutex_t ldc_res_mutex;
- ldap_pvt_thread_mutex_t ldc_abandon_mutex;
-+#define ld_ldopts_mutex ld_options.ldo_mutex
-+#define ld_ldcmutex ldc->ldc_mutex
- #define ld_msgid_mutex ldc->ldc_msgid_mutex
- #define ld_conn_mutex ldc->ldc_conn_mutex
- #define ld_req_mutex ldc->ldc_req_mutex
- #define ld_res_mutex ldc->ldc_res_mutex
- #define ld_abandon_mutex ldc->ldc_abandon_mutex
- #endif
--
-- /* protected by abandon_mutex */
-- ber_len_t ldc_nabandoned;
-- ber_int_t *ldc_abandoned; /* array of abandoned requests */
--#define ld_nabandoned ldc->ldc_nabandoned
--#define ld_abandoned ldc->ldc_abandoned
--
-- /* unused by libldap */
-- LDAPCache *ldc_cache; /* non-null if cache is initialized */
--#define ld_cache ldc->ldc_cache
--
-- /* do not mess with the rest though */
--
-- /* protected by conn_mutex */
-- LDAPConn *ldc_defconn; /* default connection */
--#define ld_defconn ldc->ldc_defconn
-- LDAPConn *ldc_conns; /* list of server connections */
--#define ld_conns ldc->ldc_conns
-- void *ldc_selectinfo;/* platform specifics for select */
--#define ld_selectinfo ldc->ldc_selectinfo
--
-- /* ldap_common refcnt - free only if 0 */
--#ifdef LDAP_R_COMPILE
-- ldap_pvt_thread_mutex_t ldc_mutex;
--#define ld_ldcmutex ldc->ldc_mutex
--#endif
-- /* protected by ldc_mutex */
-- unsigned int ldc_refcnt;
--#define ld_ldcrefcnt ldc->ldc_refcnt
- };
-
- struct ldap {
diff --git a/abs/core/openldap/ntlm.patch b/abs/core/openldap/ntlm.patch
deleted file mode 100644
index 6804b61..0000000
--- a/abs/core/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21. Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- LDAPControl **ctrls,
- LDAPDerefRes **drp ));
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- tls2.c tls_o.c tls_g.c tls_m.c \
-- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- assertion.c deref.c ldif.c fetch.c
-
- OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- tls2.c tls_o.c tls_g.c tls_m.c \
-- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- assertion.c deref.c ldif.c fetch.c
- SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
- thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
diff --git a/abs/core/openldap/openldap-ntlm.patch b/abs/core/openldap/openldap-ntlm.patch
new file mode 100644
index 0000000..6804b61
--- /dev/null
+++ b/abs/core/openldap/openldap-ntlm.patch
@@ -0,0 +1,230 @@
+Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
+actually called by evolution-data-server, checked at version 1.12.2.
+Without this patch, the Exchange addressbook integration uses simple binds
+with cleartext passwords.
+
+Russ checked with openldap-software for upstream's opinion on this patch
+on 2007-12-21. Upstream had never received it as a patch submission and
+given that it's apparently only for older Exchange servers that can't do
+SASL and DIGEST-MD5, it's not very appealing.
+
+Bug#457374 filed against evolution-data-server asking if this support is
+still required on 2007-12-21.
+
+Index: trunk/include/ldap.h
+===================================================================
+--- trunk.orig/include/ldap.h
++++ trunk/include/ldap.h
+@@ -2461,5 +2461,25 @@
+ LDAPControl **ctrls,
+ LDAPDerefRes **drp ));
+
++/*
++ * hacks for NTLM
++ */
++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
++LDAP_F( int )
++ldap_ntlm_bind LDAP_P((
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp ));
++LDAP_F( int )
++ldap_parse_ntlm_bind_result LDAP_P((
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge));
++
+ LDAP_END_DECL
+ #endif /* _LDAP_H */
+Index: trunk/libraries/libldap/ntlm.c
+===================================================================
+--- /dev/null
++++ trunk/libraries/libldap/ntlm.c
+@@ -0,0 +1,138 @@
++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
++/*
++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
++ */
++
++/* Mostly copied from sasl.c */
++
++#include "portable.h"
++
++#include <stdlib.h>
++#include <stdio.h>
++
++#include <ac/socket.h>
++#include <ac/string.h>
++#include <ac/time.h>
++#include <ac/errno.h>
++
++#include "ldap-int.h"
++
++int
++ldap_ntlm_bind(
++ LDAP *ld,
++ LDAP_CONST char *dn,
++ ber_tag_t tag,
++ struct berval *cred,
++ LDAPControl **sctrls,
++ LDAPControl **cctrls,
++ int *msgidp )
++{
++ BerElement *ber;
++ int rc;
++ ber_int_t id;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
++
++ if( msgidp == NULL ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ assert( LBER_VALID( ber ) );
++
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++ id, LDAP_REQ_BIND,
++ ld->ld_version, dn, tag,
++ cred );
++
++ /* Put Server Controls */
++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
++ ld->ld_errno = LDAP_ENCODING_ERROR;
++ ber_free( ber, 1 );
++ return ld->ld_errno;
++ }
++
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
++
++ if(*msgidp < 0)
++ return ld->ld_errno;
++
++ return LDAP_SUCCESS;
++}
++
++int
++ldap_parse_ntlm_bind_result(
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
++{
++ ber_int_t errcode;
++ ber_tag_t tag;
++ BerElement *ber;
++ ber_len_t len;
++
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
++
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
++
++ if ( ld == NULL || res == NULL ) {
++ return LDAP_PARAM_ERROR;
++ }
++
++ if( res->lm_msgtype != LDAP_RES_BIND ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
++
++ if ( ld->ld_error ) {
++ LDAP_FREE( ld->ld_error );
++ ld->ld_error = NULL;
++ }
++ if ( ld->ld_matched ) {
++ LDAP_FREE( ld->ld_matched );
++ ld->ld_matched = NULL;
++ }
++
++ /* parse results */
++
++ ber = ber_dup( res->lm_ber );
++
++ if( ber == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
++
++ tag = ber_scanf( ber, "{ioa" /*}*/,
++ &errcode, challenge, &ld->ld_error );
++ ber_free( ber, 0 );
++
++ if( tag == LBER_ERROR ) {
++ ld->ld_errno = LDAP_DECODING_ERROR;
++ return ld->ld_errno;
++ }
++
++ ld->ld_errno = errcode;
++
++ return( ld->ld_errno );
++}
++
+Index: trunk/libraries/libldap/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap/Makefile.in
++++ trunk/libraries/libldap/Makefile.in
+@@ -27,7 +27,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+
+ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+@@ -40,7 +40,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
+Index: trunk/libraries/libldap_r/Makefile.in
+===================================================================
+--- trunk.orig/libraries/libldap_r/Makefile.in
++++ trunk/libraries/libldap_r/Makefile.in
+@@ -29,7 +29,7 @@
+ init.c options.c print.c string.c util-int.c schema.c \
+ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
+ tls2.c tls_o.c tls_g.c tls_m.c \
+- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
+ assertion.c deref.c ldif.c fetch.c
+ SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
+ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
+@@ -47,7 +47,7 @@
+ init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
+ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
+- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
+ assertion.lo deref.lo ldif.lo fetch.lo
+
+ LDAP_INCDIR= ../../include
diff --git a/abs/core/openldap/openldap.install b/abs/core/openldap/openldap.install
index cf3cb9f..a34ca1a 100644
--- a/abs/core/openldap/openldap.install
+++ b/abs/core/openldap/openldap.install
@@ -1,4 +1,5 @@
post_install(){
+ systemd-tmpfiles --create slapd.conf
groupadd -g 439 ldap &>/dev/null
useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
chown -R ldap:ldap var/lib/openldap &>/dev/null
diff --git a/abs/core/openldap/slapd b/abs/core/openldap/slapd
deleted file mode 100755
index 4f212da..0000000
--- a/abs/core/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
- start)
- stat_busy "Starting OpenLDAP"
- [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
- if [ -z "$PID" ]; then
- if [ -z "$SLAPD_SERVICES" ]; then
- /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
- else
- /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
- fi
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- add_daemon slapd
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping OpenLDAP"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /run/openldap/slapd.pid
- rm -f /run/openldap/slapd.args
- rm_daemon slapd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/openldap/slapd.default b/abs/core/openldap/slapd.default
deleted file mode 100644
index 72ae2a6..0000000
--- a/abs/core/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/abs/core/openldap/slapd.service b/abs/core/openldap/slapd.service
index d8baa57..a664fa3 100644
--- a/abs/core/openldap/slapd.service
+++ b/abs/core/openldap/slapd.service
@@ -3,7 +3,7 @@ Description=OpenLDAP server daemon
[Service]
Type=forking
-ExecStart=/usr/sbin/slapd
+ExecStart=/usr/bin/slapd -u ldap -g ldap
[Install]
WantedBy=multi-user.target
diff --git a/abs/core/openldap/slapd.tmpfiles b/abs/core/openldap/slapd.tmpfiles
index 5f63bd6..b22c831 100644
--- a/abs/core/openldap/slapd.tmpfiles
+++ b/abs/core/openldap/slapd.tmpfiles
@@ -1 +1 @@
-D /run/openldap 0750 ldap ldap -
+D /run/openldap 0755 ldap ldap -
--
cgit v0.12
From 237df8ca287f8109dad86a73072853fd8d7670ff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Apr 2014 20:38:18 +0000
Subject: runit-scripts: update /sbin dirs to /usr/bin. refs #961
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/logger-runit | 2 +-
abs/core/runit-scripts/runitscripts/services/acpid/run | 2 +-
abs/core/runit-scripts/runitscripts/services/autofs/run | 4 ++--
abs/core/runit-scripts/runitscripts/services/avahi/run | 2 +-
.../runit-scripts/runitscripts/services/bluetoothd/run | 4 ++--
abs/core/runit-scripts/runitscripts/services/cron/run | 2 +-
.../runit-scripts/runitscripts/services/ddclient/run | 2 +-
abs/core/runit-scripts/runitscripts/services/dhcpd/run | 2 +-
abs/core/runit-scripts/runitscripts/services/dnsmasq/run | 2 +-
abs/core/runit-scripts/runitscripts/services/hal/run | 2 +-
.../runit-scripts/runitscripts/services/irqbalance/run | 2 +-
abs/core/runit-scripts/runitscripts/services/lcdd/run | 4 ++--
.../runit-scripts/runitscripts/services/lighttpd/run | 2 +-
.../runit-scripts/runitscripts/services/mythbackend/run | 4 ++--
.../runit-scripts/runitscripts/services/mythexport/run | 2 +-
.../runit-scripts/runitscripts/services/mythexpress/run | 2 +-
.../runit-scripts/runitscripts/services/ncid-server/run | 6 +++---
.../runitscripts/services/nfs-common/finish | 9 ++++-----
.../runit-scripts/runitscripts/services/nfs-common/run | 16 ++++++++--------
abs/core/runit-scripts/runitscripts/services/nfsd/run | 8 ++++----
abs/core/runit-scripts/runitscripts/services/nfslock/run | 4 ++--
abs/core/runit-scripts/runitscripts/services/ntpd/finish | 2 +-
abs/core/runit-scripts/runitscripts/services/oss/run | 3 +--
abs/core/runit-scripts/runitscripts/services/remotes/run | 16 ++--------------
abs/core/runit-scripts/runitscripts/services/remyth/run | 2 +-
abs/core/runit-scripts/runitscripts/services/rfcomm/run | 2 +-
abs/core/runit-scripts/runitscripts/services/rsyslog/run | 2 +-
.../runit-scripts/runitscripts/services/shellinaboxd/run | 3 +--
.../runit-scripts/runitscripts/services/smartd/finish | 2 +-
abs/core/runit-scripts/runitscripts/services/smartd/run | 2 +-
abs/core/runit-scripts/runitscripts/services/sshd/run | 2 +-
.../runit-scripts/runitscripts/services/syslog-ng/run | 10 ----------
abs/core/runit-scripts/runitscripts/services/tftpd/run | 2 +-
abs/core/runit-scripts/runitscripts/services/tty2/run | 2 +-
abs/core/runit-scripts/runitscripts/services/tty3/run | 2 +-
.../runit-scripts/runitscripts/services/zoneminder/run | 4 ++--
37 files changed, 58 insertions(+), 83 deletions(-)
delete mode 100755 abs/core/runit-scripts/runitscripts/services/syslog-ng/run
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index d97d14f..6525ba3 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=15
+pkgrel=16
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/logger-runit b/abs/core/runit-scripts/runitscripts/logger-runit
index 6888f6f..97d9f6e 100755
--- a/abs/core/runit-scripts/runitscripts/logger-runit
+++ b/abs/core/runit-scripts/runitscripts/logger-runit
@@ -8,4 +8,4 @@ then
chmod 700 /var/log/$svname
fi
-exec /sbin/svlogd -tt /var/log/$svname
+exec /usr/bin/svlogd -tt /var/log/$svname
diff --git a/abs/core/runit-scripts/runitscripts/services/acpid/run b/abs/core/runit-scripts/runitscripts/services/acpid/run
index 808808f..ef4434e 100755
--- a/abs/core/runit-scripts/runitscripts/services/acpid/run
+++ b/abs/core/runit-scripts/runitscripts/services/acpid/run
@@ -5,4 +5,4 @@ export TERM=linux
. /etc/rc.d/functions
svwaitup -s 10 /service/rsyslog
stat_runit "Starting acpid"
-exec /usr/sbin/acpid -f -l -c /etc/acpi/events
+exec /usr/bin/acpid -f -l -c /etc/acpi/events
diff --git a/abs/core/runit-scripts/runitscripts/services/autofs/run b/abs/core/runit-scripts/runitscripts/services/autofs/run
index 342ade6..d6659c4 100755
--- a/abs/core/runit-scripts/runitscripts/services/autofs/run
+++ b/abs/core/runit-scripts/runitscripts/services/autofs/run
@@ -6,7 +6,7 @@ exec 2>&1
stat_runit "Starting autofs4 kernel module" && echo ""
set -e # barf if modprobe fails
-/sbin/modprobe autofs4
+/usr/bin/modprobe autofs4
stat_runit "Starting autofs automount" && echo ""
# source application-specific settings
@@ -16,4 +16,4 @@ if [ ! -z "$TIMEOUT" ]; then
daemonoptions="--timeout=$TIMEOUT $daemonoptions"
fi
-exec /usr/sbin/automount -f $daemonoptions
+exec /usr/bin/automount -f $daemonoptions
diff --git a/abs/core/runit-scripts/runitscripts/services/avahi/run b/abs/core/runit-scripts/runitscripts/services/avahi/run
index b9b4905..bd34449 100755
--- a/abs/core/runit-scripts/runitscripts/services/avahi/run
+++ b/abs/core/runit-scripts/runitscripts/services/avahi/run
@@ -6,5 +6,5 @@ export TERM=linux
stat_runit "Starting Avahi"
-exec /usr/sbin/avahi-daemon >/dev/null 2>/dev/null
+exec /usr/bin/avahi-daemon >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
index 15d3bb2..5b3e1be 100755
--- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
+++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
@@ -8,7 +8,7 @@
[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-/sbin/svwaitup -s 15 /service/dbus || exit 1
+/usr/bin/svwaitup -s 15 /service/dbus || exit 1
stat_runit "Starting bluetooth subsystem:"
-exec /usr/sbin/bluetoothd -n >/dev/null
+exec /usr/bin/bluetoothd -n >/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/cron/run b/abs/core/runit-scripts/runitscripts/services/cron/run
index bf5787a..5bb2175 100755
--- a/abs/core/runit-scripts/runitscripts/services/cron/run
+++ b/abs/core/runit-scripts/runitscripts/services/cron/run
@@ -6,4 +6,4 @@ stat_runit "Starting Cron"
exec 2>&1
-exec /usr/sbin/crond -f -M /usr/bin/postfix -l info
+exec /usr/bin/crond -f -M /usr/bin/postfix -l info
diff --git a/abs/core/runit-scripts/runitscripts/services/ddclient/run b/abs/core/runit-scripts/runitscripts/services/ddclient/run
index c5488f6..955f565 100755
--- a/abs/core/runit-scripts/runitscripts/services/ddclient/run
+++ b/abs/core/runit-scripts/runitscripts/services/ddclient/run
@@ -5,4 +5,4 @@ export TERM=linux
stat_runit "Starting ddclient"
-exec /usr/sbin/ddclient -foreground &> /var/log/ddclient.log
+exec /usr/bin/ddclient -foreground &> /var/log/ddclient.log
diff --git a/abs/core/runit-scripts/runitscripts/services/dhcpd/run b/abs/core/runit-scripts/runitscripts/services/dhcpd/run
index 38ae40a..8711cd6 100755
--- a/abs/core/runit-scripts/runitscripts/services/dhcpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/dhcpd/run
@@ -5,4 +5,4 @@ export TERM=linux
stat_runit "Starting dhcpd"
-exec /usr/sbin/dhcpd -f &> /var/log/dhcpd.log
+exec /usr/bin/dhcpd -f &> /var/log/dhcpd.log
diff --git a/abs/core/runit-scripts/runitscripts/services/dnsmasq/run b/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
index f14c51a..d07ab7b 100755
--- a/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
+++ b/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
@@ -6,5 +6,5 @@ export TERM=linux
stat_runit "Starting dns services"
-exec /usr/sbin/dnsmasq -k >/dev/null 2>/dev/null
+exec /usr/bin/dnsmasq -k >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/hal/run b/abs/core/runit-scripts/runitscripts/services/hal/run
index a6d5c0e..fe2f2c6 100755
--- a/abs/core/runit-scripts/runitscripts/services/hal/run
+++ b/abs/core/runit-scripts/runitscripts/services/hal/run
@@ -5,4 +5,4 @@ export TERM=linux
. /etc/rc.d/functions
svwaitup dbus 2>/dev/null 1>/dev/null
stat_runit "Starting Hal"
-exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
+exec /usr/bin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/irqbalance/run b/abs/core/runit-scripts/runitscripts/services/irqbalance/run
index 6342868..83b6268 100755
--- a/abs/core/runit-scripts/runitscripts/services/irqbalance/run
+++ b/abs/core/runit-scripts/runitscripts/services/irqbalance/run
@@ -13,4 +13,4 @@ fi
stat_runit "Starting irqbalance"
-exec /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null
+exec /usr/bin/irqbalance --debug $ONESHOT_CMD >/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/lcdd/run b/abs/core/runit-scripts/runitscripts/services/lcdd/run
index da2258b..2557e1d 100755
--- a/abs/core/runit-scripts/runitscripts/services/lcdd/run
+++ b/abs/core/runit-scripts/runitscripts/services/lcdd/run
@@ -9,7 +9,7 @@ stat_runit "Starting lcdproc"
exec 2>&1
if [ x$LCDtype = xxosd ]
then
- DISPLAY=127.0.0.1:0 /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
+ DISPLAY=127.0.0.1:0 /usr/bin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
else
- exec /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
+ exec /usr/bin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
fi
diff --git a/abs/core/runit-scripts/runitscripts/services/lighttpd/run b/abs/core/runit-scripts/runitscripts/services/lighttpd/run
index 3ac10e5..73c183f 100755
--- a/abs/core/runit-scripts/runitscripts/services/lighttpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/lighttpd/run
@@ -25,4 +25,4 @@ if [ ! -d /var/run/lighttpd ] ; then
fi
# Using -angel to start lighttpd allows lighttpd to accept signals
-exec /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+exec /usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
index e24fc3d..8afd737 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
@@ -14,12 +14,12 @@ fi
#wait for mysql
if [ -e /service/mysql ]
then
- /sbin/svwaitup -s 10 /service/mysql
+ /usr/bin/svwaitup -s 10 /service/mysql
fi
if [ -e /service/avahi ]
then
- /sbin/svwaitup -s 2 /service/avahi
+ /usr/bin/svwaitup -s 2 /service/avahi
fi
#profile is here to setup LC_ALL/locale
diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/run b/abs/core/runit-scripts/runitscripts/services/mythexport/run
index 45f77fd..824ccb2 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexport/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexport/run
@@ -1,6 +1,6 @@
#!/bin/bash
-/sbin/chpst -u mythtv /usr/bin/mythexport-daemon
+/usr/bin/chpst -u mythtv /usr/bin/mythexport-daemon
PID=`pidof -o %PPID -x /usr/bin/mythexport-daemon`
diff --git a/abs/core/runit-scripts/runitscripts/services/mythexpress/run b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
index db3eba1..7410f43 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexpress/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
@@ -3,7 +3,7 @@ exec 2>&1
export TERM=linux
. /etc/rc.conf
. /etc/rc.d/functions
-/sbin/svwaitup -s 10 /service/avahi
+/usr/bin/svwaitup -s 10 /service/avahi
stat_runit "Starting MythExpress"
exec su http -s/bin/bash -c "node /usr/mythexpress/app.js"
diff --git a/abs/core/runit-scripts/runitscripts/services/ncid-server/run b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
index 337b028..4526fae 100644
--- a/abs/core/runit-scripts/runitscripts/services/ncid-server/run
+++ b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
@@ -9,12 +9,12 @@ stat_runit "Starting caller id server (ncid)"
exec 2>&1
if [ -f /etc/ncid/ncidd-user.conf ]
then
- exec /usr/sbin/ncidd -D -C /etc/ncid/ncidd-user.conf
+ exec /usr/bin/ncidd -D -C /etc/ncid/ncidd-user.conf
else
if [ x$nciddDeviceNetCallerID = "x1" ]
then
- exec /usr/sbin/ncidd -D -t /dev/$nciddSerialPort --nomodem 1 -S 4800
+ exec /usr/bin/ncidd -D -t /dev/$nciddSerialPort --nomodem 1 -S 4800
else
- exec /usr/sbin/ncidd -D -t /dev/$nciddSerialPort -S 4800
+ exec /usr/bin/ncidd -D -t /dev/$nciddSerialPort -S 4800
fi
fi
diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
index 531192d..fddac0c 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
+++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
@@ -5,19 +5,19 @@ daemon_name=nfs-common
. /etc/rc.conf
. /etc/rc.d/functions
. /etc/conf.d/$daemon_name.conf
-
+
# rpc.statd daemon & binary location
STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
+STATD="/usr/bin/rpc.statd"
# rpc.idmapd daemon & binary location
IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
+IDMAPD="/usr/bin/rpc.idmapd"
# rpc.gssd daemon & binary location
GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
+GSSD="/usr/bin/rpc.gssd"
do_umount() {
if mountpoint -q "$1" ; then
@@ -29,7 +29,6 @@ do_umount() {
get_pid() {
pidof -o %PPID "$1"
}
-
stat_runit "Stopping $GSSD_DAEMON_NAME daemon"
PID=$(get_pid $GSSD)
diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/run b/abs/core/runit-scripts/runitscripts/services/nfs-common/run
index f0dbb6e..10532ac 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfs-common/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/run
@@ -9,15 +9,15 @@ daemon_name=nfs-common
# rpc.statd daemon & binary location
STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
+STATD="/usr/bin/rpc.statd"
# rpc.idmapd daemon & binary location
IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
+IDMAPD="/usr/bin/rpc.idmapd"
# rpc.gssd daemon & binary location
GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
+GSSD="/usr/bin/rpc.gssd"
# Default mountpoint and options for rpc_pipefs filesystem
@@ -27,7 +27,7 @@ GSSD="/usr/sbin/rpc.gssd"
do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+ if [ -x /usr/bin/modprobe -a -f /proc/modules ]; then
modprobe -q "$1" || true
fi
}
@@ -36,7 +36,7 @@ do_mount() {
if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
return 1
fi
-
+
if grep -vw "$1" /proc/mounts &> /dev/null ; then
if ! mountpoint -q "$2" ; then
mount -t "$1" "$1" "$2" -o "$3"
@@ -63,14 +63,14 @@ get_pid() {
stat_runit "Starting NFS-common: $daemon_name"
-svwaitup rpcbind >/dev/null 2>/dev/null
+svwaitup rpcbind >/dev/null 2>/dev/null
printhl " NFS-common: sm-notify"
-/usr/sbin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null
+/usr/bin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null
do_modprobe sunrpc
do_modprobe nfs
do_modprobe nfsd
-do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
+do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
printhl " NFS-common: $IDMAPD_DAEMON_NAME"
diff --git a/abs/core/runit-scripts/runitscripts/services/nfsd/run b/abs/core/runit-scripts/runitscripts/services/nfsd/run
index f043143..639c0cc 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfsd/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfsd/run
@@ -11,7 +11,7 @@ svwaitup /var/service/nfs-common >/dev/null 2>/dev/null
source /etc/conf.d/nfs-server.conf
-NFSD="/usr/sbin/rpc.nfsd"
+NFSD="/usr/bin/rpc.nfsd"
@@ -23,7 +23,7 @@ NFSD="/usr/sbin/rpc.nfsd"
[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
do_modprobe() {
- if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+ if [ -x /usr/bin/modprobe -a -f /proc/modules ]; then
modprobe -q "$1" || true
fi
}
@@ -60,11 +60,11 @@ do_modprobe nfsd
do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
# Re-export all directories in /etc/exports
-/usr/sbin/exportfs -ra > /dev/null 2>/dev/null
+/usr/bin/exportfs -ra > /dev/null 2>/dev/null
$NFSD $NFSD_OPTS $NFSD_COUNT
#
-exec /usr/sbin/rpc.mountd --foreground >/dev/null 2>/dev/null
+exec /usr/bin/rpc.mountd --foreground >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/nfslock/run b/abs/core/runit-scripts/runitscripts/services/nfslock/run
index 8d627ad..5ea6842 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfslock/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfslock/run
@@ -4,5 +4,5 @@ export TERM=linux
. /etc/rc.conf
. /etc/rc.d/functions
stat_runit "Starting NFSlock"
-svwaitup portmap >/dev/null 2>/dev/null
-/usr/sbin/rpc.statd -F >/dev/null 2>/dev/null
+svwaitup portmap >/dev/null 2>/dev/null
+/usr/bin/rpc.statd -F >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/ntpd/finish b/abs/core/runit-scripts/runitscripts/services/ntpd/finish
index ba564e7..d6873b7 100755
--- a/abs/core/runit-scripts/runitscripts/services/ntpd/finish
+++ b/abs/core/runit-scripts/runitscripts/services/ntpd/finish
@@ -4,4 +4,4 @@ export TERM=linux
. /etc/rc.d/functions
stat_runit "Stopping NTPD"
printhl " setting hwclock"
-exec /sbin/hwclock --utc -w
+exec /usr/bin/hwclock --utc -w
diff --git a/abs/core/runit-scripts/runitscripts/services/oss/run b/abs/core/runit-scripts/runitscripts/services/oss/run
index 815a34e..aa2720e 100755
--- a/abs/core/runit-scripts/runitscripts/services/oss/run
+++ b/abs/core/runit-scripts/runitscripts/services/oss/run
@@ -7,6 +7,5 @@ stat_runit "Starting OSS"
rm -f /usr/lib/oss/starting
-#exec /etc/rc.d/alsa-utils start all
-exec /usr/sbin/soundon
+exec /usr/bin/soundon
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index d0efe53..9fbb16e 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -7,20 +7,8 @@ export TERM=linux
LOG=/tmp/remotes.log
-if [ -f /sbin/modprobe ]
-then
- MODPROBE="/sbin/modprobe"
-else
- MODPROBE="/usr/bin/modprobe"
-fi
-
-if [ -f /usr/sbin/lircd ]
-then
- LIRCD="/usr/sbin/lircd "
-else
- LIRCD="/usr/bin/lircd "
-fi
-
+MODPROBE="/usr/bin/modprobe"
+LIRCD="/usr/bin/lircd "
SETSERIAL="/usr/bin/setserial"
diff --git a/abs/core/runit-scripts/runitscripts/services/remyth/run b/abs/core/runit-scripts/runitscripts/services/remyth/run
index 768ec13..430d535 100755
--- a/abs/core/runit-scripts/runitscripts/services/remyth/run
+++ b/abs/core/runit-scripts/runitscripts/services/remyth/run
@@ -3,7 +3,7 @@ exec 2>&1
export TERM=linux
. /etc/rc.conf
. /etc/rc.d/functions
-/sbin/svwaitup -s 10 /service/avahi
+/usr/bin/svwaitup -s 10 /service/avahi
stat_runit "Starting ReMyth"
exec su http -s/bin/bash -c "node /usr/remyth/server.js"
diff --git a/abs/core/runit-scripts/runitscripts/services/rfcomm/run b/abs/core/runit-scripts/runitscripts/services/rfcomm/run
index 8bc619b..2c2cbb5 100644
--- a/abs/core/runit-scripts/runitscripts/services/rfcomm/run
+++ b/abs/core/runit-scripts/runitscripts/services/rfcomm/run
@@ -14,4 +14,4 @@ svwaitup -s 3 /var/service/bluetoothd || exit 1
stat_runit "Starting RFCOMM for the bluetooth subsystem"
/usr/bin/rfcomm -f $RFCOMM_CONFIG bind all
- /sbin/sv down .
+ /usr/bin/sv down .
diff --git a/abs/core/runit-scripts/runitscripts/services/rsyslog/run b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
index e7b018d..f356d10 100755
--- a/abs/core/runit-scripts/runitscripts/services/rsyslog/run
+++ b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
@@ -6,5 +6,5 @@ export TERM=linux
stat_runit "Starting rsyslog"
-exec /usr/sbin/rsyslogd -n -c5
+exec /usr/bin/rsyslogd -n -c5
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
index cddfe08..5916dc1 100755
--- a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -5,5 +5,4 @@ export TERM=linux
. /etc/rc.d/functions
stat_runit "Starting shellinabox"
-
-exec shellinaboxd -u 1000 -c /etc/lighttpd/ --no-beep
+exec chpst -umythtv shellinaboxd -c /etc/lighttpd/ --no-beep
diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/finish b/abs/core/runit-scripts/runitscripts/services/smartd/finish
index 7b77994..b93dcf0 100755
--- a/abs/core/runit-scripts/runitscripts/services/smartd/finish
+++ b/abs/core/runit-scripts/runitscripts/services/smartd/finish
@@ -4,6 +4,6 @@
. /etc/rc.d/functions
stat_runit "Stopping smartd"
- kill -9 `pidof /usr/sbin/smartd` &>/dev/null
+ kill -9 `pidof /usr/bin/smartd` &>/dev/null
rm_daemon smartd
stat_done
diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/run b/abs/core/runit-scripts/runitscripts/services/smartd/run
index b8eafb6..f4f70c1 100755
--- a/abs/core/runit-scripts/runitscripts/services/smartd/run
+++ b/abs/core/runit-scripts/runitscripts/services/smartd/run
@@ -5,4 +5,4 @@
stat_runit "Starting smartd"
- exec /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
+exec /usr/bin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/sshd/run b/abs/core/runit-scripts/runitscripts/services/sshd/run
index fc22e3b..ec1525c 100755
--- a/abs/core/runit-scripts/runitscripts/services/sshd/run
+++ b/abs/core/runit-scripts/runitscripts/services/sshd/run
@@ -10,4 +10,4 @@ stat_runit "Starting SSH"
[ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
-exec /usr/sbin/sshd -D >/dev/null 2>/dev/null
+exec /usr/bin/sshd -D >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/syslog-ng/run b/abs/core/runit-scripts/runitscripts/services/syslog-ng/run
deleted file mode 100755
index 8633a77..0000000
--- a/abs/core/runit-scripts/runitscripts/services/syslog-ng/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting syslog"
-
-
-exec /usr/sbin/syslog-ng -F
-
diff --git a/abs/core/runit-scripts/runitscripts/services/tftpd/run b/abs/core/runit-scripts/runitscripts/services/tftpd/run
index 8f742ca..4a90b09 100755
--- a/abs/core/runit-scripts/runitscripts/services/tftpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/tftpd/run
@@ -5,4 +5,4 @@ export TERM=linux
stat_runit "Starting tftpd"
-exec /usr/sbin/in.tftpd --foreground -s /tftpboot
+exec /usr/bin/in.tftpd --foreground -s /tftpboot
diff --git a/abs/core/runit-scripts/runitscripts/services/tty2/run b/abs/core/runit-scripts/runitscripts/services/tty2/run
index b2a4fa6..26b0658 100755
--- a/abs/core/runit-scripts/runitscripts/services/tty2/run
+++ b/abs/core/runit-scripts/runitscripts/services/tty2/run
@@ -4,4 +4,4 @@ export TERM=linux
. /etc/rc.d/functions
stat_runit "Starting Agetty 2"
-exec /sbin/agetty 38400 tty2 linux
+exec /usr/bin/agetty 38400 tty2 linux
diff --git a/abs/core/runit-scripts/runitscripts/services/tty3/run b/abs/core/runit-scripts/runitscripts/services/tty3/run
index 0bafcd4..a227ea5 100755
--- a/abs/core/runit-scripts/runitscripts/services/tty3/run
+++ b/abs/core/runit-scripts/runitscripts/services/tty3/run
@@ -3,4 +3,4 @@ export TERM=linux
. /etc/rc.conf
. /etc/rc.d/functions
stat_runit "Starting Agetty 3"
-exec /sbin/agetty 38400 tty3 linux
+exec /usr/bin/agetty 38400 tty3 linux
diff --git a/abs/core/runit-scripts/runitscripts/services/zoneminder/run b/abs/core/runit-scripts/runitscripts/services/zoneminder/run
index dfd15f3..050f511 100755
--- a/abs/core/runit-scripts/runitscripts/services/zoneminder/run
+++ b/abs/core/runit-scripts/runitscripts/services/zoneminder/run
@@ -6,7 +6,7 @@ MYTH_RUN_STATUS="1"
. /etc/rc.conf
. /etc/rc.d/functions
#wait for mysql
-/sbin/svwaitup -s 20 /service/mysql
+/usr/bin/svwaitup -s 20 /service/mysql
stat_runit "Starting ZoneMinder"
/usr/bin/zmpkg.pl start 2>/tmp/zoneminder.out
@@ -20,7 +20,7 @@ then
done
else
stat_runit "Zoneminder did not start correctly"
-fi
+fi
--
cgit v0.12
From b90e9ef668828634480e31a3286b7e626b8a7bd1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 00:03:59 +0000
Subject: php: update to 5.5.11. refs #961
---
abs/core/php/PKGBUILD | 87 ++++++++++++----------
abs/core/php/__changelog | 22 +++---
abs/core/php/logrotate.d.php-fpm | 2 +-
abs/core/php/php-fpm.conf.in.patch | 14 ++--
abs/core/php/php-fpm.install | 2 +-
abs/core/php/php-fpm.service | 4 +-
abs/core/php/php.ini.patch | 29 +++-----
abs/core/php/rc.d.php-fpm | 144 -------------------------------------
8 files changed, 78 insertions(+), 226 deletions(-)
mode change 100755 => 100644 abs/core/php/php.ini.patch
delete mode 100644 abs/core/php/rc.d.php-fpm
diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index 122c6ca..b1fad45 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169306 2012-10-19 05:27:26Z pierre $
+# $Id$
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,23 +21,36 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.4.8
+pkgver=5.5.11
pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'libvpx'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
- 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
- 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+ 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
+source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
+ "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
+ 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
+
+prepare() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ patch -p0 -i ${srcdir}/php.ini.patch
+ patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+ # Just because our Apache 2.4 is configured with a threaded MPM by default does not mean we want to build a ZTS PHP.
+ # Let's supress this behaviour and build a SAPI that works fine with the prefork MPM.
+ sed '/APACHE_THREADED_MPM=/d' -i sapi/apache2handler/config.m4 -i configure
+}
+
build() {
- phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+ local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
--config-cache \
--prefix=/usr \
+ --sbindir=/usr/bin \
--sysconfdir=/etc/php \
--localstatedir=/var \
--with-layout=GNU \
@@ -48,7 +61,7 @@ build() {
--without-pear \
"
- phpextensions="--enable-bcmath=shared \
+ local _phpextensions="--enable-bcmath=shared \
--enable-calendar=shared \
--enable-dba=shared \
--enable-exif=shared \
@@ -56,6 +69,7 @@ build() {
--enable-gd-native-ttf \
--enable-intl=shared \
--enable-mbstring \
+ --enable-opcache \
--enable-phar=shared \
--enable-posix=shared \
--enable-shmop=shared \
@@ -69,6 +83,7 @@ build() {
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
+ --with-fpm-systemd \
--with-freetype-dir=/usr \
--with-gd=shared \
--with-gdbm \
@@ -85,7 +100,7 @@ build() {
--with-mcrypt=shared \
--with-mhash \
--with-mssql=shared \
- --with-mysql-sock=/var/run/mysqld/mysqld.sock \
+ --with-mysql-sock=/run/mysqld/mysqld.sock \
--with-mysql=shared,mysqlnd \
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
@@ -113,86 +128,81 @@ build() {
cd ${srcdir}/${pkgbase}-${pkgver}
- # adjust paths
-
- patch -p0 -i ${srcdir}/php.ini.patch
- patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
# php
mkdir ${srcdir}/build-php
cd ${srcdir}/build-php
ln -s ../${pkgbase}-${pkgver}/configure
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cgi \
--with-readline \
--enable-pcntl \
- ${phpextensions}
+ ${_phpextensions}
make
# cgi and fcgi
# reuse the previous run; this will save us a lot of time
cp -a ${srcdir}/build-php ${srcdir}/build-cgi
cd ${srcdir}/build-cgi
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cli \
--enable-cgi \
- ${phpextensions}
+ ${_phpextensions}
make
# apache
cp -a ${srcdir}/build-php ${srcdir}/build-apache
cd ${srcdir}/build-apache
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cli \
--with-apxs2 \
- ${phpextensions}
+ ${_phpextensions}
make
# fpm
cp -a ${srcdir}/build-php ${srcdir}/build-fpm
cd ${srcdir}/build-fpm
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cli \
--enable-fpm \
--with-fpm-user=http \
--with-fpm-group=http \
- ${phpextensions}
+ ${_phpextensions}
make
# embed
cp -a ${srcdir}/build-php ${srcdir}/build-embed
cd ${srcdir}/build-embed
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cli \
--enable-embed=shared \
- ${phpextensions}
+ ${_phpextensions}
make
# pear
cp -a ${srcdir}/build-php ${srcdir}/build-pear
cd ${srcdir}/build-pear
- ./configure ${phpconfig} \
+ ./configure ${_phpconfig} \
--disable-cgi \
--with-readline \
--enable-pcntl \
--with-pear \
- ${phpextensions}
+ ${_phpextensions}
make
}
# check() {
# cd ${srcdir}/build-php
+# export SNMP_TIMEOUT=1
+# export SNMP_RETRIES=0
+# export NO_INTERACTION=1
# make test
+# echo
# }
package_php() {
pkgdesc='An HTML-embedded scripting language'
depends=('pcre' 'libxml2' 'bzip2' 'curl' 'php-gd' 'php-mcrypt')
- replaces=('php-fileinfo' 'php-gmp' 'php-curl')
- provides=('php-fileinfo' 'php-gmp' 'php-curl')
- conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
backup=('etc/php/php.ini')
- install='php.install'
cd ${srcdir}/build-php
make -j1 INSTALL_ROOT=${pkgdir} install
@@ -227,14 +237,13 @@ package_php-apache() {
package_php-fpm() {
pkgdesc='FastCGI Process Manager for PHP'
- depends=('php')
+ depends=('php' 'systemd')
backup=('etc/php/php-fpm.conf')
install='php-fpm.install'
- install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
+ install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm
install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
- install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
install -d -m755 ${pkgdir}/etc/php/fpm.d
install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
@@ -339,11 +348,11 @@ package_php-xsl() {
pkgdesc='xsl module for PHP'
install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
}
-md5sums=('bb8c816a9299be8995255ef70c63b800'
- 'f62b49e6da4a09a6dd307f82c89e2a43'
+md5sums=('9156fcd4b254cbfa9a7535f931da29d5'
+ 'SKIP'
+ '2882de6eb210c826df0872b3ce606765'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '3cfde0cc4ed09b55f1ce531437a4eb88'
- '5c1f4c967b66ce3eaf819b46951dcbf5'
- 'f56b5bb7e93c802ae8519182fbea3387'
- 'f8b206cb8fecb05cb1ded8bee45633ff'
+ '9f8263996836e27f5be1483e86ac2e33'
+ 'e036c721e5ad927cd1613c7475a58b3a'
+ 'cc2940f5312ba42e7aa1ddfab74b84c4'
'c60343df74f8e1afb13b084d5c0e47ed')
diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog
index 5e9fead..26c0ff4 100644
--- a/abs/core/php/__changelog
+++ b/abs/core/php/__changelog
@@ -1,26 +1,22 @@
-removed postfix
-openbase_dir commented out
-short_tags On
-
+PKGBUILD: package_php: add deps 'php-gd' 'php-mcrypt' since we have them in php.ini
+php.ini.patch: short_open_tags = On
+php.ini.patch: open_basedir commented out
+php.ini.patch: error_log = syslog uncommented
+pho.ini.patch:
==> check and make sure these are uncommented:
- ==> "extension=mysql.so"
+ ==> "extension=ftp.so"
==> "extension=gd.so"
==> "extension=gettext.so"
==> "extension=mcrypt.so"
==> "extension=mysqli.so"
- ==> "extension=session.so"
- ==> "extension=sockets.so"
+ ==> "extension=mysql.so"
==> "extension=openssl.so"
- ==> "extension=ftp.so"
+ ==> "extension=sockets.so"
==> "extension=zip.so"
-==> add php-gd and php-mcrypt as depends of php since we have them in php.ini
-syslog.error on
-
-php.install
+PKGBUILD: add php.install:
post_upgrade & post_install
-
if [ -f /etc/systemconfig ]
then
. /etc/systemconfig
diff --git a/abs/core/php/logrotate.d.php-fpm b/abs/core/php/logrotate.d.php-fpm
index ac2d92a..1895c5b 100644
--- a/abs/core/php/logrotate.d.php-fpm
+++ b/abs/core/php/logrotate.d.php-fpm
@@ -3,6 +3,6 @@
notifempty
delaycompress
postrotate
- kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true
+ systemctl reload php-fpm.service || true
endscript
}
diff --git a/abs/core/php/php-fpm.conf.in.patch b/abs/core/php/php-fpm.conf.in.patch
index d618fca..4bcdb73 100644
--- a/abs/core/php/php-fpm.conf.in.patch
+++ b/abs/core/php/php-fpm.conf.in.patch
@@ -1,8 +1,8 @@
---- sapi/fpm/php-fpm.conf.in 2012-08-15 06:26:05.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2012-08-16 14:17:41.809663595 +0200
+--- sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
- ; - the global prefix if it's been set (-p arguement)
+ ; - the global prefix if it's been set (-p argument)
; - @prefix@ otherwise
-;include=etc/fpm.d/*.conf
+;include=/etc/php/fpm.d/*.conf
@@ -18,7 +18,7 @@
; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -148,7 +148,8 @@
+@@ -156,7 +156,8 @@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
@@ -27,8 +27,8 @@
+listen = /run/php-fpm/php-fpm.sock
; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -159,9 +160,9 @@
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
+@@ -167,9 +168,9 @@
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0666
@@ -41,7 +41,7 @@
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -458,7 +459,7 @@
+@@ -466,7 +467,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
diff --git a/abs/core/php/php-fpm.install b/abs/core/php/php-fpm.install
index 41fc37c..3572a76 100644
--- a/abs/core/php/php-fpm.install
+++ b/abs/core/php/php-fpm.install
@@ -1,6 +1,6 @@
post_install() {
if [[ ! -d run/php-fpm ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf
+ usr/bin/systemd-tmpfiles --create php-fpm.conf
fi
}
diff --git a/abs/core/php/php-fpm.service b/abs/core/php/php-fpm.service
index fc5ead6..6e2faaf 100644
--- a/abs/core/php/php-fpm.service
+++ b/abs/core/php/php-fpm.service
@@ -3,10 +3,10 @@ Description=The PHP FastCGI Process Manager
After=syslog.target network.target
[Service]
-Type=forking
+Type=notify
PIDFile=/run/php-fpm/php-fpm.pid
PrivateTmp=true
-ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
+ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid
ExecReload=/bin/kill -USR2 $MAINPID
[Install]
diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch
old mode 100755
new mode 100644
index ed17c00..c27db10
--- a/abs/core/php/php.ini.patch
+++ b/abs/core/php/php.ini.patch
@@ -1,24 +1,15 @@
---- php.ini-production.orig 2012-11-01 00:08:25.365008573 +0000
-+++ php.ini-production 2012-11-01 00:13:48.698332172 +0000
-@@ -208,7 +208,7 @@
+--- php.ini-production.orig 2014-04-15 22:32:53.462733214 +0000
++++ php.ini-production 2014-04-15 23:16:41.483582108 +0000
+@@ -199,7 +199,7 @@
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
-short_open_tag = Off
-+short_open_tag = On
++short_open_tag = On
; Allow ASP-style <% %> tags.
; http://php.net/asp-tags
-@@ -305,7 +305,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+;open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
-
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -583,7 +583,7 @@
+@@ -574,7 +574,7 @@
; Example:
;error_log = php_errors.log
; Log errors to syslog (Event Log on NT, not valid in Windows 95).
@@ -27,7 +18,7 @@
;windows.show_crt_warning
; Default value: 0
-@@ -702,7 +702,7 @@
+@@ -693,7 +693,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -36,16 +27,16 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -725,7 +725,7 @@
+@@ -716,7 +716,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
-; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
++extension_dir = "/usr/lib/php/modules"
; On windows:
; extension_dir = "ext"
-@@ -859,51 +859,47 @@
+@@ -854,50 +854,48 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -93,7 +84,6 @@
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
--;extension=php_zip.dll
+;extension=bcmath.so
+;extension=bz2.so
+;extension=calendar.so
@@ -114,6 +104,7 @@
+extension=mysqli.so
+extension=mysql.so
+;extension=odbc.so
++;zend_extension=opcache.so
+extension=openssl.so
+;extension=pdo_mysql.so
+;extension=pdo_odbc.so
diff --git a/abs/core/php/rc.d.php-fpm b/abs/core/php/rc.d.php-fpm
deleted file mode 100644
index a8cb9ec..0000000
--- a/abs/core/php/rc.d.php-fpm
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
- try=0
- while test $try -lt 35 ; do
- case "$1" in
- 'created')
- if [ -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- 'removed')
- if [ ! -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- esac
-
- stat_append '.'
- try=`expr $try + 1`
- sleep 1
- done
-}
-
-test_config() {
- stat_busy 'Checking configuration'
- if [ $(id -u) -ne 0 ]; then
- stat_append '(This script must be run as root)'
- stat_die
- fi
-
- if [ ! -r /etc/php/php-fpm.conf ]; then
- stat_append '(/etc/php/php-fpm.conf not found)'
- stat_die
- fi
-
- local test=$(/usr/sbin/php-fpm -t 2>&1)
- if [ $? -gt 0 ]; then
- stat_append '(error in /etc/php/php-fpm.conf)'
- stat_die
- elif echo $test | grep -qi 'error'; then
- stat_append '(error in /etc/php/php.ini)'
- stat_die
- fi
-
- stat_done
-}
-
-case "$1" in
- start)
- test_config
- stat_busy 'Starting php-fpm'
-
- /usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-
- if [ "$?" != 0 ] ; then
- stat_fail
- exit 1
- fi
-
- wait_for_pid created /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- add_daemon php-fpm
- stat_done
- fi
- ;;
-
- stop)
- test_config
- stat_busy 'Gracefully shutting down php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -QUIT `cat /run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- force-quit)
- stat_busy 'Terminating php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -TERM `cat /run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- reload)
- test_config
- stat_busy 'Reload service php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -USR2 `cat /run/php-fpm/php-fpm.pid`
- stat_done
- ;;
-
- *)
- echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
- exit 1
- ;;
-
-esac
--
cgit v0.12
From 1a3bd510dd4dc4f85bbde399d983e94745869473 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 00:11:20 +0000
Subject: apache: update to 2.4.9. refs #961
---
abs/core/apache/PKGBUILD | 230 ++++++++++++++--------------------
abs/core/apache/apache.conf.d | 15 ---
abs/core/apache/apache.install | 15 ++-
abs/core/apache/apachectl-confd.patch | 15 ---
abs/core/apache/arch.layout | 4 +-
abs/core/apache/httpd | 65 ----------
abs/core/apache/httpd.logrotate | 6 +
abs/core/apache/httpd.service | 15 +++
abs/core/apache/pcre_info.patch | 22 ----
9 files changed, 133 insertions(+), 254 deletions(-)
delete mode 100644 abs/core/apache/apache.conf.d
delete mode 100644 abs/core/apache/apachectl-confd.patch
delete mode 100755 abs/core/apache/httpd
create mode 100644 abs/core/apache/httpd.logrotate
create mode 100644 abs/core/apache/httpd.service
delete mode 100644 abs/core/apache/pcre_info.patch
diff --git a/abs/core/apache/PKGBUILD b/abs/core/apache/PKGBUILD
index fd13bdd..d4344e6 100644
--- a/abs/core/apache/PKGBUILD
+++ b/abs/core/apache/PKGBUILD
@@ -1,155 +1,117 @@
-# $Id: PKGBUILD 161295 2012-06-08 23:50:11Z heftig $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apache
-pkgver=2.2.22
-pkgrel=4
+pkgver=2.4.9
+pkgrel=1
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
-options=('!libtool')
url='http://www.apache.org/dist/httpd'
license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
- etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
- etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
- etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
- etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
-optdepends=('lynx: apachectl status')
+backup=(
+ etc/httpd/conf/httpd.conf
+ etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
+ etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
+ etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+ etc/httpd/conf/extra/proxy-html.conf
+ etc/httpd/conf/{mime.types,magic}
+ etc/logrotate.d/httpd
+)
+depends=('zlib' 'apr-util' 'pcre')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+ 'lua: for mod_lua module'
+ 'openssl: for mod_ssl module'
+ 'libxml2: for mod_proxy_html, mod_xml2enc modules'
+ 'lynx: apachectl status'
+)
install=apache.install
-_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
- http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
- ${_itkurl}/02-rename-prefork-to-itk.patch
- ${_itkurl}/03-add-mpm-to-build-system.patch
- ${_itkurl}/04-correct-output-makefile-location.patch
- ${_itkurl}/05-add-copyright.patch
- ${_itkurl}/06-hook-just-after-merging-perdir-config.patch
- ${_itkurl}/07-base-functionality.patch
- ${_itkurl}/08-max-clients-per-vhost.patch
- ${_itkurl}/09-capabilities.patch
- ${_itkurl}/10-nice.patch
- ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
- apachectl-confd.patch
- apache.conf.d
- apache.tmpfiles.conf
- httpd.logrotate
- httpd
- arch.layout
- pcre_info.patch)
-md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
- '41b3a6e4948679cab70b9caf490877c4'
- 'f1d9d41360908ceb2374da55ae99197a'
- 'cdfa04985a0efa850976aef01c2a0c40'
- '0930d2d0612eb0a53a0d00aea7e8687f'
- '3a0c29bb91442c33ea73ebbe072af922'
- '0ef4729a6f1ffc848ad0e9b440a66f66'
- '940944caa948340b11ddae56adaef89b'
- 'ce09a987523884de8838f73dc8ec0d19'
- 'e75b7dd8d8afcd299ba4ab2ab81c11e4'
- 'ce1ccc21f3ad8625169c8f62913450ac'
- '1e5b222edcfbf99a3edc56fcb2074fbe'
- '4ac64df6e019edbe137017cba1ff2f51'
- '08b3c875f6260644f2f52b4056d656b0'
- '82068753dab92fe86312b1010a2904d7'
- '6382331e9700ed9e8cc78ea51887b537'
- 'c7e300a287ef7e2e066ac7639536f87e'
- '3d659d41276ba3bfcb20c231eb254e0c'
- 'fde5121e32b5aeef5a7eedb5a97009ff')
+source=(
+ http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+ apache.tmpfiles.conf
+ httpd.logrotate
+ httpd.service
+ arch.layout
+)
+sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603'
+ 'SKIP'
+ '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
+ '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
+ '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
+ 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
build() {
- cd "${srcdir}/httpd-${pkgver}"
+ cd httpd-${pkgver}
- patch -p1 -i "${srcdir}/pcre_info.patch"
- patch -Np0 -i "${srcdir}/apachectl-confd.patch"
+ # set default user
+ sed -e 's#User daemon#User http#' \
+ -e 's#Group daemon#Group http#' \
+ -i docs/conf/httpd.conf.in
- # set default user
- sed -e 's#User daemon#User http#' \
- -e 's#Group daemon#Group http#' \
- -i docs/conf/httpd.conf.in
+ cat "${srcdir}/arch.layout" >> config.layout
+
+ ./configure --sbindir=/usr/bin \
+ --enable-layout=Arch \
+ --enable-mpms-shared=all \
+ --enable-modules=all \
+ --enable-mods-shared=all \
+ --enable-so \
+ --enable-suexec \
+ --with-suexec-caller=http \
+ --with-suexec-docroot=/srv/http \
+ --with-suexec-logfile=/var/log/httpd/suexec.log \
+ --with-suexec-bin=/usr/bin/suexec \
+ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
+ --enable-ldap --enable-authnz-ldap \
+ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+ --enable-ssl --with-ssl \
+ --enable-deflate --enable-cgi --enable-cgid \
+ --enable-proxy --enable-proxy-connect \
+ --enable-proxy-http --enable-proxy-ftp \
+ --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+ --enable-lua --enable-xml2enc \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-apr-util=/usr/bin/apu-1-config \
+ --with-pcre=/usr
- cat "${srcdir}/arch.layout" >> config.layout
-
- for mpm in prefork worker itk; do
- if [ "${mpm}" = "itk" ]; then
- # Fix patch to apply with latest Apache version
- sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
-
- mkdir -p server/mpm/experimental/itk
- cp -r server/mpm/prefork/* server/mpm/experimental/itk/
- mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
-
- patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
- patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
- patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
- patch -Np1 -i "${srcdir}/05-add-copyright.patch"
- patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
- patch -Np1 -i "${srcdir}/07-base-functionality.patch"
- patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
- patch -Np1 -i "${srcdir}/09-capabilities.patch"
- patch -Np1 -i "${srcdir}/10-nice.patch"
- patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
+ make
+}
- autoconf
- fi
- mkdir build-${mpm}
- pushd build-${mpm}
- ../configure --enable-layout=Arch \
- --enable-modules=all \
- --enable-mods-shared=all \
- --enable-so \
- --enable-suexec \
- --with-suexec-caller=http \
- --with-suexec-docroot=/srv/http \
- --with-suexec-logfile=/var/log/httpd/suexec.log \
- --with-suexec-bin=/usr/sbin/suexec \
- --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
- --enable-ldap --enable-authnz-ldap \
- --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
- --enable-ssl --with-ssl \
- --enable-deflate --enable-cgid \
- --enable-proxy --enable-proxy-connect \
- --enable-proxy-http --enable-proxy-ftp \
- --enable-dbd \
- --with-apr=/usr/bin/apr-1-config \
- --with-apr-util=/usr/bin/apu-1-config \
- --with-pcre=/usr \
- --with-mpm=${mpm}
- make
- if [ "${mpm}" = "prefork" ]; then
- make DESTDIR="${pkgdir}" install
- else
- install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
- fi
- popd
- done
+package() {
+ cd httpd-${pkgver}
- install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
- install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
- install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
- install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+ install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+ install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # symlinks for /etc/httpd
- ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
- ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run"
- ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
- ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
+ # symlinks for /etc/httpd
+ # do we really need these symlinks?
+ #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
+ ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
+ #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
- # set sane defaults
- sed -e 's#/usr/lib/httpd/modules/#modules/#' \
- -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
- -i "${pkgdir}/etc/httpd/conf/httpd.conf"
+ # set sane defaults
+ sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+ -e 's|#\(LoadModule negotiation_module \)|\1|' \
+ -e 's|#\(LoadModule include_module \)|\1|' \
+ -e 's|#\(LoadModule userdir_module \)|\1|' \
+ -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \
+ -i "${pkgdir}/etc/httpd/conf/httpd.conf"
- # cleanup
- rm -rf "${pkgdir}/usr/share/httpd/manual"
- rm -rf "${pkgdir}/etc/httpd/conf/original"
- rm -rf "${pkgdir}/srv/"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/var/run"
+ # cleanup
+ rm -r "${pkgdir}/usr/share/httpd/manual"
+ rm -r "${pkgdir}/etc/httpd/conf/original"
+ rm -r "${pkgdir}/srv/"
+ rm -r "${pkgdir}/run"
}
diff --git a/abs/core/apache/apache.conf.d b/abs/core/apache/apache.conf.d
deleted file mode 100644
index c6d0ebf..0000000
--- a/abs/core/apache/apache.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model. A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
diff --git a/abs/core/apache/apache.install b/abs/core/apache/apache.install
index 9b74e60..5665f08 100644
--- a/abs/core/apache/apache.install
+++ b/abs/core/apache/apache.install
@@ -1,3 +1,16 @@
post_install() {
- systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+ if type -P systemd-tmpfiles &> /dev/null; then
+ systemd-tmpfiles --create apache.conf
+ fi
+}
+
+post_upgrade() {
+ if type -P systemd-tmpfiles &> /dev/null; then
+ systemd-tmpfiles --create apache.conf
+ fi
+
+ if [[ $2 == 2\.2\.* ]]; then
+ # it is a major upgrade, show a useful link to upgrade instructions
+ echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/2.4/upgrading.html'
+ fi
}
diff --git a/abs/core/apache/apachectl-confd.patch b/abs/core/apache/apachectl-confd.patch
deleted file mode 100644
index d0f4b69..0000000
--- a/abs/core/apache/apachectl-confd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- support/apachectl.in.orig 2010-03-06 18:09:11.000000000 +0100
-+++ support/apachectl.in 2010-03-06 18:12:31.000000000 +0100
-@@ -56,6 +56,12 @@
- # the URL to your server's mod_status status page. If you do not
- # have one, then status and fullstatus will not work.
- STATUSURL="http://localhost:@PORT@/server-status"
-+
-+# Source /etc/conf.d/apache for $HTTPD setting, etc.
-+if [ -r /etc/conf.d/apache ]; then
-+ . /etc/conf.d/apache
-+fi
-+
- #
- # Set this variable to a command that increases the maximum
- # number of file descriptors allowed per child process. This is
diff --git a/abs/core/apache/arch.layout b/abs/core/apache/arch.layout
index ab59db8..d5d2e8a 100644
--- a/abs/core/apache/arch.layout
+++ b/abs/core/apache/arch.layout
@@ -2,7 +2,7 @@
prefix: /etc/httpd
exec_prefix: /usr
bindir: /usr/bin
- sbindir: /usr/sbin
+ sbindir: /usr/bin
libdir: /usr/lib/httpd
libexecdir: /usr/lib/httpd/modules
mandir: /usr/share/man
@@ -16,7 +16,7 @@
cgidir: /srv/http/cgi-bin
includedir: /usr/include/httpd
localstatedir: /var
- runtimedir: /var/run/httpd
+ runtimedir: /run/httpd
logfiledir: /var/log/httpd
proxycachedir: /var/cache/httpd
</Layout>
\ No newline at end of file
diff --git a/abs/core/apache/httpd b/abs/core/apache/httpd
deleted file mode 100755
index 6fa9c3c..0000000
--- a/abs/core/apache/httpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
- start)
- stat_busy "Starting Apache Web Server"
- [ ! -d /var/run/httpd ] && install -d /var/run/httpd
- if $APACHECTL start >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Apache Web Server"
- if $APACHECTL stop >/dev/null ; then
- rm_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- reload)
- stat_busy "Reloading Apache Web Server"
- if $APACHECTL graceful >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- stat_busy "Restarting Apache Web Server"
- if $APACHECTL restart >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- status)
- stat_busy "Checking Apache Web Server status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/abs/core/apache/httpd.logrotate b/abs/core/apache/httpd.logrotate
new file mode 100644
index 0000000..c9755de
--- /dev/null
+++ b/abs/core/apache/httpd.logrotate
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+ missingok
+ postrotate
+ /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
diff --git a/abs/core/apache/httpd.service b/abs/core/apache/httpd.service
new file mode 100644
index 0000000..247e28f
--- /dev/null
+++ b/abs/core/apache/httpd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/core/apache/pcre_info.patch b/abs/core/apache/pcre_info.patch
deleted file mode 100644
index 906a315..0000000
--- a/abs/core/apache/pcre_info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- httpd-2.2.22/server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.22/server/util_pcre.c 2012-02-08 11:23:56.273855663 +0100
-@@ -128,6 +128,7 @@
- const char *errorptr;
- int erroffset;
- int options = 0;
-+int nsub;
-
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
-@@ -136,8 +137,9 @@
- preg->re_erroffset = erroffset;
-
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
--
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
-+ PCRE_INFO_CAPTURECOUNT, &nsub);
-+preg->re_nsub = nsub;
- return 0;
- }
-
--
cgit v0.12
From 50a9ce67fa41b2f199f06dba67a746ce53926a83 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 00:28:48 +0000
Subject: ppp: update to 2.4.6. refs #961
---
abs/core/ppp/PKGBUILD | 64 ++++----
abs/core/ppp/ppp-2.4.6-makefiles.patch | 270 +++++++++++++++++++++++++++++++++
2 files changed, 300 insertions(+), 34 deletions(-)
create mode 100644 abs/core/ppp/ppp-2.4.6-makefiles.patch
diff --git a/abs/core/ppp/PKGBUILD b/abs/core/ppp/PKGBUILD
index fb099a3..e7b4a00 100644
--- a/abs/core/ppp/PKGBUILD
+++ b/abs/core/ppp/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $
+# $Id$
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=ppp
-pkgver=2.4.5
-pkgrel=8
+pkgver=2.4.6
+pkgrel=2
pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
arch=(i686 x86_64)
url="http://www.samba.org/ppp/"
license=('custom:GPL/BSD')
depends=('glibc' 'libpcap>=1.0.0')
backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh})
-source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
+source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz{,.asc}
+ ppp-2.4.6-makefiles.patch
options
ip-up
ip-down
@@ -19,35 +20,43 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
ipv6-down
ipv6-up.d.iface-config.sh
ppp.systemd)
+sha256sums=('1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d'
+ 'SKIP'
+ 'f04f47318226c79594f45b8b75877c30710d22fe0fb1e2e17db3b4257dc4218c'
+ '0933fecb9e0adaddd88ee1e049a5f3a0508e83b81dc1aa333df784e729ab4b6e'
+ 'ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd'
+ '658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897'
+ 'aafb75b978aa13225444dc6b914fab324d686821be93c49e893800e647aa7648'
+ '17b486fa69a71dafcbe543dc4f2b8cb9ed31e675aabc5f6c98ef94dbc1561c85'
+ 'bb3f44a4f2c4b8dbe7f84d77feae90a71caa9fa3c252a20c390e015d4f8ea248'
+ '77292b79f99f97a01aa9a75cd7cd93da70d746d3b8cc60f35b31dfe0568544c0'
+ '20780cf4bd0774bebb55ecb3bdae7667c9ae5cbe003a52a1ecb0bbc77d46260f'
+ 'eb8ab2e2d71c3bb9c4297cf847b6e9d52616a3fdbf2257c479cc43dff318c831')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # fix CFLAGS
- # -D_GNU_SOURCE is needed for IPv6 to work apparently
- export CFLAGS="$CFLAGS -D_GNU_SOURCE"
- sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
- sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
- sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
- sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
- sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
+ patch -p1 -i "${srcdir}/ppp-2.4.6-makefiles.patch"
# enable active filter
sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
# enable ipv6 support
sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
# Enable Microsoft proprietary Callback Control Protocol
sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
-
- # Fix build error with recent kernels
- rm include/linux/if_pppol2tp.h
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ # -D_GNU_SOURCE is needed for IPv6 to work apparently
+ CFLAGS="$CPPFLAGS $CFLAGS -D_GNU_SOURCE" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}/usr" install
+ make INSTROOT="${pkgdir}" install
+
install -D -m644 ../options "${pkgdir}/etc/ppp/options"
install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up"
install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down"
@@ -60,28 +69,15 @@ package() {
install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d"
install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d"
install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh"
+
install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon"
install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff"
- install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog"
+ install -D -m755 scripts/plog "${pkgdir}/usr/bin/plog"
install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets"
install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets"
install -d -m755 "${pkgdir}/etc/ppp/peers"
chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
- install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
- # usrmove
- cd "$pkgdir"/usr
- mv sbin/* bin/
- rmdir sbin
+ install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
}
-md5sums=('4621bc56167b6953ec4071043fe0ec57'
- '7a9259a8f038073eeea7e4552ff1849f'
- 'e4beb16ed600b61336d50b2bd2df7cd5'
- '529b924f644f80cf30d72a966abc7419'
- '0e2eeb1af125a46291999162dcc9004a'
- '3a5d56ac23e36cdbf48187813c8ec981'
- '4cbd0a9af01c27067450ec7d3f5fa673'
- 'b75c2fbc4afa9f2d8108b680c88c7036'
- '9dde53aa5a931ebe1c7e3469199777c5'
- '37401eb0c3dcccb87f5ac4716d0f9f2c')
diff --git a/abs/core/ppp/ppp-2.4.6-makefiles.patch b/abs/core/ppp/ppp-2.4.6-makefiles.patch
new file mode 100644
index 0000000..5fc7bcc
--- /dev/null
+++ b/abs/core/ppp/ppp-2.4.6-makefiles.patch
@@ -0,0 +1,270 @@
+diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux
+--- ppp-2.4.6.orig/chat/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/chat/Makefile.linux 2014-02-24 09:00:16.666577906 +0100
+@@ -1,7 +1,7 @@
+ # $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $
+
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ MANDIR = $(DESTDIR)/share/man/man8
+
+ CDEF1= -DTERMIOS # Use the termios structure
+@@ -10,7 +10,8 @@
+ CDEF4= -DFNDELAY=O_NDELAY # Old name value
+ CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
+
+-COPTS= -O2 -g -pipe
++COPTS= @CFLAGS@
++LDFLAGS= @LDFLAGS@
+ CFLAGS= $(COPTS) $(CDEFS)
+
+ INSTALL= install
+@@ -21,7 +22,7 @@
+ $(CC) -o chat chat.o
+
+ chat.o: chat.c
+- $(CC) -c $(CFLAGS) -o chat.o chat.c
++ $(CC) -c $(CFLAGS) $(LDFLAGS) -o chat.o chat.c
+
+ install: chat
+ mkdir -p $(BINDIR) $(MANDIR)
+diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure
+--- ppp-2.4.6.orig/configure 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/configure 2014-02-24 09:00:16.743242620 +0100
+@@ -185,7 +185,10 @@
+ rm -f $2
+ if [ -f $1 ]; then
+ echo " $2 <= $1"
+- sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" $1 >$2
++ sed -e "s|@DESTDIR@|$DESTDIR|g" \
++ -e "s|@SYSCONF@|$SYSCONF|g" \
++ -e "s|@CFLAGS@|$CFLAGS|g" \
++ -e "s|@LDFLAGS@|$LDFLAGS|g" $1 >$2
+ fi
+ }
+
+diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top
+--- ppp-2.4.6.orig/linux/Makefile.top 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/linux/Makefile.top 2014-02-24 09:00:16.743242620 +0100
+@@ -1,7 +1,7 @@
+ # PPP top-level Makefile for Linux.
+
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ INCDIR = $(DESTDIR)/include
+ MANDIR = $(DESTDIR)/share/man
+ ETCDIR = $(INSTROOT)@SYSCONF@/ppp
+diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux
+--- ppp-2.4.6.orig/pppd/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/Makefile.linux 2014-02-24 09:00:16.743242620 +0100
+@@ -5,7 +5,7 @@
+
+ # Default installation locations
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ MANDIR = $(DESTDIR)/share/man/man8
+ INCDIR = $(DESTDIR)/include
+
+@@ -32,7 +32,8 @@
+
+ # CC = gcc
+ #
+-COPTS = -O2 -pipe -Wall -g
++COPTS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ LIBS =
+
+ # Uncomment the next 2 lines to include support for Microsoft's
+diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-24 09:00:16.779908379 +0100
+@@ -1,11 +1,11 @@
+ #CC = gcc
+-COPTS = -O2 -g
++COPTS = @CFLAGS@
+ CFLAGS = $(COPTS) -I.. -I../../include -fPIC
+-LDFLAGS = -shared
++LDFLAGS = @LDFLAGS@ -shared
+ INSTALL = install
+
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ MANDIR = $(DESTDIR)/share/man/man8
+ LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
+@@ -1,7 +1,7 @@
+ #CC = gcc
+-COPTS = -O2 -g
++COPTS = @CFLAGS@
+ CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
+-LDFLAGS = -shared
++LDFLAGS = @LDFLAGS@
+ INSTALL = install
+
+ #***********************************************************************
+@@ -33,7 +33,7 @@
+ all: $(PLUGIN)
+
+ $(PLUGIN): $(PLUGIN_OBJS)
+- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) -shared $^ $(LIBS)
+
+ install: all
+ $(INSTALL) -d -m 755 $(LIBDIR)
+diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-02-24 09:01:06.325349425 +0100
+@@ -1,12 +1,12 @@
+ #CC = gcc
+-COPTS = -O2 -g
++COPTS = @CFLAGS@
+ CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
+-LDFLAGS = -shared
++LDFLAGS = @LDFLAGS@
+ INSTALL = install
+
+ #***********************************************************************
+
+-DESTDIR = @DESTDIR@
++DESTDIR = $(INSTROOT)@DESTDIR@
+ LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+@@ -16,7 +16,7 @@
+ all: $(PLUGINS)
+
+ %.so: %.o
+- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) -shared $^ $(LIBS)
+
+ install: all
+ $(INSTALL) -d -m 755 $(LIBDIR)
+diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugins/radius/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
+@@ -12,7 +12,8 @@
+ INSTALL = install
+
+ PLUGIN=radius.so radattr.so radrealms.so
+-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
++CFLAGS=@CFLAGS@ -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
++LDFLAGS=@LDFLAGS@
+
+ # Uncomment the next line to include support for Microsoft's
+ # MS-CHAP authentication protocol.
+@@ -43,13 +44,13 @@
+ $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
+
+ radius.so: radius.o libradiusclient.a
+- $(CC) -o radius.so -shared radius.o libradiusclient.a
++ $(CC) -o radius.so -shared $(LDFLAGS) radius.o libradiusclient.a
+
+ radattr.so: radattr.o
+- $(CC) -o radattr.so -shared radattr.o
++ $(CC) -o radattr.so -shared $(LDFLAGS) radattr.o
+
+ radrealms.so: radrealms.o
+- $(CC) -o radrealms.so -shared radrealms.o
++ $(CC) -o radrealms.so -shared $(LDFLAGS) radrealms.o
+
+ CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
+ clientid.o sendserver.o lock.o util.o md5.o
+diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
+@@ -15,7 +15,7 @@
+ #***********************************************************************
+
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
+
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+@@ -25,12 +25,14 @@
+ # Version is set ONLY IN THE MAKEFILE! Don't delete this!
+ RP_VERSION=3.8p
+
+-COPTS=-O2 -g
++COPTS=@CFLAGS@
+ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
++LDFLAGS=@LDFLAGS@
++
+ all: rp-pppoe.so pppoe-discovery
+
+ pppoe-discovery: pppoe-discovery.o debug.o
+- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o
++ $(CC) -o pppoe-discovery $(LDFLAGS) pppoe-discovery.o debug.o
+
+ pppoe-discovery.o: pppoe-discovery.c
+ $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
+@@ -39,7 +41,7 @@
+ $(CC) $(CFLAGS) -c -o debug.o debug.c
+
+ rp-pppoe.so: plugin.o discovery.o if.o common.o
+- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
++ $(CC) -o rp-pppoe.so -shared $(LDFLAGS) plugin.o discovery.o if.o common.o
+
+ install: all
+ $(INSTALL) -d -m 755 $(LIBDIR)
+diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux
+--- ppp-2.4.6.orig/pppdump/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
+@@ -1,8 +1,9 @@
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ MANDIR = $(DESTDIR)/share/man/man8
+
+-CFLAGS= -O -I../include/net
++CFLAGS = @CFLAGS@ -I../include/net
++LDFLAGS = @LDFLAGS@
+ OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
+
+ INSTALL= install
+@@ -10,7 +11,7 @@
+ all: pppdump
+
+ pppdump: $(OBJS)
+- $(CC) -o pppdump $(OBJS)
++ $(CC) $(LDFLAGS) -o pppdump $(OBJS)
+
+ clean:
+ rm -f pppdump $(OBJS) *~
+diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux
+--- ppp-2.4.6.orig/pppstats/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
+@@ -3,14 +3,15 @@
+ # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $
+ #
+ DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
++BINDIR = $(DESTDIR)/bin
+ MANDIR = $(DESTDIR)/share/man/man8
+
+ PPPSTATSRCS = pppstats.c
+ PPPSTATOBJS = pppstats.o
+
+ #CC = gcc
+-COPTS = -O
++COPTS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ COMPILE_FLAGS = -I../include
+ LIBS =
+
+@@ -26,7 +27,7 @@
+ $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
+
+ pppstats: $(PPPSTATSRCS)
+- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
+
+ clean:
+ rm -f pppstats *~ #* core
--
cgit v0.12
From f363271bb9639f6487d9e511ed4ed93f7a8f24fb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 00:35:53 +0000
Subject: usbutils: update to 007. refs #961
---
abs/core/usbutils/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/usbutils/PKGBUILD b/abs/core/usbutils/PKGBUILD
index 08513e5..ae06500 100644
--- a/abs/core/usbutils/PKGBUILD
+++ b/abs/core/usbutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $
+# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
pkgname=usbutils
-pkgver=006
+pkgver=007
pkgrel=1
pkgdesc="USB Device Utilities"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ optdepends=('python2: for lsusb.py usage'
url="http://linux-usb.sourceforge.net/"
source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz"
fix-python2.patch)
-md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8'
+md5sums=('c9df5107ae9d26b10a1736a261250139'
'45766196895b4cc50b53cd56e1bbf3d1')
build() {
--
cgit v0.12
From d7f723b8ad32f876f989bb4061f277efe6488143 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 00:42:51 +0000
Subject: v4l-utils: update to 1.0.1. refs #961
---
abs/core/v4l-utils/PKGBUILD | 10 +++++-----
abs/core/v4l-utils/__changelog | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
create mode 100644 abs/core/v4l-utils/__changelog
diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD
index 72ff71a..abed01e 100644
--- a/abs/core/v4l-utils/PKGBUILD
+++ b/abs/core/v4l-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196834 2013-10-20 12:03:29Z thomas $
+# $Id$
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=v4l-utils
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/libv4l"
+url="http://linuxtv.org/"
provides=("libv4l=$pkgver")
replaces=('libv4l')
conflicts=('libv4l')
@@ -16,7 +16,7 @@ optdepends=('qt')
depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30'
+sha256sums=('fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df'
'SKIP')
build() {
diff --git a/abs/core/v4l-utils/__changelog b/abs/core/v4l-utils/__changelog
new file mode 100644
index 0000000..acf8dd2
--- /dev/null
+++ b/abs/core/v4l-utils/__changelog
@@ -0,0 +1 @@
+PKGBUILD: change dep qt4 to qt
--
cgit v0.12
From 73d4dccd52b2ed12e8be2158f0491676b4aced09 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 13:01:46 +0000
Subject: php: add php.install to PKGBUILD
---
abs/core/php/PKGBUILD | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index b1fad45..47981e4 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('php'
'php-tidy'
'php-xsl')
pkgver=5.5.11
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -203,6 +203,7 @@ package_php() {
pkgdesc='An HTML-embedded scripting language'
depends=('pcre' 'libxml2' 'bzip2' 'curl' 'php-gd' 'php-mcrypt')
backup=('etc/php/php.ini')
+ install='php.install'
cd ${srcdir}/build-php
make -j1 INSTALL_ROOT=${pkgdir} install
--
cgit v0.12
From 041d38fb3be61ecc369a0ecea30b8f8861877b7e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 16:36:31 +0000
Subject: dbus: update to 1.8.0
---
abs/core/dbus/30-dbus | 6 +-
abs/core/dbus/PKGBUILD | 77 +++++++++----
abs/core/dbus/memleak.patch | 37 +++++++
abs/core/dbus/systemd-user-session.patch | 183 +++++++++++++++++++++++++++++++
4 files changed, 275 insertions(+), 28 deletions(-)
create mode 100644 abs/core/dbus/memleak.patch
create mode 100644 abs/core/dbus/systemd-user-session.patch
diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus
index 69d2660..42b3a5f 100644
--- a/abs/core/dbus/30-dbus
+++ b/abs/core/dbus/30-dbus
@@ -1,8 +1,6 @@
#!/bin/bash
# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
- eval `$dbuslaunch --sh-syntax --exit-with-session`
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+ eval $(dbus-launch --sh-syntax --exit-with-session)
fi
diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD
index 02b2696..ca11c98 100644
--- a/abs/core/dbus/PKGBUILD
+++ b/abs/core/dbus/PKGBUILD
@@ -1,42 +1,71 @@
-# $Id: PKGBUILD 163850 2012-07-21 11:19:03Z andyrtr $
+# $Id$
+# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
#
-pkgname=dbus
-pkgver=1.6.4
+pkgbase=dbus
+pkgname=('dbus' 'libdbus')
+pkgver=1.8.0
pkgrel=1
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
arch=(i686 x86_64)
license=('GPL' 'custom')
-depends=("dbus-core>=$pkgver" 'libx11')
-source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
+makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
30-dbus)
-md5sums=('5ec43dc4554cba638917317b2b4f7640'
- '3d4482ee39b49da334441c76f83bf1cb'
- '9fafe8b28460aeaa6054309ef4c5ed92')
+md5sums=('059fbe84e39fc99c67a14f15b1f39dff'
+ '3314d727fa57fc443fce25b5cbeebbcc')
+
+prepare() {
+ cd dbus-$pkgver
+}
build() {
- cd $pkgname-$pkgver
+ cd dbus-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
- --with-system-pid-file=/var/run/dbus.pid \
- --disable-verbose-mode --disable-static \
+ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
+ --with-system-pid-file=/run/dbus/pid \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-console-auth-dir=/run/console/ \
--enable-inotify --disable-dnotify \
- --disable-tests --disable-asserts
- make -C tools dbus-launch
+ --disable-verbose-mode --disable-static \
+ --disable-tests --disable-asserts \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-systemd
+ make
+}
+
+package_dbus(){
+ depends=('libdbus' 'expat')
+ optdepends=('libx11: dbus-launch support')
+ provides=('dbus-core')
+ conflicts=('dbus-core')
+ replaces=('dbus-core')
+
+ cd dbus-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir/var/run"
+
+ install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+
+ # split out libdbus-1
+ rm -rf "$srcdir/_libdbus"
+ install -dm755 "$srcdir"/_libdbus/usr/lib/dbus-1.0
+ mv "$pkgdir"/usr/include "$srcdir"/_libdbus/usr/
+ mv "$pkgdir"/usr/lib/pkgconfig "$srcdir"/_libdbus/usr/lib/
+ mv "$pkgdir"/usr/lib/libdbus* "$srcdir"/_libdbus/usr/lib/
+ mv "$pkgdir"/usr/lib/dbus-1.0/include "$srcdir"/_libdbus/usr/lib/dbus-1.0/
+ install -Dm644 COPYING "$srcdir"/_libdbus/usr/share/licenses/libdbus/COPYING
}
-package() {
- cd $pkgname-$pkgver
- install -m755 -d "$pkgdir/usr/bin"
- install -m755 -d "$pkgdir/usr/share/man/man1"
- install -m755 tools/dbus-launch "$pkgdir/usr/bin/"
- install -m644 doc/dbus-launch.1 "$pkgdir/usr/share/man/man1/"
+package_libdbus(){
+ pkgdesc="DBus library"
+ depends=('glibc')
- install -m755 -d "$pkgdir/etc/X11/xinit/xinitrc.d"
- install -m755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/"
- install -d -m755 "$pkgdir/usr/share/licenses/dbus"
- install -m644 COPYING "$pkgdir/usr/share/licenses/dbus/"
+ mv "$srcdir"/_libdbus/* "$pkgdir"
}
diff --git a/abs/core/dbus/memleak.patch b/abs/core/dbus/memleak.patch
new file mode 100644
index 0000000..7dea794
--- /dev/null
+++ b/abs/core/dbus/memleak.patch
@@ -0,0 +1,37 @@
+From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
+From: Radoslaw Pajak <r.pajak@samsung.com>
+Date: Fri, 08 Nov 2013 12:51:32 +0000
+Subject: fixed memory freeing if error during listing services
+
+Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
+Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
+---
+diff --git a/bus/activation.c b/bus/activation.c
+index fcb7133..ea48a26 100644
+--- a/bus/activation.c
++++ b/bus/activation.c
+@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
+
+ error:
+ for (j = 0; j < i; j++)
+- dbus_free (retval[i]);
++ dbus_free (retval[j]);
+ dbus_free (retval);
+
+ return FALSE;
+diff --git a/bus/services.c b/bus/services.c
+index 6f380fa..01a720e 100644
+--- a/bus/services.c
++++ b/bus/services.c
+@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
+
+ error:
+ for (j = 0; j < i; j++)
+- dbus_free (retval[i]);
++ dbus_free (retval[j]);
+ dbus_free (retval);
+
+ return FALSE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/abs/core/dbus/systemd-user-session.patch b/abs/core/dbus/systemd-user-session.patch
new file mode 100644
index 0000000..3e05324
--- /dev/null
+++ b/abs/core/dbus/systemd-user-session.patch
@@ -0,0 +1,183 @@
+commit d728fdc655f17031da3bb129ab2fd17dadf0fe3a
+Author: Simon Peeters <peeters.simon@gmail.com>
+Date: 8 weeks ago
+
+ Set correct address when using --address=systemd:
+
+ When dbus gets launched through systemd, we need to create an address
+ string based on the sockets passed.
+
+ The _dbus_append_addres_from_socket() function is responsible for
+ extracting the address information from the file-descriptor and
+ formatting it in a dbus friendly way.
+
+ This fixes bus activation when running dbus under a systemd session.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=50962
+
+ Signed-off-by: Simon Peeters <peeters.simon@gmail.com>
+
+diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
+index 130f66e..d995240 100644
+--- a/dbus/dbus-server-unix.c
++++ b/dbus/dbus-server-unix.c
+@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ }
+ else if (strcmp (method, "systemd") == 0)
+ {
+- int n, *fds;
++ int i, n, *fds;
+ DBusString address;
+
+ n = _dbus_listen_systemd_sockets (&fds, error);
+@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+ }
+
+- _dbus_string_init_const (&address, "systemd:");
++ if (!_dbus_string_init (&address))
++ goto systemd_oom;
+
+- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
+- if (*server_p == NULL)
++ for (i = 0; i < n; i++)
+ {
+- int i;
+-
+- for (i = 0; i < n; i++)
++ if (i > 0)
+ {
+- _dbus_close_socket (fds[i], NULL);
++ if (!_dbus_string_append (&address, ";"))
++ goto systemd_oom;
+ }
+- dbus_free (fds);
+-
+- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ if (!_dbus_append_address_from_socket (fds[i], &address, error))
++ goto systemd_err;
+ }
+
++ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
++ if (*server_p == NULL)
++ goto systemd_oom;
++
+ dbus_free (fds);
+
+ return DBUS_SERVER_LISTEN_OK;
+- }
++ systemd_oom:
++ _DBUS_SET_OOM (error);
++ systemd_err:
++ for (i = 0; i < n; i++)
++ {
++ _dbus_close_socket (fds[i], NULL);
++ }
++ dbus_free (fds);
++ _dbus_string_free (&address);
++
++ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
++ }
+ #ifdef DBUS_ENABLE_LAUNCHD
+ else if (strcmp (method, "launchd") == 0)
+ {
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index b4ecc96..55743b1 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -55,6 +55,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <grp.h>
++#include <arpa/inet.h>
+
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void)
+ #endif
+ }
+
++/**
++ * Read the address from the socket and append it to the string
++ *
++ * @param fd the socket
++ * @param address
++ * @param error return location for error code
++ */
++dbus_bool_t
++_dbus_append_address_from_socket (int fd,
++ DBusString *address,
++ DBusError *error)
++{
++ union {
++ struct sockaddr sa;
++ struct sockaddr_storage storage;
++ struct sockaddr_un un;
++ struct sockaddr_in ipv4;
++ struct sockaddr_in6 ipv6;
++ } socket;
++ char hostip[INET6_ADDRSTRLEN];
++ int size = sizeof (socket);
++
++ if (getsockname (fd, &socket.sa, &size))
++ goto err;
++
++ switch (socket.sa.sa_family)
++ {
++ case AF_UNIX:
++ if (socket.un.sun_path[0]=='\0')
++ {
++ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1])))
++ return TRUE;
++ }
++ else
++ {
++ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path))
++ return TRUE;
++ }
++ break;
++ case AF_INET:
++ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip)))
++ if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u",
++ hostip, ntohs (socket.ipv4.sin_port)))
++ return TRUE;
++ break;
++#ifdef AF_INET6
++ case AF_INET6:
++ if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip)))
++ if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u",
++ hostip, ntohs (socket.ipv6.sin6_port)))
++ return TRUE;
++ break;
++#endif
++ default:
++ dbus_set_error (error,
++ _dbus_error_from_errno (EINVAL),
++ "Failed to read address from socket: Unknown socket type.");
++ return FALSE;
++ }
++ err:
++ dbus_set_error (error,
++ _dbus_error_from_errno (errno),
++ "Failed to open socket: %s",
++ _dbus_strerror (errno));
++ return FALSE;
++}
++
+ /* tests in dbus-sysdeps-util.c */
+diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
+index 9b70896..a265b33 100644
+--- a/dbus/dbus-sysdeps-unix.h
++++ b/dbus/dbus-sysdeps-unix.h
+@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str,
+
+ void _dbus_close_all (void);
+
++dbus_bool_t _dbus_append_address_from_socket (int fd,
++ DBusString *address,
++ DBusError *error);
++
+ /** @} */
+
+ DBUS_END_DECLS
--
cgit v0.12
From eb65e92be2f22c5b0047bbd4e36460e7628f3c08 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 16:37:16 +0000
Subject: dbus-core: remove; included in dbus
---
abs/core/dbus-core/PKGBUILD | 54 -----------------------------------------
abs/core/dbus-core/dbus | 51 --------------------------------------
abs/core/dbus-core/dbus.install | 23 ------------------
3 files changed, 128 deletions(-)
delete mode 100644 abs/core/dbus-core/PKGBUILD
delete mode 100644 abs/core/dbus-core/dbus
delete mode 100644 abs/core/dbus-core/dbus.install
diff --git a/abs/core/dbus-core/PKGBUILD b/abs/core/dbus-core/PKGBUILD
deleted file mode 100644
index afca05e..0000000
--- a/abs/core/dbus-core/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 163992 2012-07-23 14:58:38Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus-core
-pkgver=1.6.4
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
-makedepends=('libx11')
-options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
- dbus)
-md5sums=('5ec43dc4554cba638917317b2b4f7640'
- '3d4482ee39b49da334441c76f83bf1cb'
- 'f0364f3f5dc5f653bb05d39aa36e3264')
-
-build() {
- cd dbus-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
- --with-system-pid-file=/run/dbus/pid \
- --with-system-socket=/run/dbus/system_bus_socket \
- --with-console-auth-dir=/run/console/ \
- --enable-inotify --disable-dnotify \
- --disable-verbose-mode --disable-static \
- --disable-tests --disable-asserts \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --enable-systemd
- make
-}
-
-package(){
- cd dbus-$pkgver
- make DESTDIR="$pkgdir" install
-
- rm -f "$pkgdir/usr/bin/dbus-launch"
- rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
- rm -rf "$pkgdir/var/run"
-
- install -m755 -d "$pkgdir/etc/rc.d"
- install -m755 ../dbus "$pkgdir/etc/rc.d/"
-
- #Fix configuration file
- sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf"
-
- install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
- install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
-}
-
diff --git a/abs/core/dbus-core/dbus b/abs/core/dbus-core/dbus
deleted file mode 100644
index bf532a2..0000000
--- a/abs/core/dbus-core/dbus
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case $1 in
- start)
- stat_busy "Starting D-BUS system messagebus"
- if [[ ! -d /run/dbus ]] ; then
- install -m755 -g 81 -o 81 -d /run/dbus
- fi
-
- if ! dbus-daemon --system; then
- stat_fail
- else
- add_daemon dbus
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping D-BUS system messagebus"
- if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
- stat_fail
- else
- rm -f /run/dbus/pid
- rm_daemon dbus
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- reload)
- stat_busy "Reloading D-BUS configuration"
- if ! { [[ -f /run/dbus/pid ]] && dbus-send \
- --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig; }; then
- stat_fail
- else
- stat_done
- fi
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
- ;;
-esac
-exit 0
diff --git a/abs/core/dbus-core/dbus.install b/abs/core/dbus-core/dbus.install
deleted file mode 100644
index f1ffd61..0000000
--- a/abs/core/dbus-core/dbus.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
- getent group dbus >/dev/null || groupadd -g 81 dbus
- getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
- passwd -l dbus &>/dev/null
-}
-
-post_upgrade() {
- post_install
-
- # Make sure new rc script can shutdown running dbus
- if [ -f run/dbus.pid -a -d run/dbus ]; then
- mv run/dbus.pid run/dbus/pid
- fi
-}
-
-post_remove() {
- if getent passwd dbus >/dev/null; then
- userdel dbus
- fi
- if getent group dbus >/dev/null; then
- groupdel dbus
- fi
-}
--
cgit v0.12
From 0fd0dca48ba1af407f134304909c7ccb25f42b61 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 16:49:21 +0000
Subject: wpa_supplicant: update to 2.1. refs #961
---
...SSL-Do-not-accept-SSL-Client-certificate-.patch | 74 +++++++++++++
abs/core/wpa_supplicant/PKGBUILD | 35 +++---
abs/core/wpa_supplicant/config | 120 ++++++++-------------
.../hostap_allow-linking-with-libnl-3.2.patch | 12 ---
4 files changed, 139 insertions(+), 102 deletions(-)
create mode 100644 abs/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch
delete mode 100644 abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
diff --git a/abs/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch b/abs/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch
new file mode 100644
index 0000000..8b0b1b3
--- /dev/null
+++ b/abs/core/wpa_supplicant/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch
@@ -0,0 +1,74 @@
+From b62d5b5450101676a0c05691b4bcd94e11426397 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Wed, 19 Feb 2014 11:56:02 +0200
+Subject: [PATCH] Revert "OpenSSL: Do not accept SSL Client certificate for
+ server"
+
+This reverts commit 51e3eafb68e15e78e98ca955704be8a6c3a7b304. There are
+too many deployed AAA servers that include both id-kp-clientAuth and
+id-kp-serverAuth EKUs for this change to be acceptable as a generic rule
+for AAA authentication server validation. OpenSSL enforces the policy of
+not connecting if only id-kp-clientAuth is included. If a valid EKU is
+listed with it, the connection needs to be accepted.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/crypto/tls.h | 3 +--
+ src/crypto/tls_openssl.c | 13 -------------
+ 2 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/src/crypto/tls.h b/src/crypto/tls.h
+index 287fd33..feba13f 100644
+--- a/src/crypto/tls.h
++++ b/src/crypto/tls.h
+@@ -41,8 +41,7 @@ enum tls_fail_reason {
+ TLS_FAIL_ALTSUBJECT_MISMATCH = 6,
+ TLS_FAIL_BAD_CERTIFICATE = 7,
+ TLS_FAIL_SERVER_CHAIN_PROBE = 8,
+- TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9,
+- TLS_FAIL_SERVER_USED_CLIENT_CERT = 10
++ TLS_FAIL_DOMAIN_SUFFIX_MISMATCH = 9
+ };
+
+ union tls_event_data {
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index a13fa38..8cf1de8 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -105,7 +105,6 @@ struct tls_connection {
+ unsigned int ca_cert_verify:1;
+ unsigned int cert_probe:1;
+ unsigned int server_cert_only:1;
+- unsigned int server:1;
+
+ u8 srv_cert_hash[32];
+
+@@ -1480,16 +1479,6 @@ static int tls_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
+ TLS_FAIL_SERVER_CHAIN_PROBE);
+ }
+
+- if (!conn->server && err_cert && preverify_ok && depth == 0 &&
+- (err_cert->ex_flags & EXFLAG_XKUSAGE) &&
+- (err_cert->ex_xkusage & XKU_SSL_CLIENT)) {
+- wpa_printf(MSG_WARNING, "TLS: Server used client certificate");
+- openssl_tls_fail_event(conn, err_cert, err, depth, buf,
+- "Server used client certificate",
+- TLS_FAIL_SERVER_USED_CLIENT_CERT);
+- preverify_ok = 0;
+- }
+-
+ if (preverify_ok && context->event_cb != NULL)
+ context->event_cb(context->cb_ctx,
+ TLS_CERT_CHAIN_SUCCESS, NULL);
+@@ -2541,8 +2530,6 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data,
+ int res;
+ struct wpabuf *out_data;
+
+- conn->server = !!server;
+-
+ /*
+ * Give TLS handshake data from the server (if available) to OpenSSL
+ * for processing.
+--
+1.9.0
+
diff --git a/abs/core/wpa_supplicant/PKGBUILD b/abs/core/wpa_supplicant/PKGBUILD
index 9b73f77..78860cb 100644
--- a/abs/core/wpa_supplicant/PKGBUILD
+++ b/abs/core/wpa_supplicant/PKGBUILD
@@ -1,33 +1,42 @@
-# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $
+# $Id$
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wpa_supplicant
-pkgver=2.0
-pkgrel=4
+pkgver=2.1
+pkgrel=3
pkgdesc="A utility providing key negotiation for WPA wireless networks"
url="http://hostap.epitest.fi/wpa_supplicant"
arch=('i686' 'x86_64')
-depends=('openssl' 'dbus-core' 'readline' 'libnl')
+depends=('openssl' 'libdbus' 'readline' 'libnl')
optdepends=('wpa_supplicant_gui: wpa_gui program')
license=('GPL')
backup=('etc/wpa_supplicant/wpa_supplicant.conf')
source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
- config)
+ config
+ 0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch)
+sha256sums=('91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277'
+ '522b1e2b330bd3fcb9c3c964b0f05ad197a2f1160741835a47585ea45ba8e0a4'
+ '3c85fa2cf2465fea86383eece75fa5479507a174da6f0cd09e691fbaaca03c74')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}/"
- cd "${pkgname}"
+ patch -p1 -i "${srcdir}"/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch
+ cd "${pkgname}/"
cp "${srcdir}/config" ./.config
+}
- sed -i 's@/usr/local@$(PREFIX)@g' Makefile
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
- make PREFIX=/usr
+ # The Makefile does not pick up our CPPFLAGS
+ export CFLAGS="$CPPFLAGS $CFLAGS"
+ make LIBDIR=/usr/lib BINDIR=/usr/bin
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
- make PREFIX=/usr DESTDIR="${pkgdir}" install
+ make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="${pkgdir}" install
install -d -m755 "${pkgdir}/etc/wpa_supplicant"
install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf"
@@ -45,10 +54,4 @@ package() {
install -d -m755 "${pkgdir}/usr/lib/systemd/system"
install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
-
- # usrmove
- cd "$pkgdir"/usr
- mv sbin bin
}
-md5sums=('3be2ebfdcced52e00eda0afe2889839d'
- '4aa1e5accd604091341b989b47fe1076')
diff --git a/abs/core/wpa_supplicant/config b/abs/core/wpa_supplicant/config
index 50426bf..c1035b4 100644
--- a/abs/core/wpa_supplicant/config
+++ b/abs/core/wpa_supplicant/config
@@ -20,63 +20,6 @@
# used to fix build issues on such systems (krb5.h not found).
#CFLAGS += -I/usr/include/kerberos
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-# -I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
# Driver interface for generic Linux wireless extensions
# Note: WEXT is deprecated in the current Linux kernel version and no new
# functionality is added to it. nl80211-based interface is the new
@@ -88,6 +31,19 @@ CONFIG_DRIVER_WEXT=y
# Driver interface for Linux drivers using the nl80211 kernel interface
CONFIG_DRIVER_NL80211=y
+# driver_nl80211.c requires libnl. If you are compiling it yourself
+# you may need to point hostapd to your version of libnl.
+#
+#CFLAGS += -I$<path to libnl include files>
+#LIBS += -L$<path to libnl library files>
+
+# Use libnl v2.0 (or 3.0) libraries.
+#CONFIG_LIBNL20=y
+
+# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
+CONFIG_LIBNL32=y
+
+
# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
#CONFIG_DRIVER_BSD=y
#CFLAGS += -I/usr/local/include
@@ -147,11 +103,10 @@ CONFIG_EAP_PEAP=y
CONFIG_EAP_TTLS=y
# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
+# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
+# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
+# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
+CONFIG_EAP_FAST=y
# EAP-GTC
CONFIG_EAP_GTC=y
@@ -210,6 +165,9 @@ CONFIG_WPS_NFC=y
# EAP-IKEv2
#CONFIG_EAP_IKEV2=y
+# EAP-EKE
+#CONFIG_EAP_EKE=y
+
# PKCS#12 (PFX) support (used to read private key and certificate file from
# a file that usually has extension .p12 or .pfx)
CONFIG_PKCS12=y
@@ -225,6 +183,9 @@ CONFIG_SMARTCARD=y
# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
CONFIG_HT_OVERRIDES=y
+# Support VHT overrides (disable VHT, mask MCS rates, etc.)
+CONFIG_VHT_OVERRIDES=y
+
# Development testing
#CONFIG_EAPOL_TEST=y
@@ -258,11 +219,6 @@ CONFIG_READLINE=y
# 35-50 kB in code size.
#CONFIG_NO_WPA=y
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
# This option can be used to reduce code size by removing support for
# converting ASCII passphrases into PSK. If this functionality is removed, the
@@ -306,7 +262,6 @@ CONFIG_BACKEND=file
# Select event loop implementation
# eloop = select() loop (default)
# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
#CONFIG_ELOOP=eloop
# Should we use poll instead of select? Select is used by default.
@@ -326,7 +281,7 @@ CONFIG_PEERKEY=y
# IEEE 802.11w (management frame protection), also known as PMF
# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
# Select TLS implementation
# openssl = OpenSSL (default)
@@ -420,6 +375,10 @@ CONFIG_DEBUG_FILE=y
# same file, e.g., using trace-cmd.
#CONFIG_DEBUG_LINUX_TRACING=y
+# Add support for writing debug log to Android logcat instead of standard
+# output
+#CONFIG_ANDROID_LOG=y
+
# Enable privilege separation (see README 'Privilege separation' for details)
#CONFIG_PRIVSEP=y
@@ -477,7 +436,11 @@ CONFIG_DEBUG_FILE=y
CONFIG_NO_RANDOM_POOL=y
# IEEE 802.11n (High Throughput) support (mainly for AP mode)
-#CONFIG_IEEE80211N=y
+CONFIG_IEEE80211N=y
+
+# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
+# (depends on CONFIG_IEEE80211N)
+CONFIG_IEEE80211AC=y
# Wireless Network Management (IEEE Std 802.11v-2011)
# Note: This is experimental and not complete implementation.
@@ -492,6 +455,9 @@ CONFIG_NO_RANDOM_POOL=y
# Hotspot 2.0
#CONFIG_HS20=y
+# Disable roaming in wpa_supplicant
+#CONFIG_NO_ROAMING=y
+
# AP mode operations with wpa_supplicant
# This can be used for controlling AP mode operations with wpa_supplicant. It
# should be noted that this is mainly aimed at simple cases like
@@ -504,9 +470,17 @@ CONFIG_AP=y
# more information on P2P operations.
CONFIG_P2P=y
+# Enable TDLS support
+CONFIG_TDLS=y
+
+# Wi-Fi Direct
+# This can be used to enable Wi-Fi Direct extensions for P2P using an external
+# program to control the additional information exchanges in the messages.
+CONFIG_WIFI_DISPLAY=y
+
# Autoscan
# This can be used to enable automatic scan support in wpa_supplicant.
-# See wpa_supplicant.conf for more information on autoscan usage.
+# See wpa_supplicant.conf for more information on autoscan usage.
#
# Enabling directly a module will enable autoscan support.
# For exponential module:
@@ -522,9 +496,7 @@ CONFIG_AUTOSCAN_PERIODIC=y
# External password backend for testing purposes (developer use)
#CONFIG_EXT_PASSWORD_TEST=y
-CONFIG_LIBNL32=y
-
-# More options that are not in defconfig:
+# Options that are present not in defconfig:
# RSN IBSS/AdHoc support
CONFIG_IBSS_RSN=y
diff --git a/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 5d89039..0000000
--- a/abs/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600
-+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
- DRV_LIBS += -lnl-3
- DRV_LIBS += -lnl-genl-3
-- DRV_CFLAGS += -DCONFIG_LIBNL20
-+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
- else
- ifdef CONFIG_LIBNL_TINY
- DRV_LIBS += -lnl-tiny
--
cgit v0.12
From 8e41fcf367697e694aa00b9c6e5e0613803548b0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 17:16:01 +0000
Subject: crda: update to 3.13. refs #961
---
.../crda/0001-Makefile-Don-t-run-ldconfig.patch | 24 ++++++++++
...Link-libreg.so-against-the-crypto-library.patch | 55 ++++++++++++++++++++++
...e-linking-order-to-avoid-compilation-erro.patch | 52 ++++++++++++++++++++
...STDIR-support-in-install-libreg-rules-in-.patch | 37 +++++++++++++++
abs/extra/crda/PKGBUILD | 36 ++++++++++----
abs/extra/crda/__changelog | 1 +
abs/extra/crda/libnl32.patch | 12 -----
7 files changed, 195 insertions(+), 22 deletions(-)
create mode 100644 abs/extra/crda/0001-Makefile-Don-t-run-ldconfig.patch
create mode 100644 abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
create mode 100644 abs/extra/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
create mode 100644 abs/extra/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
create mode 100644 abs/extra/crda/__changelog
delete mode 100644 abs/extra/crda/libnl32.patch
diff --git a/abs/extra/crda/0001-Makefile-Don-t-run-ldconfig.patch b/abs/extra/crda/0001-Makefile-Don-t-run-ldconfig.patch
new file mode 100644
index 0000000..e9f102d
--- /dev/null
+++ b/abs/extra/crda/0001-Makefile-Don-t-run-ldconfig.patch
@@ -0,0 +1,24 @@
+From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Fri, 21 Feb 2014 20:30:24 +0100
+Subject: [PATCH] Makefile: Don't run ldconfig
+
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 80f4946..c003195 100644
+--- a/Makefile
++++ b/Makefile
+@@ -130,7 +130,6 @@ install-libreg:
+ $(NQ) ' INSTALL libreg'
+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+- $(Q)ldconfig
+
+ %.o: %.c regdb.h $(LIBREG)
+ $(NQ) ' CC ' $@
+--
+1.9.0
+
diff --git a/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch b/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
new file mode 100644
index 0000000..10dae58
--- /dev/null
+++ b/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
@@ -0,0 +1,55 @@
+From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Fri, 21 Feb 2014 20:15:32 +0100
+Subject: [PATCH] Makefile: Link libreg.so against the crypto library.
+
+---
+ Makefile | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1f25509..80f4946 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG)
+ LDLIBS += -lm
+ LIBREG += libreg.so
+ LDFLAGS += -L ./
++LIBREG_LDFLAGS += -lm
+
+ all: all_noverify verify
+
+@@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize
+
+ ifeq ($(USE_OPENSSL),1)
+ CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+-LDLIBS += `pkg-config --libs openssl`
++LDCRYPTOLIB := `pkg-config --libs openssl`
+
+ $(LIBREG): keys-ssl.c
+
+ else
+ CFLAGS += -DUSE_GCRYPT
+-LDLIBS += -lgcrypt
++LDCRYPTOLIB := -lgcrypt
+
+ $(LIBREG): keys-gcrypt.c
+
+ endif
++LDLIBS += $(LDCRYPTOLIB)
++LIBREG_LDFLAGS += $(LDCRYPTOLIB)
+ MKDIR ?= mkdir -p
+ INSTALL ?= install
+
+@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+
+ $(LIBREG): regdb.h reglib.h reglib.c
+ $(NQ) ' CC ' $@
+- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS)
+
+ install-libreg-headers:
+ $(NQ) ' INSTALL libreg-headers'
+--
+1.9.0
+
diff --git a/abs/extra/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/abs/extra/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
new file mode 100644
index 0000000..6807e99
--- /dev/null
+++ b/abs/extra/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
@@ -0,0 +1,52 @@
+From fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 Mon Sep 17 00:00:00 2001
+From: Krishna Chaitanya <chaitanya.mgit@gmail.com>
+Date: Mon, 16 Dec 2013 21:57:39 +0530
+Subject: [PATCH] crda: Fix the linking order to avoid compilation error
+
+While linking the crda.o and libreg.so, first put crda.o
+and then -lreg. This fixed the below error:
+
+ GEN keys-gcrypt.c
+ Trusted pubkeys: pubkeys/linville.key.pub.pem
+ CC libreg.so
+ CC crda.o
+ LD crda
+crda.o: In function `main':
+crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2'
+collect2: ld returned 1 exit status
+make: *** [crda] Error 1
+
+Note: This still doesn't fix the below error (will send another mail)
+
+ CHK /usr/lib/crda/regulatory.bin
+Database signature verification failed.
+Invalid or empty regulatory file, note: a binary regulatory file should be used.
+make: *** [verify] Error 234
+
+Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
+Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com>
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4a351c6..0b2f0d7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ CFLAGS += -O2 -fpic
+ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
+ CFLAGS += -Wall -g
+-LDLIBS += -lm
+ LDLIBREG += -lreg
++LDLIBS += $(LDLIBREG)
++LDLIBS += -lm
+ LIBREG += libreg.so
+-LDFLAGS += -L ./ $(LDLIBREG)
++LDFLAGS += -L ./
+
+ all: all_noverify verify
+
+--
+1.9.0
+
diff --git a/abs/extra/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/abs/extra/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
new file mode 100644
index 0000000..c69f8f7
--- /dev/null
+++ b/abs/extra/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
@@ -0,0 +1,37 @@
+From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001
+From: "John W. Linville" <linville@tuxdriver.com>
+Date: Fri, 14 Feb 2014 13:58:44 -0500
+Subject: [PATCH 2/2] crda: Add DESTDIR support in install-libreg* rules in
+ Makefile
+
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0b2f0d7..1f25509 100644
+--- a/Makefile
++++ b/Makefile
+@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c
+
+ install-libreg-headers:
+ $(NQ) ' INSTALL libreg-headers'
+- $(Q)mkdir -p $(INCLUDE_DIR)
+- $(Q)cp *.h $(INCLUDE_DIR)/
++ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR)
++ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/
+
+ install-libreg:
+ $(NQ) ' INSTALL libreg'
+- $(Q)mkdir -p $(LIBDIR)
+- $(Q)cp $(LIBREG) $(LIBDIR)/
++ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
++ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+ $(Q)ldconfig
+
+ %.o: %.c regdb.h $(LIBREG)
+--
+1.9.0
+
diff --git a/abs/extra/crda/PKGBUILD b/abs/extra/crda/PKGBUILD
index 2f4f1c2..53fe499 100644
--- a/abs/extra/crda/PKGBUILD
+++ b/abs/extra/crda/PKGBUILD
@@ -1,23 +1,41 @@
-# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $
+# $Id$
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=crda
-pkgver=1.1.3
-pkgrel=2
+pkgver=3.13
+pkgrel=1
pkgdesc="Central Regulatory Domain Agent for wireless networks"
arch=(i686 x86_64)
url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
+depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw')
makedepends=('python-m2crypto')
install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
- set-wireless-regdom)
+source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar.xz
+ set-wireless-regdom
+ 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
+ 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
+ 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
+ 0001-Makefile-Don-t-run-ldconfig.patch)
+sha256sums=('2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59'
+ '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3'
+ '8920b5988eb1befe13f88ce5c0dbbf30c294796d613681a2b0925f6f8534c51b'
+ 'ced0a372b06ffd64f90be77d7267c9d8cc10413bc017c3154b7208dbf69be3cb'
+ '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520'
+ 'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663')
-build() {
+prepare() {
cd "${srcdir}"/${pkgname}-${pkgver}
sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
- make crda regdbdump
+ patch -p1 -i "${srcdir}"/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch
+ patch -p1 -i "${srcdir}"/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch
+ patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
+ patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make
}
package() {
@@ -33,5 +51,3 @@ package() {
install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
}
-md5sums=('29579185e06a75675507527243d28e5c'
- '65c93f2ff2eb1b29d9e9fa102ae2dd45')
diff --git a/abs/extra/crda/__changelog b/abs/extra/crda/__changelog
new file mode 100644
index 0000000..2c7ba65
--- /dev/null
+++ b/abs/extra/crda/__changelog
@@ -0,0 +1 @@
+PKGBUILD: change dep python2-m2crypto to python-m2crypto
diff --git a/abs/extra/crda/libnl32.patch b/abs/extra/crda/libnl32.patch
deleted file mode 100644
index 682b6c5..0000000
--- a/abs/extra/crda/libnl32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile
---- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200
-+++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100
-@@ -51,7 +51,7 @@
-
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
- NLLIBNAME = libnl-3.0
- else
- ifeq ($(NL2FOUND),Y)
--
cgit v0.12
From e5964f928b92018a912288591d43d44b64a26c22 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 17:34:30 +0000
Subject: ddclient: update to 3.8.2. refs #961
---
abs/extra/ddclient/ChangeLog | 22 ------------
abs/extra/ddclient/PKGBUILD | 53 +++++++++++++---------------
abs/extra/ddclient/ddclient-foreground.patch | 47 ------------------------
abs/extra/ddclient/ddclient.conf.d | 2 --
abs/extra/ddclient/ddclient.install | 37 -------------------
abs/extra/ddclient/ddclient.rc | 37 -------------------
abs/extra/ddclient/ddclient.service | 11 ++++++
7 files changed, 36 insertions(+), 173 deletions(-)
delete mode 100644 abs/extra/ddclient/ChangeLog
delete mode 100644 abs/extra/ddclient/ddclient-foreground.patch
delete mode 100644 abs/extra/ddclient/ddclient.conf.d
delete mode 100644 abs/extra/ddclient/ddclient.install
delete mode 100644 abs/extra/ddclient/ddclient.rc
create mode 100644 abs/extra/ddclient/ddclient.service
diff --git a/abs/extra/ddclient/ChangeLog b/abs/extra/ddclient/ChangeLog
deleted file mode 100644
index 4520b69..0000000
--- a/abs/extra/ddclient/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-2008-08-07 Abhishek Dasgupta <abhidg@gmail.com>
-
- * ddclient 3.7.3-2
- * added /etc/conf.d/ddclient for modifying
- daemon poll frequency. This overrides the
- setting specified in /etc/ddclient/ddclient.conf
- when ddclient is called as an rc script.
-
-2007-08-08 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
- * ddclient-3.7.3-1
- * version bump
- * GPL -> GPL2
- * shortened pkgdesc
-
-2007-07-02 tardo <tardo@nagi-fanboi.net>
-
- * Built for x86_64
-
-2007-06-29 Georg Grabler (STiAT) <ggrabler@gmail.com>
-
- * Version Bump to 3.7.2
diff --git a/abs/extra/ddclient/PKGBUILD b/abs/extra/ddclient/PKGBUILD
index 77be4a8..91f7baa 100644
--- a/abs/extra/ddclient/PKGBUILD
+++ b/abs/extra/ddclient/PKGBUILD
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD 17388 2010-05-24 09:45:55Z spupykin $
-# Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
+# $Id$
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
# Contributor: David Rosenstrauch <darose@darose.net>
pkgname=ddclient
-pkgver=3.8.0
-pkgrel=4
-pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services."
+pkgver=3.8.2
+pkgrel=1
+pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services"
arch=('any')
-url="http://ddclient.sourceforge.net/"
+url="http://ddclient.sourceforge.net"
license=('GPL2')
-depends=('perl' 'perl-io-socket-ssl')
-backup=('etc/ddclient/ddclient.conf' 'etc/conf.d/ddclient')
-install=ddclient.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 ddclient.rc ddclient.conf.d ddclient-foreground.patch)
+depends=('perl-io-socket-ssl' 'perl-digest-sha1' 'net-tools')
+backup=('etc/ddclient/ddclient.conf')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+ $pkgname.service)
+md5sums=('62cd5fe93ced2c794d5f441f9d908841'
+ '1bcd3e75309e658931532adef2a0608a')
-build() {
- cd ${srcdir}/ddclient-${pkgver}
- patch < ${srcdir}/ddclient-foreground.patch
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
- # core files
- install -D -m755 ddclient ${pkgdir}/usr/sbin/ddclient
- install -D -m755 ${srcdir}/ddclient.rc ${pkgdir}/etc/rc.d/ddclient
- install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf
- install -D -m644 ${srcdir}/ddclient.conf.d ${pkgdir}/etc/conf.d/ddclient
- install -d ${pkgdir}/var/cache/ddclient
+ install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+ install -Dm600 sample-etc_$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf
+ install -d "$pkgdir"/var/cache/$pkgname
+ install -Dm644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
- # additional instructions, sample configs
- install -D -m644 README ${pkgdir}/etc/ddclient/samples/README
- install -D -m644 sample-etc_cron.d_ddclient ${pkgdir}/etc/ddclient/samples/sample-etc_cron.d_ddclient
- install -D -m644 sample-etc_dhcpc_dhcpcd-eth0.exe ${pkgdir}/etc/ddclient/samples/sample-etc_dhcpc_dhcpcd-eth0.exe
- install -D -m644 sample-etc_ppp_ip-up.local ${pkgdir}/etc/ddclient/samples/sample-etc_ppp_ip-up.local
+ install -Dm644 README.cisco "$pkgdir"/usr/share/doc/$pkgname/README.cisco
+ install -Dm644 README.md "$pkgdir"/usr/share/doc/$pkgname/README.md
+ install -Dm644 README.ssl "$pkgdir"/usr/share/doc/$pkgname/README.ssl
+ install -Dm644 sample-etc_cron.d_$pkgname "$pkgdir"/usr/share/doc/$pkgname/sample-etc_cron.d_$pkgname
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+ install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
}
-md5sums=('6cac7a5eb1da781bfd4d98cef0b21f8e'
- '7035bf8132f3517a59167f61ee5e8b90'
- 'b8f39c82827776da948b76ef83544d33'
- 'd8ffc95f98f9afcb4a06a1e192220e35')
diff --git a/abs/extra/ddclient/ddclient-foreground.patch b/abs/extra/ddclient/ddclient-foreground.patch
deleted file mode 100644
index a814ede..0000000
--- a/abs/extra/ddclient/ddclient-foreground.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../ddclient-orig/ddclient 2009-10-19 22:45:15.000000000 +1030
-+++ ddclient 2009-10-19 22:50:11.000000000 +1030
-@@ -307,6 +307,7 @@
- my %variables = (
- 'global-defaults' => {
- 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')),
-+ 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef),
- 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef),
- 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef),
- 'pid' => setv(T_FILE, 0, 0, 1, "", undef),
-@@ -535,6 +536,7 @@
- "usage: ${program} [options]",
- "options are:",
- [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ],
-+ [ "foreground", "!", "-foreground : do not fork" ],
- [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ],
- [ "server", "=s", "-server host : update DNS information on 'host'" ],
- [ "protocol", "=s", "-protocol type : update protocol used" ],
-@@ -623,7 +625,10 @@
- $SIG{'HUP'} = sub { $caught_hup = 1; };
- $SIG{'TERM'} = sub { $caught_term = 1; };
- $SIG{'KILL'} = sub { $caught_kill = 1; };
--if (opt('daemon') && !opt('force')) {
-+# don't fork() if foreground or force is on
-+if (opt('foreground') || opt('force')) {
-+ ;
-+} elsif (opt('daemon')) {
- $SIG{'CHLD'} = 'IGNORE';
- my $pid = fork;
- if ($pid < 0) {
-@@ -633,12 +638,15 @@
- exit 0;
- }
- $SIG{'CHLD'} = 'DEFAULT';
-- $opt{'syslog'} = 1;
- open(STDOUT, ">/dev/null");
- open(STDERR, ">/dev/null");
- open(STDIN, "</dev/null");
-+}
-
-+# write out the pid file if we're daemon'ized
-+if(opt('daemon')) {
- write_pid();
-+ $opt{'syslog'} = 1;
- }
-
- umask 077;
diff --git a/abs/extra/ddclient/ddclient.conf.d b/abs/extra/ddclient/ddclient.conf.d
deleted file mode 100644
index 8b754a3..0000000
--- a/abs/extra/ddclient/ddclient.conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-# Parameters passed to ddclient
-EXTRA_ARGS="-daemon 300"
diff --git a/abs/extra/ddclient/ddclient.install b/abs/extra/ddclient/ddclient.install
deleted file mode 100644
index 55b0e1b..0000000
--- a/abs/extra/ddclient/ddclient.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1: the new package version
-post_install() {
-cat << EOM
-
-If you want to use ddclient with dhcpcd, cron or pppd,
-see /etc/ddclient/samples for further instructions.
-
-If you have ddclient in the DAEMONS array of /etc/rc.conf:
-- Change /etc/conf.d/ddclient according to your needs.
-- This setting OVERRIDES any setting in
- /etc/ddclient/ddclient.conf
-
-EOM
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-
-if [ -f /etc/ddclient/ddclient.cache ]; then
- echo -n "Moving ddclient.cache from /etc/ddclient/ to /var/cache/ddclient/."
- mv /etc/ddclient/ddclient.cache /var/cache/ddclient/
- echo " (done)"
-fi
-
-if [ "$(vercmp $2 3.7.3-2)" -lt 0 ]; then
-cat << EOM
-
-If you have ddclient in the DAEMONS array of /etc/rc.conf:
-- Change /etc/conf.d/ddclient according to your needs.
-- This setting OVERRIDES any setting in
- /etc/ddclient/ddclient.conf
-
-EOM
-fi
-
-}
diff --git a/abs/extra/ddclient/ddclient.rc b/abs/extra/ddclient/ddclient.rc
deleted file mode 100644
index a9093f7..0000000
--- a/abs/extra/ddclient/ddclient.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/ddclient ] && . /etc/conf.d/ddclient
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/ddclient`
-case "$1" in
- start)
- stat_busy "Starting ddclient"
- [ -z "$PID" ] && /usr/sbin/ddclient ${EXTRA_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ddclient
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ddclient"
- [ -n "$PID" ] && kill -15 $PID >/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ddclient
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/abs/extra/ddclient/ddclient.service b/abs/extra/ddclient/ddclient.service
new file mode 100644
index 0000000..4abadac
--- /dev/null
+++ b/abs/extra/ddclient/ddclient.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dynamic DNS Update Client
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/ddclient.pid
+ExecStart=/usr/bin/ddclient
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 03cd3869c1b675a2c63b4b483d8da9fe3e058110 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 18:33:00 +0000
Subject: fakechroot: update to 2.17.2. refs #961
---
abs/extra/fakechroot/PKGBUILD | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/abs/extra/fakechroot/PKGBUILD b/abs/extra/fakechroot/PKGBUILD
index 4cdd8c9..853268e 100644
--- a/abs/extra/fakechroot/PKGBUILD
+++ b/abs/extra/fakechroot/PKGBUILD
@@ -3,25 +3,17 @@
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=fakechroot
-pkgver=2.16
-pkgrel=3
+pkgver=2.17.2
+pkgrel=1
pkgdesc="Gives a fake chroot environment"
arch=('i686' 'x86_64')
-url="https://github.com/fakechroot/fakechroot/wiki"
+url="https://github.com/dex4er/fakechroot/wiki"
license=('LGPL')
-options=('!libtool')
install=fakechroot.install
-source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
-md5sums=('3ea5efb76664e787450e0cfcefc1b807')
+source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz)
+md5sums=('e614f62972efa4654fc780ae7e4affad')
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # https://github.com/fakechroot/fakechroot/issues/10
- sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t
-}
-
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --sbindir=/usr/bin \
--
cgit v0.12
From 37d5f6904031836e9782f4b35cea69932b15a95b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 18:41:36 +0000
Subject: ifenslave: refs #961
---
abs/extra/ifenslave/PKGBUILD | 19 +++++++------------
abs/extra/ifenslave/bonding.conf.d | 12 ------------
2 files changed, 7 insertions(+), 24 deletions(-)
delete mode 100644 abs/extra/ifenslave/bonding.conf.d
diff --git a/abs/extra/ifenslave/PKGBUILD b/abs/extra/ifenslave/PKGBUILD
index a730f2f..9747bc9 100644
--- a/abs/extra/ifenslave/PKGBUILD
+++ b/abs/extra/ifenslave/PKGBUILD
@@ -1,21 +1,17 @@
-# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $
-# Maintainer:
+# $Id$
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=ifenslave
pkgver=1.1.0
-pkgrel=7
+pkgrel=8
pkgdesc='Utility for bonding ethernet interfaces'
-arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/en/Net:Bonding'
+arch=('i686' 'x86_64')
license=('GPL2')
-depends=('glibc')
makedepends=('linux-api-headers')
-backup=('etc/conf.d/bonding')
-source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf'
- 'bonding.conf.d')
-sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73'
- '6843971c0254768868b556af33289d7d32d6208d')
+source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc')
+sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0')
build() {
cd "${srcdir}"
@@ -24,6 +20,5 @@ build() {
package() {
cd "${srcdir}"
- install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave
- install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding
+ install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave
}
diff --git a/abs/extra/ifenslave/bonding.conf.d b/abs/extra/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e..0000000
--- a/abs/extra/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
--
cgit v0.12
From b0fb9ff7e955759a37dfef00664a52d6b7473608 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 18:52:25 +0000
Subject: inadyn: refs #961
---
abs/extra/inadyn/PKGBUILD | 39 ++++++++++++++++---------
abs/extra/inadyn/inadyn.conf | 64 +++++++++++++++++++++++++++++++++++++++++
abs/extra/inadyn/inadyn.service | 11 +++++++
abs/extra/inadyn/run | 4 ---
4 files changed, 101 insertions(+), 17 deletions(-)
create mode 100644 abs/extra/inadyn/inadyn.conf
create mode 100644 abs/extra/inadyn/inadyn.service
delete mode 100644 abs/extra/inadyn/run
diff --git a/abs/extra/inadyn/PKGBUILD b/abs/extra/inadyn/PKGBUILD
index 2cbd9c8..e674492 100644
--- a/abs/extra/inadyn/PKGBUILD
+++ b/abs/extra/inadyn/PKGBUILD
@@ -1,20 +1,33 @@
+# Maintainer: megadriver <megadriver at gmx dot com>
+# Contributor: Dag Odenhall <dag.odenhall@gmail.com>
+# Contributor: Inxsible <inxsible at gmail dot com>
+# Contributor: Frikilinux <frikilinux at frikilinux.com.ar>
+
pkgname=inadyn
pkgver=1.96.2
-pkgrel=4
-pkgdesc="Simple dynamic DNS client"
-url="http://www.dyndns.com/support/kb/using_inadyn_with_dyndns_services.html"
-makedepends=('unzip')
+pkgrel=5
+pkgdesc="A simple dynamic DNS updater"
arch=('i686' 'x86_64')
+url="http://www.inatech.eu/inadyn/"
license=('GPL')
-source=(http://cdn.dyndns.com/$pkgname.zip run)
-
+depends=('bash')
+backup=(etc/inadyn.conf)
+source=("http://www.inatech.eu/inadyn/inadyn.v$pkgver.zip" inadyn.conf inadyn.service)
+md5sums=('702a127f13b96eee38d60c6f30b20efa'
+ 'f910c5778add779dfef4d680108513a2'
+ '85d2fbe3b45aba719fcb6f7085a3ae47')
build() {
- cd $startdir/src/$pkgname
- install -m755 -D bin/linux/$pkgname $startdir/pkg/usr/sbin/$pkgname
- install -m644 -D man/$pkgname.8 $startdir/pkg/usr/man/man8/$pkgname.8
- install -m644 -D man/$pkgname.conf.5 $startdir/pkg/usr/man/man5/$pkgname.conf.5
- install -m755 -D ../run $startdir/pkg/etc/sv/inadyn/run
+ cd "$srcdir/inadyn"
+ make
+}
+
+package() {
+ cd "$srcdir/inadyn"
+ install -Dm755 bin/linux/inadyn $pkgdir/usr/bin/inadyn
+ install -Dm644 man/inadyn.8 $pkgdir/usr/share/man/man8/inadyn.8
+ install -Dm644 man/inadyn.conf.5 $pkgdir/usr/share/man/man5/inadyn.conf.5
+ install -Dm644 readme.html $pkgdir/usr/share/doc/inadyn/readme.html
+ install -Dm644 ../inadyn.conf $pkgdir/etc/inadyn.conf
+ install -Dm644 ../inadyn.service $pkgdir/usr/lib/systemd/system/inadyn.service
}
-md5sums=('d394ed5ab7a9313992bdc62c412cb369'
- '3fee8156d8ae96125470dd0c692b0937')
diff --git a/abs/extra/inadyn/inadyn.conf b/abs/extra/inadyn/inadyn.conf
new file mode 100644
index 0000000..a63de2e
--- /dev/null
+++ b/abs/extra/inadyn/inadyn.conf
@@ -0,0 +1,64 @@
+# inadyn.conf
+# For more details see /usr/share/doc/inadyn/readme.html
+
+# example for FreeDNS service
+
+#--ip_server_name :80 checkip.dyndns.org
+#--dyndns_server_name :80
+#--dyndns_system default@freedns.afraid.org
+#--alias own.domain.com,PLohnR5QmhERfsashjyjyjkuQ3MTAzMQ== # copy and paste the hash value after the '?' until the end of line
+#--alias second-own.domain.com,LogEf5QmhERfsGGHJfjfyjkuQ3MTAzMQ==
+
+# example for no-ip.com sevice
+
+#--ip_server_name :80 checkip.dyndns.org
+#--dyndns_server_name :80
+#--dyndns_system default@no-ip.com
+#--username test
+#--password test
+#--alias HOST
+
+# example for dyndns.org
+
+#--ip_server_name :80 checkip.dyndns.org
+#--dyndns_server_name :80
+#--dyndns_system custom@dyndns.org
+#--username test
+#--password test
+#--alias HOST
+
+# Common Options
+
+# How often the IP is checked. The period is in [ms]. Default is about 1 min. Max is 10 days
+#--update_period 300000
+
+# Runs in background. Output to syslog or to log file [if specified].
+#--background
+
+# The client IP is detected by calling 'url' from this 'ip_server_name:port'. Defaults to checkip.dyndns.org:80
+#--ip_server_name[:port] url
+
+# [NAME[:port]] - the http proxy server name and port. Default is none.
+#--proxy_server
+
+# How often the IP is checked. The period is in [sec]. Default is about 1 min. Max is 10 days
+#--update_period_sec
+
+# How often the IP is updated even if it is not changed. [in sec]
+#--forced_update_period
+
+# Log file path
+#--log_file /var/log/inadyn.log
+
+# Set dbg level. 0 to 5
+#--verbose 0
+
+# Set the number of DNS updates. Default is 0, which means infinity.
+#--iterations
+
+# Explicit set output to syslog. (e.g. /var/log/messages). Works on **NIX systems only.
+#--syslog
+
+# After init changes user ID and group ID to the provided ones.
+# This allows dropping unneeded [root] privileges after startup. Works for **NIX only.
+#--change_persona uid[:gid]
\ No newline at end of file
diff --git a/abs/extra/inadyn/inadyn.service b/abs/extra/inadyn/inadyn.service
new file mode 100644
index 0000000..54846bf
--- /dev/null
+++ b/abs/extra/inadyn/inadyn.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dynamic DNS updater
+After=network.target
+Documentation=man:inadyn(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/inadyn
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/extra/inadyn/run b/abs/extra/inadyn/run
deleted file mode 100644
index 7046c12..0000000
--- a/abs/extra/inadyn/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-exec 2>&1
-. /etc/systemconfig
-exec /usr/sbin/inadyn -u $DDnslogin -p $DDnspassword -a $DDnshostname --syslog
--
cgit v0.12
From 11c3e94e238a13a11766ad35a21a8e71218e3e05 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 18:54:03 +0000
Subject: runit-scripts: add inadyn service
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/inadyn/run | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 abs/core/runit-scripts/runitscripts/services/inadyn/run
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 6525ba3..66e68bb 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.1
-pkgrel=16
+pkgrel=17
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/inadyn/run b/abs/core/runit-scripts/runitscripts/services/inadyn/run
new file mode 100644
index 0000000..6b4d844
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/inadyn/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+exec 2>&1
+. /etc/systemconfig
+exec /usr/bin/inadyn -u $DDnslogin -p $DDnspassword -a $DDnshostname --syslog
--
cgit v0.12
From e3907228d688f76e93b56a6052a82d583b59693b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 19:06:46 +0000
Subject: numactl: initial inclusion. dep of irqbalance
---
abs/extra/numactl/PKGBUILD | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 abs/extra/numactl/PKGBUILD
diff --git a/abs/extra/numactl/PKGBUILD b/abs/extra/numactl/PKGBUILD
new file mode 100644
index 0000000..532e145
--- /dev/null
+++ b/abs/extra/numactl/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Florian Zeitz <florob at babelmonkeys dot de>
+
+pkgname=numactl
+pkgver=2.0.9
+pkgrel=2
+pkgdesc="Simple NUMA policy support"
+arch=('i686' 'x86_64')
+url="http://oss.sgi.com/projects/libnuma/"
+license=('LGPL2.1' 'GPL2')
+depends=('perl')
+source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz)
+sha1sums=('7231abc8f49e805225858ac08d801ade722f0b94')
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ rm numastat
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ make prefix="$pkgdir/usr" libdir="$pkgdir/usr/lib" install
+ rmdir $pkgdir/usr/share/man/man2
+}
--
cgit v0.12
From 04e18c0a85934ddcab865fa7cb699ca7725b2e9c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 19:15:30 +0000
Subject: irqbalance: update to 1.0.7. refs #961
---
abs/extra/irqbalance/Makefile.irqbalance | 13 ---------
abs/extra/irqbalance/PKGBUILD | 31 +++++++++------------
abs/extra/irqbalance/finish | 15 -----------
abs/extra/irqbalance/irqbalance.conf.d | 6 -----
abs/extra/irqbalance/irqbalance.install | 10 -------
abs/extra/irqbalance/irqbalance.rc.d | 46 --------------------------------
abs/extra/irqbalance/irqbalance.service | 8 ++++++
abs/extra/irqbalance/run | 25 -----------------
8 files changed, 21 insertions(+), 133 deletions(-)
delete mode 100644 abs/extra/irqbalance/Makefile.irqbalance
delete mode 100644 abs/extra/irqbalance/finish
delete mode 100644 abs/extra/irqbalance/irqbalance.conf.d
delete mode 100644 abs/extra/irqbalance/irqbalance.install
delete mode 100644 abs/extra/irqbalance/irqbalance.rc.d
create mode 100644 abs/extra/irqbalance/irqbalance.service
delete mode 100644 abs/extra/irqbalance/run
diff --git a/abs/extra/irqbalance/Makefile.irqbalance b/abs/extra/irqbalance/Makefile.irqbalance
deleted file mode 100644
index fe08dc0..0000000
--- a/abs/extra/irqbalance/Makefile.irqbalance
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 -Wall -W $(shell pkg-config --cflags glib-2.0)
-LDFLAGS := $(shell pkg-config --libs glib-2.0)
-
-OBJS = bitmap.o irqbalance.o cputree.o procinterrupts.o irqlist.o \
- placement.o activate.o network.o powermode.o numa.o classify.o
-
-all: irqbalance
-
-irqbalance: $(OBJS)
- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
-clean:
- rm -f irqbalance *~ *.o
diff --git a/abs/extra/irqbalance/PKGBUILD b/abs/extra/irqbalance/PKGBUILD
index 13db8d0..125f2b4 100644
--- a/abs/extra/irqbalance/PKGBUILD
+++ b/abs/extra/irqbalance/PKGBUILD
@@ -2,33 +2,28 @@
# Contributor: Martin Striz <ms@poruba.net>
pkgname=irqbalance
-pkgver=0.56
-pkgrel=1
+pkgver=1.0.7
+pkgrel=2
pkgdesc="IRQ balancing daemon for SMP systems"
arch=('i686' 'x86_64')
-url="http://www.irqbalance.org/"
+url="https://github.com/Irqbalance/irqbalance"
license=('GPL')
-depends=(glib2)
+depends=(glib2 numactl libcap-ng)
makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tbz2
- irqbalance.conf.d
- irqbalance.rc.d)
-md5sums=('cd0c4d3b2bb84778a04fc594ad83949a'
- '336c1ee99818f9ecda1687e34c69fd6b'
- 'fb82fc5d267d39110baf720d81282a7c')
+source=(https://github.com/Irqbalance/irqbalance/archive/v${pkgver}.tar.gz
+ irqbalance.service)
+md5sums=('2a7090abab6bba15d632c24f5554e7ae'
+ 'a97ad17dc7df98b81acb500b27f931e5')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
./autogen.sh
- ./configure
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance
- install -D -m644 irqbalance.1 $pkgdir/usr/share/man/man1/irqbalance.1
- install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance
- install -D -m755 ../irqbalance.rc.d $pkgdir/etc/rc.d/irqbalance
+ cd "$srcdir/$pkgname-$pkgver"
+ make install DESTDIR="$pkgdir"
+ install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service
}
diff --git a/abs/extra/irqbalance/finish b/abs/extra/irqbalance/finish
deleted file mode 100644
index ccd9278..0000000
--- a/abs/extra/irqbalance/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-
- stat_runit "Stopping IRQ balancing"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon irqbalance
- stat_done
- fi
diff --git a/abs/extra/irqbalance/irqbalance.conf.d b/abs/extra/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd..0000000
--- a/abs/extra/irqbalance/irqbalance.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Settings for irqbalance daemon
-#
-
-# one shot mode - set to 1 if you have Pentium 4 with HT
-ONESHOT=0
diff --git a/abs/extra/irqbalance/irqbalance.install b/abs/extra/irqbalance/irqbalance.install
deleted file mode 100644
index d4e15f1..0000000
--- a/abs/extra/irqbalance/irqbalance.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install () {
- add_service.sh irqbalance
-
-}
-
-pre_remove () {
- remove_service.sh irqbalance
-
-}
-
diff --git a/abs/extra/irqbalance/irqbalance.rc.d b/abs/extra/irqbalance/irqbalance.rc.d
deleted file mode 100644
index 987c26b..0000000
--- a/abs/extra/irqbalance/irqbalance.rc.d
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
- ONESHOT_CMD="--oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-case "$1" in
- start)
- stat_busy "Starting IRQ balancing"
- [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD
- if [ $? -gt 0 ]; then
- stat_fail
- else
- if [ "$ONESHOT" -eq 0 ]; then
- add_daemon irqbalance
- fi
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping IRQ balancing"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon irqbalance
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/irqbalance/irqbalance.service b/abs/extra/irqbalance/irqbalance.service
new file mode 100644
index 0000000..c9fced0
--- /dev/null
+++ b/abs/extra/irqbalance/irqbalance.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=CPU Interrupt Request Balancer
+
+[Service]
+ExecStart=/usr/bin/irqbalance --foreground
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/extra/irqbalance/run b/abs/extra/irqbalance/run
deleted file mode 100644
index f0d18f7..0000000
--- a/abs/extra/irqbalance/run
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
- ONESHOT_CMD="oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-
- stat_runit "Starting IRQ balancing"
- [ -z "$PID" ] && /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- if [ "$ONESHOT" -eq 0 ]; then
- add_daemon irqbalance
- fi
- stat_done
- fi
--
cgit v0.12
From c306569e7b974f09329b98cf2e0d743e24b6a2a6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 19:35:58 +0000
Subject: libplist: update to 1.11
---
abs/extra/libplist/PKGBUILD | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/abs/extra/libplist/PKGBUILD b/abs/extra/libplist/PKGBUILD
index 3e67eb5..c6e331c 100644
--- a/abs/extra/libplist/PKGBUILD
+++ b/abs/extra/libplist/PKGBUILD
@@ -1,30 +1,28 @@
# $Id$
+# Maintainer : Tom Gundersen <teg@jklm.no>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=libplist
-pkgver=1.8
-pkgrel=2
+pkgver=1.11
+pkgrel=1
pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
url="http://libimobiledevice.org/"
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
-depends=('glib2' 'libxml2' 'python2')
-makedepends=('cmake' 'swig')
+depends=('glib2' 'libxml2')
+makedepends=('python2')
+options=('!makeflags')
source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec')
+md5sums=('82de65f38cb2f0a9fd0839679b46072b')
build() {
- mkdir build
- cd build
- cmake ../$pkgname-$pkgver \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr
+ cd libplist-$pkgver
+ ./configure --prefix=/usr
make
}
package() {
- cd build
+ cd libplist-$pkgver
make DESTDIR="$pkgdir" install
}
--
cgit v0.12
From 5cdae5c25ac775b261dcf5447c7c6461ac74d7c6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 19:49:40 +0000
Subject: libusbmuxd: initial inclusion. dep of libimobiledevice.
---
abs/extra/libusbmuxd/PKGBUILD | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 abs/extra/libusbmuxd/PKGBUILD
diff --git a/abs/extra/libusbmuxd/PKGBUILD b/abs/extra/libusbmuxd/PKGBUILD
new file mode 100644
index 0000000..418db3f
--- /dev/null
+++ b/abs/extra/libusbmuxd/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libusbmuxd
+pkgver=1.0.9
+pkgrel=1
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('LGPL2.1' 'GPL2')
+depends=('libusb' 'libplist')
+conflicts=('usbmuxd<1.0.9')
+source=(http://www.libimobiledevice.org/downloads/libusbmuxd-$pkgver.tar.bz2)
+md5sums=('3f1d4bd0c0a1a4d7bf96219e117ec499')
+
+build() {
+ cd libusbmuxd-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd libusbmuxd-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From 8a553769984b0153c7f35dc49b5c9c08155efd66 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 20:00:31 +0000
Subject: libimobiledevice: update to 1.1.6
---
abs/extra/libimobiledevice/HOME-segfault.patch | 14 --------------
abs/extra/libimobiledevice/PKGBUILD | 20 ++++++++------------
2 files changed, 8 insertions(+), 26 deletions(-)
delete mode 100644 abs/extra/libimobiledevice/HOME-segfault.patch
diff --git a/abs/extra/libimobiledevice/HOME-segfault.patch b/abs/extra/libimobiledevice/HOME-segfault.patch
deleted file mode 100644
index e48e6cb..0000000
--- a/abs/extra/libimobiledevice/HOME-segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset
-Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
---- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300
-+++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300
-@@ -125,6 +125,9 @@
- const char *cdir = getenv("XDG_CONFIG_HOME");
- if (!cdir) {
- cdir = getenv("HOME");
-+ if (!cdir) {
-+ cdir="/root";
-+ }
- strcpy(__config_dir, cdir);
- strcat(__config_dir, DIR_SEP_S);
- strcat(__config_dir, ".config");
diff --git a/abs/extra/libimobiledevice/PKGBUILD b/abs/extra/libimobiledevice/PKGBUILD
index bc921ac..9c4a74a 100644
--- a/abs/extra/libimobiledevice/PKGBUILD
+++ b/abs/extra/libimobiledevice/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 164989 2012-08-08 00:24:19Z tomegun $
+# $Id$
+# Maintainer : Tom Gundersen <teg@jklm.no>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=libimobiledevice
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.6
+pkgrel=1
pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
url="http://libimobiledevice.org/"
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
- HOME-segfault.patch)
+depends=('libusbmuxd' 'gnutls' 'libgcrypt')
+makedepends=('python2')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
+md5sums=('274783651e9b772774cd9fed2fc52e08')
build() {
cd "$pkgname-$pkgver"
-
- patch -p0 < "$srcdir/HOME-segfault.patch"
-
PYTHON=/usr/bin/python2 ./configure --prefix=/usr
make
}
@@ -27,5 +25,3 @@ package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-md5sums=('3f28cbc6a2e30d34685049c0abde5183'
- '0de709dbf8e79d0b00cca06f5e61d57c')
--
cgit v0.12
From 85a37d558caffb947008b18a6c156e94e93861b1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 20:12:49 +0000
Subject: usbmuxd: update to 1.0.9. refs #961
---
abs/extra/usbmuxd/39-usbmuxd.rules | 9 +++++++
abs/extra/usbmuxd/85-usbmuxd.rules | 9 -------
abs/extra/usbmuxd/PKGBUILD | 48 +++++++++++++++++---------------------
abs/extra/usbmuxd/__changelog | 3 ---
4 files changed, 30 insertions(+), 39 deletions(-)
create mode 100644 abs/extra/usbmuxd/39-usbmuxd.rules
delete mode 100644 abs/extra/usbmuxd/85-usbmuxd.rules
delete mode 100644 abs/extra/usbmuxd/__changelog
diff --git a/abs/extra/usbmuxd/39-usbmuxd.rules b/abs/extra/usbmuxd/39-usbmuxd.rules
new file mode 100644
index 0000000..ec9f725
--- /dev/null
+++ b/abs/extra/usbmuxd/39-usbmuxd.rules
@@ -0,0 +1,9 @@
+# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
+
+# Forces iDevices to the last USB configuration and runs usbmuxd
+TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
+LABEL="usbmuxd_systemd_end"
+
+# Exit usbmuxd when the last device is removed
+ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/abs/extra/usbmuxd/85-usbmuxd.rules b/abs/extra/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index ec9f725..0000000
--- a/abs/extra/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Forces iDevices to the last USB configuration and runs usbmuxd
-TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
-LABEL="usbmuxd_systemd_end"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/abs/extra/usbmuxd/PKGBUILD b/abs/extra/usbmuxd/PKGBUILD
index 3282c08..6695533 100644
--- a/abs/extra/usbmuxd/PKGBUILD
+++ b/abs/extra/usbmuxd/PKGBUILD
@@ -3,46 +3,40 @@
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=usbmuxd
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.0.9
+pkgrel=1
pkgdesc="USB Multiplex Daemon"
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
arch=('i686' 'x86_64')
-license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb' 'libplist')
-makedepends=('cmake')
+license=('GPL2' 'GPL3')
+depends=('libimobiledevice')
+makedepends=('git')
install=usbmuxd.install
-source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
+source=("git+http://git.sukimashita.com/usbmuxd.git#commit=c92b4f59aba053a3df1ae67c49403122650ad996"
'usbmuxd.service'
- '85-usbmuxd.rules')
+ '39-usbmuxd.rules')
+md5sums=('SKIP'
+ 'dae0660f972510a6483992b5b81e1b5a'
+ 'dc4b2893651149eccbf7b2c8467cd288')
+
+prepare() {
+ cd usbmuxd
+ sed -i -e 's|udevrulesdir = /lib/udev/rules.d|udevrulesdir = /usr/lib/udev/rules.d|' Makefile.am
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- echo "${pkgver}" > version.tag
- mkdir build
- cd build
- cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
+ cd usbmuxd
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}/build"
+ cd usbmuxd
make DESTDIR="${pkgdir}" install
- # fix udev dir being hardcoded
- mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
- rmdir "${pkgdir}/lib"
- # usrmove
- mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/"
- rmdir "${pkgdir}/usr/sbin"
# install systemd service file
- install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
+ install -D -m644 ../usbmuxd.service "${pkgdir}/usr/lib/systemd/system/usbmuxd.service"
# use udev rule that works with systemd
- install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
- #fix version
- sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc
-
+ install -m644 ../39-usbmuxd.rules "${pkgdir}/usr/lib/udev/rules.d/"
}
-md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
- 'dae0660f972510a6483992b5b81e1b5a'
- 'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/abs/extra/usbmuxd/__changelog b/abs/extra/usbmuxd/__changelog
deleted file mode 100644
index e5a6fbf..0000000
--- a/abs/extra/usbmuxd/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-#fix version -jm
-sed -i "s/Version.*$/Version: ${pkgver}/g" $pkgdir/usr/lib/pkgconfig/libusbmuxd.pc
-
--
cgit v0.12
From 4156c57408808da79bb6d08e612ea2e27f084025 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 20:16:16 +0000
Subject: wireless-regdb: update to 2013.11.27. refs #961
---
abs/extra/wireless-regdb/PKGBUILD | 48 ++++++++++++-------------
abs/extra/wireless-regdb/wireless-regdb.install | 4 +--
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/abs/extra/wireless-regdb/PKGBUILD b/abs/extra/wireless-regdb/PKGBUILD
index 0a5f163..4ff914e 100644
--- a/abs/extra/wireless-regdb/PKGBUILD
+++ b/abs/extra/wireless-regdb/PKGBUILD
@@ -1,46 +1,46 @@
-# $Id: PKGBUILD 141966 2011-11-03 18:52:54Z thomas $
+# $Id$
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=wireless-regdb
-pkgver=2011.04.28
+pkgver=2013.11.27
pkgrel=1
pkgdesc="Central Regulatory Domain Database"
arch=('any')
-url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
+url="http://wireless.kernel.org/en/developers/Regulatory"
backup=(etc/conf.d/wireless-regdom)
license=('custom')
depends=('sh')
+makedepends=('crda')
install=wireless-regdb.install
-source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.xz
crda.conf.d)
-sha256sums=('ed1c3e134e34ba5f93594f6f76b90861fe8d24359c064839a2bb78736416642b'
+sha256sums=('aa86150a367df0d6c8d875c05448c96a18c4ddf063f3e1b8c2235c2679117cc2'
'192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
package() {
# Install and verify regulatory.bin file
msg "Installing and verifying the regulatory.bin file ..."
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- # If crda is installed, the wireless regdb can be verified using regdbdump
- # Keep this step optional so no depend/makedepend loop is created
- if [ -x /sbin/regdbdump ]; then
- if /sbin/regdbdump ${pkgdir}/usr/lib/crda/regulatory.bin > /dev/null; then
- msg "Regulatory database verification was succesful."
- else
- error "Regulatory database verification failed."
- return 1
- fi
+ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin "${pkgdir}"/usr/lib/crda/regulatory.bin
+ # This creates a depend/makedepend loop:
+ # crda depends on wireless-regdb (but strictly doesn't makedepend on it)
+ # wireless-regdb makedepends on crda
+ if /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then
+ msg "Regulatory database verification was succesful."
else
- warning "Crda is not installed, regulatory database could not be verified."
+ error "Regulatory database verification failed."
+ return 1
fi
-
+ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/linville.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/linville.key.pub.pem
+ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE
+ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin.5 "${pkgdir}"/usr/share/man/man5/regulatory.bin.5
+
msg "Installing /etc/conf.d/wireless-regdom ..."
- install -D -m644 ${srcdir}/crda.conf.d ${pkgdir}/etc/conf.d/wireless-regdom
- for dom in $(grep ^country ${srcdir}/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do
- echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${pkgdir}/etc/conf.d/wireless-regdom.tmp
+ install -D -m644 "${srcdir}"/crda.conf.d "${pkgdir}"/etc/conf.d/wireless-regdom
+ for dom in $(grep ^country "${srcdir}"/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do
+ echo "#WIRELESS_REGDOM=\"${dom}\"" >> "${pkgdir}"/etc/conf.d/wireless-regdom.tmp
done
- sort -u ${pkgdir}/etc/conf.d/wireless-regdom.tmp >> ${pkgdir}/etc/conf.d/wireless-regdom
- rm -f ${pkgdir}/etc/conf.d/wireless-regdom.tmp
+ sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom
+ rm "${pkgdir}"/etc/conf.d/wireless-regdom.tmp
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/abs/extra/wireless-regdb/wireless-regdb.install b/abs/extra/wireless-regdb/wireless-regdb.install
index ae712db..7b5a05d 100644
--- a/abs/extra/wireless-regdb/wireless-regdb.install
+++ b/abs/extra/wireless-regdb/wireless-regdb.install
@@ -5,8 +5,8 @@ post_install() {
post_upgrade() {
# If crda is installed, we verify the integrity of the database
# If not, we skip this step silently
- if [ -x /sbin/regdbdump ]; then
- if ! /sbin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then
+ if [ -x /usr/bin/regdbdump ]; then
+ if ! /usr/bin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then
echo "Failed to verify the integrity of the wireless regulatory database, CRDA will not work."
fi
fi
--
cgit v0.12
From e663ac7ad184f870e081d1e9e88d50085b6d0ce2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 20:30:20 +0000
Subject: udisks: update to 1.0.5. refs #961
---
abs/core/udisks/PKGBUILD | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/abs/core/udisks/PKGBUILD b/abs/core/udisks/PKGBUILD
index 08ab090..8e2a311 100644
--- a/abs/core/udisks/PKGBUILD
+++ b/abs/core/udisks/PKGBUILD
@@ -1,16 +1,19 @@
-# $Id: PKGBUILD 198467 2013-10-30 15:03:09Z allan $
+# $Id$
# Maintainer: Tom Gundersen <teg@jklm.no>
pkgname=udisks
-pkgver=1.0.4
-pkgrel=8
+pkgver=1.0.5
+pkgrel=1
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
license=('GPL')
-depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted'
+ 'device-mapper' 'libatasmart' 'lsof')
makedepends=('intltool' 'docbook-xsl')
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+ udisks.service
+ drop-pci-db.patch)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -45,6 +48,6 @@ package() {
# install the /media folder
install -d -m 755 $pkgdir/media
}
-md5sums=('86c63b2b5484f2060499a052b5b6256b'
+md5sums=('70d48dcfe523a74cd7c7fbbc2847fcdd'
'5d80832b4d4da72beeb45c15b63a1481'
'773cccd70afd18ace4332037feff67ec')
--
cgit v0.12
From 2e362cac2506ccf479fe3133edcb41359da33115 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 21:05:49 +0000
Subject: dcron: refs #961
---
abs/core/dcron/PKGBUILD | 72 ++++++++++++++++++++++++--------------------
abs/core/dcron/dcron.install | 4 +--
abs/core/dcron/service | 11 +++++++
3 files changed, 52 insertions(+), 35 deletions(-)
create mode 100644 abs/core/dcron/service
diff --git a/abs/core/dcron/PKGBUILD b/abs/core/dcron/PKGBUILD
index 5a0b4a8..bcbb3f3 100644
--- a/abs/core/dcron/PKGBUILD
+++ b/abs/core/dcron/PKGBUILD
@@ -1,47 +1,53 @@
-# Maintainer: Paul Mattal <paul.archlinux.org>
+# Maintainer: notfoss <AT> gmx.com
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Paul Mattal <paul.archlinux.org>
pkgname=dcron
pkgver=4.5
-pkgrel=4
+pkgrel=5
pkgdesc="dillon's lightweight cron daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron"
-backup=('var/spool/cron/root' 'etc/conf.d/crond')
-depends=('bash' 'postfix')
-provides=('cron')
-conflicts=('cron')
-source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
-optdepends=('smtp-server: sending cron job output via email')
+arch=("i686" "x86_64")
+license=("GPL")
+url="http://www.jimpryor.net/linux/dcron.html"
+backup=("var/spool/cron/root" "etc/conf.d/crond")
+depends=("bash" "postfix")
+optdepends=("msmtp-mta: sending cron job output via email")
+provides=("cron")
+conflicts=("cron")
install=$pkgname.install
+source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz"
+ "service")
+md5sums=("078833f3281f96944fc30392b1888326"
+ "2eefc422db24bf2ac38e3a16292ccdc4")
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
+ cd "$srcdir/${pkgname}-${pkgver}"
- # by default, any member of group "users" can edit their own crontab
- make \
- PREFIX=/usr \
- CRONTAB_GROUP=users \
- CRONTABS=/var/spool/cron \
- CRONSTAMPS=/var/spool/cronstamps
+ # fix paths to point to /usr/bin
+ sed -i 's=/usr/sbin/sendmail=/usr/bin/sendmail=g' defs.h
+ sed -i 's=/usr/sbin/run-cron=/usr/bin/run-cron=g' extra/root.crontab
+
+ # by default, any member of group "users" can edit their own crontab
+ make \
+ PREFIX=/usr \
+ SBINDIR=/usr/bin \
+ CRONTAB_GROUP=users \
+ CRONTABS=/var/spool/cron \
+ CRONSTAMPS=/var/spool/cronstamps
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}"
- make DESTDIR="$pkgdir" install
+ cd "$srcdir/${pkgname}-${pkgver}"
+ make DESTDIR="$pkgdir" install
- # install standard configuration and scripts
- install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly}
+ # install standard configuration and scripts
+ install -d -m755 "$pkgdir"/etc/cron.{hourly,daily,weekly,monthly}
- install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
- install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root"
- install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
- install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
- install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
- sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
- install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
- #mv sbin->bin
- mv $pkgdir/usr/sbin/* $pkgdir/usr/bin
- rmdir $pkgdir/usr/sbin
+ install -D -m755 extra/run-cron "$pkgdir"/usr/bin/run-cron
+ install -D -m0600 extra/root.crontab "$pkgdir"/var/spool/cron/root
+ install -D -m0644 extra/crond.conf "$pkgdir"/etc/conf.d/crond
+ install -D -m644 extra/crontab.vim "$pkgdir"/usr/share/vim/vimfiles/ftplugin/crontab.vim
+ sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
+ install -D -m755 extra/prune-cronstamps "$pkgdir"/etc/cron.d/prune-cronstamps
+ install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/dcron.service
}
-md5sums=('078833f3281f96944fc30392b1888326')
diff --git a/abs/core/dcron/dcron.install b/abs/core/dcron/dcron.install
index fb01dc9..ad5442a 100644
--- a/abs/core/dcron/dcron.install
+++ b/abs/core/dcron/dcron.install
@@ -8,13 +8,13 @@ post_upgrade() {
grep -q cron.tenminutes /var/spool/cron/root
if [ $? = 1 ]
then
- echo "0,10,20,30,40,50 * * * * /usr/sbin/run-cron /etc/cron.tenminutes" >> /var/spool/cron/root
+ echo "0,10,20,30,40,50 * * * * /usr/bin/run-cron /etc/cron.tenminutes" >> /var/spool/cron/root
fi
if [ ! -e /etc/cron.tenminutes ]
then
mkdir -p /etc/cron.tenminutes
fi
-
+ sed -i 's|/usr/sbin|/usr/bin|g' /var/spool/cron/root
}
post_install() {
diff --git a/abs/core/dcron/service b/abs/core/dcron/service
new file mode 100644
index 0000000..703f320
--- /dev/null
+++ b/abs/core/dcron/service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Periodic Command Scheduler
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/crond
+ExecStart=/usr/bin/crond $CROND_ARGS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From e7ee4654a4458469999f591478d748a17c94c4f2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Apr 2014 21:17:04 +0000
Subject: ipw3945d & ipw3945-ucode: remove old pkgs
---
abs/core/ipw3945-ucode/PKGBUILD | 22 ---------------
abs/core/ipw3945-ucode/ipw3945-ucode.install | 18 ------------
abs/core/ipw3945d/PKGBUILD | 28 -------------------
abs/core/ipw3945d/ipw3945d.install | 35 -----------------------
abs/core/ipw3945d/ipw3945d.rc | 42 ----------------------------
5 files changed, 145 deletions(-)
delete mode 100644 abs/core/ipw3945-ucode/PKGBUILD
delete mode 100644 abs/core/ipw3945-ucode/ipw3945-ucode.install
delete mode 100644 abs/core/ipw3945d/PKGBUILD
delete mode 100644 abs/core/ipw3945d/ipw3945d.install
delete mode 100644 abs/core/ipw3945d/ipw3945d.rc
diff --git a/abs/core/ipw3945-ucode/PKGBUILD b/abs/core/ipw3945-ucode/PKGBUILD
deleted file mode 100644
index dbc79ca..0000000
--- a/abs/core/ipw3945-ucode/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-
-pkgname=ipw3945-ucode
-pkgver=1.14.2
-pkgrel=2
-pkgdesc="Intel Centrino Drivers firmware for IPW3945"
-arch=(i686 x86_64)
-url="http://www.bughost.org/ipw3945"
-license=""
-depends=('udev')
-install=ipw3945-ucode.install
-source=(http://www.bughost.org/ipw3945/ucode/$pkgname-$pkgver.tgz)
-
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- #Install firmware
- install -D -m 644 ipw3945.ucode $startdir/pkg/lib/firmware/ipw3945.ucode
- # Install firmware license
- install -D -m 644 LICENSE.ipw3945-ucode $startdir/pkg/lib/firmware/LICENSE.ipw3945-ucode
-}
-md5sums=('c1c4cc7f993f448e7c05768c012084aa')
diff --git a/abs/core/ipw3945-ucode/ipw3945-ucode.install b/abs/core/ipw3945-ucode/ipw3945-ucode.install
deleted file mode 100644
index 9296f8c..0000000
--- a/abs/core/ipw3945-ucode/ipw3945-ucode.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1: the new package version
-post_install() {
-cat << EOF
-IMPORTANT
-==> In order to use this firmware you have to agree to Intel's license located in
-==> /lib/firmware/LICENSE.ipw3945-ucode else please remove this package.
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core/ipw3945d/PKGBUILD b/abs/core/ipw3945d/PKGBUILD
deleted file mode 100644
index 5a9351b..0000000
--- a/abs/core/ipw3945d/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: James Rayner <iphitus@gmail.com>
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-
-pkgname=ipw3945d
-pkgver=1.7.22
-pkgrel=5
-pkgdesc="Regulatory daemon for IPW3945"
-arch=('i686' 'x86_64')
-url="http://www.bughost.org/ipw3945"
-license=('custom')
-depends=('glibc')
-install=ipw3945d.install
-source=(http://www.bughost.org/ipw3945/daemon/${pkgname}-${pkgver}.tgz ipw3945d.rc)
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- #Install daemon w/ Arch specific fix
- if [ "$CARCH" = "x86_64" ]; then
- install -D -m 755 x86_64/ipw3945d ${pkgdir}/sbin/ipw3945d
- else install -D -m 755 x86/ipw3945d ${pkgdir}/sbin/ipw3945d
- fi
- # Install license
- install -D -m 644 LICENSE.ipw3945d ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
- install -m755 -D ${srcdir}/ipw3945d.rc ${pkgdir}/etc/rc.d/ipw3945d || return
-}
-md5sums=('097888f5be05eb2b9b87dcdbeeb948ce'
- '72aafd7cba214592de6175974a48b4f9')
diff --git a/abs/core/ipw3945d/ipw3945d.install b/abs/core/ipw3945d/ipw3945d.install
deleted file mode 100644
index 3d35fc5..0000000
--- a/abs/core/ipw3945d/ipw3945d.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1: the new package version
-post_install() {
-cat << EOF
-IMPORTANT
-==> In order to use this daemon you have to agree to Intel's license located
-==> in /usr/share/licenses/custom/ipw3945d/LICENSE.ipw3945d
-==> else please remove this package.
-==>
-==> To use this daemon, add 'ipw3945d' to your DAEMONS=() entry in /etc/rc.conf
-EOF
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-cat << EOF
-IMPORTANT
-==> In order to use this daemon you have to agree to Intel's license located
-==> in /usr/share/licenses/custom/ipw3945d/LICENSE.ipw3945d
-==> else please remove this package.
-==>
-AUTOMATIC DAEMON LOADING VIA MODPROBE
-==> To do this, you typically place the following two lines into your
-==> /etc/modprobe.conf:
-==> echo install ipw3945 /sbin/modprobe --ignore-install ipw3945 ; \
-==> sleep 0.5 ; /sbin/ipw3945d --quiet >> /etc/modprobe.conf
-==>
-==> echo remove ipw3945 /sbin/ipw3945d --kill ; \
-==> /sbin/modprobe -r --ignore-remove ipw3945 >> /etc/modprobe.conf
-EOF
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core/ipw3945d/ipw3945d.rc b/abs/core/ipw3945d/ipw3945d.rc
deleted file mode 100644
index b0e02bb..0000000
--- a/abs/core/ipw3945d/ipw3945d.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/ipw3945d`
-case "$1" in
- start)
- stat_busy "Starting IPW3945d"
- [ -z "$PID" ] && /sbin/ipw3945d --quiet
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo `pidof -o %PPID /sbin/ipw3945d` > /var/run/ipw3945d.pid
- add_daemon ipw3945d
- sleep 1 # not good, but daemon needs time to upload to card, otherwise network fails.
- stat_done
- fi
-
- sleep 0.5
- ;;
- stop)
- stat_busy "Stopping IPW3945d"
- [ ! -z "$PID" ] && /sbin/ipw3945d --kill
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ipw3945d
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
--
cgit v0.12
From e3dfe57abfa410573d3fb8ddb22e73744f1a1804 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 19 Apr 2014 01:44:00 +0000
Subject: LinHES-config: Bump and name R8.2
---
abs/core/LinHES-config/LinHES-release | 2 +-
abs/core/LinHES-config/PKGBUILD | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index f4126e5..d5029cc 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R8.1 (It isn't only a girl's name)
+LinHES R8.2 (Paid the iron price)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 4a891db..5c1b9da 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
-pkgver=8.1
-pkgrel=18
+pkgver=8.2
+pkgrel=1
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -147,7 +147,7 @@ md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
'5012fbd31d205a6d6b0a1d8caf3eba8f'
'157e73d0f90d7b306aba8f5921aeedd3'
'f8f803cb5738ce0021cd37c1ab514c45'
- '952af1c0a44579c04a405ffce9aed264'
+ '879c692ebfd86cdd60d93278f1df8041'
'5f890ea9bda6aef652d2560ca19dac07'
'ab2aa42c2947148c2b1cac0ade6d1d55'
'd429b59d3cfb37b0624c6a4a71a7c2c0'
--
cgit v0.12
From bfd89de7d3d8c84844d3649f598cb119bae7a1a5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 22:11:45 +0000
Subject: google-chrome: update to 34.0.1847.132
---
abs/extra/google-chrome/PKGBUILD | 16 +++++++---------
abs/extra/google-chrome/google-chrome.install | 27 +++++++++++++++++++++++++--
2 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index ca4ae42..c4357a3 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=34.0.1847.116
+pkgver=34.0.1847.132
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -16,16 +16,15 @@ depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfb
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=${pkgver}")
-conflicts=('google-chrome<35')
replaces=('chromium')
options=('!emptydirs' '!strip')
install=${pkgname}.install
_channel=stable
_arch=i386
[ "${CARCH}" = 'x86_64' ] && _arch=amd64
-source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
- 'https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html')
-[ "${CARCH}" = 'x86_64' ] && md5sums[0]='f0186cc5b1f6ceb0166abb0628182663'
+source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb")
+md5sums=('7a25fe96c07da3f0da72783788aad054')
+[ "${CARCH}" = 'x86_64' ] && md5sums[0]='54515de584acbe880a0adcc828e3173a'
package() {
msg2 "Extracting the data.tar.lzma"
@@ -42,7 +41,9 @@ package() {
gzip "${pkgdir}"/usr/share/man/man1/google-chrome.1
# License
- install -Dm644 eula_text.html "${pkgdir}"/usr/share/licenses/google-chrome/eula_text.html
+ install -d "${pkgdir}"/usr/share/licenses/google-chrome/
+ curl -Ls https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html \
+ -o "${pkgdir}"/usr/share/licenses/google-chrome/eula_text.html
msg2 "Symlinking missing Udev lib"
ln -s /usr/lib/libudev.so.1 "${pkgdir}"/opt/google/chrome/libudev.so.0
@@ -53,7 +54,4 @@ package() {
msg2 "Rename google-chrome-stable to google-chrome"
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
-
}
-md5sums=('f0186cc5b1f6ceb0166abb0628182663'
- '6d57da7476a4b1b7a81821d9c036425c')
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index 4b923b2..5d42e84 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -1,16 +1,39 @@
-post_install() {
+# Colored makepkg-like functions
+msg_blue() {
+ printf "${BLUE}==>${ALL_OFF}${BOLD} $1${ALL_OFF}\n"
+}
+
+note() {
+ printf "${BLUE}==>${ALL_OFF}${YELLOW} NOTE:${ALL_OFF}${BOLD} ${1}${ALL_OFF}\n"
+}
+
+ALL_OFF="$(tput sgr0)"
+BOLD="$(tput bold)"
+BLUE="${BOLD}$(tput setaf 4)"
+YELLOW="${BOLD}$(tput setaf 3)"
+
+_update() {
+ msg_blue "Updating desktop MIME database..."
+ update-desktop-database -q
+ msg_blue "Updating icon cache.."
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_install() {
+ _update
if [ ! -e /usr/bin/chromium ]; then
ln -s /usr/bin/google-chrome /usr/bin/chromium
fi
}
+
post_upgrade() {
post_install
}
+
post_remove() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ _update
if [ -h /usr/bin/chromium ]; then
rm /usr/bin/chromium
fi
--
cgit v0.12
From b31bcace672a8a7cfbe28ef51411ab8fbd077cf1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 22:42:54 +0000
Subject: python-setuptools: initial inclusion
---
abs/core/python_modules/python-setuptools/PKGBUILD | 70 ++++++++++++++++++++++
.../python_modules/python-setuptools/__changelog | 1 +
2 files changed, 71 insertions(+)
create mode 100644 abs/core/python_modules/python-setuptools/PKGBUILD
create mode 100644 abs/core/python_modules/python-setuptools/__changelog
diff --git a/abs/core/python_modules/python-setuptools/PKGBUILD b/abs/core/python_modules/python-setuptools/PKGBUILD
new file mode 100644
index 0000000..44701e9
--- /dev/null
+++ b/abs/core/python_modules/python-setuptools/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgbase=python-setuptools
+pkgname=('python2-setuptools')
+pkgver=3.4.4
+pkgrel=1
+pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
+arch=('any')
+license=('PSF')
+url="http://pypi.python.org/pypi/setuptools"
+makedepends=('python2')
+checkdepends=('python-pytest' 'python2-pytest')
+source=("http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz")
+md5sums=('6ca9e8377b65233c2ff3a1752406a22d')
+
+check() {
+ # Disabled python 3.x tests for setuptools 3.4.1:
+ # https://bitbucket.org/pypa/setuptools/issue/180/34-release-fails-tests
+
+ # Check python3 module
+ cd "${srcdir}"/setuptools-${pkgver}
+ #python3 setup.py test
+
+ # Check python2 module
+ cd "${srcdir}"/setuptools-${pkgver}-python2
+ python2 setup.py test
+}
+
+prepare() {
+ cp -a setuptools-${pkgver}{,-python2}
+
+ cd "${srcdir}"/setuptools-${pkgver}
+ sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py
+ sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|" setuptools/command/easy_install.py
+
+ cd "${srcdir}"/setuptools-${pkgver}-python2
+ sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
+ sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python2|" setuptools/command/easy_install.py
+}
+
+build() {
+ # Build python 3 module
+ #cd "${srcdir}"/setuptools-${pkgver}
+ #python3 setup.py build
+
+ # Build python 2 module
+ cd "${srcdir}"/setuptools-${pkgver}-python2
+ python2 setup.py build
+}
+
+#package_python-setuptools() {
+ #depends=('python>=3.4')
+ #provides=('python-distribute')
+ #replaces=('python-distribute')
+
+ #cd "${srcdir}/setuptools-${pkgver}"
+ #python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+#}
+
+package_python2-setuptools() {
+ depends=('python2>=2.7')
+ provides=('python2-distribute' 'setuptools')
+ replaces=('python2-distribute' 'setuptools')
+
+ cd "${srcdir}/setuptools-${pkgver}-python2"
+ python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+ rm "${pkgdir}/usr/bin/easy_install"
+}
diff --git a/abs/core/python_modules/python-setuptools/__changelog b/abs/core/python_modules/python-setuptools/__changelog
new file mode 100644
index 0000000..9715c21
--- /dev/null
+++ b/abs/core/python_modules/python-setuptools/__changelog
@@ -0,0 +1 @@
+PKGBUILD - comment out all python 3 stuff and only build for py 2
--
cgit v0.12
From 9a4547f8eb786441be0eee3cee5b0f9605903b67 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 22:53:02 +0000
Subject: python-distribute: replaced by python-setuptools
---
abs/core/python_modules/python-distribute/PKGBUILD | 54 ----------------------
.../python_modules/python-distribute/__changelog | 1 -
.../distribute-python2_and_3.patch | 36 ---------------
3 files changed, 91 deletions(-)
delete mode 100644 abs/core/python_modules/python-distribute/PKGBUILD
delete mode 100644 abs/core/python_modules/python-distribute/__changelog
delete mode 100644 abs/core/python_modules/python-distribute/distribute-python2_and_3.patch
diff --git a/abs/core/python_modules/python-distribute/PKGBUILD b/abs/core/python_modules/python-distribute/PKGBUILD
deleted file mode 100644
index 5627eb7..0000000
--- a/abs/core/python_modules/python-distribute/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 159385 2012-05-22 22:16:56Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sebastien Binet <binet@farnsworth>
-pkgbase=python-distribute
-pkgname=('python2-distribute')
-pkgver=0.6.27
-pkgrel=1
-pkgdesc="Easily build and distribute Python packages"
-arch=('any')
-license=('PSF')
-url="http://pypi.python.org/pypi/distribute"
-makedepends=('python2')
-source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
- distribute-python2_and_3.patch)
-sha1sums=('cebaaf91938581cb8c4a2f708f2b3e770232d3a5'
- '9c19c12edac507b0f76696d282b9831c4b653a7e')
-build() {
- cd "${srcdir}"
-
- pushd distribute-${pkgver}
- patch -Np1 -i ../distribute-python2_and_3.patch
- popd
-
- cp -a distribute-${pkgver}{,-python2}
-
- ## Build python 3 module
- cd distribute-${pkgver}
- # python setup.py build
-# python setup.py test
-
- # Build python 2 module
- cd ../distribute-${pkgver}-python2
-
- sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
-
- python2 setup.py build
-# python2 setup.py test
-}
-
-package_python-distribute() {
- # depends=('python>=3.2')
-
- cd "${srcdir}/distribute-${pkgver}"
- python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}
-
-package_python2-distribute() {
- depends=('python2>=2.7')
- provides=('setuptools')
- conflicts=('setuptools')
-
- cd "${srcdir}/distribute-${pkgver}-python2"
- python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}
diff --git a/abs/core/python_modules/python-distribute/__changelog b/abs/core/python_modules/python-distribute/__changelog
deleted file mode 100644
index a995e3a..0000000
--- a/abs/core/python_modules/python-distribute/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove python
diff --git a/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch b/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch
deleted file mode 100644
index 2c51100..0000000
--- a/abs/core/python_modules/python-distribute/distribute-python2_and_3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur distribute-0.6.27.ori/distribute.egg-info/entry_points.txt distribute-0.6.27/distribute.egg-info/entry_points.txt
---- distribute-0.6.27.ori/distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400
-+++ distribute-0.6.27/distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400
-@@ -11,6 +11,8 @@
- install_egg_info = setuptools.command.install_egg_info:install_egg_info
- alias = setuptools.command.alias:alias
- easy_install = setuptools.command.easy_install:easy_install
-+easy_install-2.7 = setuptools.command.easy_install:main
-+easy_install-3.2 = setuptools.command.easy_install:main
- install_scripts = setuptools.command.install_scripts:install_scripts
- bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
- bdist_egg = setuptools.command.bdist_egg:bdist_egg
-diff -Naur distribute-0.6.27.ori/distribute_setup.py distribute-0.6.27/distribute_setup.py
---- distribute-0.6.27.ori/distribute_setup.py 2012-05-18 15:45:03.000000000 -0400
-+++ distribute-0.6.27/distribute_setup.py 2012-05-22 18:14:17.443383039 -0400
-@@ -299,8 +299,7 @@
- log.warn('Could not find the install location')
- return
- pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-- (SETUPTOOLS_FAKED_VERSION, pyver)
-+ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
- pkg_info = os.path.join(placeholder, setuptools_file)
- if os.path.exists(pkg_info):
- log.warn('%s already exists', pkg_info)
-diff -Naur distribute-0.6.27.ori/setup.py distribute-0.6.27/setup.py
---- distribute-0.6.27.ori/setup.py 2012-05-18 15:19:51.000000000 -0400
-+++ distribute-0.6.27/setup.py 2012-05-22 18:14:17.443383039 -0400
-@@ -100,6 +100,7 @@
- finally:
- f.close()
-
-+console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
-
- # if we are installing Distribute using "python setup.py install"
- # we need to get setuptools out of the way
--
cgit v0.12
From dba8f2d49aa00834ff08e1941aeceafb1eb934bb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 22:58:58 +0000
Subject: python-docutils: initial inclusion
---
.../01-python33-relative-import.patch | 196 +++++++++++++++++++++
abs/core/python_modules/python-docutils/PKGBUILD | 80 +++++++++
.../python_modules/python-docutils/__changelog | 1 +
.../python-docutils/python2-docutils.install | 9 +
4 files changed, 286 insertions(+)
create mode 100644 abs/core/python_modules/python-docutils/01-python33-relative-import.patch
create mode 100644 abs/core/python_modules/python-docutils/PKGBUILD
create mode 100644 abs/core/python_modules/python-docutils/__changelog
create mode 100644 abs/core/python_modules/python-docutils/python2-docutils.install
diff --git a/abs/core/python_modules/python-docutils/01-python33-relative-import.patch b/abs/core/python_modules/python-docutils/01-python33-relative-import.patch
new file mode 100644
index 0000000..f2c4247
--- /dev/null
+++ b/abs/core/python_modules/python-docutils/01-python33-relative-import.patch
@@ -0,0 +1,196 @@
+From 12e5aa7b94e0a0ec37e754527e06707005d28d1c Mon Sep 17 00:00:00 2001
+From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
+Date: Wed, 11 Jul 2012 12:25:14 +0000
+Subject: [PATCH] Fix [3541369] Relative __import__ also with Python 3.3.
+
+git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk@7486 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
+---
+ docutils/HISTORY.txt | 1 +
+ docutils/docutils/_compat.py | 11 +++++++++++
+ docutils/docutils/languages/__init__.py | 8 ++++++--
+ docutils/docutils/parsers/__init__.py | 5 ++++-
+ .../docutils/parsers/rst/directives/__init__.py | 6 +++++-
+ .../docutils/parsers/rst/languages/__init__.py | 6 +++++-
+ docutils/docutils/readers/__init__.py | 5 ++++-
+ docutils/docutils/writers/__init__.py | 7 +++++--
+ 8 files changed, 41 insertions(+), 8 deletions(-)
+
+diff --git a/docutils/docutils/_compat.py b/docutils/docutils/_compat.py
+index 1450534..19654a6 100644
+--- a/docutils/docutils/_compat.py
++++ b/docutils/docutils/_compat.py
+@@ -35,3 +35,14 @@ else:
+ # using this hack since 2to3 "fixes" the relative import
+ # when using ``from io import BytesIO``
+ BytesIO = __import__('io').BytesIO
++
++if sys.version_info < (2,5):
++ import __builtin__
++
++ def __import__(name, globals={}, locals={}, fromlist=[], level=-1):
++ """Compatibility definition for Python 2.4.
++
++ Silently ignore the `level` argument missing in Python < 2.5.
++ """
++ # we need the level arg because the default changed in Python 3.3
++ return __builtin__.__import__(name, globals, locals, fromlist)
+diff --git a/docutils/docutils/languages/__init__.py b/docutils/docutils/languages/__init__.py
+index 675bb0e..57d3ec2 100644
+--- a/docutils/docutils/languages/__init__.py
++++ b/docutils/docutils/languages/__init__.py
+@@ -11,7 +11,11 @@ This package contains modules for language-dependent features of Docutils.
+
+ __docformat__ = 'reStructuredText'
+
++import sys
++
+ from docutils.utils import normalize_language_tag
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+ _languages = {}
+
+@@ -26,7 +30,7 @@ def get_language(language_code, reporter=None):
+ if tag in _languages:
+ return _languages[tag]
+ try:
+- module = __import__(tag, globals(), locals())
++ module = __import__(tag, globals(), locals(), level=1)
+ except ImportError:
+ continue
+ _languages[tag] = module
+@@ -35,6 +39,6 @@ def get_language(language_code, reporter=None):
+ reporter.warning(
+ 'language "%s" not supported: ' % language_code +
+ 'Docutils-generated text will be in English.')
+- module = __import__('en', globals(), locals())
++ module = __import__('en', globals(), locals(), level=1)
+ _languages[tag] = module # warn only one time!
+ return module
+diff --git a/docutils/docutils/parsers/__init__.py b/docutils/docutils/parsers/__init__.py
+index 2683376..341e358 100644
+--- a/docutils/docutils/parsers/__init__.py
++++ b/docutils/docutils/parsers/__init__.py
+@@ -8,7 +8,10 @@ This package contains Docutils parser modules.
+
+ __docformat__ = 'reStructuredText'
+
++import sys
+ from docutils import Component
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+
+ class Parser(Component):
+@@ -43,5 +46,5 @@ def get_parser_class(parser_name):
+ parser_name = parser_name.lower()
+ if parser_name in _parser_aliases:
+ parser_name = _parser_aliases[parser_name]
+- module = __import__(parser_name, globals(), locals())
++ module = __import__(parser_name, globals(), locals(), level=1)
+ return module.Parser
+diff --git a/docutils/docutils/parsers/rst/directives/__init__.py b/docutils/docutils/parsers/rst/directives/__init__.py
+index b00a676..fdc70d7 100644
+--- a/docutils/docutils/parsers/rst/directives/__init__.py
++++ b/docutils/docutils/parsers/rst/directives/__init__.py
+@@ -10,8 +10,12 @@ __docformat__ = 'reStructuredText'
+
+ import re
+ import codecs
++import sys
++
+ from docutils import nodes
+ from docutils.parsers.rst.languages import en as _fallback_language_module
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+
+ _directive_registry = {
+@@ -109,7 +113,7 @@ def directive(directive_name, language_module, document):
+ # Error handling done by caller.
+ return None, messages
+ try:
+- module = __import__(modulename, globals(), locals())
++ module = __import__(modulename, globals(), locals(), level=1)
+ except ImportError, detail:
+ messages.append(document.reporter.error(
+ 'Error importing directive module "%s" (directive "%s"):\n%s'
+diff --git a/docutils/docutils/parsers/rst/languages/__init__.py b/docutils/docutils/parsers/rst/languages/__init__.py
+index 53017d7..5a151e4 100644
+--- a/docutils/docutils/parsers/rst/languages/__init__.py
++++ b/docutils/docutils/parsers/rst/languages/__init__.py
+@@ -12,7 +12,11 @@ reStructuredText.
+
+ __docformat__ = 'reStructuredText'
+
++import sys
++
+ from docutils.utils import normalize_language_tag
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+ _languages = {}
+
+@@ -21,7 +25,7 @@ def get_language(language_code):
+ if tag in _languages:
+ return _languages[tag]
+ try:
+- module = __import__(tag, globals(), locals())
++ module = __import__(tag, globals(), locals(), level=1)
+ except ImportError:
+ continue
+ _languages[tag] = module
+diff --git a/docutils/docutils/readers/__init__.py b/docutils/docutils/readers/__init__.py
+index a28248f..e3e6fb5 100644
+--- a/docutils/docutils/readers/__init__.py
++++ b/docutils/docutils/readers/__init__.py
+@@ -8,9 +8,12 @@ This package contains Docutils Reader modules.
+
+ __docformat__ = 'reStructuredText'
+
++import sys
+
+ from docutils import utils, parsers, Component
+ from docutils.transforms import universal
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+
+ class Reader(Component):
+@@ -103,5 +106,5 @@ def get_reader_class(reader_name):
+ reader_name = reader_name.lower()
+ if reader_name in _reader_aliases:
+ reader_name = _reader_aliases[reader_name]
+- module = __import__(reader_name, globals(), locals())
++ module = __import__(reader_name, globals(), locals(), level=1)
+ return module.Reader
+diff --git a/docutils/docutils/writers/__init__.py b/docutils/docutils/writers/__init__.py
+index e30dbf6..8fcee0c 100644
+--- a/docutils/docutils/writers/__init__.py
++++ b/docutils/docutils/writers/__init__.py
+@@ -8,11 +8,14 @@ This package contains Docutils Writer modules.
+
+ __docformat__ = 'reStructuredText'
+
+-
+ import os.path
++import sys
++
+ import docutils
+ from docutils import languages, Component
+ from docutils.transforms import universal
++if sys.version_info < (2,5):
++ from docutils._compat import __import__
+
+
+ class Writer(Component):
+@@ -130,5 +133,5 @@ def get_writer_class(writer_name):
+ writer_name = writer_name.lower()
+ if writer_name in _writer_aliases:
+ writer_name = _writer_aliases[writer_name]
+- module = __import__(writer_name, globals(), locals())
++ module = __import__(writer_name, globals(), locals(), level=1)
+ return module.Writer
+--
+1.6.5.GIT
+
diff --git a/abs/core/python_modules/python-docutils/PKGBUILD b/abs/core/python_modules/python-docutils/PKGBUILD
new file mode 100644
index 0000000..c0b5341
--- /dev/null
+++ b/abs/core/python_modules/python-docutils/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgbase=docutils
+pkgname=('python2-docutils')
+pkgver=0.11
+pkgrel=2
+pkgdesc='Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX'
+arch=('any')
+url='http://docutils.sourceforge.net'
+license=('custom')
+makedepends=('python2')
+source=("http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz")
+md5sums=('20ac380a18b369824276864d98ec0ad6')
+
+build() {
+ cd $pkgbase-$pkgver
+# for _p in "$srcdir"/*.patch; do
+# msg2 "${_p##*/}"
+# patch -p2 -i "$_p"
+# done
+# python3 setup.py build --build-lib=build/python
+# find build/python -type f -exec \
+# sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python3,' {} \;
+ python2 setup.py build --build-lib=build/python2
+ find build/python2 -type f -exec \
+ sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ # we need utf locale to valid utf8 tests
+ export LANG=en_US.UTF-8
+ # Disable python3 check
+ #msg2 'python checks'
+ #PYTHONPATH="$PWD/build/python/" python3 test3/alltests.py
+ msg2 'python2 checks'
+ PYTHONPATH="$PWD/build/python2/" python2 test/alltests.py
+}
+
+#package_python-docutils() {
+# depends=('python')
+#
+# cd $pkgbase-$pkgver
+# python setup.py build --build-lib=build/python \
+ install --root="$pkgdir" --optimize=1
+ # symlink without .py
+# for f in "$pkgdir"/usr/bin/*.py; do
+# ln -s "$(basename $f)" "$pkgdir/usr/bin/$(basename $f .py)"
+# done
+ # setup license
+# install -D -m644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
+# install -D -m644 licenses/python* "$pkgdir/usr/share/licenses/$pkgname/"
+#}
+
+package_python2-docutils() {
+ depends=('python2')
+ provides=("docutils=$pkgver")
+ replaces=('docutils')
+ install=python2-docutils.install
+
+ cd $pkgbase-$pkgver
+ python2 setup.py build --build-lib=build/python2 \
+ install --root="$pkgdir" --optimize=1
+ # fix python-docutils conflict
+ for _f in "$pkgdir"/usr/bin/*.py; do
+ mv -v "$_f" "${_f%.py}2.py"
+ done
+ # symlink without .py
+ for _f in "$pkgdir"/usr/bin/*.py; do
+ ln -s "$(basename $_f)" "$pkgdir/usr/bin/$(basename $_f .py)"
+ done
+ # setup license
+ install -D -m644 COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
+ install -D -m644 licenses/python* "$pkgdir/usr/share/licenses/$pkgname/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-docutils/__changelog b/abs/core/python_modules/python-docutils/__changelog
new file mode 100644
index 0000000..3439597
--- /dev/null
+++ b/abs/core/python_modules/python-docutils/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm python 3 stuff
diff --git a/abs/core/python_modules/python-docutils/python2-docutils.install b/abs/core/python_modules/python-docutils/python2-docutils.install
new file mode 100644
index 0000000..3e414af
--- /dev/null
+++ b/abs/core/python_modules/python-docutils/python2-docutils.install
@@ -0,0 +1,9 @@
+post_upgrade() {
+ [ $(vercmp '0.8.1-2' "$2") -gt 0 ] && cat <<EOF || :
+python2-docutils:
+rst* binaries have been renamed to rst*2 to avoid conflict with python-docutils
+remember to update your scripts
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
--
cgit v0.12
From ae65f9323dd037b478a7116a53067f2e5c68a86a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 23:09:13 +0000
Subject: python-markupsafe: initial inclusion
---
abs/core/python_modules/python-markupsafe/PKGBUILD | 50 ++++++++++++++++++++++
.../python_modules/python-markupsafe/__changelog | 1 +
2 files changed, 51 insertions(+)
create mode 100644 abs/core/python_modules/python-markupsafe/PKGBUILD
create mode 100644 abs/core/python_modules/python-markupsafe/__changelog
diff --git a/abs/core/python_modules/python-markupsafe/PKGBUILD b/abs/core/python_modules/python-markupsafe/PKGBUILD
new file mode 100644
index 0000000..17725d0
--- /dev/null
+++ b/abs/core/python_modules/python-markupsafe/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer : Felix Yan <felixonmars@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
+
+pkgname=('python2-markupsafe')
+pkgver=0.21
+pkgrel=1
+pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/MarkupSafe"
+license=('custom')
+makedepends=('python2-setuptools')
+source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+sha512sums=('ecedf56be7ad1723c4d7bf799e1aefb8ceb0a28840a1b8ffdc2dee0f734149430cf5dfd5d335591e9934cf223255475e9c04da5ab34ed69e7845298f599d81bc')
+
+build() {
+ cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
+# cd "${srcdir}/MarkupSafe-${pkgver}"
+# python setup.py build
+
+ cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+ python2 setup.py build
+}
+
+check() {
+# cd "${srcdir}/MarkupSafe-${pkgver}"
+# python setup.py test
+
+ cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+ python2 setup.py test
+}
+
+#package_python-markupsafe() {
+# depends=('python')
+
+# cd MarkupSafe-${pkgver}
+# python setup.py install --root="${pkgdir}" --optimize=1
+
+# install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
+#}
+
+package_python2-markupsafe() {
+ depends=('python2')
+
+ cd python2-MarkupSafe-${pkgver}
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
+}
diff --git a/abs/core/python_modules/python-markupsafe/__changelog b/abs/core/python_modules/python-markupsafe/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-markupsafe/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 88c34a9f842d5f7424c8fc9ab204d4cbc62e01d7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 23:14:28 +0000
Subject: python-jinja: initial inclusion
---
...refixLoader-does-not-pass-globals-to-load.patch | 26 ++++++++++++
abs/core/python_modules/python-jinja/PKGBUILD | 49 ++++++++++++++++++++++
abs/core/python_modules/python-jinja/__changelog | 1 +
3 files changed, 76 insertions(+)
create mode 100644 abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
create mode 100644 abs/core/python_modules/python-jinja/PKGBUILD
create mode 100644 abs/core/python_modules/python-jinja/__changelog
diff --git a/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch b/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
new file mode 100644
index 0000000..8100449
--- /dev/null
+++ b/abs/core/python_modules/python-jinja/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
@@ -0,0 +1,26 @@
+From 478983594423dcdb85e26ea7a02b8d1d72215db6 Mon Sep 17 00:00:00 2001
+From: Morris Jobke <morris.jobke@gmail.com>
+Date: Mon, 27 May 2013 00:54:52 +0300
+Subject: [PATCH] Fix "PrefixLoader does not pass globals to load"
+
+Fix mitsuhiko/jinja2#225
+---
+ jinja2/loaders.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jinja2/loaders.py b/jinja2/loaders.py
+index a9a2625..cc9c683 100644
+--- a/jinja2/loaders.py
++++ b/jinja2/loaders.py
+@@ -349,7 +349,7 @@ def get_source(self, environment, template):
+ def load(self, environment, name, globals=None):
+ loader, local_name = self.get_loader(name)
+ try:
+- return loader.load(environment, local_name)
++ return loader.load(environment, local_name, globals)
+ except TemplateNotFound:
+ # re-raise the exception with the correct fileame here.
+ # (the one that includes the prefix)
+--
+1.8.1.6
+
diff --git a/abs/core/python_modules/python-jinja/PKGBUILD b/abs/core/python_modules/python-jinja/PKGBUILD
new file mode 100644
index 0000000..a7e3b6d
--- /dev/null
+++ b/abs/core/python_modules/python-jinja/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Peter Baldwin <bald_pete@hotmail.com>
+
+pkgname=('python2-jinja')
+pkgver=2.7.2
+pkgrel=2
+pkgdesc="A simple pythonic template language written in Python"
+arch=('any')
+url="http://jinja.pocoo.org/"
+license=('BSD')
+makedepends=('python2-setuptools'
+ 'python2-markupsafe')
+source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz)
+sha256sums=('310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235')
+
+build() {
+ cd "$srcdir"
+
+ rm -rf python{2,3}-build
+ for builddir in python2-build; do
+ cp -r Jinja2-$pkgver $builddir
+ pushd $builddir
+ ${builddir%-build} setup.py build
+ popd
+ done
+}
+
+#package_python-jinja() {
+# depends=('python-setuptools' 'python-markupsafe')
+
+# cd "$srcdir/python3-build"
+
+# python3 setup.py install --root="$pkgdir" -O1
+
+# install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
+
+package_python2-jinja() {
+ depends=('python2-setuptools' 'python2-markupsafe')
+
+ cd "$srcdir/python2-build"
+
+ python2 setup.py install --root="$pkgdir" -O1
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-jinja/__changelog b/abs/core/python_modules/python-jinja/__changelog
new file mode 100644
index 0000000..3439597
--- /dev/null
+++ b/abs/core/python_modules/python-jinja/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm python 3 stuff
--
cgit v0.12
From 593cf54c6c5cd88164bfe85441a2a993a09a89e3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 29 Apr 2014 23:17:15 +0000
Subject: python-pygments:initial inclusion
---
abs/core/python_modules/python-pygments/PKGBUILD | 56 ++++++++++++++++++++++
.../python_modules/python-pygments/__changelog | 1 +
.../python-pygments/python-pygments.install | 7 +++
3 files changed, 64 insertions(+)
create mode 100644 abs/core/python_modules/python-pygments/PKGBUILD
create mode 100644 abs/core/python_modules/python-pygments/__changelog
create mode 100644 abs/core/python_modules/python-pygments/python-pygments.install
diff --git a/abs/core/python_modules/python-pygments/PKGBUILD b/abs/core/python_modules/python-pygments/PKGBUILD
new file mode 100644
index 0000000..fa1e572
--- /dev/null
+++ b/abs/core/python_modules/python-pygments/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Timm Preetz <timm@preetz.us>
+
+pkgname=('python2-pygments')
+pkgver=1.6
+pkgrel=3
+pkgdesc="Python syntax highlighter"
+arch=('any')
+url="http://pygments.org/"
+license=('BSD')
+makedepends=('python2-setuptools')
+options=('!emptydirs')
+source=(http://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz)
+sha256sums=('799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0')
+
+build() {
+ cd "$srcdir"
+
+ rm -rf python{2,3}-build
+ for builddir in python2-build; do
+ cp -r Pygments-$pkgver $builddir
+ pushd $builddir
+ ${builddir%-build} setup.py build
+ popd
+ done
+}
+
+#package_python-pygments() {
+# depends=('python-setuptools')
+# install=python-pygments.install
+
+# cd "$srcdir/python3-build"
+
+# python3 setup.py install --root="$pkgdir" -O1
+
+ # pygmentize has been moved to the python2-pygments package
+# rm "$pkgdir/usr/bin/pygmentize"
+
+# install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
+
+package_python2-pygments() {
+ depends=('python2-setuptools')
+
+ cd "$srcdir/python2-build"
+
+ python2 setup.py install --root="$pkgdir" -O1
+
+ install -Dm644 external/pygments.bashcomp \
+ "$pkgdir/usr/share/bash-completion/completions/pygmentize"
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-pygments/__changelog b/abs/core/python_modules/python-pygments/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-pygments/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
diff --git a/abs/core/python_modules/python-pygments/python-pygments.install b/abs/core/python_modules/python-pygments/python-pygments.install
new file mode 100644
index 0000000..eab5811
--- /dev/null
+++ b/abs/core/python_modules/python-pygments/python-pygments.install
@@ -0,0 +1,7 @@
+post_upgrade() {
+ if (($(vercmp $2 1.4-5) < 0)); then
+ echo '/usr/bin/pygmentize has been moved to the python2-pygments package'
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From ccbca905ebd76c0643ec1e5a06364c428e036566 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:22:00 +0000
Subject: python-sphinx: initial inclusion. dep of llvm
---
abs/core/python_modules/python-sphinx/PKGBUILD | 76 +++++++++++++++++++++++
abs/core/python_modules/python-sphinx/__changelog | 1 +
2 files changed, 77 insertions(+)
create mode 100644 abs/core/python_modules/python-sphinx/PKGBUILD
create mode 100644 abs/core/python_modules/python-sphinx/__changelog
diff --git a/abs/core/python_modules/python-sphinx/PKGBUILD b/abs/core/python_modules/python-sphinx/PKGBUILD
new file mode 100644
index 0000000..1012e75
--- /dev/null
+++ b/abs/core/python_modules/python-sphinx/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Fabio Volpe <volpefabio@gmail.com>
+
+pkgbase=python-sphinx
+pkgname=('python2-sphinx')
+pkgver=1.2.2
+pkgrel=3
+arch=('any')
+url='http://sphinx.pocoo.org/'
+license=('GPL')
+makedepends=(
+ 'python2-setuptools'
+ 'python2-docutils'
+ 'python2-jinja'
+ 'python2-pygments'
+)
+checkdepends=(
+ 'python2-nose'
+ 'texlive-latexextra'
+)
+source=("http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz")
+md5sums=('3dc73ccaa8d0bfb2d62fb671b1f7e8a4')
+
+prepare() {
+ # souce duplication is required because makefile modify source code
+ # setyp.py --build tricks don't works well
+ cp -a Sphinx-$pkgver Sphinx-${pkgver}2
+ # change python2 interpreter
+ find Sphinx-${pkgver}2 -type f -exec \
+ sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+ # change sphinx-binaries name in source code
+ find Sphinx-${pkgver}2 -type f -name '*.py' -exec \
+ sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
+}
+
+build() {
+# msg2 'Python 3 version'
+# cd "$srcdir"/Sphinx-$pkgver
+# make PYTHON=python3 build
+ msg2 'Python 2 version'
+ cd "$srcdir"/Sphinx-${pkgver}2
+ make PYTHON=python2 build
+}
+
+check() {
+# msg2 'Python 3 version'
+# cd "$srcdir"/Sphinx-$pkgver
+# make PYTHON=python3 test
+# rm -r build/lib/tests
+ msg2 'Python 2 version'
+ cd "$srcdir"/Sphinx-${pkgver}2
+ make PYTHON=python2 test
+ rm -r build/lib/tests
+}
+
+#package_python-sphinx() {
+# pkgdesc='Python3 documentation generator'
+# depends=('python-jinja' 'python-pygments' 'python-docutils')
+# optdepends=('texlive-latexextra: for generation of PDF documentation')
+
+# cd Sphinx-$pkgver
+# python setup.py install --root="$pkgdir" --optimize=1
+#}
+
+package_python2-sphinx() {
+ pkgdesc='Python2 documentation generator'
+ depends=('python2-jinja' 'python2-pygments' 'python2-docutils')
+ optdepends=('texlive-latexextra: for generation of PDF documentation')
+
+ cd Sphinx-${pkgver}2
+ python2 setup.py install --root="$pkgdir" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-sphinx/__changelog b/abs/core/python_modules/python-sphinx/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-sphinx/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 966dee2f697dcffe7aa4945854a6168efb76df0d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:26:47 +0000
Subject: python-py: initial inclusion. dep of python-pytest
---
abs/core/python_modules/python-py/PKGBUILD | 57 +++++++++++++++++++++++++++
abs/core/python_modules/python-py/__changelog | 1 +
2 files changed, 58 insertions(+)
create mode 100644 abs/core/python_modules/python-py/PKGBUILD
create mode 100644 abs/core/python_modules/python-py/__changelog
diff --git a/abs/core/python_modules/python-py/PKGBUILD b/abs/core/python_modules/python-py/PKGBUILD
new file mode 100644
index 0000000..d0fec8b
--- /dev/null
+++ b/abs/core/python_modules/python-py/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Sebastian Wiesner <lunaryorn googlemail com>
+# Contributor: Igor Ramos Tiburcio <irtigor@yahoo.com.br>
+# Contributor: Wieland Hoffmann <themineo+aur@gmail.com>
+# Contributor: Hervé Cauwelier <herve ¤ oursours.net>
+# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
+
+pkgbase=python-py
+pkgname=('python2-py')
+pkgver=1.4.20
+pkgrel=3
+pkgdesc="library with cross-python path, ini-parsing, io, code, log facilities"
+arch=('any')
+license=('MIT')
+url="http://pylib.readthedocs.org/en/latest/"
+makedepends=('python2-setuptools')
+checkdepends=('python2-pytest')
+source=("http://pypi.python.org/packages/source/p/py/py-$pkgver.tar.gz")
+
+prepare() {
+ cp -r py-${pkgver}{,-py2}
+}
+
+build() {
+# cd "$srcdir/py-${pkgver}"
+# python setup.py build
+
+ cd "$srcdir/py-${pkgver}-py2"
+ python2 setup.py build
+}
+
+check() {
+# cd "$srcdir/py-${pkgver}"
+# LANG=en_US.utf8 py.test
+
+ cd "$srcdir/py-${pkgver}-py2"
+ LANG=en_US.utf8 py.test2
+}
+
+#package_python-py() {
+# depends=('python')
+
+# cd py-${pkgver}
+# python setup.py install --root="${pkgdir}" --optimize=1
+# install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+#}
+
+package_python2-py() {
+ depends=('python2')
+
+ cd py-${pkgver}-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+sha512sums=('db392bd8d52ac2bf7b4785e18aaf58564596f66f15d355ee6f6e4169f6da7847331096ac7118c758ee5ce3f1865502a45f92ca2c99f411c12ee316760ca2b212')
diff --git a/abs/core/python_modules/python-py/__changelog b/abs/core/python_modules/python-py/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-py/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From b220fce3c46d73b62ea09b8f4ef3db7c40b96532 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:28:56 +0000
Subject: python-mock: initial inclusion. dep of python-pytest
---
abs/core/python_modules/python-mock/PKGBUILD | 40 +++++++++++++++++++++++++
abs/core/python_modules/python-mock/__changelog | 1 +
2 files changed, 41 insertions(+)
create mode 100644 abs/core/python_modules/python-mock/PKGBUILD
create mode 100644 abs/core/python_modules/python-mock/__changelog
diff --git a/abs/core/python_modules/python-mock/PKGBUILD b/abs/core/python_modules/python-mock/PKGBUILD
new file mode 100644
index 0000000..63fd848
--- /dev/null
+++ b/abs/core/python_modules/python-mock/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
+# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
+
+pkgbase=python-mock
+pkgname=(python2-mock)
+pkgver=1.0.1
+pkgrel=3
+pkgdesc='Mocking and Patching Library for Testing'
+url='http://www.voidspace.org.uk/python/mock/'
+makedepends=('python2')
+license=('BSD')
+arch=('any')
+source=("http://pypi.python.org/packages/source/m/mock/mock-$pkgver.tar.gz")
+md5sums=('c3971991738caa55ec7c356bbc154ee2')
+
+build() {
+ cd "$srcdir"
+ cp -rf "mock-$pkgver" "mock2-$pkgver"
+
+# cd "$srcdir/mock-$pkgver"
+# python3 setup.py build
+
+ cd "$srcdir/mock2-$pkgver"
+ python2 setup.py build
+}
+
+#package_python-mock() {
+#depends=('python')
+# cd "$srcdir/mock-$pkgver"
+# python3 setup.py install --optimize=1 --root="$pkgdir"
+# install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+#}
+
+package_python2-mock() {
+depends=('python2')
+ cd "$srcdir/mock2-$pkgver"
+ python2 setup.py install --optimize=1 --root="$pkgdir"
+ install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/abs/core/python_modules/python-mock/__changelog b/abs/core/python_modules/python-mock/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-mock/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From adcdf962cdd781061806d820a9078c35d6d8a659 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:34:44 +0000
Subject: python-nose: update to 1.3.1
---
abs/core/python_modules/python-nose/PKGBUILD | 42 +++++++++++++------------
abs/core/python_modules/python-nose/__changelog | 2 +-
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/abs/core/python_modules/python-nose/PKGBUILD b/abs/core/python_modules/python-nose/PKGBUILD
index 5d36e01..be20823 100644
--- a/abs/core/python_modules/python-nose/PKGBUILD
+++ b/abs/core/python_modules/python-nose/PKGBUILD
@@ -1,44 +1,46 @@
-# $Id: PKGBUILD 144082 2011-12-03 05:50:51Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id$
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: Cilyan Olowen <gaknar@gmail.com>
+
pkgbase=python-nose
-pkgname=('python2-nose' )
-pkgver=1.1.2
-pkgrel=3
+pkgname=('python2-nose' 'python-nose-doc')
+pkgver=1.3.1
+pkgrel=2
pkgdesc="A discovery-based unittest extension"
arch=('any')
-url="http://www.somethingaboutorange.com/mrl/projects/nose/"
-license=('LGPL2')
+url='http://readthedocs.org/docs/nose/'
+license=('LGPL2.1')
+makedepends=('python2' 'python2-setuptools' 'python2-sphinx')
source=("http://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz")
-makedepends=( 'python2' 'python2-distribute' )
-md5sums=('144f237b615e23f21f6a50b2183aa817')
+md5sums=('672398801ddf5ba745c55c6eed79c5aa')
build() {
cd "$srcdir/nose-$pkgver"
sed -i -e "s:man/man1:share/man/man1:g" setup.py
- cp -R $srcdir/nose-$pkgver $srcdir/nose2-$pkgver
+ cp -R "$srcdir/nose-$pkgver" "$srcdir/nose2-$pkgver"
}
-package_python-nose() {
- depends=('python' 'python-distribute')
- cd "$srcdir/nose-$pkgver"
- python setup.py install --prefix=/usr --root=${pkgdir}
- mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests3"
-}
+#package_python-nose() {
+# depends=('python' 'python-setuptools')
+# cd "$srcdir/nose-$pkgver"
+# python3 setup.py install --prefix=/usr --root="${pkgdir}"
+# mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests3"
+#}
package_python2-nose() {
- depends=('python2' 'python2-distribute')
+ depends=('python2' 'python2-setuptools')
cd "$srcdir/nose2-$pkgver"
- python2 setup.py install --prefix=/usr --root=${pkgdir}
+ python2 setup.py install --prefix=/usr --root="${pkgdir}"
mv "$pkgdir/usr/bin/nosetests" "$pkgdir/usr/bin/nosetests2"
- rm -rf $pkgdir/usr/share
+ rm -rf "$pkgdir/usr/share"
}
package_python-nose-doc(){
pkgdesc="Nose documentation and examples"
cd "$srcdir/nose-$pkgver/doc"
- make html
+ make SPHINXBUILD=sphinx-build22 html
mkdir -p "$pkgdir/usr/share/doc/python-nose"
cp -r .build/html "$pkgdir/usr/share/doc/python-nose"
cp -r ../examples "$pkgdir/usr/share/doc/python-nose"
diff --git a/abs/core/python_modules/python-nose/__changelog b/abs/core/python_modules/python-nose/__changelog
index 0802ff6..488d3cf 100644
--- a/abs/core/python_modules/python-nose/__changelog
+++ b/abs/core/python_modules/python-nose/__changelog
@@ -1 +1 @@
-removed python
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 70ab5535c3d7b47b586a0188409631616924fdc7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:41:05 +0000
Subject: python-pexpect: update to 3.2
---
abs/core/python_modules/python-pexpect/PKGBUILD | 40 +++++++++++++++-------
abs/core/python_modules/python-pexpect/__changelog | 1 +
2 files changed, 28 insertions(+), 13 deletions(-)
create mode 100644 abs/core/python_modules/python-pexpect/__changelog
diff --git a/abs/core/python_modules/python-pexpect/PKGBUILD b/abs/core/python_modules/python-pexpect/PKGBUILD
index 09ddb51..4034457 100644
--- a/abs/core/python_modules/python-pexpect/PKGBUILD
+++ b/abs/core/python_modules/python-pexpect/PKGBUILD
@@ -1,24 +1,38 @@
-# $Id: PKGBUILD 69520 2012-04-17 21:14:19Z ebelanger $
-# Maintainer:
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-pkgname=python-pexpect
-pkgver=2.4
+pkgname=('python2-pexpect')
+pkgver=3.2
pkgrel=1
-pkgdesc='A pure Python Expect-like module'
+pkgdesc='Make Python a better tool for controlling and automating other programs'
arch=('any')
-url='http://pexpect.sourceforge.net/'
+url='http://pexpect.readthedocs.org/en/latest/'
license=('MIT')
-depends=('python2')
+makedepends=('python2')
+conflicts=('python-pexpect<=2.4')
+replaces=('python-pexpect<=2.4')
source=("http://pypi.python.org/packages/source/p/pexpect/pexpect-$pkgver.tar.gz")
-md5sums=('fe82d69be19ec96d3a6650af947d5665')
+sha256sums=('dbc4c9a01c118e198d1b6ca76f31eb7292f212567f253e6b36a880e5168e961f')
-package() {
- cd "$srcdir/pexpect-$pkgver"
+prepare() {
+ cp -r "pexpect-$pkgver" "python2-pexpect-$pkgver"
+ sed -i 's:env python:env python2:' "python2-pexpect-$pkgver/pexpect/FSM.py"
+}
+
+#package_python-pexpect() {
+# depends+=('python')
+# cd "pexpect-$pkgver"
+# python setup.py install --root="$pkgdir"
+# install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
- # python2 fix
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' FSM.py
+package_python2-pexpect() {
+ depends+=('python2')
+ cd "python2-pexpect-$pkgver"
python2 setup.py install --root="$pkgdir"
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-pexpect/__changelog b/abs/core/python_modules/python-pexpect/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-pexpect/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From d46cbc46a5675e936be028d13336fe85d2f61dc8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:44:14 +0000
Subject: python-yaml: initial inclusion
---
abs/core/python_modules/python-yaml/PKGBUILD | 36 +++++++++++++++++++++++++
abs/core/python_modules/python-yaml/__changelog | 1 +
2 files changed, 37 insertions(+)
create mode 100644 abs/core/python_modules/python-yaml/PKGBUILD
create mode 100644 abs/core/python_modules/python-yaml/__changelog
diff --git a/abs/core/python_modules/python-yaml/PKGBUILD b/abs/core/python_modules/python-yaml/PKGBUILD
new file mode 100644
index 0000000..f0fd7e6
--- /dev/null
+++ b/abs/core/python_modules/python-yaml/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Michal Bozon <michal.bozon__at__gmail.com>
+
+pkgbase=python-yaml
+pkgname=(python2-yaml)
+pkgver=3.11
+pkgrel=1
+pkgdesc="Python bindings for YAML, using fast libYAML library"
+arch=('i686' 'x86_64')
+url="http://pyyaml.org"
+license=('MIT')
+makedepends=('python2' 'libyaml')
+install='python-yaml.install'
+source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
+md5sums=('f50e08ef0fe55178479d3a618efe21db')
+
+build() {
+ true
+}
+
+package_python2-yaml() {
+ depends=('python2' 'libyaml')
+
+ cd $srcdir/PyYAML-$pkgver
+ python2 setup.py install --prefix=/usr --root=$pkgdir
+ install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+#package_python-yaml() {
+# depends=('python' 'libyaml')
+
+# cd $srcdir/PyYAML-$pkgver
+# python setup.py install --prefix=/usr --root=$pkgdir
+# install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+#}
diff --git a/abs/core/python_modules/python-yaml/__changelog b/abs/core/python_modules/python-yaml/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-yaml/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 6eae208f1674fa476dd45ab7bbfc24e320e59ada Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:47:43 +0000
Subject: python-pytest: initial inclusion.
---
abs/core/python_modules/python-pytest/PKGBUILD | 56 +++++++++++++++++++++++
abs/core/python_modules/python-pytest/__changelog | 1 +
2 files changed, 57 insertions(+)
create mode 100644 abs/core/python_modules/python-pytest/PKGBUILD
create mode 100644 abs/core/python_modules/python-pytest/__changelog
diff --git a/abs/core/python_modules/python-pytest/PKGBUILD b/abs/core/python_modules/python-pytest/PKGBUILD
new file mode 100644
index 0000000..d8db835
--- /dev/null
+++ b/abs/core/python_modules/python-pytest/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
+
+pkgbase=python-pytest
+pkgname=('python2-pytest')
+pkgver=2.5.2
+pkgrel=3
+pkgdesc="Simple powerful testing with Python"
+arch=('any')
+license=('MIT')
+url="http://pytest.org/"
+makedepends=('python2-setuptools' 'python2-py')
+checkdepends=('lsof' 'python2-nose' 'twisted' 'python2-mock' 'python2-yaml' 'python2-pexpect')
+source=("http://pypi.python.org/packages/source/p/pytest/pytest-$pkgver.tar.gz")
+
+prepare() {
+ cp -r pytest-${pkgver}{,-py2}
+}
+
+build() {
+# cd "$srcdir/pytest-${pkgver}"
+# python setup.py build
+
+ cd "$srcdir/pytest-${pkgver}-py2"
+ python2 setup.py build
+}
+
+check() {
+# cd "$srcdir/pytest-${pkgver}"
+# python setup.py test
+
+ cd "$srcdir/pytest-${pkgver}-py2"
+ # Tests fail with 2.5.2: https://bitbucket.org/hpk42/pytest/issue/493/example-failure-in-pytests-own-testcase
+ python2 setup.py test
+}
+
+#package_python-pytest() {
+# depends=('python' 'python-py' 'python-setuptools')
+
+# cd pytest-${pkgver}
+# python setup.py install --root="${pkgdir}" --optimize=1
+# install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+#}
+
+package_python2-pytest() {
+ depends=('python2' 'python2-py' 'python2-setuptools')
+
+ cd pytest-${pkgver}-py2
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ mv "${pkgdir}/usr/bin/py.test" "${pkgdir}/usr/bin/py.test2"
+}
+
+sha512sums=('d291f229f4c0a2132c437dde6ca04bf87701fe270c2fa314104badad9221ab866251890c66387d23fefd3ab1f928ee3b290dac21e3d62e7660af8903e85a2f36')
diff --git a/abs/core/python_modules/python-pytest/__changelog b/abs/core/python_modules/python-pytest/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-pytest/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 68a48a32bd92d0a68be285aca5be4da346cab25f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 13:48:38 +0000
Subject: python-yaml: add .install
---
abs/core/python_modules/python-yaml/python-yaml.install | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 abs/core/python_modules/python-yaml/python-yaml.install
diff --git a/abs/core/python_modules/python-yaml/python-yaml.install b/abs/core/python_modules/python-yaml/python-yaml.install
new file mode 100644
index 0000000..e2ae067
--- /dev/null
+++ b/abs/core/python_modules/python-yaml/python-yaml.install
@@ -0,0 +1,7 @@
+post_install() {
+ cat << EOT
+==> Note that even though this package uses libyaml library,
+==> slower pure python implementation is used by default.
+==> See http://pyyaml.org/wiki/PyYAMLDocumentation
+EOT
+}
--
cgit v0.12
From 6e4889e232ba0cdaf498eb2c624a0d6a496e45fc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 16:19:43 +0000
Subject: python-sphinx: don't append 2 to bins
---
abs/core/python_modules/python-sphinx/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/python_modules/python-sphinx/PKGBUILD b/abs/core/python_modules/python-sphinx/PKGBUILD
index 1012e75..b4db703 100644
--- a/abs/core/python_modules/python-sphinx/PKGBUILD
+++ b/abs/core/python_modules/python-sphinx/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=python-sphinx
pkgname=('python2-sphinx')
pkgver=1.2.2
-pkgrel=3
+pkgrel=4
arch=('any')
url='http://sphinx.pocoo.org/'
license=('GPL')
@@ -31,8 +31,8 @@ prepare() {
find Sphinx-${pkgver}2 -type f -exec \
sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
# change sphinx-binaries name in source code
- find Sphinx-${pkgver}2 -type f -name '*.py' -exec \
- sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
+# find Sphinx-${pkgver}2 -type f -name '*.py' -exec \
+# sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \;
}
build() {
--
cgit v0.12
From 9c2d818e627d8763a22d860b8f1d8977aa853102 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 18:03:49 +0000
Subject: llvm: update to 3.4
---
abs/extra/llvm/PKGBUILD | 190 ++++++++++++---------
abs/extra/llvm/bug-9869-operator-h-c++0x.patch | 57 -------
abs/extra/llvm/cindexer-clang-path.patch | 10 --
.../clang-3.1-fix-libprofile_rt.a-location.patch | 12 --
abs/extra/llvm/clang-3.3-use-gold-linker.patch | 12 ++
abs/extra/llvm/clang-plugin-loader-registry.patch | 11 --
abs/extra/llvm/clang-pure64.patch | 13 --
abs/extra/llvm/clang-toolchains-gcc-versions.patch | 12 --
abs/extra/llvm/enable-lto.patch | 32 ----
abs/extra/llvm/llvm-3.1-2.src.tar.gz | 1 -
10 files changed, 122 insertions(+), 228 deletions(-)
delete mode 100644 abs/extra/llvm/bug-9869-operator-h-c++0x.patch
delete mode 100644 abs/extra/llvm/cindexer-clang-path.patch
delete mode 100644 abs/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch
create mode 100644 abs/extra/llvm/clang-3.3-use-gold-linker.patch
delete mode 100644 abs/extra/llvm/clang-plugin-loader-registry.patch
delete mode 100644 abs/extra/llvm/clang-pure64.patch
delete mode 100644 abs/extra/llvm/clang-toolchains-gcc-versions.patch
delete mode 100644 abs/extra/llvm/enable-lto.patch
delete mode 120000 abs/extra/llvm/llvm-3.1-2.src.tar.gz
diff --git a/abs/extra/llvm/PKGBUILD b/abs/extra/llvm/PKGBUILD
index 515dbc7..3a837d2 100644
--- a/abs/extra/llvm/PKGBUILD
+++ b/abs/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159472 2012-05-24 20:02:15Z foutrelis $
+# $Id$
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -9,93 +9,63 @@
# Contributor: Roberto Alsina <ralsina@kde.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.1
-pkgrel=2
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
+ 'clang-tools-extra')
+pkgver=3.4
+pkgrel=1
arch=('i686' 'x86_64')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml')
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
+makedepends=('libffi' 'python2' 'ocaml' 'python2-sphinx')
+options=('staticlibs')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
- http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz
+ http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz
+ http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
+ clang-3.3-use-gold-linker.patch
llvm-Config-config.h
- llvm-Config-llvm-config.h
- cindexer-clang-path.patch
- clang-pure64.patch
- enable-lto.patch
- clang-3.1-fix-libprofile_rt.a-location.patch)
-sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
- 'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
- '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
+ llvm-Config-llvm-config.h)
+sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628'
+ '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b'
+ 'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
+ 'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
+ '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
'312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
- '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
- '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
- '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
- 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
- '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
+ '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
-build() {
- cd "$srcdir/$pkgname-$pkgver.src"
+prepare() {
+ cd "$srcdir/llvm-$pkgver"
# At the present, clang must reside inside the LLVM source code tree to build
# See http://llvm.org/bugs/show_bug.cgi?id=4840
- rm -rf tools/clang
- cp -r "$srcdir/clang-$pkgver.src" tools/clang
+ mv "$srcdir/clang-$pkgver" tools/clang
- rm -rf projects/compiler-rt
- cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+ mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra
- # Fix symbolic links from OCaml bindings to LLVM libraries
- sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
+ mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt
- # Fix installation directories, ./configure doesn't seem to set them right
- sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
- -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
- -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+ # Fix docs installation directory
+ sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
Makefile.config.in
- sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \
- tools/llvm-config/llvm-config.cpp
- sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \
- autoconf/configure.ac \
- configure
-
- # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
- sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
- # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
- patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
- if [[ $CARCH == x86_64 ]]; then
- # Adjust linker path
- patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
- fi
- # Make -flto work
- # Use gold instead of default linker, and always use the plugin
- patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
+ # Make -flto work; use ld.gold instead of the default linker
+ patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
+}
- # Fix FS#29984: [clang] -coverage is broken
- patch -d tools/clang -Np1 -i \
- "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
+build() {
+ cd "$srcdir/llvm-$pkgver"
# Apply strip option to configure
_optimized_switch="enable"
[[ $(check_option strip) == n ]] && _optimized_switch="disable"
# Include location of libffi headers in CPPFLAGS
- export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
- # Use Python 2
- mkdir "$srcdir/python2-path"
- ln -s /usr/bin/python2 "$srcdir/python2-path/python"
- export PATH="$srcdir/python2-path:$PATH"
+ CPPFLAGS+=" $(pkg-config --cflags libffi)"
# Force the use of GCC instead of clang
CC=gcc CXX=g++ \
./configure \
--prefix=/usr \
- --libdir=/usr/lib/llvm \
--sysconfdir=/etc \
--enable-shared \
--enable-libffi \
@@ -104,16 +74,20 @@ build() {
--disable-debug-runtime \
--disable-assertions \
--with-binutils-include=/usr/include \
+ --with-python=/usr/bin/python2 \
--$_optimized_switch-optimized
make REQUIRES_RTTI=1
+ make -C docs -f Makefile.sphinx man
+ make -C docs -f Makefile.sphinx html
+ make -C tools/clang/docs -f Makefile.sphinx html
}
package_llvm() {
pkgdesc="Low Level Virtual Machine"
- depends=('perl' 'libffi')
+ depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
- cd "$srcdir/$pkgname-$pkgver.src"
+ cd "$srcdir/llvm-$pkgver"
# We move the clang directory out of the tree so it won't get installed and
# then we bring it back in for the clang package
@@ -123,27 +97,26 @@ package_llvm() {
make -j1 DESTDIR="$pkgdir" install
mv "$srcdir/clang" tools
+ # The runtime library goes into llvm-libs
+ mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
+
# OCaml bindings go to a separate package
rm -rf "$srcdir"/{ocaml,ocamldoc}
mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
# Remove duplicate files installed by the OCaml bindings
- rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+ rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
# Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
+ chmod -x "$pkgdir"/usr/lib/*.a
# Get rid of example Hello transformation
- rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
-
- # Add ld.so.conf.d entry
- install -d "$pkgdir/etc/ld.so.conf.d"
- echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
+ rm "$pkgdir"/usr/lib/*LLVMHello.*
# Symlink LLVMgold.so into /usr/lib/bfd-plugins
# (https://bugs.archlinux.org/task/28479)
install -d "$pkgdir/usr/lib/bfd-plugins"
- ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so"
+ ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so"
if [[ $CARCH == x86_64 ]]; then
# Needed for multilib (https://bugs.archlinux.org/task/29951)
@@ -155,14 +128,32 @@ package_llvm() {
done
fi
+ # Install man pages
+ install -d "$pkgdir/usr/share/man/man1"
+ cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/"
+
+ # Install html docs
+ cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/"
+ rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
+
install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
+package_llvm-libs() {
+ pkgdesc="Low Level Virtual Machine (runtime library)"
+ depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
+
+ install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
+
+ install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
package_llvm-ocaml() {
pkgdesc="OCaml bindings for LLVM"
depends=("llvm=$pkgver-$pkgrel" 'ocaml')
- cd "$srcdir/llvm-$pkgver.src"
+ cd "$srcdir/llvm-$pkgver"
install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
@@ -171,7 +162,7 @@ package_llvm-ocaml() {
# Remove execute bit from static libraries
chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_clang() {
@@ -181,19 +172,35 @@ package_clang() {
# Fix installation path for clang docs
sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
- "$srcdir/llvm-$pkgver.src/Makefile.config"
+ "$srcdir/llvm-$pkgver/Makefile.config"
+
+ cd "$srcdir/llvm-$pkgver/tools/clang"
+
+ # We move the extra tools directory out of the tree so it won't get
+ # installed and then we bring it back in for the clang-tools-extra package
+ mv tools/extra "$srcdir"
- cd "$srcdir/llvm-$pkgver.src/tools/clang"
make DESTDIR="$pkgdir" install
+ mv "$srcdir/extra" tools/
# Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
+ chmod -x "$pkgdir"/usr/lib/*.a
# Revert the path change in case we want to do a repackage later
sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
- "$srcdir/llvm-$pkgver.src/Makefile.config"
+ "$srcdir/llvm-$pkgver/Makefile.config"
+
+ # Install html docs
+ cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/"
+ rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+ # Install Python bindings
+ install -d "$pkgdir/usr/lib/python2.7/site-packages"
+ cp -r bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/"
+ python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+ python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
package_clang-analyzer() {
@@ -201,7 +208,7 @@ package_clang-analyzer() {
url="http://clang-analyzer.llvm.org/"
depends=("clang=$pkgver-$pkgrel" 'python2')
- cd "$srcdir/llvm-$pkgver.src/tools/clang"
+ cd "$srcdir/llvm-$pkgver/tools/clang"
install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
for _tool in scan-{build,view}; do
@@ -209,6 +216,14 @@ package_clang-analyzer() {
ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
done
+ # scan-build looks for clang within the same directory
+ ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/"
+
+ # Relocate man page
+ install -d "$pkgdir/usr/share/man/man1"
+ mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
+ "$pkgdir/usr/share/man/man1/"
+
# Use Python 2
sed -i \
-e 's|env python$|&2|' \
@@ -220,7 +235,22 @@ package_clang-analyzer() {
python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang-tools-extra() {
+ pkgdesc="Extra tools built using Clang's tooling APIs"
+ url="http://clang.llvm.org/"
+ depends=("clang=$pkgver-$pkgrel")
+
+ cd "$srcdir/llvm-$pkgver/tools/clang/tools/extra"
+
+ make DESTDIR="$pkgdir" install
+
+ # Fix permissions of static libs
+ chmod -x "$pkgdir"/usr/lib/*.a
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/llvm/bug-9869-operator-h-c++0x.patch b/abs/extra/llvm/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index b95d7d7..0000000
--- a/abs/extra/llvm/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006
-+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062
-@@ -186,28 +186,46 @@
- };
-
- class AddOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+ ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+ ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+ ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+ ~ShlOperator(); // DO NOT IMPLEMENT
-+};
-
-
- class SDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+ ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+ ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+ ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+ ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-
-
-
- class GEPOperator
- : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+ ~GEPOperator(); // DO NOT IMPLEMENT
-+
- enum {
- IsInBounds = (1 << 0)
- };
diff --git a/abs/extra/llvm/cindexer-clang-path.patch b/abs/extra/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab69..0000000
--- a/abs/extra/llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-
- // We now have the CIndex directory, locate clang relative to it.
- LibClangPath.eraseComponent();
-+ LibClangPath.eraseComponent();
- #endif
-
- LibClangPath.appendComponent("clang");
diff --git a/abs/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/abs/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch
deleted file mode 100644
index 080aa4f..0000000
--- a/abs/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
---- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300
-+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300
-@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain
- // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
- // not supported by old linkers.
- std::string ProfileRT =
-- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
-+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a";
-
- CmdArgs.push_back(Args.MakeArgString(ProfileRT));
- }
diff --git a/abs/extra/llvm/clang-3.3-use-gold-linker.patch b/abs/extra/llvm/clang-3.3-use-gold-linker.patch
new file mode 100644
index 0000000..76905a6
--- /dev/null
+++ b/abs/extra/llvm/clang-3.3-use-gold-linker.patch
@@ -0,0 +1,12 @@
+diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp
+--- cfe.src.orig/lib/Driver/ToolChains.cpp 2013-06-08 16:17:19.000000000 +0300
++++ cfe.src/lib/Driver/ToolChains.cpp 2013-06-08 16:17:33.000000000 +0300
+@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm
+ PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
+ GCCInstallation.getTriple().str() + "/bin").str());
+
+- Linker = GetProgramPath("ld");
++ Linker = GetProgramPath("ld.gold");
+
+ Distro Distro = DetectDistro(Arch);
+
diff --git a/abs/extra/llvm/clang-plugin-loader-registry.patch b/abs/extra/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9f..0000000
--- a/abs/extra/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- global: main;
- __progname;
- environ;
-+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
-
- local: *;
- };
diff --git a/abs/extra/llvm/clang-pure64.patch b/abs/extra/llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa..0000000
--- a/abs/extra/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3306,7 +3306,7 @@
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
-- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
- }
-
- CmdArgs.push_back("-o");
diff --git a/abs/extra/llvm/clang-toolchains-gcc-versions.patch b/abs/extra/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 7e00837..0000000
--- a/abs/extra/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
- GccTriple = "i586-suse-linux";
- }
-
-- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+ const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
- "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
- "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
- "4.2"};
diff --git a/abs/extra/llvm/enable-lto.patch b/abs/extra/llvm/enable-lto.patch
deleted file mode 100644
index 3205fbf..0000000
--- a/abs/extra/llvm/enable-lto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp (revision 123373)
-+++ lib/Driver/ToolChains.cpp (working copy)
-@@ -1398,7 +1398,7 @@
- PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
- GCCInstallation.getTriple() + "/bin").str());
-
-- Linker = GetProgramPath("ld");
-+ Linker = GetProgramPath("ld.gold");
-
- LinuxDistro Distro = DetectLinuxDistro(Arch);
-
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3412,11 +3412,11 @@
- // Tell the linker to load the plugin. This has to come before AddLinkerInputs
- // as gold requires -plugin to come before any -plugin-opt that -Wl might
- // forward.
-- if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
-+ // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
- CmdArgs.push_back("-plugin");
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
- CmdArgs.push_back(Args.MakeArgString(Plugin));
-- }
-+ // }
-
- AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
- }
diff --git a/abs/extra/llvm/llvm-3.1-2.src.tar.gz b/abs/extra/llvm/llvm-3.1-2.src.tar.gz
deleted file mode 120000
index 4ea98f7..0000000
--- a/abs/extra/llvm/llvm-3.1-2.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/src_packages/llvm-3.1-2.src.tar.gz
\ No newline at end of file
--
cgit v0.12
From 746d035fe4428152e54c966ca9fe058843dca9a4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 18:40:01 +0000
Subject: mesa: update to 10.1.1
---
abs/core/mesa/PKGBUILD | 331 +++++++--------------
abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 46 ---
...round-for-robustness-and-reset-with-intel.patch | 15 +
3 files changed, 129 insertions(+), 263 deletions(-)
delete mode 100644 abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
create mode 100644 abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch
diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD
index 7e54fe4..1cd06e1 100644
--- a/abs/core/mesa/PKGBUILD
+++ b/abs/core/mesa/PKGBUILD
@@ -1,276 +1,173 @@
-# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
- pkgver=7.10.99.git20110709
- #pkgver=7.11
- else
- pkgver=8.0.4
-fi
+pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.1.1
pkgrel=2
arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
- 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(LICENSE
- mesa-8.0.3-llvm-3.1-fixes.patch)
-if [ "${_git}" = "true" ]; then
- # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
- #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
- source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
- else
- source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${pkgver}/MesaLib-${pkgver}.tar.bz2"
- #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
- #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
-)
-fi
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+ LICENSE
+ workaround-for-robustness-and-reset-with-intel.patch)
+md5sums=('1fde7ed079df7aeb9b6a744ca033de8d'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ 'b6b744a948b0de9cd14a2a971b7472de')
+
+prepare () {
+ cd ${srcdir}/?esa-*
+
+ # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723
+ patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
+}
build() {
- cd ${srcdir}/?esa-*
+ cd ${srcdir}/?esa-*
- patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+ autoreconf -vfi # our automake is far too new for their build system :)
-if [ "${_git}" = "true" ]; then
- autoreconf -vfi
- ./autogen.sh --prefix=/usr \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
- --enable-gallium-llvm \
- --enable-gallium-egl \
- --enable-shared-glapi \
- --enable-gbm \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --with-egl-platforms=x11,drm,wayland \
+ --with-llvm-shared-libs \
--enable-egl \
- --enable-texture-float \
- --enable-xa \
- --enable-shared-dricore
- #--enable-gbm \
- # --enable-gallium-svga \
-
- else
- autoreconf -vfi
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,svga,swrast \
- --with-dri-drivers=i915,i965,r200,radeon,swrast \
+ --disable-gallium-egl \
+ --enable-gbm \
+ --enable-gallium-gbm \
--enable-gallium-llvm \
- --enable-gallium-egl \
--enable-shared-glapi \
- --enable-gbm \
--enable-glx-tls \
--enable-dri \
--enable-glx \
--enable-osmesa \
--enable-gles1 \
--enable-gles2 \
- --enable-egl \
--enable-texture-float \
--enable-xa \
- --enable-shared-dricore
-fi
+ --enable-vdpau \
+ --enable-dri3
+ # --help
+ # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096)
make
-}
-
-package_libgl() {
- depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
- pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
- #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
- bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
-
- cd src/mesa/drivers/dri
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
- ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_osmesa() {
- depends=('mesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages')
- pkgdesc="Mesa 3D off-screen rendering library"
-
- make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
}
-package_libglapi() {
- depends=('glibc')
- pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgbm() {
- depends=('glibc')
- pkgdesc="Mesa gbm library"
+package_ati-dri() {
+ pkgdesc="Mesa drivers for AMD/ATI Radeon"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+ conflicts=('xf86-video-ati<6.9.0-6')
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
+ install -m755 -d ${pkgdir}/usr/lib/vdpau/
+ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/
- install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
}
-package_libgles() {
- depends=('libglapi' 'khrplatform-devel')
- pkgdesc="Mesa GLES libraries and headers"
+package_intel-dri() {
+ pkgdesc="Mesa drivers for Intel"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m755 -d "${pkgdir}/usr/include"
- install -m755 -d "${pkgdir}/usr/include/GLES"
- install -m755 -d "${pkgdir}/usr/include/GLES2"
- bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
- bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
- bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
- bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
- install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
}
-package_libegl() {
- depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
- pkgdesc="Mesa EGL libraries and headers"
+package_nouveau-dri() {
+ pkgdesc="Mesa drivers for Nouveau"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
- cd ${srcdir}/?esa-*
- make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m755 -d "${pkgdir}/usr/include"
- install -m755 -d "${pkgdir}/usr/include/"
- install -m755 -d "${pkgdir}/usr/include/EGL"
- install -m755 -d "${pkgdir}/usr/share"
- install -m755 -d "${pkgdir}/usr/share/doc"
- install -m755 -d "${pkgdir}/usr/share/doc/libegl"
- bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
- install -m755 -d "${pkgdir}/usr/lib/egl"
- bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
- bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
- bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+ install -m755 -d ${pkgdir}/usr/lib/vdpau/
+ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
- install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
}
-package_khrplatform-devel() {
- #depends=('')
- pkgdesc="Khronos platform development package"
+package_svga-dri() {
+ pkgdesc="Gallium3D VMware guest GL driver"
+ depends=('libdrm' 'expat' 'llvm-libs')
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/include/KHR"
- bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
- install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
}
package_mesa() {
- depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
+ pkgdesc="an open-source implementation of the OpenGL specification"
+ depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
- pkgdesc="Mesa 3-D graphics libraries and include files"
-
- cd ${srcdir}/?esa-*
- make DESTDIR="${pkgdir}" install
+ provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
- rm -f "${pkgdir}/usr/lib/libGL.so"*
- rm -f "${pkgdir}/usr/lib/libglapi.so"*
- rm -f "${pkgdir}/usr/lib/libgbm.so"*
- rm -f "${pkgdir}/usr/lib/libGLESv"*
- rm -f "${pkgdir}/usr/lib/libEGL"*
- rm -rf "${pkgdir}/usr/lib/egl"
- rm -f "${pkgdir}/usr/lib/libOSMesa"*
- rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
- rm -rf "${pkgdir}/usr/lib/xorg"
- rm -f "${pkgdir}/usr/include/GL/glew.h"
- rm -f "${pkgdir}/usr/include/GL/glxew.h"
- rm -f "${pkgdir}/usr/include/GL/wglew.h"
- rm -f "${pkgdir}/usr/include/GL/glut.h"
- rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
- #remove glu files
- rm -f "${pkgdir}/usr/include/GL/glu.h"
- rm -f "${pkgdir}/usr/include/GL/glu_mangle.h"
- rm -f "${pkgdir}/usr/lib/libGLU.so"
- rm -f "${pkgdir}/usr/lib/libGLU.so.1"
- rm -f "${pkgdir}/usr/lib/pkgconfig/glu.pc"
+ mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+ install -m755 -d ${pkgdir}/usr/lib/mesa
+ # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+ mv -v ${pkgdir}/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/
+ mv -v ${pkgdir}/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/
+ mv -v ${pkgdir}/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
}
-package_ati-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
- conflicts=('xf86-video-ati<6.9.0-6')
-
- # classic mesa drivers for radeon,r200
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
- # gallium3D driver for r300,r600
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Intel"
+package_mesa-libgl() {
+ pkgdesc="Mesa 3-D graphics library"
+ depends=("mesa=${pkgver}")
+ provides=("libgl=${pkgver}")
+ replaces=('libgl')
+
+ # See FS#26284
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+ ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
+ ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
-package_nouveau-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+ ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
+ ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
-package_svga-dri() {
- depends=("mesa=${pkgver}")
- pkgdesc="Gallium3D VMware guest GL driver"
+ ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'c452ed3392468170726c004c2f4e02ca'
- 'd546f988adfdf986cff45b1efa2d8a46')
diff --git a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b59..0000000
--- a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+ if (!MRI) {
-+ debug_printf("error: no register info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+
-+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+ if (!MII) {
-+ debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
- llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
-
-
diff --git a/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch b/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch
new file mode 100644
index 0000000..dc4a213
--- /dev/null
+++ b/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch
@@ -0,0 +1,15 @@
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index e113654..5790680 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
+
+ brw_init_driver_functions(brw, &functions);
+
+- if (notify_reset)
++ if (notify_reset && brw->gen >= 6)
+ functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+
+ struct gl_context *ctx = &brw->ctx;
+
+
--
cgit v0.12
From df679528b5b2b2599baf83888db1694c7795b0b7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:03:34 +0000
Subject: LinHES-config: update python-pexpect dep
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 5c1b9da..978e0db 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,11 +1,11 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=1
+pkgrel=2
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
- 'python-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
+ 'python2-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' )
arch=('i686' 'x86_64')
--
cgit v0.12
From 91935524659556f67ee33f7c9e7797c2772e7503 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:08:28 +0000
Subject: fceux: rebuild against updated mesa
---
abs/extra/fceux/PKGBUILD | 4 ++--
abs/extra/fceux/__changelog | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/abs/extra/fceux/PKGBUILD b/abs/extra/fceux/PKGBUILD
index f27f3d5..cae2c61 100644
--- a/abs/extra/fceux/PKGBUILD
+++ b/abs/extra/fceux/PKGBUILD
@@ -5,13 +5,13 @@
pkgname=fceux
pkgver=2.2.2
-pkgrel=1
+pkgrel=2
url='http://www.fceux.com/'
pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
arch=('x86_64' 'i686')
license=('GPL')
depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua' 'libgl' 'shared-mime-info')
-makedepends=('scons' 'mesa' 'glu')
+makedepends=('scons' 'mesa-libgl' 'glu')
install='fceux.install'
source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz")
sha256sums=('804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1')
diff --git a/abs/extra/fceux/__changelog b/abs/extra/fceux/__changelog
index 135adfc..6bb6428 100644
--- a/abs/extra/fceux/__changelog
+++ b/abs/extra/fceux/__changelog
@@ -1,2 +1 @@
- PKGBUILD: change dep lua51 to lua
-- PKGBUILD: change makedep mesa-libgl to mesa
--
cgit v0.12
From 8c7fee681c71d3b12e28c48df23cd68edaf44d3d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:15:37 +0000
Subject: htop: update to 1.0.3
---
abs/extra/htop/PKGBUILD | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/abs/extra/htop/PKGBUILD b/abs/extra/htop/PKGBUILD
index 93b4db6..1ba9d94 100644
--- a/abs/extra/htop/PKGBUILD
+++ b/abs/extra/htop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170397 2012-11-07 01:25:17Z dreisner $
+# $Id$
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=htop
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc="Interactive process viewer"
arch=('i686' 'x86_64')
@@ -15,14 +15,18 @@ makedepends=('python2')
optdepends=('lsof: show files opened by a process'
'strace: attach to a running process')
options=('!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('0d01cca8df3349c74569cefebbd9919e')
+source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('e768b9b55c033d9c1dffda72db3a6ac7')
-build() {
+prepare() {
cd "$pkgname-$pkgver"
sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
sed -i 's|python|python2|' scripts/MakeHeader.py
+}
+
+build() {
+ cd "$pkgname-$pkgver"
./configure \
--prefix=/usr \
--
cgit v0.12
From 14cc1b8e883e5144adb89cefd4b9046238be69c5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:21:13 +0000
Subject: tig: update to 2.0.1
---
abs/extra/community/tig/PKGBUILD | 30 ------------------------------
abs/extra/tig/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 30 deletions(-)
delete mode 100644 abs/extra/community/tig/PKGBUILD
create mode 100644 abs/extra/tig/PKGBUILD
diff --git a/abs/extra/community/tig/PKGBUILD b/abs/extra/community/tig/PKGBUILD
deleted file mode 100644
index ccba8c3..0000000
--- a/abs/extra/community/tig/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Loui Chang <louipc dot ist at gmail company>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: Nathan Jones <nathanj@insightbb.com>
-
-pkgname=tig
-pkgver=1.2
-pkgrel=1
-pkgdesc='Text-mode interface for Git.'
-depends=('git' 'ncurses')
-url='http://jonas.nitro.dk/tig/'
-license=('GPL')
-arch=('i686' 'x86_64')
-source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('9821525564aa3f4aa51ad2b6c11b3a91')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install install-doc-man
- install -Dm0644 contrib/tigrc "$pkgdir/etc/tigrc.sample"
- install -Dm0644 contrib/tig-completion.bash "$pkgdir/usr/share/bash-completion/completions/tig"
-}
diff --git a/abs/extra/tig/PKGBUILD b/abs/extra/tig/PKGBUILD
new file mode 100644
index 0000000..edc023b
--- /dev/null
+++ b/abs/extra/tig/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Loui Chang <louipc dot ist at gmail company>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Contributor: Nathan Jones <nathanj@insightbb.com>
+
+pkgname=tig
+pkgver=2.0.1
+pkgrel=1
+pkgdesc='Text-mode interface for Git.'
+depends=('git' 'ncurses')
+makedepends=('asciidoc' 'xmlto')
+url='http://jonas.nitro.dk/tig/'
+license=('GPL')
+arch=('i686' 'x86_64')
+backup=('etc/tigrc')
+source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e0b3bc47b8c2c1e556ae953c0b30faab')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr --sysconfdir=/etc
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install install-doc-man
+
+ install -Dm0644 contrib/tig-completion.bash "$pkgdir/usr/share/bash-completion/completions/tig"
+}
--
cgit v0.12
From e329e9f893789bb194978c21be503b00dc1af508 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:30:44 +0000
Subject: athcool: remove as now handled in kernel
---
abs/extra/community/athcool/PKGBUILD | 28 -----------------------
abs/extra/community/athcool/athcool | 35 -----------------------------
abs/extra/community/athcool/athcool.install | 18 ---------------
abs/extra/community/athcool/finish | 3 ---
abs/extra/community/athcool/run | 2 --
5 files changed, 86 deletions(-)
delete mode 100644 abs/extra/community/athcool/PKGBUILD
delete mode 100644 abs/extra/community/athcool/athcool
delete mode 100644 abs/extra/community/athcool/athcool.install
delete mode 100755 abs/extra/community/athcool/finish
delete mode 100644 abs/extra/community/athcool/run
diff --git a/abs/extra/community/athcool/PKGBUILD b/abs/extra/community/athcool/PKGBUILD
deleted file mode 100644
index 58d7c21..0000000
--- a/abs/extra/community/athcool/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-pkgname=athcool
-pkgver=0.3.12
-pkgrel=4
-pkgdesc="Small utility allowing to enable powersaving mode on AMD Duron/Athlon/Athlon XP processors."
-url="http://members.jcom.home.ne.jp/jacobi/linux/softwares.html"
-depends=('pciutils')
-license=('GPL')
-install=athcool.install
-arch=('i686' 'x86_64')
-source=(http://members.jcom.home.ne.jp/jacobi/linux/files/$pkgname-$pkgver.tar.gz
- athcool run finish)
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make || return 1
-}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -D -m0755 ../athcool ${pkgdir}/etc/rc.d/athcool
- mkdir -p ${pkgdir}/etc/sv/athcool/supervise
- install -D -m0755 ../run ${pkgdir}/etc/sv/athcool
- install -D -m0755 ../finish ${pkgdir}/etc/sv/athcool
-}
-md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
- 'bbf32484cec6431568ccf51c2516f9e7'
- 'b9cf31ac580c1665d50d70e405d276bc'
- 'f854a49b2430852fddab2b7baa0591ad')
diff --git a/abs/extra/community/athcool/athcool b/abs/extra/community/athcool/athcool
deleted file mode 100644
index f49bd40..0000000
--- a/abs/extra/community/athcool/athcool
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-ATHCOOL=/usr/sbin/athcool
-
-case "$1" in
- start)
- stat_busy "Enabling Athcool"
- $ATHCOOL on > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- stop)
- stat_busy "Disabling Athcool"
- $ATHCOOL off > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- ;;
- restart)
- $0 stop
- /bin/sleep 1
- $0 start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/community/athcool/athcool.install b/abs/extra/community/athcool/athcool.install
deleted file mode 100644
index 8896da2..0000000
--- a/abs/extra/community/athcool/athcool.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1: the new package version
-post_install() {
- add_service.sh athcool
-}
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- /bin/true
-}
-
-# arg 1: the old package version
-post_remove() {
- remove_service.sh athcool
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/community/athcool/finish b/abs/extra/community/athcool/finish
deleted file mode 100755
index cae6b1b..0000000
--- a/abs/extra/community/athcool/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-exec 2>&1
-sv down athcool
diff --git a/abs/extra/community/athcool/run b/abs/extra/community/athcool/run
deleted file mode 100644
index b43936c..0000000
--- a/abs/extra/community/athcool/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/athcool on 2>&1
--
cgit v0.12
From 4468f0f722bea40754ba5d4819a88b6c59f5cdde Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:38:50 +0000
Subject: yajl: update to 2.1.0
---
abs/extra/yajl/PKGBUILD | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 abs/extra/yajl/PKGBUILD
diff --git a/abs/extra/yajl/PKGBUILD b/abs/extra/yajl/PKGBUILD
new file mode 100644
index 0000000..24b3cfa
--- /dev/null
+++ b/abs/extra/yajl/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Dave Reisner <d@falconindy.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
+
+pkgname=yajl
+pkgver=2.1.0
+pkgrel=1
+pkgdesc='Yet Another JSON Library'
+arch=('i686' 'x86_64')
+url='http://lloyd.github.com/yajl/'
+license=('ISC')
+makedepends=('cmake')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/archive/$pkgver.tar.gz")
+md5sums=('6887e0ed7479d2549761a4d284d3ecb0')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
--
cgit v0.12
From a7ebe990abce89bf5d66879890737d2bb8a8e11f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:45:08 +0000
Subject: yajl: move to extra
---
abs/extra/community/mutagen/PKGBUILD | 28 ----------------------------
abs/extra/community/yajl/PKGBUILD | 33 ---------------------------------
2 files changed, 61 deletions(-)
delete mode 100644 abs/extra/community/mutagen/PKGBUILD
delete mode 100644 abs/extra/community/yajl/PKGBUILD
diff --git a/abs/extra/community/mutagen/PKGBUILD b/abs/extra/community/mutagen/PKGBUILD
deleted file mode 100644
index 5e3d7b0..0000000
--- a/abs/extra/community/mutagen/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 149368 2012-02-07 08:50:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=mutagen
-pkgver=1.20
-pkgrel=4
-pkgdesc="An audio metadata tag reader and writer"
-arch=('any')
-url="http://code.google.com/p/mutagen/"
-license=('GPL2')
-depends=('python2')
-source=(http://mutagen.googlecode.com/files/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('7a8c1918160e6b5d24acd146f57c08ed942a2fa8'
- '046c2d763cd59f86ee920a6dc28a32f86b555473')
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py test
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --root="${pkgdir}"
- install -d "${pkgdir}/usr/bin"
- install -m755 tools/* "${pkgdir}/usr/bin"
- sed -i 's|^#!.*/usr/bin/env.*python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/* \
- "${pkgdir}/usr/lib/python2.7/site-packages/mutagen/__init__.py"
-}
diff --git a/abs/extra/community/yajl/PKGBUILD b/abs/extra/community/yajl/PKGBUILD
deleted file mode 100644
index 8cd9121..0000000
--- a/abs/extra/community/yajl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Dave Reisner <d@falconindy.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-
-pkgname=yajl
-pkgver=2.0.4
-pkgrel=1
-pkgdesc='Yet Another JSON Library.'
-arch=('i686' 'x86_64')
-url='http://lloyd.github.com/yajl/'
-license=('ISC')
-makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver")
-md5sums=('ee6208e697c43dcccf798ce80d370379')
-
-build() {
- dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q);
- cd "$dirname"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
-
- make
-}
-
-package() {
- dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q);
- cd "$dirname"
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
--
cgit v0.12
From 212e835aa50d7f08de33f934a7eeb4f24bae3aac Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:48:00 +0000
Subject: mutagen: update to 1.22
---
abs/extra/mutagen/PKGBUILD | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 abs/extra/mutagen/PKGBUILD
diff --git a/abs/extra/mutagen/PKGBUILD b/abs/extra/mutagen/PKGBUILD
new file mode 100644
index 0000000..7c6d05a
--- /dev/null
+++ b/abs/extra/mutagen/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=mutagen
+pkgver=1.22
+pkgrel=1
+pkgdesc="An audio metadata tag reader and writer"
+arch=('any')
+url="http://code.google.com/p/mutagen/"
+license=('GPL2')
+depends=('python2')
+source=(http://mutagen.googlecode.com/files/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha1sums=('4338be32a7fcdbc9063ce58277c144a143a856be'
+ 'SKIP')
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ LANG=en_US.UTF8 python2 setup.py test
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python2 setup.py install --root="${pkgdir}"
+ install -d "${pkgdir}/usr/bin"
+ install -m755 tools/* "${pkgdir}/usr/bin"
+ sed -i 's|^#!.*/usr/bin/env.*python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/* \
+ "${pkgdir}/usr/lib/python2.7/site-packages/mutagen/__init__.py"
+}
--
cgit v0.12
From 455dee5756c201ca1ea5b0768edb0786bb9f6d87 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 19:52:21 +0000
Subject: enca: update to 1.15
---
abs/extra/community/enca/PKGBUILD | 32 --------------------------------
abs/extra/community/nxtvepg.tar.gz | Bin 2018 -> 0 bytes
abs/extra/enca/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 abs/extra/community/enca/PKGBUILD
delete mode 100644 abs/extra/community/nxtvepg.tar.gz
create mode 100644 abs/extra/enca/PKGBUILD
diff --git a/abs/extra/community/enca/PKGBUILD b/abs/extra/community/enca/PKGBUILD
deleted file mode 100644
index fdcea7c..0000000
--- a/abs/extra/community/enca/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 143739 2011-11-28 18:10:34Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Filip Dvorak <fila@pruda.com>
-
-pkgname=enca
-pkgver=1.13
-pkgrel=2
-pkgdesc="Charset analyser and converter"
-arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/enca/"
-options=('!libtool')
-license=('GPL')
-depends=('recode' 'bash')
-source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('762bead5d9a0a5e55024e1102baaa89d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib \
- --mandir=/usr/share/man \
- --with-librecode=/usr \
- --enable-external
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra/community/nxtvepg.tar.gz b/abs/extra/community/nxtvepg.tar.gz
deleted file mode 100644
index fe8da09..0000000
Binary files a/abs/extra/community/nxtvepg.tar.gz and /dev/null differ
diff --git a/abs/extra/enca/PKGBUILD b/abs/extra/enca/PKGBUILD
new file mode 100644
index 0000000..33346c7
--- /dev/null
+++ b/abs/extra/enca/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Filip Dvorak <fila@pruda.com>
+
+pkgname=enca
+pkgver=1.15
+pkgrel=1
+pkgdesc="Charset analyser and converter"
+arch=('i686' 'x86_64')
+url="http://cihar.com/software/enca/"
+license=('GPL')
+depends=('recode')
+options=('!docs')
+source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('fef132969d26e649719eae08297a4a52')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --mandir=/usr/share/man \
+ --with-librecode=/usr \
+ --enable-external
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From 353f7ade545f2a9c935400c479376315104961ca Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 20:03:16 +0000
Subject: flashplugin: update to 11.2.202.356
---
abs/extra/community/flashplugin/PKGBUILD | 55 ----------------------
.../community/flashplugin/flashplugin.install | 14 ------
abs/extra/community/flashplugin/mms.cfg | 2 -
abs/extra/flashplugin/PKGBUILD | 55 ++++++++++++++++++++++
abs/extra/flashplugin/flashplugin.install | 14 ++++++
abs/extra/flashplugin/mms.cfg | 2 +
6 files changed, 71 insertions(+), 71 deletions(-)
delete mode 100644 abs/extra/community/flashplugin/PKGBUILD
delete mode 100644 abs/extra/community/flashplugin/flashplugin.install
delete mode 100644 abs/extra/community/flashplugin/mms.cfg
create mode 100644 abs/extra/flashplugin/PKGBUILD
create mode 100644 abs/extra/flashplugin/flashplugin.install
create mode 100644 abs/extra/flashplugin/mms.cfg
diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD
deleted file mode 100644
index 59f78f5..0000000
--- a/abs/extra/community/flashplugin/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 161290 2012-06-08 23:27:45Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=flashplugin
-_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
-pkgver=11.2.202.236
-pkgrel=1
-pkgdesc='Adobe Flash Player'
-url='http://get.adobe.com/flashplayer'
-arch=('i686' 'x86_64')
-depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
-optdepends=('libvdpau: GPU acceleration on Nvidia card')
-provides=('flashplayer')
-license=('custom')
-options=(!strip)
-install=flashplugin.install
-backup=(etc/adobe/mms.cfg)
-
-if [ "$CARCH" = "i686" ]; then
- source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz"
- "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
- mms.cfg)
- md5sums=('00b3dd02b9ac600272440ebadda724e1'
- '94ca2aecb409abfe36494d1a7ec7591d'
- 'f34aae6279b40e0bd2abfb0d9963d7b8')
-elif [ "$CARCH" = "x86_64" ]; then
- source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz"
- "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
- mms.cfg)
- md5sums=('f3cec2b9b38bd58f5e20f543d957bc17'
- '94ca2aecb409abfe36494d1a7ec7591d'
- 'f34aae6279b40e0bd2abfb0d9963d7b8')
-fi
-
-package () {
- install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so"
- if [ "$CARCH" = x86_64 ]; then
- install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
- else
- install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
- fi
- install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties"
- for i in 16x16 22x22 24x24 32x32 48x48; do
- install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \
- "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png"
- done
- install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop"
- install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
- install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf"
- install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg"
-}
-md5sums=('f3cec2b9b38bd58f5e20f543d957bc17'
- '94ca2aecb409abfe36494d1a7ec7591d'
- 'f34aae6279b40e0bd2abfb0d9963d7b8')
diff --git a/abs/extra/community/flashplugin/flashplugin.install b/abs/extra/community/flashplugin/flashplugin.install
deleted file mode 100644
index 8018fcb..0000000
--- a/abs/extra/community/flashplugin/flashplugin.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- echo " >> "
- echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
- echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
- echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
- echo " >> "
-}
-
-post_upgrade() {
- if [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
- post_install $1
- fi
-}
diff --git a/abs/extra/community/flashplugin/mms.cfg b/abs/extra/community/flashplugin/mms.cfg
deleted file mode 100644
index 716525d..0000000
--- a/abs/extra/community/flashplugin/mms.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-#Hardware video decoding
-#EnableLinuxHWVideoDecode=1
diff --git a/abs/extra/flashplugin/PKGBUILD b/abs/extra/flashplugin/PKGBUILD
new file mode 100644
index 0000000..a4ef79c
--- /dev/null
+++ b/abs/extra/flashplugin/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=flashplugin
+_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
+pkgver=11.2.202.356
+pkgrel=1
+pkgdesc='Adobe Flash Player'
+url='http://get.adobe.com/flashplayer'
+arch=('i686' 'x86_64')
+depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
+optdepends=('libvdpau: GPU acceleration on Nvidia card')
+provides=('flashplayer')
+license=('custom')
+options=(!strip)
+install=flashplugin.install
+backup=(etc/adobe/mms.cfg)
+
+if [ "$CARCH" = "i686" ]; then
+ source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz"
+ "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
+ mms.cfg)
+ md5sums=('8c197a50457c8266ca0e18fa28bd6acf'
+ '94ca2aecb409abfe36494d1a7ec7591d'
+ 'f34aae6279b40e0bd2abfb0d9963d7b8')
+elif [ "$CARCH" = "x86_64" ]; then
+ source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz"
+ "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
+ mms.cfg)
+ md5sums=('719258340ba34eda72495187b8148f75'
+ '94ca2aecb409abfe36494d1a7ec7591d'
+ 'f34aae6279b40e0bd2abfb0d9963d7b8')
+fi
+
+package () {
+ install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so"
+ if [ "$CARCH" = x86_64 ]; then
+ install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
+ else
+ install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
+ fi
+ install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties"
+ for i in 16x16 22x22 24x24 32x32 48x48; do
+ install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \
+ "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png"
+ done
+ install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop"
+ install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
+ install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf"
+ install -Dm644 mms.cfg "$pkgdir/etc/adobe/mms.cfg"
+}
+md5sums=('719258340ba34eda72495187b8148f75'
+ '94ca2aecb409abfe36494d1a7ec7591d'
+ 'f34aae6279b40e0bd2abfb0d9963d7b8')
diff --git a/abs/extra/flashplugin/flashplugin.install b/abs/extra/flashplugin/flashplugin.install
new file mode 100644
index 0000000..8018fcb
--- /dev/null
+++ b/abs/extra/flashplugin/flashplugin.install
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ echo " >> "
+ echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
+ echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
+ echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
+ echo " >> "
+}
+
+post_upgrade() {
+ if [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
+ post_install $1
+ fi
+}
diff --git a/abs/extra/flashplugin/mms.cfg b/abs/extra/flashplugin/mms.cfg
new file mode 100644
index 0000000..716525d
--- /dev/null
+++ b/abs/extra/flashplugin/mms.cfg
@@ -0,0 +1,2 @@
+#Hardware video decoding
+#EnableLinuxHWVideoDecode=1
--
cgit v0.12
From 0edf5c9bfaa42278be30ac92c7233be1b3ae22d1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 20:07:57 +0000
Subject: desktop-file-utils: update to .22
---
abs/extra/community/desktop-file-utils/ChangeLog | 7 -------
abs/extra/community/desktop-file-utils/PKGBUILD | 24 -----------------------
abs/extra/desktop-file-utils/PKGBUILD | 25 ++++++++++++++++++++++++
3 files changed, 25 insertions(+), 31 deletions(-)
delete mode 100644 abs/extra/community/desktop-file-utils/ChangeLog
delete mode 100644 abs/extra/community/desktop-file-utils/PKGBUILD
create mode 100644 abs/extra/desktop-file-utils/PKGBUILD
diff --git a/abs/extra/community/desktop-file-utils/ChangeLog b/abs/extra/community/desktop-file-utils/ChangeLog
deleted file mode 100644
index 8941e48..0000000
--- a/abs/extra/community/desktop-file-utils/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-22 Alexander Fehr <pizzapunk gmail com>
-
- * desktop-file-utils-0.15-1:
- New upstream release.
- New maintainer.
- Changed url.
- Added ChangeLog.
diff --git a/abs/extra/community/desktop-file-utils/PKGBUILD b/abs/extra/community/desktop-file-utils/PKGBUILD
deleted file mode 100644
index 1588bfc..0000000
--- a/abs/extra/community/desktop-file-utils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 161386 2012-06-10 16:51:40Z jgc $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=desktop-file-utils
-pkgver=0.20
-pkgrel=1
-pkgdesc="Command line utilities for working with desktop entries"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
-license=('GPL')
-depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
-md5sums=('8c85cbc13632ba69077c6bc41ce4d0ac')
-
-build() {
- cd "${srcdir}/desktop-file-utils-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/desktop-file-utils-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra/desktop-file-utils/PKGBUILD b/abs/extra/desktop-file-utils/PKGBUILD
new file mode 100644
index 0000000..25859b2
--- /dev/null
+++ b/abs/extra/desktop-file-utils/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+
+pkgname=desktop-file-utils
+pkgver=0.22
+pkgrel=1
+pkgdesc="Command line utilities for working with desktop entries"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+license=('GPL')
+depends=('glib2')
+source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
+sha256sums=('843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5')
+
+build() {
+ cd "${srcdir}/desktop-file-utils-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/desktop-file-utils-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From 61fbc34a07d7620a6bb233a2a90f3c3119eea3ac Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 20:35:27 +0000
Subject: libtorrent-rasterbar: update to .16.16
---
abs/extra/community/libtorrent-rasterbar/PKGBUILD | 31 -----------------------
abs/extra/libtorrent-rasterbar/PKGBUILD | 31 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 31 deletions(-)
delete mode 100644 abs/extra/community/libtorrent-rasterbar/PKGBUILD
create mode 100644 abs/extra/libtorrent-rasterbar/PKGBUILD
diff --git a/abs/extra/community/libtorrent-rasterbar/PKGBUILD b/abs/extra/community/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index ea71f07..0000000
--- a/abs/extra/community/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163820 2012-07-20 21:36:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.16.2
-pkgrel=1
-epoch=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('04da641d21d0867fc103f4f57ffd41b3fce19ead')
-
-build() {
- cd $pkgname-$pkgver
- PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
- --enable-python-binding \
- --with-libgeoip=system
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/abs/extra/libtorrent-rasterbar/PKGBUILD b/abs/extra/libtorrent-rasterbar/PKGBUILD
new file mode 100644
index 0000000..d1f4910
--- /dev/null
+++ b/abs/extra/libtorrent-rasterbar/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgname=libtorrent-rasterbar
+pkgver=0.16.16
+pkgrel=1
+epoch=1
+pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
+url="http://www.rasterbar.com/products/libtorrent/"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('boost-libs' 'geoip' 'python2')
+makedepends=('boost')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/libtorrent/$pkgname-$pkgver.tar.gz)
+sha1sums=('de8faed5cbc09baddb2748cb7b75edd07ab0addc')
+
+build() {
+ cd $pkgname-$pkgver
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --enable-python-binding \
+ --with-libgeoip=system
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
--
cgit v0.12
From 2c1d7e9e6b841addd6e3060fec9434e10cb742c3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 21:21:23 +0000
Subject: python-six: initial inclusion. dep of pyopenssl
---
abs/core/python_modules/python-six/PKGBUILD | 41 ++++++++++++++++++++++++++
abs/core/python_modules/python-six/__changelog | 1 +
2 files changed, 42 insertions(+)
create mode 100644 abs/core/python_modules/python-six/PKGBUILD
create mode 100644 abs/core/python_modules/python-six/__changelog
diff --git a/abs/core/python_modules/python-six/PKGBUILD b/abs/core/python_modules/python-six/PKGBUILD
new file mode 100644
index 0000000..0e8986b
--- /dev/null
+++ b/abs/core/python_modules/python-six/PKGBUILD
@@ -0,0 +1,41 @@
+# Contributer: Allan McRae <allan@archlinux.org>
+# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
+
+pkgbase=python-six
+pkgname=('python2-six')
+pkgver=1.6.1
+pkgrel=2
+pkgdesc="Python 2 and 3 compatibility utilities"
+arch=('any')
+url="http://pypi.python.org/pypi/six/"
+license=('MIT')
+makedepends=('python2')
+source=(http://pypi.python.org/packages/source/s/six/six-$pkgver.tar.gz)
+md5sums=('07d606ac08595d795bf926cc9985674f')
+
+build() {
+ cd $srcdir
+ cp -r six-$pkgver six2-$pkgver
+}
+
+check() {
+# cd $srcdir/six-$pkgver
+# python3 setup.py check
+
+ cd $srcdir/six2-$pkgver
+ python2 setup.py check
+}
+
+#package_python-six() {
+# depends=('python')
+# cd $srcdir/six-$pkgver
+# python3 setup.py install --root "${pkgdir}" --optimize=1
+# install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+#}
+
+package_python2-six() {
+ depends=('python2')
+ cd $srcdir/six2-$pkgver
+ python2 setup.py install --root "${pkgdir}" --optimize=1
+ install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/core/python_modules/python-six/__changelog b/abs/core/python_modules/python-six/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-six/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 3c0c19a4da26028096ed8edd602c000c5b95ddfd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 21:37:01 +0000
Subject: python-ply: initial inclusion. dep of python-pycparser
---
abs/core/python_modules/python-ply/PKGBUILD | 45 ++++++++++++++++++++++++++
abs/core/python_modules/python-ply/__changelog | 1 +
2 files changed, 46 insertions(+)
create mode 100644 abs/core/python_modules/python-ply/PKGBUILD
create mode 100644 abs/core/python_modules/python-ply/__changelog
diff --git a/abs/core/python_modules/python-ply/PKGBUILD b/abs/core/python_modules/python-ply/PKGBUILD
new file mode 100644
index 0000000..3c8cace
--- /dev/null
+++ b/abs/core/python_modules/python-ply/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Marcin "avalan" Falkiewicz <avalatron@gmail.com>
+# Contributor: C Anthony Risinger <anthony@xtfx.me>
+
+pkgbase=python-ply
+pkgname=(python2-ply)
+pkgver=3.4
+pkgrel=4
+pkgdesc='Implementation of lex and yacc parsing tools'
+arch=('any')
+url='http://www.dabeaz.com/ply/'
+license=('BSD')
+makedepends=('python2-setuptools')
+source=("${url}ply-$pkgver.tar.gz")
+sha256sums=('af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b')
+
+prepare() {
+ cp -r ${pkgbase#python-}-$pkgver{,-py2}
+}
+
+#package_python-ply() {
+# depends=('python')
+
+# cd "${pkgbase#python-}-$pkgver"
+
+# python setup.py install --root="$pkgdir"
+
+# install -d "$pkgdir/usr/share/licenses/$pkgname"
+# head -n30 README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
+
+package_python2-ply() {
+ depends=('python2')
+
+ cd "${pkgbase#python-}-$pkgver-py2"
+
+ python2 setup.py install --root="$pkgdir"
+
+ install -d "$pkgdir/usr/share/licenses/$pkgname"
+ head -n30 README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-ply/__changelog b/abs/core/python_modules/python-ply/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-ply/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 78d1fe0507d79db6997f85a2cd1022bb7572164c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 21:40:49 +0000
Subject: python-pycparser: initial inclusion. dep of python-cffi
---
abs/core/python_modules/python-pycparser/PKGBUILD | 53 ++++++++++++++++++++++
.../python_modules/python-pycparser/__changelog | 1 +
2 files changed, 54 insertions(+)
create mode 100644 abs/core/python_modules/python-pycparser/PKGBUILD
create mode 100644 abs/core/python_modules/python-pycparser/__changelog
diff --git a/abs/core/python_modules/python-pycparser/PKGBUILD b/abs/core/python_modules/python-pycparser/PKGBUILD
new file mode 100644
index 0000000..6b36524
--- /dev/null
+++ b/abs/core/python_modules/python-pycparser/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Justin Dray <justin@dray.be>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: lang2 <wenzhi.liang@gmail.com>
+
+pkgbase=python-pycparser
+pkgname=(python2-pycparser)
+pkgver=2.10
+pkgrel=4
+pkgdesc='C parser and AST generator written in Python'
+url='https://github.com/eliben/pycparser'
+makedepends=('python2-ply' 'git')
+arch=('any')
+license=('BSD')
+source=('https://github.com/eliben/pycparser/archive/release_v2.10.zip')
+sha256sums=('1217244f882c330782f4762a1fb37cef21a929ce0123ac388e7e367c35ddbae3')
+
+prepare() {
+ cp -r pycparser-release_v${pkgver}{,-py2}
+}
+
+build() {
+# cd pycparser-release_v${pkgver}
+# python setup.py build
+
+# cd pycparser
+# python _build_tables.py
+
+ cd "$srcdir/pycparser-release_v${pkgver}-py2"
+ python2 setup.py build
+
+ cd pycparser
+ python2 _build_tables.py
+}
+
+#package_python-pycparser() {
+# depends=('python-ply')
+
+# cd pycparser-release_v${pkgver}
+
+# python setup.py install --root="$pkgdir" --optimize=1
+# install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
+
+package_python2-pycparser() {
+ depends=('python2-ply')
+
+ cd pycparser-release_v${pkgver}-py2
+
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/abs/core/python_modules/python-pycparser/__changelog b/abs/core/python_modules/python-pycparser/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-pycparser/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From a96f1f6a926b8f144910f3d575ec218197b8d676 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 21:44:51 +0000
Subject: python-cffi: initial inclusion. dep of python-cryptography.
---
abs/core/python_modules/python-cffi/PKGBUILD | 44 +++++++++++++++++++++++++
abs/core/python_modules/python-cffi/__changelog | 1 +
2 files changed, 45 insertions(+)
create mode 100644 abs/core/python_modules/python-cffi/PKGBUILD
create mode 100644 abs/core/python_modules/python-cffi/__changelog
diff --git a/abs/core/python_modules/python-cffi/PKGBUILD b/abs/core/python_modules/python-cffi/PKGBUILD
new file mode 100644
index 0000000..5f75a0e
--- /dev/null
+++ b/abs/core/python_modules/python-cffi/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: lilydjwg <lilydjwg@gmail.com>
+
+_name=cffi
+pkgbase=python-$_name
+pkgname=(python2-$_name)
+pkgver=0.8.2
+pkgrel=4
+pkgdesc="Foreign Function Interface for Python calling C code"
+arch=('i686' 'x86_64')
+url="http://cffi.readthedocs.org/"
+license=('MIT')
+makedepends=('python2-setuptools' 'python2-pycparser')
+md5sums=('37fc88c62f40d04e8a18192433f951ec')
+source=("http://pypi.python.org/packages/source/c/${_name}/${_name}-${pkgver}.tar.gz")
+
+prepare() {
+ cp -r $_name-$pkgver{,-py2}
+}
+
+build() {
+# cd "$srcdir/$_name-$pkgver"
+# python3 setup.py build
+
+ cd "$srcdir/$_name-$pkgver-py2"
+ python2 setup.py build
+}
+
+#package_python-cffi() {
+# depends=('python' 'python-pycparser')
+
+# cd "$srcdir/$_name-$pkgver"
+# python3 setup.py install --root="$pkgdir/" --optimize=1
+# install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
+
+package_python2-cffi() {
+ depends=('python2' 'python2-pycparser')
+
+ cd "$srcdir/$_name-$pkgver-py2"
+ python2 setup.py install --root="$pkgdir/" --optimize=1
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/abs/core/python_modules/python-cffi/__changelog b/abs/core/python_modules/python-cffi/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-cffi/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From c4a7f47bcb488c4a2d1fe5fa047f4b42d0f4ce4a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 30 Apr 2014 21:50:39 +0000
Subject: python-cryptography: initial inclusion. dep of pyopenssl
---
.../python_modules/python-cryptography/PKGBUILD | 54 ++++++++++++++++++++++
.../python_modules/python-cryptography/__changelog | 1 +
2 files changed, 55 insertions(+)
create mode 100644 abs/core/python_modules/python-cryptography/PKGBUILD
create mode 100644 abs/core/python_modules/python-cryptography/__changelog
diff --git a/abs/core/python_modules/python-cryptography/PKGBUILD b/abs/core/python_modules/python-cryptography/PKGBUILD
new file mode 100644
index 0000000..f916ada
--- /dev/null
+++ b/abs/core/python_modules/python-cryptography/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgbase=python-cryptography
+pkgname=('python2-cryptography')
+pkgver=0.3
+pkgrel=1
+pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
+arch=('i686' 'x86_64')
+license=('Apache')
+url="http://pypi.python.org/pypi/cryptography"
+makedepends=('python2-setuptools' 'python2-six' 'python2-cffi')
+checkdepends=('python2-pytest' 'python2-cryptography-vectors'
+ 'python2-iso8601' 'python2-pretend')
+source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz")
+md5sums=('1a9f2520acfef9489ac42fdc9a7be441')
+
+check() {
+ # Check python3 module
+# cd "${srcdir}"/cryptography-${pkgver}
+# python3 setup.py test
+
+ # Check python2 module
+ cd "${srcdir}"/cryptography-${pkgver}-python2
+ python2 setup.py test
+}
+
+prepare() {
+ cp -a cryptography-${pkgver}{,-python2}
+}
+
+build() {
+ # Build python 3 module
+ cd cryptography-${pkgver}
+# python3 setup.py build
+
+ # Build python 2 module
+ cd ../cryptography-${pkgver}-python2
+ python2 setup.py build
+}
+
+#package_python-cryptography() {
+# depends=('python' 'python-six' 'python-cffi')
+
+# cd cryptography-${pkgver}
+# python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+#}
+
+package_python2-cryptography() {
+ depends=('python2' 'python2-six' 'python2-cffi')
+
+ cd cryptography-${pkgver}-python2
+ python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}
diff --git a/abs/core/python_modules/python-cryptography/__changelog b/abs/core/python_modules/python-cryptography/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/python-cryptography/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 6085abd4119deccd1cfde0432d7309ebe9552958 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 May 2014 20:42:51 +0000
Subject: x264: update to 142.20140311
---
abs/core/x264/PKGBUILD | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD
index 4c986ee..e44493d 100644
--- a/abs/core/x264/PKGBUILD
+++ b/abs/core/x264/PKGBUILD
@@ -1,35 +1,40 @@
-# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=x264
-pkgver=20120705
+pkgver=142.20140311
pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
+epoch=1
+pkgdesc='Library for encoding H264/AVC video streams'
arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
+url='http://www.videolan.org/developers/x264.html'
license=('GPL')
depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
+makedepends=('yasm' 'git')
+source=(git://git.videolan.org/x264.git#commit=aff928d2)
+md5sums=('SKIP')
+
+pkgver() {
+ cd $pkgname
+ local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+ local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+
+ echo ${_ver}.${_date}
+}
build() {
- cd "$pkgname-snapshot-$pkgver-2245-stable"
+ cd $pkgname
- ./configure --enable-shared
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --enable-pic
- make
+ make
}
-package() {
- cd "$pkgname-snapshot-$pkgver-2245-stable"
- make DESTDIR="$pkgdir" \
- bindir=/usr/bin \
- libdir=/usr/lib \
- includedir=/usr/include \
- install
+package() {
+ make -C $pkgname DESTDIR="$pkgdir" install
}
-
-# vim:set ts=2 sw=2 et:
--
cgit v0.12
From e85b9416c808cadbcc11974c6ed41b7b31356b7a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 May 2014 20:44:34 +0000
Subject: pyopenssl: update to .14
---
abs/core/python_modules/pyopenssl/PKGBUILD | 52 ++++++++++++++++++++-------
abs/core/python_modules/pyopenssl/__changelog | 1 +
2 files changed, 41 insertions(+), 12 deletions(-)
create mode 100644 abs/core/python_modules/pyopenssl/__changelog
diff --git a/abs/core/python_modules/pyopenssl/PKGBUILD b/abs/core/python_modules/pyopenssl/PKGBUILD
index a136830..63eeaaf 100644
--- a/abs/core/python_modules/pyopenssl/PKGBUILD
+++ b/abs/core/python_modules/pyopenssl/PKGBUILD
@@ -1,21 +1,49 @@
-# $Id: PKGBUILD 87790 2010-08-18 10:10:07Z ibiru $
+# $Id$
# Maintainer : Ionut Biru<ibiru@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-pkgname=pyopenssl
-pkgver=0.10
-pkgrel=4
-pkgdesc="pyOpenSSL is a Python interface to the OpenSSL library"
-arch=('i686' 'x86_64')
-url="http://pyopenssl.sourceforge.net"
-license=('LGPL')
-depends=('python2' 'openssl')
+pkgbase=pyopenssl
+pkgname=('python2-pyopenssl')
+pkgver=0.14
+pkgrel=3
+arch=('any')
+url="http://pypi.python.org/pypi/pyOpenSSL"
+license=('LGPL2.1')
+makedepends=('python2-setuptools' 'openssl' 'python2-six' 'python2-cryptography')
source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('34db8056ec53ce80c7f5fc58bee9f093')
+md5sums=('8579ff3a1d858858acfba5f046a4ddf7')
build() {
- cd "${srcdir}/pyOpenSSL-${pkgver}"
+ cd "${srcdir}"
+ cp -a "pyOpenSSL-${pkgver}"{,-python2}
+
+ #build python 3 module
+ cd "pyOpenSSL-${pkgver}"
+# python setup.py build
+
+ #build python 2 module
+ cd ../"pyOpenSSL-${pkgver}-python2"
python2 setup.py build
- python2 setup.py install --prefix="$pkgdir/usr" --optimize=1
}
+#package_python-pyopenssl(){
+# pkgdesc="Python3 wrapper module around the OpenSSL library"
+# depends=('python>=3.3' 'openssl' 'python-six' 'python-cryptography')
+# replaces=('pyopenssl')
+# provides=('pyopenssl')
+# conflicts=('pyopenssl')
+
+# cd "${srcdir}/pyOpenSSL-${pkgver}"
+# python setup.py install --root "${pkgdir}" --optimize=1
+#}
+
+package_python2-pyopenssl(){
+ pkgdesc="Python2 wrapper module around the OpenSSL library"
+ depends=('python2>=2.7' 'openssl' 'python2-six' 'python2-cryptography')
+ replaces=('pyopenssl')
+ provides=('pyopenssl')
+ conflicts=('pyopenssl')
+
+ cd "${srcdir}/pyOpenSSL-${pkgver}-python2"
+ python2 setup.py install --root "${pkgdir}" --optimize=1
+}
diff --git a/abs/core/python_modules/pyopenssl/__changelog b/abs/core/python_modules/pyopenssl/__changelog
new file mode 100644
index 0000000..488d3cf
--- /dev/null
+++ b/abs/core/python_modules/pyopenssl/__changelog
@@ -0,0 +1 @@
+PKGBUILD: rm py 3 stuff
--
cgit v0.12
From 9552d6997572056a5198515ae5a209191b0d2479 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 May 2014 20:50:11 +0000
Subject: x265: initial inclusion. dep of ffmpeg
---
abs/core/x265/PKGBUILD | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 abs/core/x265/PKGBUILD
diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD
new file mode 100644
index 0000000..5ee7836
--- /dev/null
+++ b/abs/core/x265/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: kfgz <kfgz at interia pl>
+
+pkgname=x265
+pkgver=0.9
+pkgrel=1
+pkgdesc='Open Source H265/HEVC video encoder'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc-libs')
+makedepends=('yasm' 'cmake')
+url='https://bitbucket.org/multicoreware/x265'
+source=($url/get/$pkgver.tar.bz2)
+md5sums=('0cc0b0189cf9ed7422aad98633c6de8f')
+
+build() {
+ cd multicoreware-x265-*/build/linux
+ [[ $CARCH == x86_64 ]] && LDFLAGS+=',-z,noexecstack'
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ../../source
+ make
+}
+
+package() {
+ cd multicoreware-x265-*/build/linux
+ make DESTDIR="$pkgdir" install
+}
--
cgit v0.12
From 259d33f90e2f9c9ba0384dfc541fda3d2c8d708d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 02:28:51 +0000
Subject: ffmpeg: update to 2.2.1
---
.../0001-libx265-Support-API-version-9.patch | 50 ++++++++++++++
abs/core/ffmpeg/PKGBUILD | 79 +++++++++++++++-------
abs/core/ffmpeg/__changelog | 2 +-
3 files changed, 104 insertions(+), 27 deletions(-)
create mode 100644 abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch
diff --git a/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch b/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch
new file mode 100644
index 0000000..3b6a6e2
--- /dev/null
+++ b/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch
@@ -0,0 +1,50 @@
+From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001
+From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+Date: Thu, 6 Mar 2014 20:01:17 +0000
+Subject: [PATCH] libx265: Support API version 9
+
+Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+---
+ configure | 4 ++--
+ libavcodec/libx265.c | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index d3f5f33..4d7382a 100755
+--- a/configure
++++ b/configure
+@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &
+ { check_cpp_condition x264.h "X264_BUILD >= 118" ||
+ die "ERROR: libx264 version must be >= 0.118."; }
+ enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode &&
+- { check_cpp_condition x265.h "X265_BUILD >= 7" ||
+- die "ERROR: libx265 version must be >= 7."; }
++ { check_cpp_condition x265.h "X265_BUILD >= 9" ||
++ die "ERROR: libx265 version must be >= 9."; }
+ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
+ enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
+ enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
+index 961fc74..a6e4193 100644
+--- a/libavcodec/libx265.c
++++ b/libavcodec/libx265.c
+@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
+ av_reduce(&sar_num, &sar_den,
+ avctx->sample_aspect_ratio.num,
+ avctx->sample_aspect_ratio.den, 4096);
+- ctx->params->bEnableVuiParametersPresentFlag = 1;
+- ctx->params->bEnableAspectRatioIdc = 1;
+- ctx->params->aspectRatioIdc = 255;
+- ctx->params->sarWidth = sar_num;
+- ctx->params->sarHeight = sar_den;
++ ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
++ ctx->params->vui.bEnableAspectRatioIdc = 1;
++ ctx->params->vui.aspectRatioIdc = 255;
++ ctx->params->vui.sarWidth = sar_num;
++ ctx->params->vui.sarHeight = sar_den;
+
+ if (x265_max_bit_depth == 8)
+ ctx->params->internalBitDepth = 8;
+--
+1.7.10.4
+
diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD
index e3062b4..aa91a8c 100644
--- a/abs/core/ffmpeg/PKGBUILD
+++ b/abs/core/ffmpeg/PKGBUILD
@@ -1,49 +1,76 @@
-# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=0.11.1
+pkgver=2.2.1
pkgrel=1
epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
+url='http://ffmpeg.org/'
license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('ff8cb914f657e164dd60ea1008b555a8')
+depends=(
+ 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau'
+ 'libbluray' 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+ 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+ 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'x265'
+ )
+makedepends=('libvdpau' 'yasm')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}
+ 0001-libx265-Support-API-version-9.patch)
+md5sums=('b8a1ee4964c2638f46fcc803ed453818'
+ 'SKIP'
+ '4cbf9b13dc013e96be36445b4a2bfdac')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../0001-libx265-Support-API-version-9.patch
+}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libxvid \
- --enable-libx264 \
- --enable-libvpx \
- --enable-libtheora \
+ --disable-debug \
+ --disable-static \
+ --enable-avresample \
+ --enable-dxva2 \
+ --enable-fontconfig \
+ --enable-gnutls \
+ --enable-gpl \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libfreetype \
--enable-libgsm \
- --enable-libspeex \
- --enable-postproc \
- --enable-shared \
- --enable-x11grab \
+ --enable-libmodplug \
+ --enable-libmp3lame \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
- --enable-libschroedinger \
--enable-libopenjpeg \
- --enable-librtmp \
+ --enable-libopus \
--disable-libpulse \
+ --enable-librtmp \
+ --enable-libschroedinger \
+ --enable-libspeex \
+ --enable-libtheora \
--enable-libv4l2 \
- --enable-gpl \
- --enable-version3 \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxvid \
+ --enable-pic \
+ --enable-postproc \
--enable-runtime-cpudetect \
- --disable-debug \
- --disable-static
+ --enable-shared \
+ --enable-swresample \
+ --enable-vdpau \
+ --enable-version3 \
+ --enable-x11grab
make
make tools/qt-faststart
@@ -53,7 +80,7 @@ build() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install install-man
- install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+ install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/core/ffmpeg/__changelog b/abs/core/ffmpeg/__changelog
index 1672732..7d491f4 100644
--- a/abs/core/ffmpeg/__changelog
+++ b/abs/core/ffmpeg/__changelog
@@ -1 +1 @@
-no pulse
+PKGBUILD - remove libpulse dep and disable-libpulse in configure
--
cgit v0.12
From 01b517fdd8888d402ac8a4fcda6713898f22c342 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 16:25:37 +0000
Subject: libcdio: update to .92
---
abs/extra/libcdio/PKGBUILD | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/abs/extra/libcdio/PKGBUILD b/abs/extra/libcdio/PKGBUILD
index a532e0d..803acef 100644
--- a/abs/extra/libcdio/PKGBUILD
+++ b/abs/extra/libcdio/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $
+# $Id$
# Maintainer:
# Contributor: damir <damir@archlinux.org>
pkgname=libcdio
-pkgver=0.83
+pkgver=0.92
pkgrel=1
pkgdesc="GNU Compact Disc Input and Control Library"
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses')
-options=('!libtool')
+depends=('libcddb' 'ncurses' 'gcc-libs')
install=libcdio.install
source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
libcdio-0.83-linking.patch)
-md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
- 'a7864a4b572a1e2a28cc0a05aa4a67d3'
+md5sums=('86f3f2869c1d34e4c6e52db77992b918'
+ 'SKIP'
'5a7f50209c03d5919d5b932f07871af7')
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../libcdio-0.83-linking.patch
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
- ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make -j1 DESTDIR="${pkgdir}" install
sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
--
cgit v0.12
From 838c2ea5c568a12c68f868b4dc3268543579fbcb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 16:29:59 +0000
Subject: libcdio-paranoia: initial inclusion. dep of mplayer
---
abs/extra/libcdio-paranoia/PKGBUILD | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 abs/extra/libcdio-paranoia/PKGBUILD
diff --git a/abs/extra/libcdio-paranoia/PKGBUILD b/abs/extra/libcdio-paranoia/PKGBUILD
new file mode 100644
index 0000000..152b38a
--- /dev/null
+++ b/abs/extra/libcdio-paranoia/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 174870 2013-01-08 10:06:34Z jgc $
+# Maintainer:
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=libcdio-paranoia
+pkgver=10.2+0.90+1
+pkgrel=2
+pkgdesc="CD paranoia libraries from libcdio"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+url="http://www.gnu.org/software/libcdio/"
+depends=('libcdio')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('e79e196864dd3b1ca87a01345abbda07'
+ 'SKIP')
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make -j1 DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From ca76854086bdfe667853750fa09f1610edcf11a7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 17:16:16 +0000
Subject: mplayer: update to 37051
---
abs/core/mplayer/PKGBUILD | 145 ++++++++++++++++++++-----------
abs/core/mplayer/__changelog | 5 +-
abs/core/mplayer/cdio-includes.patch | 43 +++++++++
abs/core/mplayer/include-samba-4.0.patch | 12 +++
abs/core/mplayer/mplayer.desktop | 1 +
5 files changed, 152 insertions(+), 54 deletions(-)
create mode 100644 abs/core/mplayer/cdio-includes.patch
create mode 100644 abs/core/mplayer/include-samba-4.0.patch
diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index c725fc3..51b3da6 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,73 +1,114 @@
-# $Id: PKGBUILD 163158 2012-07-08 09:32:14Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgbase=mplayer
pkgname=('mplayer' 'mencoder')
-pkgver=35014
+pkgver=37051
pkgrel=1
arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
- 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca'
+ 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+ 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'fribidi' 'unzip' 'mesa'
+ 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+ 'libcdio-paranoia' 'opus'
+)
license=('GPL')
-url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop)
-md5sums=('d0785560e5e8eb02e089728ef4412eae'
- 'c0d6ef795cf6de48e3b87ff7c23f0319')
+url='http://www.mplayerhq.hu/'
+options=('!buildflags' '!emptydirs')
+source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
+ http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2
+ mplayer.desktop
+ cdio-includes.patch
+ include-samba-4.0.patch)
+md5sums=('SKIP'
+ '744febca199548c9393b1f1ed05ccdd8'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d')
+
+#pkgver() {
+# cd $pkgbase-$pkgver
+# svnversion
+#}
+
+prepare() {
+ cd $pkgbase-$pkgver
+ mv ../ffmpeg-2.2 ./ffmpeg
+
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+
+ ./version.sh
+}
build() {
- cd "$srcdir/$pkgbase"
+ cd $pkgbase-$pkgver
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-gui \
- --disable-arts \
- --disable-liblzo \
- --disable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --disable-ass-internal \
- --disable-cdparanoia \
- --enable-radio \
- --language=all \
- --confdir=/etc/mplayer
- [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak
+ ./configure --prefix=/usr \
+ --enable-runtime-cpudetection \
+ --disable-gui \
+ --disable-arts \
+ --disable-liblzo \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack \
+ --disable-esd \
+ --disable-mga \
+ --disable-ass-internal \
+ --disable-cdparanoia \
+ --enable-xvmc \
+ --enable-radio \
+ --enable-radio-capture \
+ --enable-smb \
+ --language=all \
+ --confdir=/etc/mplayer
+ [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
- make
+ make
}
package_mplayer() {
- pkgdesc="A movie player for linux"
- install=mplayer.install
- backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
- depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl'
- 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
- 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
+ pkgdesc='Media player for Linux'
+ install=mplayer.install
+ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+ depends=(
+ 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
+ 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+ 'libgl' 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+ 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+ 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+ )
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
- cd "$srcdir/$pkgbase"
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+ "$pkgdir/etc/mplayer/"
- make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
- install -dm755 "$pkgdir/usr/share/mplayer/"
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
- rm -rf "$pkgdir/usr/share/mplayer/font"
- #desktop file FS#14770
- install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
- install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+ # desktop file (FS#14770)
+ install -Dm644 ../mplayer.desktop \
+ "$pkgdir"/usr/share/applications/mplayer.desktop
+ install -Dm644 etc/mplayer256x256.png \
+ "$pkgdir"/usr/share/pixmaps/mplayer.png
}
package_mencoder() {
- pkgdesc="Free command line video decoding, encoding and filtering tool"
- depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
- 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
+ pkgdesc='Free command line video decoding, encoding and filtering tool'
+ depends=(
+ 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+ 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
+ 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+ 'libvorbis' 'opus'
+ )
- cd "$srcdir/$pkgbase"
- make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- #find "$pkgdir/usr/share/man" -name 'mplayer.1.gz' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
- rm -rf $pkgdir/usr/share/man
+ make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+ #find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+ rm -rf $pkgdir/usr/share/man
}
diff --git a/abs/core/mplayer/__changelog b/abs/core/mplayer/__changelog
index 07977e4..46c977a 100644
--- a/abs/core/mplayer/__changelog
+++ b/abs/core/mplayer/__changelog
@@ -1,2 +1,3 @@
-removed pulse
-remove man pages from mencoder
+PKGBUILD - remove dep libpulse
+PKGBUILD - remove dep jack
+PKGBUILD - remove man pages from mencoder
diff --git a/abs/core/mplayer/cdio-includes.patch b/abs/core/mplayer/cdio-includes.patch
new file mode 100644
index 0000000..f714728
--- /dev/null
+++ b/abs/core/mplayer/cdio-includes.patch
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure (revision 35421)
++++ configure (working copy)
+@@ -5968,8 +5968,8 @@
+ cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+ void *test = cdda_verbose_set;
+ printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c (revision 35421)
++++ gui/win32/interface.c (working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c (revision 35421)
++++ stream/stream_cdda.c (working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/abs/core/mplayer/include-samba-4.0.patch b/abs/core/mplayer/include-samba-4.0.patch
new file mode 100644
index 0000000..2ed272b
--- /dev/null
+++ b/abs/core/mplayer/include-samba-4.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+
+ #include "config.h"
+
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+
+ #include "mp_msg.h"
diff --git a/abs/core/mplayer/mplayer.desktop b/abs/core/mplayer/mplayer.desktop
index 07acea1..946b8e3 100644
--- a/abs/core/mplayer/mplayer.desktop
+++ b/abs/core/mplayer/mplayer.desktop
@@ -19,3 +19,4 @@ Terminal=false
NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
--
cgit v0.12
From 476546903378373f361d169c7014354ab61bf917 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 17:22:38 +0000
Subject: libvdpau: update to 0.7
---
abs/core/libvdpau/PKGBUILD | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/abs/core/libvdpau/PKGBUILD b/abs/core/libvdpau/PKGBUILD
index 2bc1767..f215b3c 100644
--- a/abs/core/libvdpau/PKGBUILD
+++ b/abs/core/libvdpau/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 166179 2012-09-05 07:50:49Z andyrtr $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libvdpau
-pkgver=0.5
+pkgver=0.7
pkgrel=1
pkgdesc="Nvidia VDPAU library"
arch=(i686 x86_64)
url='http://cgit.freedesktop.org/~aplattner/libvdpau'
-depends=('gcc-libs')
+depends=('gcc-libs' 'libxext')
conflicts=('nvidia-utils<190.42-2')
-options=('!libtool')
license=('custom')
source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz)
-makedepends=('libx11')
-sha1sums=('1b18b8f75eea52740af84881313d860ad5c27d0b')
+makedepends=('dri2proto')
+sha256sums=('24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
--
cgit v0.12
From 920cda4709c0752be3f7e76fd795aa1f7a97130f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 18:45:06 +0000
Subject: libbluray: update to 0.5.0
---
abs/extra/libbluray/PKGBUILD | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/abs/extra/libbluray/PKGBUILD b/abs/extra/libbluray/PKGBUILD
index 083cc1a..26c7c22 100644
--- a/abs/extra/libbluray/PKGBUILD
+++ b/abs/extra/libbluray/PKGBUILD
@@ -1,37 +1,30 @@
-# $Id: PKGBUILD 157790 2012-04-29 15:02:33Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Andrew Cook <ariscop@gmail.com>
pkgname=libbluray
-pkgver=0.2.2
+pkgver=0.5.0
pkgrel=1
-pkgdesc="Library to access Blu-Ray disks for video playback"
+pkgdesc='Library to access Blu-Ray disks for video playback'
arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/libbluray.html"
+url='http://www.videolan.org/developers/libbluray.html'
license=('LGPL2.1')
-depends=('libxml2')
-makedepends=('apache-ant' 'jdk7-openjdk')
-optdepends=('java-environment: Blu-ray Disc Java support library')
-options=(!libtool)
+depends=('libxml2' 'freetype2')
source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a')
+md5sums=('04cf15d0f3581a955d3a2ccb9dc06e9e')
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
- . /etc/profile.d/jdk.sh
./configure --prefix=/usr \
- --enable-bdjava \
- --with-jdk=${JAVA_HOME} \
--disable-static
make
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
- #install bdj
- install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar"
}
# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 3baa5e8e788bd1819dc0d3c50e5c6dd82016aa38 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 18:55:08 +0000
Subject: elfutils: update to 0.158
---
abs/core/elfutils/CVE-2014-0172.patch | 37 ++++++++++++++++++
abs/core/elfutils/PKGBUILD | 45 ++++++++++++++--------
.../fix-run-backtrace-native-core-test.patch | 43 +++++++++++++++++++++
3 files changed, 110 insertions(+), 15 deletions(-)
create mode 100644 abs/core/elfutils/CVE-2014-0172.patch
create mode 100644 abs/core/elfutils/fix-run-backtrace-native-core-test.patch
diff --git a/abs/core/elfutils/CVE-2014-0172.patch b/abs/core/elfutils/CVE-2014-0172.patch
new file mode 100644
index 0000000..5f9541d
--- /dev/null
+++ b/abs/core/elfutils/CVE-2014-0172.patch
@@ -0,0 +1,37 @@
+From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mjw@redhat.com>
+Date: Wed, 9 Apr 2014 11:33:23 +0200
+Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to
+ uncompress data.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1085663
+
+Reported-by: Florian Weimer <fweimer@redhat.com>
+Signed-off-by: Mark Wielaard <mjw@redhat.com>
+diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
+index 79daeac..34ea373 100644
+--- a/libdw/dwarf_begin_elf.c
++++ b/libdw/dwarf_begin_elf.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor from ELF descriptor for processing file.
+- Copyright (C) 2002-2011 Red Hat, Inc.
++ Copyright (C) 2002-2011, 2014 Red Hat, Inc.
+ This file is part of elfutils.
+ Written by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
+ memcpy (&size, data->d_buf + 4, sizeof size);
+ size = be64toh (size);
+
++ /* Check for unsigned overflow so malloc always allocated
++ enough memory for both the Elf_Data header and the
++ uncompressed section data. */
++ if (unlikely (sizeof (Elf_Data) + size < size))
++ break;
++
+ Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
+ if (unlikely (zdata == NULL))
+ break;
+--
+1.9.2
+
diff --git a/abs/core/elfutils/PKGBUILD b/abs/core/elfutils/PKGBUILD
index 8cbee1e..6a7485d 100644
--- a/abs/core/elfutils/PKGBUILD
+++ b/abs/core/elfutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163718 2012-07-18 03:05:26Z eric $
-# Maintainer:
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
pkgname=elfutils
-pkgver=0.154
-pkgrel=1
-pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information"
+pkgver=0.158
+pkgrel=2
+pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
arch=('i686' 'x86_64')
url="https://fedorahosted.org/elfutils/"
license=('LGPL3' 'GPL' 'GPL3')
@@ -13,27 +13,42 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
provides=('libelf')
replaces=('libelf')
conflicts=('libelf')
-options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} \
- elfutils-0.154-binutils-pr-ld-13621.patch)
-sha1sums=('3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b'
- '956461d44b03823e0b448e78b1f4aa25ef269e1e'
- '09681b728edb86c77eed47286554bef048f3507f')
+source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
+ fix-run-backtrace-native-core-test.patch
+ CVE-2014-0172.patch)
+options=('staticlibs')
+sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d'
+ 'SKIP'
+ '8ecef640f3d1229cdf45ffda016a69848c18e61b'
+ '3e776c07d6ca2c7604a384d266f79c3ece1fb179')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 -i ../fix-run-backtrace-native-core-test.patch
+ # merged upstream
+ patch -Np1 -i ../CVE-2014-0172.patch
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
+
CFLAGS+=" -g" # required for test-suite success
- patch -p1 -i "${srcdir}/elfutils-0.154-binutils-pr-ld-13621.patch"
./configure --prefix=/usr --program-prefix="eu-"
+
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
+
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
+
make DESTDIR="${pkgdir}" install
+
+ rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a
}
diff --git a/abs/core/elfutils/fix-run-backtrace-native-core-test.patch b/abs/core/elfutils/fix-run-backtrace-native-core-test.patch
new file mode 100644
index 0000000..5088ea5
--- /dev/null
+++ b/abs/core/elfutils/fix-run-backtrace-native-core-test.patch
@@ -0,0 +1,43 @@
+From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001
+From: Matthias Klose <doko@ubuntu.com>
+Date: Tue, 07 Jan 2014 09:25:29 +0000
+Subject: tests: backtrace-subr.sh (check_native_core) should check core file name.
+
+Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename
+the core file, and if it does still fail, skip the test.
+
+Signed-off-by: Mark Wielaard <mjw@redhat.com>
+---
+diff --git a/tests/ChangeLog b/tests/ChangeLog
+index 63b7bed..7e9dcf4 100644
+--- a/tests/ChangeLog
++++ b/tests/ChangeLog
+@@ -1,3 +1,9 @@
++2014-01-07 Matthias Klose <doko@ubuntu.com>
++
++ * backtrace-subr.sh (check_native_core): Check to see if core file
++ was created without ".PID" extension, if so mv core to core.PID.
++ Skip test if no core file was created or could be found.
++
+ 2014-01-04 Mark Wielaard <mjw@redhat.com>
+
+ * backtrace-data.c (main): Don't assert if raise returns.
+diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh
+index e7ece91..62b873c 100644
+--- a/tests/backtrace-subr.sh
++++ b/tests/backtrace-subr.sh
+@@ -111,6 +111,11 @@ check_native_core()
+
+ # Skip the test if we cannot adjust core ulimit.
+ core="core.`ulimit -c unlimited || exit 77; set +ex; testrun ${abs_builddir}/$child --gencore; true`"
++ # see if /proc/sys/kernel/core_uses_pid is set to 0
++ if [ -f core ]; then
++ mv core "$core"
++ fi
++ if [ ! -f "$core" ]; then exit 77; fi
+
+ if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then
+ VALGRIND_CMD="$SAVED_VALGRIND_CMD"
+--
+cgit v0.9.2
+
--
cgit v0.12
From 191ec49dea5fccada2dd2a3400aa7813da04e042 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:03:15 +0000
Subject: elfutils: rm old patch
---
abs/core/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 abs/core/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch
diff --git a/abs/core/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch b/abs/core/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch
deleted file mode 100644
index 06dba1e..0000000
--- a/abs/core/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
-index 8aca9e1..d449416 100755
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -51,4 +51,4 @@ runtest ../libebl/libebl_sh.so
- runtest ../libebl/libebl_sparc.so
- runtest ../libebl/libebl_x86_64.so
-
--exit $status
-+test $status == 0 || echo "binutils PR ld/13621 workaround"
--
cgit v0.12
From 7a66b7c8158f22d19f181a282083b8ec489f1bc4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:25:41 +0000
Subject: lame: update to 3.99.5
---
abs/core/lame/03_lame-ffmpeg.diff | 72 -------------------------------------
abs/core/lame/PKGBUILD | 29 +++++++++------
abs/core/lame/shared-frontend.patch | 23 ------------
3 files changed, 18 insertions(+), 106 deletions(-)
delete mode 100644 abs/core/lame/03_lame-ffmpeg.diff
delete mode 100644 abs/core/lame/shared-frontend.patch
diff --git a/abs/core/lame/03_lame-ffmpeg.diff b/abs/core/lame/03_lame-ffmpeg.diff
deleted file mode 100644
index a803935..0000000
--- a/abs/core/lame/03_lame-ffmpeg.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- lame-3.98.2.orig/libmp3lame/lame.c 2009-07-07 10:52:01.000000000 +0200
-+++ lame-3.98.2/libmp3lame/lame.c 2009-07-07 10:52:03.000000000 +0200
-@@ -1602,6 +1602,13 @@
- /* update mfbuf[] counters */
- gfc->mf_size += n_out;
- assert(gfc->mf_size <= MFSIZE);
-+
-+ /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0
-+ * so we have to reinitialize it here when that happened.
-+ */
-+ if (gfc->mf_samples_to_encode < 1) {
-+ gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+ }
- gfc->mf_samples_to_encode += n_out;
-
-
-@@ -1931,6 +1938,10 @@
- int frames_left;
- int samples_to_encode = gfc->mf_samples_to_encode;
-
-+ /* Was flush already called? */
-+ if (gfc->mf_samples_to_encode < 1) {
-+ return 0;
-+ }
- memset(buffer, 0, sizeof(buffer));
- mp3count = 0;
-
-@@ -1942,7 +1953,9 @@
- end_padding += pad_out_samples;
-
- frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize;
-- while (frames_left > 0) {
-+
-+ /* send in a frame of 0 padding until all internal sample buffers are flushed */
-+ while (frames_left > 0 && imp3 >= 0) {
- int frame_num = gfp->frameNum;
-
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@
- if (mp3buffer_size == 0)
- mp3buffer_size_remaining = 0;
-
-- /* send in a frame of 0 padding until all internal sample buffers
-- * are flushed
-- */
- imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
- mp3buffer, mp3buffer_size_remaining);
-
-- if (frame_num != gfp->frameNum) {
-- --frames_left;
-- }
-- if (imp3 < 0) {
-- /* some type of fatal error */
-- return imp3;
-- }
- mp3buffer += imp3;
- mp3count += imp3;
-+ frames_left -= (frame_num != gfp->frameNum) ? 1 : 0;
- }
-+ /* Set gfc->mf_samples_to_encode to 0, so we may detect
-+ * and break loops calling it more than once in a row.
-+ */
-+ gfc->mf_samples_to_encode = 0;
-+
-+ if (imp3 < 0) {
-+ /* some type of fatal error */
-+ return imp3;
-+ }
-+
- mp3buffer_size_remaining = mp3buffer_size - mp3count;
- /* if user specifed buffer size = 0, dont check size */
- if (mp3buffer_size == 0)
diff --git a/abs/core/lame/PKGBUILD b/abs/core/lame/PKGBUILD
index 6853b74..432a519 100644
--- a/abs/core/lame/PKGBUILD
+++ b/abs/core/lame/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 80636 2010-05-20 16:06:46Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=lame
-pkgver=3.98.4
-pkgrel=1
-pkgdesc="An MP3 encoder and graphical frame analyzer"
+pkgver=3.99.5
+pkgrel=2
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
arch=('i686' 'x86_64')
url="http://lame.sourceforge.net/"
depends=('ncurses')
makedepends=('nasm')
license=('LGPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e9866ad6b570c6c95c8cba48060473f')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('84835b313d4a8b68f5349816d33e07ce')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--enable-nasm \
--enable-shared
- make -j1 || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ make
}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/lame/shared-frontend.patch b/abs/core/lame/shared-frontend.patch
deleted file mode 100644
index e5ae0a9..0000000
--- a/abs/core/lame/shared-frontend.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- lame-3.96.1.orig/frontend/Makefile.am 2004-01-21 01:41:36.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.am 2004-10-03 16:39:12.415901779 -0700
-@@ -50,7 +50,7 @@
- endif
-
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
-
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
-
-diff -Naur lame-3.96.1.orig/frontend/Makefile.in lame-3.96.1/frontend/Makefile.in
---- lame-3.96.1.orig/frontend/Makefile.in 2004-01-21 05:50:29.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.in 2004-10-03 16:39:19.711701553 -0700
-@@ -91,7 +91,7 @@
- $(top_builddir)/libmp3lame/libmp3lame.la \
- @FRONTEND_LDADD@
-
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
--
cgit v0.12
From 37bd316cbdda00ab174603c3103f68a9d499adc9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:27:20 +0000
Subject: libass: update to 0.11.2
---
abs/core/libass/PKGBUILD | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/abs/core/libass/PKGBUILD b/abs/core/libass/PKGBUILD
index 3bf6771..ec9c5f0 100644
--- a/abs/core/libass/PKGBUILD
+++ b/abs/core/libass/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 146950 2012-01-19 15:31:00Z giovanni $
+# $Id$
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
pkgname=libass
-pkgver=0.10.0
-pkgrel=3
+pkgver=0.11.2
+pkgrel=1
pkgdesc="A portable library for SSA/ASS subtitles rendering"
arch=('i686' 'x86_64')
-url="http://code.google.com/p/libass/"
+url="https://github.com/libass/libass/releases"
license=('BSD')
-depends=('enca' 'fontconfig' 'fribidi')
-makedepends=('pkg-config')
-options=(!libtool)
-source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('1855bddc4c167f96968dddeeda0eb45c')
+depends=('fribidi' 'fontconfig' 'enca' 'harfbuzz')
+makedepends=('pkg-config' 'yasm')
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('701b761934de0eff7d45f58d7d13eaf6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ ./configure --prefix=/usr \
+ --enable-enca \
+ --enable-harfbuzz \
+ --enable-fontconfig
make
}
--
cgit v0.12
From 1d696ceb329c5f6e5d78f1a364c70b234a3d3f43 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:30:35 +0000
Subject: libdca: update pkg
---
abs/core/libdca/PKGBUILD | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/abs/core/libdca/PKGBUILD b/abs/core/libdca/PKGBUILD
index 4794c02..2d05c00 100644
--- a/abs/core/libdca/PKGBUILD
+++ b/abs/core/libdca/PKGBUILD
@@ -1,22 +1,31 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libdca
pkgver=0.0.5
-pkgrel=1
+pkgrel=4
pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('GPL')
url="http://www.videolan.org/developers/libdca.html"
-source=(http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('dab6b2795c66a82a6fcd4f8343343021')
+depends=('sh')
provides=('libdts')
replaces=('libdts')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('dab6b2795c66a82a6fcd4f8343343021')
build() {
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr
- make || return 1
- make DESTDIR=$startdir/pkg install
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+
+ rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1
+ ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz"
+ ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz"
}
--
cgit v0.12
From 5095db5489b514be38266e8a1722d430e4573865 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:33:29 +0000
Subject: libjpeg-turbo: update to 1.3.1
---
abs/core/libjpeg-turbo/PKGBUILD | 69 +++++++++++++++++------------------------
1 file changed, 28 insertions(+), 41 deletions(-)
diff --git a/abs/core/libjpeg-turbo/PKGBUILD b/abs/core/libjpeg-turbo/PKGBUILD
index f882559..65f5bc4 100644
--- a/abs/core/libjpeg-turbo/PKGBUILD
+++ b/abs/core/libjpeg-turbo/PKGBUILD
@@ -1,56 +1,43 @@
-# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
pkgname=libjpeg-turbo
-pkgver=1.2.1
+pkgver=1.3.1
pkgrel=1
-pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
-arch=('i686' 'x86_64')
-url="http://libjpeg-turbo.virtualgl.org/"
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
license=('GPL' 'custom')
-depends=('glibc')
+arch=('i686' 'x86_64')
makedepends=('nasm')
-provides=('libjpeg=8.0.2')
-conflicts=('libjpeg')
-replaces=('libjpeg')
-options=('!libtool')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5fa19252e5ca992cfa40446a0210ceff55fbe468')
- # put documentation in a reasonable directory...
- sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
- sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
+provides=('libjpeg=8.0.2' 'turbojpeg')
+conflicts=('libjpeg' 'turbojpeg')
+replaces=('libjpeg' 'turbojpeg')
- ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
- make
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
+ make
}
check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make test
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make test
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- # provide jpegint.h as it is required by various software
- install -m644 jpegint.h "$pkgdir/usr/include/"
-
- # do not distributre libturbojpeg as it is unversioned
- rm "$pkgdir"/usr/lib/libturbojpeg.{so,a}
- rm "$pkgdir/usr/include/turbojpeg.h"
- rm "$pkgdir/usr/bin/tjbench"
-
- install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/"
- ln -s ../../doc/libjpeg-turbo/README \
- "$pkgdir/usr/share/licenses/libjpeg-turbo/README"
- ln -s ../../doc/libjpeg-turbo/README-turbo.txt \
- "$pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make \
+ DESTDIR="${pkgdir}" \
+ docdir="/usr/share/doc/${pkgname}" \
+ exampledir="/usr/share/doc/${pkgname}" \
+ install
+
+ install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+ ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
+ install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
}
--
cgit v0.12
From 24f49296f451cfb96d498aafde46e11accfe3003 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:44:29 +0000
Subject: libmng: update to 2.0.2
---
abs/extra/libmng/PKGBUILD | 30 ++++++++++++++++--------------
abs/extra/libmng/__changelog | 1 -
abs/extra/libmng/automake-patch | 11 -----------
abs/extra/libmng/libmng-stdio.patch | 10 ++++++++++
4 files changed, 26 insertions(+), 26 deletions(-)
delete mode 100644 abs/extra/libmng/__changelog
delete mode 100644 abs/extra/libmng/automake-patch
create mode 100644 abs/extra/libmng/libmng-stdio.patch
diff --git a/abs/extra/libmng/PKGBUILD b/abs/extra/libmng/PKGBUILD
index 7be67d7..812b577 100644
--- a/abs/extra/libmng/PKGBUILD
+++ b/abs/extra/libmng/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 137860 2011-09-12 05:28:13Z eric $
+# $Id$
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=libmng
-pkgver=1.0.10
-pkgrel=4
+pkgver=2.0.2
+pkgrel=3
pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
arch=('i686' 'x86_64')
url="http://www.libmng.com/"
license=('custom')
-depends=('zlib' 'libjpeg')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 automake-patch)
+depends=('lcms2')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc}
+ libmng-stdio.patch)
+sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69'
+ 'SKIP'
+ '2f8b472d53791ba3a44dab9b18fb215e8b19dd77')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p5 -i "${srcdir}/libmng-stdio.patch"
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np0 < $srcdir/automake-patch || exit 1
- ln -s makefiles/configure.in .
- ln -s makefiles/Makefile.am .
- autoreconf --force --install
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
-md5sums=('eaf1476a3bb29f6190bca660e6abef16'
- 'abd75e07394cc04e0d8ffa9a93b1e485')
diff --git a/abs/extra/libmng/__changelog b/abs/extra/libmng/__changelog
deleted file mode 100644
index 41fd872..0000000
--- a/abs/extra/libmng/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-add automake_patch
diff --git a/abs/extra/libmng/automake-patch b/abs/extra/libmng/automake-patch
deleted file mode 100644
index 309983a..0000000
--- a/abs/extra/libmng/automake-patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefiles/configure.in 2005-01-30 05:28:00.000000000 -0500
-+++ makefiles/configure.in.new 2012-05-03 16:36:01.000000000 -0400
-@@ -15,7 +15,7 @@
- dnl Checks for programs.
- AC_PROG_CC
- AC_ISC_POSIX
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
- if test "x$U" != "x"; then
- AC_MSG_ERROR(Compiler not ANSI compliant)
- fi
diff --git a/abs/extra/libmng/libmng-stdio.patch b/abs/extra/libmng/libmng-stdio.patch
new file mode 100644
index 0000000..42414f1
--- /dev/null
+++ b/abs/extra/libmng/libmng-stdio.patch
@@ -0,0 +1,10 @@
+--- /mnt/chrootstaging32/usr/include/libmng_types.h 2013-08-15 16:26:03.000000000 -0400
++++ /mnt/chrootstaging64/usr/include/libmng_types.h 2013-08-16 19:53:39.165878412 -0400
+@@ -204,6 +204,7 @@
+ #define HAVE_BOOLEAN
+ typedef int boolean;
+ #endif
++#include <stdio.h>
+ #include <jpeglib.h>
+ #endif /* MNG_INCLUDE_IJG6B */
+
--
cgit v0.12
From 38bfac964a91d715bcc046f9c5db35a82a9864d7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:47:16 +0000
Subject: lame: rm __changelog
---
abs/core/lame/__changelog | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 abs/core/lame/__changelog
diff --git a/abs/core/lame/__changelog b/abs/core/lame/__changelog
deleted file mode 100644
index 1cb148f..0000000
--- a/abs/core/lame/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-add -j1 to make command
--
cgit v0.12
From fca51d2c6854d17ced220a16d7b00a16493d3d3a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:52:37 +0000
Subject: libvpx: update to 1.3.0
---
abs/extra/libvpx/PKGBUILD | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/abs/extra/libvpx/PKGBUILD b/abs/extra/libvpx/PKGBUILD
index 09c994f..0fad7b8 100644
--- a/abs/extra/libvpx/PKGBUILD
+++ b/abs/extra/libvpx/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 158895 2012-05-12 18:37:10Z ibiru $
+# $Id$
# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
pkgname=libvpx
-pkgver=1.1.0
+pkgver=1.3.0
pkgrel=1
-pkgdesc="The VP8 Codec SDK"
+pkgdesc='The VP8 Codec SDK'
arch=('i686' 'x86_64')
-url="http://www.webmproject.org/"
+url='http://www.webmproject.org/'
license=('BSD')
depends=('glibc')
-makedepends=('yasm')
-source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2)
-sha1sums=('356af5f770c50cd021c60863203d8f30164f6021')
+makedepends=('yasm' 'git')
+source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver)
+md5sums=('SKIP')
build() {
- cd "$pkgname-v$pkgver"
- ./configure --prefix=/usr --enable-vp8 \
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --enable-vp8 \
+ --enable-vp9 \
--enable-runtime-cpu-detect \
--enable-shared \
--enable-postproc \
@@ -25,7 +28,7 @@ build() {
}
package() {
- cd "$pkgname-v$pkgver"
+ cd $pkgname
make DIST_DIR="$pkgdir/usr" install
- install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
--
cgit v0.12
From 1203b22b705b7c0bf886d98eac966dacec0778d3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 19:54:43 +0000
Subject: libxss: rm tar.gz
---
abs/core/libxss/libxss-1.2.2-1.src.tar.gz | 1 -
1 file changed, 1 deletion(-)
delete mode 120000 abs/core/libxss/libxss-1.2.2-1.src.tar.gz
diff --git a/abs/core/libxss/libxss-1.2.2-1.src.tar.gz b/abs/core/libxss/libxss-1.2.2-1.src.tar.gz
deleted file mode 120000
index 040aa82..0000000
--- a/abs/core/libxss/libxss-1.2.2-1.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/data/pkg_repo/src_packages/libxss-1.2.2-1.src.tar.gz
\ No newline at end of file
--
cgit v0.12
From 36a12716f917b66be9ca97af1c5ffb6be9798a2b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 20:00:21 +0000
Subject: mpg123: update to 1.19.0
---
abs/extra/mpg123/PKGBUILD | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/abs/extra/mpg123/PKGBUILD b/abs/extra/mpg123/PKGBUILD
index 8b2633f..e0c6397 100644
--- a/abs/extra/mpg123/PKGBUILD
+++ b/abs/extra/mpg123/PKGBUILD
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD 163205 2012-07-09 20:33:57Z eric $
+# $Id$
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=mpg123
-pkgver=1.14.3
+pkgver=1.19.0
pkgrel=1
pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/mpg123"
-license=('GPL2' 'LGPL2.1')
+license=('LGPL2.1')
depends=('libltdl' 'alsa-lib')
makedepends=('sdl')
optdepends=('sdl: for sdl audio support')
-conflicts=('mpg321')
-provides=('mpg321')
-options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('c3cd800121bccf15d8fc31a30575a5dce8aaa5d5'
- '32f4a507aed62c038b1620c938c8001b3a9b04b5')
+sha1sums=('835f8ae489b41ae69fa8c76a0b1e5ee5495ef0ae'
+ 'SKIP')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \
- --with-audio="alsa oss sdl "
+ --with-audio="alsa oss sdl"
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
+ install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay"
}
--
cgit v0.12
From d163bad3fb474ab56dde64e433b4677fb387cfe6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 20:27:35 +0000
Subject: mplayer: rebuild with updated deps
---
abs/core/mplayer/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 51b3da6..f32c1d3 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=mplayer
pkgname=('mplayer' 'mencoder')
pkgver=37051
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=(
'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
--
cgit v0.12
From 94b70fa157c1b96c375ddbf4de906277ade3c2c0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 20:59:55 +0000
Subject: nvidia & nvidia-utils: update to 337.12
---
abs/core/nvidia-utils/PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++------
abs/core/nvidia/PKGBUILD | 16 +++++++-----
2 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index e38a75a..a890901 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: James Rayner <iphitus@gmail.com>
pkgbase=nvidia-utils
pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
-pkgver=331.49
+pkgver=337.12
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -11,8 +11,8 @@ license=('custom')
options=('!strip')
source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha1sums=('3ab5c9e3b206cdb93baf6ea17dafe1486dbaa03f'
- '72f7c25ba94041a80f81a8d8bf025ef680ed1f4f')
+sha1sums=('a99cd207d55fabeda424441c3eac23867f843b33'
+ '265178244fd20dd9a4fff740d0a02c072efc1f18')
[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -64,6 +64,18 @@ package_nvidia-libgl() {
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1"
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so"
+ ln -s "/usr/lib/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.${pkgver}"
+ ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.1"
+ ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so"
+
+ ln -s "/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}"
+ ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
+ ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so"
+
+ ln -s "/usr/lib/nvidia/libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.${pkgver}"
+ ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.2"
+ ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so"
+
mkdir -p "${pkgdir}/usr/share/licenses"
ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
}
@@ -72,47 +84,77 @@ package_nvidia-utils() {
pkgdesc="NVIDIA drivers utilities"
depends=('xorg-server')
optdepends=('gtk2: nvidia-settings'
+ 'xorg-server-devel: nvidia-xconfig'
'opencl-nvidia: OpenCL support')
cd "${srcdir}/${_pkg}"
# X driver
install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
# GLX extension module for X
install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so" # X doesn't find glx otherwise
- # OpenGL library
+
+ # OpenGL libraries
install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
+ install -D -m755 "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libEGL.so.${pkgver}"
+ install -D -m755 "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}"
+ install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.${pkgver}"
+
# OpenGL core library
install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
+ install -D -m755 "libnvidia-eglcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-eglcore.so.${pkgver}"
+ install -D -m755 "libnvidia-glsi.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glsi.so.${pkgver}"
+
+ # misc
+ install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ifr.so.${pkgver}"
+ install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-fbc.so.${pkgver}"
+ install -D -m755 "libnvidia-encode.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-encode.so.${pkgver}"
+ install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
+ install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
+
# VDPAU
install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
+
# nvidia-tls library
install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}"
- install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
- install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
# CUDA
install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
- #install -D -m755 nvidia-cuda-proxy-server "${pkgdir}/usr/bin/nvidia-cuda-proxy-server"
- #install -D -m644 nvidia-cuda-proxy-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-proxy-control.1.gz"
+
# DEBUG
install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
+
# nvidia-xconfig
install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz"
+
# nvidia-settings
install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings"
install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz"
install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
+
# nvidia-bug-report
install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh"
+
# nvidia-smi
install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
+ # nvidia-cuda-mps
+ install -D -m755 nvidia-cuda-mps-server "${pkgdir}/usr/bin/nvidia-cuda-mps-server"
+ install -D -m644 nvidia-cuda-mps-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-mps-control.1.gz"
+
+ # nvidia-modprobe
+ # This should be removed if nvidia fixed their uvm module!
+ install -D -m4755 nvidia-modprobe "${pkgdir}/usr/bin/nvidia-modprobe"
+
+ # application profiles
+ install -D -m644 nvidia-application-profiles-${pkgver}-rc "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-rc"
+ install -D -m644 nvidia-application-profiles-${pkgver}-key-documentation "${pkgdir}/usr/share/nvidia/nvidia-application-profiles-${pkgver}-key-documentation"
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index cafec22..30ce01e 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer : Thomas Baechler <thomas@archlinux.org>
pkgname=nvidia
-pkgver=331.49
+pkgver=337.12
_extramodules=extramodules-3.13-ARCH
pkgrel=1
pkgdesc="NVIDIA drivers for linux"
@@ -16,14 +16,13 @@ install=nvidia.install
options=(!strip)
source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('176c77f9a10eaa652860dbc24042bff2'
- 'd0c944466a36cae8b1e23330b27a721c')
+md5sums=('c610d5bff8f7f758dc25fdd51b1b65eb'
+ '4c2aaac75c1ff01a09ac8f4ff84084cd')
[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
prepare() {
- cd "${srcdir}"
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
# patches here
@@ -31,15 +30,20 @@ prepare() {
build() {
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${srcdir}"/"${_pkg}"/kernel
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ cd uvm
make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
}
package() {
install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
}
--
cgit v0.12
From c898af2ab3f1e632904729401e4dbcddc7eee2d1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 5 May 2014 21:27:37 +0000
Subject: ffmpeg: build with updated deps
---
abs/core/ffmpeg/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD
index aa91a8c..2e90fb1 100644
--- a/abs/core/ffmpeg/PKGBUILD
+++ b/abs/core/ffmpeg/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=ffmpeg
pkgver=2.2.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')
--
cgit v0.12
From 0b162d606184851b4416d9f832d1ea2be4b329a5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 01:37:00 +0000
Subject: mythtv, mythplugins, mythweb: update to latest -fixes
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash_web | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 11 +++--
.../stable-0.27/mythplugins/cdparanoia.patch | 52 ++++++++++++++++++++++
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythweb/PKGBUILD | 2 +-
6 files changed, 64 insertions(+), 7 deletions(-)
create mode 100644 abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 065c8e2..16ca17a 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-ad2f1ffebde4fcb05856584a3411a45487cc4cf5
+e2acf0d940009b2b240d52e9b53a123e1309a134
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
index 64220c6..90675ae 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
@@ -1 +1 @@
-b4983f178bc847bfe7647ce5b9f235f5d2cbe362
+a492e9343caff760e0081f785d540ca6a1fe39fa
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 45c4187..65a5578 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=13
+pkgrel=14
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
@@ -19,7 +19,8 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi
'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python-imaging'
'python-pycurl' 'zlib')
-source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch')
+source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch'
+ 'cdparanoia.patch')
build() {
if [ -e ${srcdir}/mythplugins ]
@@ -33,6 +34,9 @@ build() {
cp -rp ../git_src/mythtv/mythplugins $srcdir
cd ${srcdir}/${pkgbase}
+ msg "Patching configure"
+ patch -Np1 -i "$srcdir/cdparanoia.patch"
+
msg "Configuring mythplugins"
./configure --prefix=/usr \
--enable-all \
@@ -117,4 +121,5 @@ package_mythzoneminder() {
md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2'
'0364d2613f22943f3d4c9d5ee43c1982'
- '1063cf62878cd341476f28f63cb12782')
+ '1063cf62878cd341476f28f63cb12782'
+ '5de8dd79d0b8a2b006f3c3258938b6b7')
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch b/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch
new file mode 100644
index 0000000..b4d1449
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythplugins/cdparanoia.patch
@@ -0,0 +1,52 @@
+diff -Nru a/configure b/configure
+--- a/configure 2012-10-02 23:30:24.000000000 +1300
++++ b/configure 2013-01-09 14:54:40.448916370 +1300
+@@ -649,7 +649,7 @@
+ echo "MythMusic requires FLAC."
+ fi
+
+- if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
++ if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then
+ disable cdio
+ fi
+
+diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp
+--- a/mythmusic/mythmusic/cddecoder.cpp 2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cddecoder.cpp 2013-01-09 14:53:37.031690618 +1300
+@@ -14,7 +14,7 @@
+ #include <QString>
+
+ // libcdio
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #include <cdio/logging.h>
+
+ // MythTV
+diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h
+--- a/mythmusic/mythmusic/cddecoder.h 2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cddecoder.h 2013-01-09 14:53:12.328140979 +1300
+@@ -11,8 +11,8 @@
+ #endif
+
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif
+
+ class Metadata;
+diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp
+--- a/mythmusic/mythmusic/cdrip.cpp 2012-10-02 23:30:24.000000000 +1300
++++ b/mythmusic/mythmusic/cdrip.cpp 2013-01-09 14:54:11.815330268 +1300
+@@ -8,8 +8,8 @@
+
+ #include "config.h"
+ #ifdef HAVE_CDIO
+-# include <cdio/cdda.h>
+-# include <cdio/paranoia.h>
++# include <cdio/paranoia/cdda.h>
++# include <cdio/paranoia/paranoia.h>
+ #endif //def HAVE_CDIO
+
+ // C++ includes
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index fe05903..70eed29 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=13
+pkgrel=14
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
index d2d0808..7489e8a 100644
--- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.27
-pkgrel=3
+pkgrel=4
commit_hash=`cat ../git_src/git_hash_web`
pkgdesc="Web interface for MythTV's backend, $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From ebcf37747e6768f1dfdfef180aec4604c84482b0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 01:53:06 +0000
Subject: handbrake: rebuild
---
abs/extra/handbrake/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/handbrake/PKGBUILD b/abs/extra/handbrake/PKGBUILD
index e2b4833..f7cef21 100644
--- a/abs/extra/handbrake/PKGBUILD
+++ b/abs/extra/handbrake/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=('handbrake' 'handbrake-cli')
pkgver=0.9.9
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url="http://handbrake.fr/"
license=('GPL')
--
cgit v0.12
From cf4ca9fbb2c264310d948035277521b0f637a6d5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 02:35:56 +0000
Subject: mythmusic: add dep libcdio-paranoia
---
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 65a5578..6b7e6bc 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -81,7 +81,7 @@ package_mythgame() {
package_mythmusic() {
pkgdesc="Music playing plugin for MythTV"
- depends=('cdparanoia' 'fftw' 'flac' 'libcdaudio' 'libcdio'
+ depends=('cdparanoia' 'fftw' 'flac' 'libcdaudio' 'libcdio-paranoia'
'libvisual-plugins' 'libvorbis' "mythtv>=${pkgver}" 'taglib')
cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic"
make INSTALL_ROOT="${pkgdir}" install || return 1
--
cgit v0.12
From 750642bbdbc4bdd370437a16f4a1ece1e5b31fb5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 19:56:33 +0000
Subject: mesa-demos: initial inclusion. dep of xbmc 13
---
abs/extra/mesa-demos/LICENSE | 82 +++++++++++++++++++++++++++++++++++++++++++
abs/extra/mesa-demos/PKGBUILD | 29 +++++++++++++++
2 files changed, 111 insertions(+)
create mode 100644 abs/extra/mesa-demos/LICENSE
create mode 100644 abs/extra/mesa-demos/PKGBUILD
diff --git a/abs/extra/mesa-demos/LICENSE b/abs/extra/mesa-demos/LICENSE
new file mode 100644
index 0000000..ae33d27
--- /dev/null
+++ b/abs/extra/mesa-demos/LICENSE
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
diff --git a/abs/extra/mesa-demos/PKGBUILD b/abs/extra/mesa-demos/PKGBUILD
new file mode 100644
index 0000000..310dc36
--- /dev/null
+++ b/abs/extra/mesa-demos/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname='mesa-demos'
+pkgver=8.1.0
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="Mesa demos and tools"
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+depends=('libgl' 'glew')
+source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
+ 'LICENSE')
+sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+
+build() {
+ cd "${srcdir}/mesa-demos-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/mesa-demos-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
+ install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
+}
--
cgit v0.12
From 99f7455467559a3af544e88ba3e9512749f2b349 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 20:21:36 +0000
Subject: shairplay: initial inclusion. dep of xbmc 13
---
abs/extra/shairplay/PKGBUILD | 51 +++++++++++++++++++++++++++++++++++
abs/extra/shairplay/shairplay.service | 13 +++++++++
2 files changed, 64 insertions(+)
create mode 100644 abs/extra/shairplay/PKGBUILD
create mode 100644 abs/extra/shairplay/shairplay.service
diff --git a/abs/extra/shairplay/PKGBUILD b/abs/extra/shairplay/PKGBUILD
new file mode 100644
index 0000000..e5f4d44
--- /dev/null
+++ b/abs/extra/shairplay/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: winlu
+
+pkgname=shairplay
+_gitname=shairplay
+pkgver=20140422
+pkgrel=1
+pkgdesc='Apple airplay and raop protocol server'
+arch=('i686' 'x86_64')
+url='https://github.com/juhovh/shairplay'
+license=('custom')
+depends=('libao')
+optdepends=('avahi: to run the server')
+makedepends=('git')
+source=("$_gitname::git://github.com/juhovh/shairplay.git#commit=64d59e3087f829006d091fa0d114efb50972a2bf"
+ 'shairplay.service')
+sha256sums=('SKIP'
+ 'f0a176539a6c5be46dc832d054be2f18c3256e5fd34c5f1416c9463bd75c82b3')
+options=(!libtool)
+provides=('libshairport')
+conflicts=('libshairport')
+
+build() {
+ cd $_gitname
+
+ # installing airport.key to /etc/shairplay/
+ sed 's/airport.key/\/etc\/shairplay\/airport.key/' -i "$srcdir/$_gitname"/src/shairplay.c
+
+ ./autogen.sh
+ ./configure --prefix=/usr/
+ make
+}
+
+
+package() {
+ cd $_gitname
+ make DESTDIR="$pkgdir" install
+
+ # install systemd service file
+ install -Dm644 "$srcdir/shairplay.service" "$pkgdir/usr/lib/systemd/system/shairplay.service"
+
+ # install key file
+ install -Dm644 airport.key "$pkgdir/etc/shairplay/airport.key"
+
+ # install license file
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # install documentation
+ install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+}
diff --git a/abs/extra/shairplay/shairplay.service b/abs/extra/shairplay/shairplay.service
new file mode 100644
index 0000000..a624384
--- /dev/null
+++ b/abs/extra/shairplay/shairplay.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Apple airplay and raop protocol server
+Requires=network.target sound.target
+Wants=avahi-daemon.service
+After=avahi-daemon.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/shairplay -a %H
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From ead19d2b4f81397ffff43c0fda503570e6a67608 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 21:23:25 +0000
Subject: xbmc: update to 13.0
---
abs/extra/xbmc/PKGBUILD | 58 +++++++++++++++++++--------------------------
abs/extra/xbmc/__changelog | 6 ++---
abs/extra/xbmc/xbmc.service | 2 +-
3 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 3d49bee..8e3aae1 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -8,19 +8,14 @@
_prefix=/usr
pkgname=xbmc
-pkgver=12.3
-_codename=Frodo
-pkgrel=13
+pkgver=13.0
+_codename=Gotham
+pkgrel=1
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
- 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
- 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
- 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
- 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
- 'tinyxml' 'taglib')
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib' 'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
@@ -30,19 +25,17 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'unrar: access compressed files without unpacking them'
'xorg-xinit: autostart xbmc')
install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
- "xbmc.service" "xbmc.sh" "xbmc_lib.conf"
- "polkit.rules"
- "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
+source=(
+ "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
+ "xbmc.service"
+ "polkit.rules"
+ "xbmc.sh"
+ "xbmc_lib.conf"
+ )
prepare() {
cd "${srcdir}/xbmc-$pkgver-$_codename"
- patch -p0 <$srcdir/libass.patch
-
- # fix lsb_release dependency
- sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
-# sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
}
build() {
@@ -83,8 +76,9 @@ build() {
--enable-udev \
--enable-libusb \
--enable-libcec \
- --enable-external-libraries \
- --disable-external-ffmpeg
+ --enable-external-libraries
+
+
# Now (finally) build
make
}
@@ -97,18 +91,17 @@ package() {
# run feh with python2
sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
- # lsb_release fix
- sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
- sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
# Tools
+ msg2 "Tools"
install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
- install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+ msg2 "Copy licenses"
+ install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
for licensef in LICENSE.GPL copying.txt; do
- mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
+ mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef} \
+ ${pkgdir}${_prefix}/share/licenses/${pkgname}
done
# LinHES stuff
@@ -117,14 +110,13 @@ package() {
#add in xbmc_lib.conf
install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf
+ # install systemd service
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
-# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
+ install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
}
# vim:set ts=2 sw=2 et:
-md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
- '03e9a33e15714d1fd1f2a516abea5393'
- 'e48a3d87984669ef206e902bc8290ff9'
- '71176cb0e5aaa230d7c9634c37245bfb'
+md5sums=('54fafd985b5209859ba6faeb50b8f142'
+ 'de331663cc8adc94f2fe44a262cfff58'
'02f7951824ee13103344f36009c0ef2a'
- '7fd6399d2ffbdf06b724f0cc2efa0784')
+ 'e48a3d87984669ef206e902bc8290ff9'
+ '71176cb0e5aaa230d7c9634c37245bfb')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 161a9f6..ddbbf7b 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,3 +1,3 @@
-8/23/12 -jm -Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
-brf - keep --disable-external-ffmpeg instead of using external ffmpeg
-brf - xbmc.install: add gen_lib_xml.py to post_install and post_remove
+PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
+PKGBUILD - keep --disable-external-ffmpeg instead of using external ffmpeg
+xbmc.install - add gen_lib_xml.py to post_install and post_remove
diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service
index 050460f..d36ddb0 100644
--- a/abs/extra/xbmc/xbmc.service
+++ b/abs/extra/xbmc/xbmc.service
@@ -9,7 +9,7 @@ Group = xbmc
PAMName=login
Type = simple
TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
Restart = on-abort
[Install]
--
cgit v0.12
From 1a327a227ed861eac0905b20c40b4b8b1ac230d5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 6 May 2014 21:30:24 +0000
Subject: mesa-demos: move to core where it already was
---
abs/core/mesa-demos/LICENSE | 1 -
abs/core/mesa-demos/PKGBUILD | 20 ++++------
abs/core/mesa-demos/__changelog | 4 --
abs/extra/mesa-demos/LICENSE | 82 -----------------------------------------
abs/extra/mesa-demos/PKGBUILD | 29 ---------------
5 files changed, 8 insertions(+), 128 deletions(-)
delete mode 100644 abs/core/mesa-demos/__changelog
delete mode 100644 abs/extra/mesa-demos/LICENSE
delete mode 100644 abs/extra/mesa-demos/PKGBUILD
diff --git a/abs/core/mesa-demos/LICENSE b/abs/core/mesa-demos/LICENSE
index 26a04af..ae33d27 100644
--- a/abs/core/mesa-demos/LICENSE
+++ b/abs/core/mesa-demos/LICENSE
@@ -80,4 +80,3 @@ X demos progs/xdemos/ Brian Paul see source files
SGI demos progs/samples/ SGI SGI copyright
RedBook demos progs/redbook/ SGI SGI copyright
-
diff --git a/abs/core/mesa-demos/PKGBUILD b/abs/core/mesa-demos/PKGBUILD
index dfeb84a..310dc36 100644
--- a/abs/core/mesa-demos/PKGBUILD
+++ b/abs/core/mesa-demos/PKGBUILD
@@ -2,17 +2,18 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-pkgname=mesa-demos
-pkgver=8.0.1
-pkgrel=3
+pkgname='mesa-demos'
+pkgver=8.1.0
+pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="Mesa demos and tools"
url="http://mesa3d.sourceforge.net"
license=('custom')
-depends=('glew>=1.5.6')
-conflicts=('mesa<7.9')
-source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
- LICENSE)
+depends=('libgl' 'glew')
+source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
+ 'LICENSE')
+sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
build() {
cd "${srcdir}/mesa-demos-${pkgver}"
@@ -25,9 +26,4 @@ package() {
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
- mv ${pkgdir}/usr/bin/clear ${pkgdir}/usr/bin/glxclear
- mv ${pkgdir}/usr/bin/line ${pkgdir}/usr/bin/glxline
}
-
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
- '10a9d94c27477a9f9afed27f7d1c4476')
diff --git a/abs/core/mesa-demos/__changelog b/abs/core/mesa-demos/__changelog
deleted file mode 100644
index 7b2e5a6..0000000
--- a/abs/core/mesa-demos/__changelog
+++ /dev/null
@@ -1,4 +0,0 @@
---renamed conflicting files
- mv ${pkgdir}/usr/bin/clear ${pkgdir}/usr/bin/glxclear
- mv ${pkgdir}/usr/bin/line ${pkgdir}/usr/bin/glxline
-
diff --git a/abs/extra/mesa-demos/LICENSE b/abs/extra/mesa-demos/LICENSE
deleted file mode 100644
index ae33d27..0000000
--- a/abs/extra/mesa-demos/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights
-and licenses apply to different components. For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors. See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-
-Device drivers src/mesa/drivers/* See drivers See drivers
-
-Ext headers include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-GLUT src/glut/ Mark Kilgard Mark's copyright
-
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-
-SGI GLU library src/glu/sgi/ SGI SGI Free B
-
-demo programs progs/demos/ various see source files
-
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
diff --git a/abs/extra/mesa-demos/PKGBUILD b/abs/extra/mesa-demos/PKGBUILD
deleted file mode 100644
index 310dc36..0000000
--- a/abs/extra/mesa-demos/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname='mesa-demos'
-pkgver=8.1.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Mesa demos and tools"
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-depends=('libgl' 'glew')
-source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
- 'LICENSE')
-sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
- '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
-
-build() {
- cd "${srcdir}/mesa-demos-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/mesa-demos-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
- install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
-}
--
cgit v0.12
From 57f614882edbbcc6393fff8876f6e85628714808 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 7 May 2014 00:06:10 +0000
Subject: xbmc-pvr-addons: update to 20130426
---
abs/extra/xbmc-pvr-addons/PKGBUILD | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/abs/extra/xbmc-pvr-addons/PKGBUILD b/abs/extra/xbmc-pvr-addons/PKGBUILD
index 936ef39..e52db69 100644
--- a/abs/extra/xbmc-pvr-addons/PKGBUILD
+++ b/abs/extra/xbmc-pvr-addons/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xbmc-pvr-addons
-pkgver=20131106git
+pkgver=20140426
pkgrel=1
pkgdesc="XBMC PVR add-ons for current stable xbmc"
arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@ depends=('xbmc' 'libmysqlclient')
makedepends=('git' 'libmysqlclient' 'boost')
optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
conflicts=('xbmc-pvr-addons-git')
-#source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz")
-#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
-source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo")
+source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
md5sums=('SKIP')
+pkgver() {
+ cd "$srcdir/$pkgname"
+ git log -1 --format="%cd" --date=short | tr -d '-'
+}
+
build() {
cd "$srcdir/$pkgname"
./bootstrap
--
cgit v0.12
From ee73e801262740f800f3fbbf72391b0e6cff8911 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 7 May 2014 14:27:48 +0000
Subject: xbmc: upgpkg
---
abs/extra/xbmc/PKGBUILD | 49 ++++++++++++++++++++++++++--------------------
abs/extra/xbmc/__changelog | 2 +-
2 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 8e3aae1..87a9e78 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -10,32 +10,39 @@ _prefix=/usr
pkgname=xbmc
pkgver=13.0
_codename=Gotham
-pkgrel=1
+pkgrel=2
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib' 'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt')
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+ 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
+ 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image'
+ 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump'
+ 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng'
+ 'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib'
+ 'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt' 'ffmpeg')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
- 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
+ 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
- 'lirc: remote controller support'
- 'udisks: automount external drives'
- 'upower: used to trigger power management functionality'
- 'unrar: access compressed files without unpacking them'
- 'xorg-xinit: autostart xbmc')
+ 'lirc: remote controller support'
+ 'udisks: automount external drives'
+ 'upower: used to trigger power management functionality'
+ 'unrar: access compressed files without unpacking them'
+ 'xorg-xinit: autostart xbmc')
install="${pkgname}.install"
source=(
- "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
- "xbmc.service"
- "polkit.rules"
- "xbmc.sh"
- "xbmc_lib.conf"
+ "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
+ "xbmc.service"
+ "polkit.rules"
+ "enable-external-ffmpeg.patch"
+ "xbmc.sh"
+ "xbmc_lib.conf"
)
prepare() {
cd "${srcdir}/xbmc-$pkgver-$_codename"
-
+ patch -p1 -i ../enable-external-ffmpeg.patch
}
build() {
@@ -76,7 +83,7 @@ build() {
--enable-udev \
--enable-libusb \
--enable-libcec \
- --enable-external-libraries
+ --enable-external-libraries
# Now (finally) build
@@ -92,16 +99,16 @@ package() {
sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
# Tools
- msg2 "Tools"
+ msg2 "Tools"
install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
- msg2 "Copy licenses"
- install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ msg2 "Copy licenses"
+ install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
for licensef in LICENSE.GPL copying.txt; do
- mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef} \
- ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef} \
+ ${pkgdir}${_prefix}/share/licenses/${pkgname}
done
# LinHES stuff
@@ -114,9 +121,9 @@ package() {
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
}
-# vim:set ts=2 sw=2 et:
md5sums=('54fafd985b5209859ba6faeb50b8f142'
'de331663cc8adc94f2fe44a262cfff58'
'02f7951824ee13103344f36009c0ef2a'
+ '9f9b41cfc1e21b1e7d0bb10d6e85b3c6'
'e48a3d87984669ef206e902bc8290ff9'
'71176cb0e5aaa230d7c9634c37245bfb')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index ddbbf7b..829f14d 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,3 +1,3 @@
+PKGBUILD - remove libpulse dep
PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
-PKGBUILD - keep --disable-external-ffmpeg instead of using external ffmpeg
xbmc.install - add gen_lib_xml.py to post_install and post_remove
--
cgit v0.12
From 69f172e985d06712b11cde9fa020353a78ec3c9f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 7 May 2014 20:20:42 +0000
Subject: xbmc: add ffmpeg patch
---
abs/extra/xbmc/enable-external-ffmpeg.patch | 100 ++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
create mode 100644 abs/extra/xbmc/enable-external-ffmpeg.patch
diff --git a/abs/extra/xbmc/enable-external-ffmpeg.patch b/abs/extra/xbmc/enable-external-ffmpeg.patch
new file mode 100644
index 0000000..2bc1aaf
--- /dev/null
+++ b/abs/extra/xbmc/enable-external-ffmpeg.patch
@@ -0,0 +1,100 @@
+diff -rupN a/configure.in b/configure.in
+--- a/configure.in 2014-05-03 21:03:25.000000000 +0000
++++ b/configure.in 2014-05-07 09:56:30.039177391 +0000
+@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
+ MAKE="${MAKE:-make}"
+ OBJDUMP="${OBJDUMP:-objdump}"
+
+-use_external_ffmpeg=no
++use_external_ffmpeg=yes
+ use_static_ffmpeg=no
+
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
+@@ -632,7 +632,7 @@ case $host in
+ use_arch="x86"
+ use_cpu="i686"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
+ ARCH="x86_64-linux"
+@@ -640,7 +640,7 @@ case $host in
+ use_arch="x86_64"
+ use_cpu="x86_64"
+ fi
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ i386-*-freebsd*)
+ ARCH="x86-freebsd"
+@@ -696,7 +696,7 @@ case $host in
+ use_sdl=no
+ use_x11=no
+ use_wayland=no
+- use_static_ffmpeg=yes
++ use_static_ffmpeg=no
+ ;;
+ arm*-*linux-android*)
+ target_platform=target_android
+diff -rupN a/lib/DllAvCodec.h b/lib/DllAvCodec.h
+--- a/lib/DllAvCodec.h 2014-05-03 21:03:25.000000000 +0000
++++ b/lib/DllAvCodec.h 2014-05-07 10:10:06.298165915 +0000
+@@ -43,6 +43,7 @@ extern "C" {
+
+ #if (defined USE_EXTERNAL_FFMPEG)
+ #include <libavcodec/avcodec.h>
++ #include <libavutil/frame.h>
+ #else
+ #include "libavcodec/avcodec.h"
+ #endif
+diff -rupN a/lib/DllAvUtil.h b/lib/DllAvUtil.h
+--- a/lib/DllAvUtil.h 2014-05-03 21:03:25.000000000 +0000
++++ b/lib/DllAvUtil.h 2014-05-07 10:17:31.415798448 +0000
+@@ -31,33 +31,19 @@
+ #endif
+
+ extern "C" {
+-#if (defined USE_EXTERNAL_FFMPEG)
+- #include <libavutil/avutil.h>
+- // for av_get_default_channel_layout
+- #include <libavutil/audioconvert.h>
+- #include <libavutil/crc.h>
+- #include <libavutil/fifo.h>
+- // for LIBAVCODEC_VERSION_INT:
+- #include <libavcodec/avcodec.h>
+- // for enum AVSampleFormat
+- #include <libavutil/samplefmt.h>
+- #include <libavutil/opt.h>
+- #include <libavutil/mem.h>
+- #include <libavutil/mathematics.h>
+- #if (defined USE_LIBAV_HACKS)
+- #include "xbmc-libav-hacks/libav_hacks.h"
+- #endif
+-#else
+- #include "libavutil/avutil.h"
+- //for av_get_default_channel_layout
+- #include "libavutil/audioconvert.h"
+- #include "libavutil/crc.h"
+- #include "libavutil/opt.h"
+- #include "libavutil/mem.h"
+- #include "libavutil/fifo.h"
+- // for enum AVSampleFormat
+- #include "libavutil/samplefmt.h"
+-#endif
++#include <libavutil/avutil.h>
++#include <libavutil/frame.h>
++// for av_get_default_channel_layout
++#include <libavutil/audioconvert.h>
++#include <libavutil/crc.h>
++#include <libavutil/fifo.h>
++// for LIBAVCODEC_VERSION_INT:
++#include <libavcodec/avcodec.h>
++// for enum AVSampleFormat
++#include <libavutil/samplefmt.h>
++#include <libavutil/opt.h>
++#include <libavutil/mem.h>
++#include <libavutil/mathematics.h>
+ }
+
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
--
cgit v0.12
From a1f762b784f2abde026f2874bb85b85a41d503c3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 8 May 2014 15:44:23 +0000
Subject: mythtv, mythplugins, mythhweb: update to latest -fixes
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash_web | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythweb/PKGBUILD | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 16ca17a..560b9f7 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-e2acf0d940009b2b240d52e9b53a123e1309a134
+9f353cc287733cb5fc70ab67b3752557a4101753
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
index 90675ae..90a5feb 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web
@@ -1 +1 @@
-a492e9343caff760e0081f785d540ca6a1fe39fa
+fca2bd2f78136a5363b1fbe7a313677b6bd1adc5
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 6b7e6bc..0bf96e6 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27
-pkgrel=14
+pkgrel=15
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 70eed29..2442551 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=14
+pkgrel=15
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
diff --git a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
index 7489e8a..df18538 100644
--- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.27
-pkgrel=4
+pkgrel=5
commit_hash=`cat ../git_src/git_hash_web`
pkgdesc="Web interface for MythTV's backend, $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From e5cc083e2bc5884a245829489b15e1b1ea936d73 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 17:31:14 +0000
Subject: xbmc-pvr-addons: update to 20140512
---
abs/extra/xbmc-pvr-addons/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/xbmc-pvr-addons/PKGBUILD b/abs/extra/xbmc-pvr-addons/PKGBUILD
index e52db69..56f0e07 100644
--- a/abs/extra/xbmc-pvr-addons/PKGBUILD
+++ b/abs/extra/xbmc-pvr-addons/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xbmc-pvr-addons
-pkgver=20140426
+pkgver=20140512
pkgrel=1
pkgdesc="XBMC PVR add-ons for current stable xbmc"
arch=('i686' 'x86_64')
--
cgit v0.12
From a5b1f9bed21ee14c3d9471c6d9f0b04faef9b288 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 18:12:43 +0000
Subject: bluez: update to 5.18. refs #968
---
abs/extra/bluez/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index 9465acb..25a7e32 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase=bluez
pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.15
+pkgver=5.18
pkgrel=1
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
bluetooth.modprobe)
# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('487bd75697e565793bf5bc4fbd5fa6a602788313b0c694f7542b81689fc0aa87'
+sha256sums=('8c8bb13db83d0de6c85def2da8dfa0a758aff595405fb57a00719ed94d558340'
'896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b'
'46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
--
cgit v0.12
From 1e328bcfaa64c5e77fc7ac7dfe4b095538d8dcaf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 18:20:52 +0000
Subject: runit-scripts: update bluetoothd for new bluez
---
abs/core/runit-scripts/PKGBUILD | 4 ++--
abs/core/runit-scripts/runitscripts/services/bluetoothd/run | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 66e68bb..7cef4f0 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
-pkgver=8.1
-pkgrel=17
+pkgver=8.2
+pkgrel=1
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
index 5b3e1be..9b25f0b 100755
--- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
+++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
@@ -6,9 +6,7 @@
. /etc/rc.conf
. /etc/rc.d/functions
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
/usr/bin/svwaitup -s 15 /service/dbus || exit 1
-stat_runit "Starting bluetooth subsystem:"
+stat_runit "Starting bluetooth"
-exec /usr/bin/bluetoothd -n >/dev/null
+exec /usr/bin/bluetoothctl
--
cgit v0.12
From 118c5f50c9ab1d98e9314413d64bc1ca3f8cc6c2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 19:10:13 +0000
Subject: python-mako: initial inclusion. dep of gobject-introspection
---
abs/core/python_modules/python-mako/PKGBUILD | 54 +++++++++++++++++++++++++
abs/core/python_modules/python-mako/__changelog | 1 +
2 files changed, 55 insertions(+)
create mode 100644 abs/core/python_modules/python-mako/PKGBUILD
create mode 100644 abs/core/python_modules/python-mako/__changelog
diff --git a/abs/core/python_modules/python-mako/PKGBUILD b/abs/core/python_modules/python-mako/PKGBUILD
new file mode 100644
index 0000000..71440e4
--- /dev/null
+++ b/abs/core/python_modules/python-mako/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer :
+
+pkgname=('python2-mako')
+pkgver=0.9.1
+pkgrel=2
+pkgdesc="Hyperfast and lightweight templating for the Python2 platform"
+arch=('any')
+url="http://www.makotemplates.org/"
+license=('MIT')
+makedepends=('python2-setuptools')
+checkdepends=('python2-nose')
+source=(https://pypi.python.org/packages/source/M/Mako/Mako-$pkgver.tar.gz{,.asc})
+sha1sums=('aa01bafca5a835eb92a9048be92414fa83da102b'
+ 'SKIP')
+
+prepare() {
+ cp -r Mako-$pkgver python2-Mako-$pkgver
+ mv Mako-$pkgver/scripts/mako-render Mako-$pkgver/scripts/python3-mako-render
+# 2to3 -nw Mako-$pkgver/scripts/python3-mako-render
+ sed -i 's/mako-render/python3-mako-render/' Mako-$pkgver/setup.py
+}
+
+build() {
+ cd Mako-$pkgver
+# python3 setup.py build
+
+ cd ../python2-Mako-$pkgver
+ python2 setup.py build
+}
+
+check() {
+ cd Mako-$pkgver
+# python3 setup.py test
+
+ cd ../python2-Mako-$pkgver
+ python2 setup.py test
+}
+
+#package_python-mako() {
+# depends=('python-markupsafe' 'python-beaker')
+
+# cd Mako-$pkgver
+# python3 setup.py install --root="$pkgdir" --optimize=1
+# install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING"
+#}
+
+package_python2-mako() {
+ depends=('python2-markupsafe' 'python2-beaker')
+
+ cd python2-Mako-$pkgver
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -D LICENSE "$pkgdir/usr/share/licenses/python2-mako/COPYING"
+}
diff --git a/abs/core/python_modules/python-mako/__changelog b/abs/core/python_modules/python-mako/__changelog
new file mode 100644
index 0000000..9715c21
--- /dev/null
+++ b/abs/core/python_modules/python-mako/__changelog
@@ -0,0 +1 @@
+PKGBUILD - comment out all python 3 stuff and only build for py 2
--
cgit v0.12
From 922c15990fa416ab24e5bb0cbf2a65891e69bbc6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 19:15:03 +0000
Subject: python-beaker: initial inclusion. dep of python-mako
---
abs/core/python_modules/python-beaker/PKGBUILD | 42 +++++++++++++++++++++++
abs/core/python_modules/python-beaker/__changelog | 1 +
2 files changed, 43 insertions(+)
create mode 100644 abs/core/python_modules/python-beaker/PKGBUILD
create mode 100644 abs/core/python_modules/python-beaker/__changelog
diff --git a/abs/core/python_modules/python-beaker/PKGBUILD b/abs/core/python_modules/python-beaker/PKGBUILD
new file mode 100644
index 0000000..fbc3bae
--- /dev/null
+++ b/abs/core/python_modules/python-beaker/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
+
+pkgname=('python2-beaker')
+pkgver=1.6.4
+pkgrel=2
+arch=('any')
+license=('custom')
+pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
+url="http://beaker.groovie.org/"
+makedepends=('python2-setuptools')
+source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-${pkgver}.tar.gz")
+md5sums=('c2e102870ed4c53104dec48ceadf8e9d')
+
+build() {
+ cp -r Beaker-${pkgver} python2-Beaker-${pkgver}
+
+ cd "${srcdir}/Beaker-${pkgver}"
+ sed -i "s#/usr/bin/python#/usr/bin/python3#" beaker/crypto/pbkdf2.py
+# python3 setup.py build
+
+ cd "${srcdir}/python2-Beaker-${pkgver}"
+ sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
+ python2 setup.py build
+}
+
+#package_python-beaker() {
+# depends=('python')
+
+# cd "${srcdir}/Beaker-${pkgver}"
+# python3 setup.py install --root="${pkgdir}" --optimize=1
+# install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-beaker/LICENSE"
+#}
+
+package_python2-beaker() {
+ depends=('python2')
+
+ cd "${srcdir}/python2-Beaker-${pkgver}"
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-beaker/LICENSE"
+}
diff --git a/abs/core/python_modules/python-beaker/__changelog b/abs/core/python_modules/python-beaker/__changelog
new file mode 100644
index 0000000..9715c21
--- /dev/null
+++ b/abs/core/python_modules/python-beaker/__changelog
@@ -0,0 +1 @@
+PKGBUILD - comment out all python 3 stuff and only build for py 2
--
cgit v0.12
From 2920628a4d62688c005fda29f72f573b99a0fcdc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 19:31:14 +0000
Subject: glib2: update to 2.40
---
abs/core/glib2/PKGBUILD | 63 ++++++++++++++++++++++++++++++++----------------
abs/core/glib2/glib2.csh | 1 -
abs/core/glib2/glib2.sh | 1 -
3 files changed, 42 insertions(+), 23 deletions(-)
delete mode 100644 abs/core/glib2/glib2.csh
delete mode 100644 abs/core/glib2/glib2.sh
diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD
index 0b43721..6617cc0 100644
--- a/abs/core/glib2/PKGBUILD
+++ b/abs/core/glib2/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 163895 2012-07-21 19:19:49Z ibiru $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=glib2
-pkgver=2.32.4
+pkgbase=glib2
+pkgname=(glib2 glib2-docs)
+pkgver=2.40.0
pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
- glib2.sh
- glib2.csh
+makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
revert-warn-glib-compile-schemas.patch)
-sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2'
- '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
- '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+sha256sums=('0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+prepare() {
+ cd glib-$pkgver
+ patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+}
+
build() {
cd glib-$pkgver
- patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
--with-pcre=system \
@@ -31,16 +28,40 @@ build() {
make
}
-package() {
+check() {
cd glib-$pkgver
- make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
+ #make -k check || :
+}
- install -d "$pkgdir/etc/profile.d"
- install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
- install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
+package_glib2() {
+ depends=('pcre' 'libffi')
+ optdepends=('python2: for gdbus-codegen and gtester-report'
+ 'elfutils: gresource inspection tool')
+ options=('!docs' '!emptydirs')
+ license=('LGPL')
+
+ cd glib-$pkgver
+ make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
chmod -x "$_i"
done
- sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+
+ # Our gdb does not ship the required python modules, so remove it
+ rm -rf "$pkgdir/usr/share/gdb/"
+}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for glib2"
+ conflicts=('gobject2-docs')
+ replaces=('gobject2-docs')
+ license=('custom')
+ options=('docs' '!emptydirs')
+
+ cd glib-$pkgver/docs
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
+ install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
+
+ rm -rf "${pkgdir}/usr/share/man"
}
diff --git a/abs/core/glib2/glib2.csh b/abs/core/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2f..0000000
--- a/abs/core/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/abs/core/glib2/glib2.sh b/abs/core/glib2/glib2.sh
deleted file mode 100644
index 96a056e..0000000
--- a/abs/core/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
--
cgit v0.12
From 2a688c11c593658036b1463ec016d33e2587c6e7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 20:15:25 +0000
Subject: gobject-introspection: update to 1.40
---
abs/core/gobject-introspection/PKGBUILD | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/abs/core/gobject-introspection/PKGBUILD b/abs/core/gobject-introspection/PKGBUILD
index 972a8a9..1d25467 100644
--- a/abs/core/gobject-introspection/PKGBUILD
+++ b/abs/core/gobject-introspection/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 157399 2012-04-28 09:26:41Z allan $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gobject-introspection
-pkgver=1.32.1
-pkgrel=2
+pkgver=1.40.0
+pkgrel=1
pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
+url="https://live.gnome.org/GObjectIntrospection"
arch=('x86_64' 'i686')
license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
+depends=('glib2' 'python2' 'python2-mako')
makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98')
build() {
cd "$pkgname-$pkgver"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool
make
}
--
cgit v0.12
From 5cd1b95e1f680f549c2e11ce30e0d22a3a887678 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 May 2014 20:35:54 +0000
Subject: pyobject: initial inclusion
---
abs/core/python_modules/pygobject/PKGBUILD | 55 +++++++++++++++++++++++++++
abs/core/python_modules/pygobject/__changelog | 1 +
2 files changed, 56 insertions(+)
create mode 100644 abs/core/python_modules/pygobject/PKGBUILD
create mode 100644 abs/core/python_modules/pygobject/__changelog
diff --git a/abs/core/python_modules/pygobject/PKGBUILD b/abs/core/python_modules/pygobject/PKGBUILD
new file mode 100644
index 0000000..32e4c31
--- /dev/null
+++ b/abs/core/python_modules/pygobject/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgbase=pygobject
+pkgname=(python2-gobject pygobject-devel)
+pkgver=3.12.1
+pkgrel=1
+arch=(i686 x86_64)
+url="https://live.gnome.org/PyGObject"
+license=(LGPL)
+makedepends=(python2 python2-cairo gobject-introspection gnome-common)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35')
+
+prepare() {
+ mkdir build-py2 build-py3 devel
+ cd ${pkgbase}-${pkgver}
+ sed -i '/Werror=format/d' configure # gcc 4.8
+}
+
+build() {
+ cd build-py2
+ ../${pkgbase}-${pkgver}/autogen.sh --prefix=/usr --with-python=/usr/bin/python2
+ make
+
+# cd ../build-py3
+# ../${pkgbase}-${pkgver}/configure --prefix=/usr
+ make
+}
+
+#package_python-gobject() {
+# pkgdesc="Python 3 bindings for GObject"
+# depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
+
+# cd build-py3
+# make DESTDIR="$pkgdir" install
+# rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
+#}
+
+package_python2-gobject() {
+ pkgdesc="Python 2 bindings for GObject"
+ depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
+
+ cd build-py2
+ make DESTDIR="$pkgdir" install
+ mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
+}
+
+package_pygobject-devel() {
+ pkgdesc="Development files for the pygobject bindings"
+ cd "devel"
+ mkdir -p "$pkgdir"/usr/{include,lib}
+ mv include "$pkgdir/usr/"
+ mv pkgconfig "$pkgdir/usr/lib/"
+}
diff --git a/abs/core/python_modules/pygobject/__changelog b/abs/core/python_modules/pygobject/__changelog
new file mode 100644
index 0000000..9715c21
--- /dev/null
+++ b/abs/core/python_modules/pygobject/__changelog
@@ -0,0 +1 @@
+PKGBUILD - comment out all python 3 stuff and only build for py 2
--
cgit v0.12
From 9e73f8ae6c7d9800b6fc643fc143f40549fac609 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 May 2014 16:48:51 +0000
Subject: LinHES-system: idle.py: add option to check user logins. closes #969
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/idle.py | 45 ++++++++++++++++++++++++++++++++---------
2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index d151b48..7d57587 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
-pkgver=8.1
-pkgrel=23
+pkgver=8.2
+pkgrel=1
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -119,7 +119,7 @@ md5sums=('a10cb96850951ae835c46f41f92463b2'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
- 'b08a9c9aa1215e9aa3aa7d2e654e72e5'
+ '0c6cab59e09c82e40f6e627c96d5a5f6'
'a94fe6d980f4b810f2e2ae5352084b39'
'384956b4fd9bf40907856bab0e67b169'
'f4ce577e2ab1b6dbf9def46a8ab86e2d'
diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py
index 16dc873..6b813b4 100755
--- a/abs/core/LinHES-system/idle.py
+++ b/abs/core/LinHES-system/idle.py
@@ -182,6 +182,25 @@ def mythtvsetup_check(cmdargs):
msg(cmdargs," mythtv-setup is NOT running.")
return True
+def userlogins_check(cmdargs):
+ if (cmdargs.logins):
+ u=False
+ msg(cmdargs," Checking for users logged in...")
+ users=subprocess.check_output("who")
+ names=([x.split() for x in users.splitlines()])
+ for i in names:
+ if (i[0] == "mythtv" and i[4] == "(:0)"):
+ msg(cmdargs," Ignoring %s %s" %(i[0],i[4]))
+ else:
+ msg(cmdargs," User logged in: %s %s" %(i[0],i[4]))
+ u=True
+ if u:
+ return False
+ else:
+ return True
+ else:
+ return True
+
def mythfe_check(cmdargs,cursor,mythDB):
if ( cmdargs.runningfe ):
msg(cmdargs," Checking for running and playing mythfrontends...")
@@ -229,20 +248,22 @@ def usage():
idle.py checks these parts of the system in this order to
determine if it is idle:
+ - (option -g) users are logged in return busy
+ ignores mythtv (:0) for busy
- (option -l) mythshutdown is locked return busy
- - (option -d) In a daily wake period or
+ - (option -d) in a daily wake period or
about to start a daily wake period return busy
checks the next 15 minutes. -t TIME changes time
- schema is locked return busy
- - There are in use programs return busy
- - There are active jobs in the job queue return busy
+ - there are in use programs return busy
+ - there are active jobs in the job queue return busy
- mythfilldatabase is running return busy
- mythtv-setup is running return busy
- - There are upcoming recordings return busy
+ - there are upcoming recordings return busy
checks the next 15 minutes. -t TIME changes time
- - (option -r) mythfrontends running
- - mythfrontends playing back a recording or video
- - mythfrontends not in menus
+ - (option -r) mythfrontends running return busy
+ - mythfrontends playing back a recording or video return busy
+ - mythfrontends not in menus return busy
idle.py stops checking and returns false (busy) when the first busy is found.
'''
@@ -252,6 +273,7 @@ def usage():
def main(args=[False]):
parser = argparse.ArgumentParser()
parser.add_argument('-d', '--daily', action='store_true', help='Include daily wake & about to start wake in system busy. (default: daily wake & about to start wake is system idle)')
+ parser.add_argument('-g', '--logins', action='store_true', help='Include user logins in system busy. ignores mythtv (:0) in system busy.')
parser.add_argument('-l', '--lock', action='store_true', help='Include mythshutdown lock in system busy. (default: mythshutdown lock is system idle)')
parser.add_argument('-r', '--runningfe', action='store_true', help='Include running mythfrontends in system busy. (default: running mythfrontends are system idle)')
parser.add_argument('-s', '--silent', action='store_true', help='Run without printing output. Recommended for use in cron jobs or scripts.')
@@ -267,6 +289,11 @@ def main(args=[False]):
idle=True
msg(cmdargs,"Checking system idle...")
+ if (userlogins_check(cmdargs)):
+ idle = True
+ else:
+ idle = False
+
try:
from MythTV import MythDB
mythDB = MythDB()
@@ -284,7 +311,7 @@ def main(args=[False]):
msg(cmdargs,"Couldn't connect to MythTV backend.")
be_conn=False
- if ( db_conn ):
+ if ( db_conn and idle ):
if (mythshutdownlock_check(cmdargs,cursor) and dailywake_check(cmdargs,cursor) and schemalock_check(cmdargs,cursor) and in_use(cmdargs,cursor) and job_check(cmdargs,cursor)):
idle=True
else:
@@ -297,7 +324,7 @@ def main(args=[False]):
idle=False
if ( db_conn and idle ):
- if ( mythfe_check(cmdargs,cursor,mythDB) ):
+ if (mythfe_check(cmdargs,cursor,mythDB)):
idle=True
else:
idle=False
--
cgit v0.12
From 036f0763152578b7a80b0ebee96b4a0dfa95938c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 May 2014 17:16:17 +0000
Subject: google-chrome: update to 34.0.1847.137
---
abs/extra/google-chrome/PKGBUILD | 6 +++---
abs/extra/google-chrome/google-chrome.install | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
mode change 100644 => 100755 abs/extra/google-chrome/PKGBUILD
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
old mode 100644
new mode 100755
index c4357a3..d586b72
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=34.0.1847.132
+pkgver=34.0.1847.137
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -23,8 +23,8 @@ _channel=stable
_arch=i386
[ "${CARCH}" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb")
-md5sums=('7a25fe96c07da3f0da72783788aad054')
-[ "${CARCH}" = 'x86_64' ] && md5sums[0]='54515de584acbe880a0adcc828e3173a'
+md5sums=('06388a15d51f815062dd4bcddaeec1cf')
+[ "${CARCH}" = 'x86_64' ] && md5sums[0]='3cc7cd28bbb7bb3e5add19f27a6d0dda'
package() {
msg2 "Extracting the data.tar.lzma"
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index 5d42e84..b44a73e 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -1,6 +1,6 @@
# Colored makepkg-like functions
msg_blue() {
- printf "${BLUE}==>${ALL_OFF}${BOLD} $1${ALL_OFF}\n"
+ printf "${BLUE}==>${ALL_OFF}${BOLD} ${1}${ALL_OFF}\n"
}
note() {
--
cgit v0.12
From cff739f47ec689c4333ca1380108e04e52f29884 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 27 May 2014 16:08:07 +0000
Subject: google-chrome: update to 35.0.1916.114
---
abs/extra/google-chrome/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
mode change 100755 => 100644 abs/extra/google-chrome/PKGBUILD
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
old mode 100755
new mode 100644
index d586b72..987100f
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=34.0.1847.137
+pkgver=35.0.1916.114
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -23,8 +23,8 @@ _channel=stable
_arch=i386
[ "${CARCH}" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb")
-md5sums=('06388a15d51f815062dd4bcddaeec1cf')
-[ "${CARCH}" = 'x86_64' ] && md5sums[0]='3cc7cd28bbb7bb3e5add19f27a6d0dda'
+md5sums=('c4a88b4234f42c783441f760f5fc6070')
+[ "${CARCH}" = 'x86_64' ] && md5sums[0]='622a495960f247eca2f14eb2eccb5303'
package() {
msg2 "Extracting the data.tar.lzma"
--
cgit v0.12
From d57ac93a1102d61a67340e24d6800b8571921e25 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 27 May 2014 17:53:35 +0000
Subject: mythtv & mythplugins: update to .27.1 -fixes
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 4 +-
...tect-metadata-loads-from-multiple-threads.patch | 52 ----------------------
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 7 +--
4 files changed, 5 insertions(+), 60 deletions(-)
delete mode 100644 abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 560b9f7..d12df68 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-9f353cc287733cb5fc70ab67b3752557a4101753
+81c77ba1730563b7786060a372e870a995b40723
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 0bf96e6..e7f7695 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=('mytharchive'
'mythnews'
'mythweather'
'mythzoneminder')
-pkgver=0.27
-pkgrel=15
+pkgver=0.27.1
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch b/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
deleted file mode 100644
index d8f4a0c..0000000
--- a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Sun, 10 Jun 2012 13:36:42 -0400
-Subject: [PATCH] protect metadata loads from multiple threads
-
----
- mythtv/libs/libmythmetadata/dbaccess.cpp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/mythtv/libs/libmythmetadata/dbaccess.cpp b/mythtv/libs/libmythmetadata/dbaccess.cpp
-index 67cd904..46adb7a 100644
---- a/mythtv/libs/libmythmetadata/dbaccess.cpp
-+++ b/mythtv/libs/libmythmetadata/dbaccess.cpp
-@@ -47,8 +47,11 @@ class SingleValueImp
-
- virtual ~SingleValueImp() {}
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -271,8 +274,11 @@ class MultiValueImp
- .arg(m_value_name).arg(m_table_name).arg(m_id_name);
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -730,8 +736,11 @@ class FileAssociationsImp
- }
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
---
-1.7.2.5
-
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 2442551..12328ff 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
-pkgver=0.27
-pkgrel=15
+pkgver=0.27.1
+pkgrel=1
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -20,8 +20,6 @@ backup=()
install='mythtv.install'
patches=('myth_settings.patch'
- '0001-protect-metadata-loads-from-multiple-threads.patch'
- #http://code.mythtv.org/trac/ticket/10825 thread safety in video metadata load
'suggestedstarttime.patch.v1')
#http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb
@@ -103,6 +101,5 @@ package() {
}
md5sums=('5f3e43567e62afe17bad39f5a9b604cf'
- '67f7316c750fba17fa578d10840b9dbd'
'35a7fd3e3057691e3b1bf355bb9e8b16'
'65a08d8949431ecdeb51a686dc6f9c21')
--
cgit v0.12
From a0a83f64fd37eeca9182825de16cd30f5335d0ff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 27 May 2014 20:04:59 +0000
Subject: linhes-theme: upstream changes
---
abs/core/linhes-theme/PKGBUILD | 6 +++---
abs/core/linhes-theme/readme.txt.patch | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 0047d36..d98916d 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=1
+pkgrel=2
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.50 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.53 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
'LHLogoAndText.png')
@@ -76,7 +76,7 @@ package() {
sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
-md5sums=('025442908211ee2a2a3ab5a9fed0a929'
+md5sums=('2dca856c2a4d1f959473512c94e43b60'
'ed4f8baf431e20babc345e4e2602426f'
'cb8c0d63392f6c8c2d8219243fbf47c6'
'c75c83b90969fb07755062113f858e88'
diff --git a/abs/core/linhes-theme/readme.txt.patch b/abs/core/linhes-theme/readme.txt.patch
index 3f66992..f82817d 100644
--- a/abs/core/linhes-theme/readme.txt.patch
+++ b/abs/core/linhes-theme/readme.txt.patch
@@ -1,5 +1,5 @@
---- readme.txt.orig 2014-04-13 21:06:06.302600752 +0000
-+++ readme.txt 2014-04-13 21:07:53.282168214 +0000
+--- readme.txt.orig 2014-05-27 19:56:48.714421419 +0000
++++ readme.txt 2014-05-27 19:58:12.880315485 +0000
@@ -1,26 +1,9 @@
-Backgrounds.
-
@@ -24,6 +24,6 @@
-To use just backup main-ui.xml. Example cp menu-ui.xml menu-ui.xml.bak.
-Then cp menu-ui-vert.xml to menu-ui.xml.
-
- Old solid select bar.
- If you liked the old select bar look you can still get it by copying base.xml_solid_select_bar to base.xml
- and copying osd.xml_solid_select_bar osd.xml.
+ Color text in lists.
+
+ There are two types of lists in the theme.
--
cgit v0.12
From e1ab01c98cf4a5eb643e199a2e0abba06e049e14 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 4 Jun 2014 14:07:37 +0000
Subject: linhes-theme: update for upstream changes
---
abs/core/linhes-theme/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index d98916d..33e2c49 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=2
+pkgrel=3
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.53 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.54 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
'LHLogoAndText.png')
--
cgit v0.12
From 5e29a75f3f39cc350d4fb0cd4ca52d2c03cae549 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Jun 2014 16:38:52 +0000
Subject: mythtv mythplugins: update to latest -fixes
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index d12df68..86f58a6 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-81c77ba1730563b7786060a372e870a995b40723
+2720f457c590465af558fe0720aa9f019fa4b26f
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index e7f7695..72ce020 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 12328ff..469b682 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27.1
-pkgrel=1
+pkgrel=2
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 0b0821f89efdc3c8a72c455258017b75d7322576 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:46:07 -0500
Subject: ed: 1.9 refs #961
---
abs/core/ed/PKGBUILD | 14 +++++++-------
abs/core/ed/ed.install | 18 ++++++++++++++++++
2 files changed, 25 insertions(+), 7 deletions(-)
create mode 100644 abs/core/ed/ed.install
diff --git a/abs/core/ed/PKGBUILD b/abs/core/ed/PKGBUILD
index dac07e3..96ba7fe 100644
--- a/abs/core/ed/PKGBUILD
+++ b/abs/core/ed/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146434 2012-01-11 04:50:27Z dreisner $
+# $Id: PKGBUILD 189480 2013-07-03 11:36:49Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=ed
-pkgver=1.6
+pkgver=1.9
pkgrel=1
pkgdesc="A POSIX-compliant line-oriented text editor"
arch=('i686' 'x86_64')
@@ -11,13 +11,16 @@ license=('GPL')
url="http://www.gnu.org/software/ed/ed.html"
depends=('glibc' 'sh')
options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9a78593decccaa889523aa4bb555ed4b')
+source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig})
+install='ed.install'
+md5sums=('565b6d1d5a9a8816b9b304fc4ed9405d'
+ 'SKIP')
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/ \
+ --bindir=/usr/bin \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
"CFLAGS=$CFLAGS" \
@@ -32,7 +35,4 @@ check() {
package() {
make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install
-
- # nuke info pages
- rm -r "$pkgdir/usr/share/info"
}
diff --git a/abs/core/ed/ed.install b/abs/core/ed/ed.install
new file mode 100644
index 0000000..2be95d9
--- /dev/null
+++ b/abs/core/ed/ed.install
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(ed.info)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2>/dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2>/dev/null
+ done
+}
--
cgit v0.12
From c798df59e141d0e675376e6ad394dd097f5ecfc0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:46:52 -0500
Subject: fping: 3.8-2
refs #961
---
abs/core/fping/PKGBUILD | 4 ++--
abs/core/fping/fping-3.8-2.src.tar.gz | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 120000 abs/core/fping/fping-3.8-2.src.tar.gz
diff --git a/abs/core/fping/PKGBUILD b/abs/core/fping/PKGBUILD
index b2414a5..cc3f56b 100644
--- a/abs/core/fping/PKGBUILD
+++ b/abs/core/fping/PKGBUILD
@@ -4,13 +4,14 @@
pkgname=fping
pkgver=3.8
-pkgrel=2
+pkgrel=3
pkgdesc="A utility to ping multiple hosts at once"
arch=('i686' 'x86_64')
url="http://www.fping.org/"
license=('custom')
depends=('glibc')
source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
+md5sums=('1e36467cc96a4ca959925ac167ea19af')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -33,4 +34,3 @@ package() {
chmod 4555 ${pkgdir}/usr/bin/fping
chmod 4555 ${pkgdir}/usr/bin/fping6
}
-md5sums=('1e36467cc96a4ca959925ac167ea19af')
diff --git a/abs/core/fping/fping-3.8-2.src.tar.gz b/abs/core/fping/fping-3.8-2.src.tar.gz
new file mode 120000
index 0000000..9cbf1dd
--- /dev/null
+++ b/abs/core/fping/fping-3.8-2.src.tar.gz
@@ -0,0 +1 @@
+/data/pkg_repo/src_packages/fping-3.8-2.src.tar.gz
\ No newline at end of file
--
cgit v0.12
From 71f378885f42296fe9550a09f393858d791187d0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:47:24 -0500
Subject: linux-atm:2.5.2-4 refs #961
---
abs/core/linux-atm/PKGBUILD | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/linux-atm/PKGBUILD b/abs/core/linux-atm/PKGBUILD
index 5b6e62d..ec50fb4 100644
--- a/abs/core/linux-atm/PKGBUILD
+++ b/abs/core/linux-atm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $
+# $Id: PKGBUILD 197830 2013-10-30 11:05:41Z allan $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Surain Mallawa Arachchi <mas@crc32.net>
pkgname=linux-atm
pkgver=2.5.2
-pkgrel=2
+pkgrel=4
pkgdesc="Drivers and tools to support ATM networking under Linux."
arch=('i686' 'x86_64')
depends=('glibc')
@@ -12,7 +12,9 @@ url="http://linux-atm.sourceforge.net/"
license=(GPL)
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
man-pages.patch)
-options=(!libtool !makeflags)
+options=(!makeflags)
+md5sums=('d49499368c3cf15f73a05d9bce8824a8'
+ '181390736336cdb615ae32f1ae5acfa6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +23,7 @@ build() {
# install firmware in /usr/lib
sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc
make
}
@@ -29,5 +31,3 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('d49499368c3cf15f73a05d9bce8824a8'
- '181390736336cdb615ae32f1ae5acfa6')
--
cgit v0.12
From faeb656ff58332ea2a2e4a6cac420e6cc2707352 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:47:46 -0500
Subject: mythinstall: recompile for new mythtv libs
---
abs/core/mythinstall/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 1a64fd3..a116ec6 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.1
-pkgrel=13
+pkgrel=14
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From 10b538e37e37825b86b023ebec6344fe654e88aa Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:48:09 -0500
Subject: ncid: .89 refs #961
---
abs/core/ncid/PKGBUILD | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/abs/core/ncid/PKGBUILD b/abs/core/ncid/PKGBUILD
index 6e09ef8..867e9c4 100755
--- a/abs/core/ncid/PKGBUILD
+++ b/abs/core/ncid/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=ncid
-pkgver=0.84
+pkgver=0.89
pkgrel=1
pkgdesc="daemon to display callerid"
url="http://ncid.sourceforge.net/"
@@ -12,7 +12,7 @@ backup=()
arch=('i686' 'x86_64' )
install=ncid.install
#source=(http://voxel.dl.sourceforge.net/project/ncid/ncid/$pkgver/$pkgname-$pkgver-src.tar.gz ncidd.conf ncid.conf ncid.py ncidpermissions.sql ncid.sql)
-source=(http://voxel.dl.sourceforge.net/project/ncid/ncid/$pkgver/$pkgname-$pkgver-src.tar.gz ncid-log.py ncidpermissions.sql ncid.sql ncid-linhes)
+source=(http://downloads.sourceforge.net/project/ncid/ncid/$pkgver/$pkgname-$pkgver-src.tar.gz ncid-log.py ncidpermissions.sql ncid.sql ncid-linhes)
#must be built with -j 1
build() {
cd $startdir/src/$pkgname
@@ -25,16 +25,20 @@ package(){
#sed out MakeFILE
sed -i "s|^.*\$(MAKE) install prefix=/usr prefix2=|\t\$(MAKE) install prefix=${pkgdir}/usr prefix2=$pkgdir|" Makefile
- #sed -i "s|^.*\$(MAKE) install prefix=/usr prefix2=|\t\$(MAKE) install prefix=${pkgdir}/usr prefix2=|" Makefile
+ sed -i "s|/sbin$|/bin|" Makefile
+
+
mkdir -p ${pkgdir}/etc
make package-install
- install -m 755 $startdir/src/ncid-linhes $startdir/pkg/usr/share/ncid
- install -m 755 $startdir/src/ncid-log.py $startdir/pkg/usr/bin/ncid-log.py
- install -m 755 -D $startdir/src/ncid.sql $startdir/pkg/tmp/ncid.sql
- install -m 755 -D $startdir/src/ncidpermissions.sql $startdir/pkg/tmp/ncidpermissions.sql
- chmod 777 $startdir/pkg/tmp
+ install -m 755 $startdir/src/ncid-linhes $pkgdir/usr/share/ncid
+ install -m 755 $startdir/src/ncid-log.py $pkgdir/usr/bin/ncid-log.py
+ install -m 755 -D $startdir/src/ncid.sql $pkgdir/tmp/ncid.sql
+ install -m 755 -D $startdir/src/ncidpermissions.sql $pkgdir/tmp/ncidpermissions.sql
+ mv $pkgdir/usr/sbin/* $pkgdir/usr/bin
+ rmdir $pkgdir/usr/sbin
+ chmod 777 $pkgdir/tmp
}
-md5sums=('4451cb67bd13899e3f98aeda8d8e4f40'
+md5sums=('a19dfd40447503941db0e5f9ed4d8365'
'd921bc210d5fa63855edd6c0e0102f68'
'7655255b35a4fcdc0645c4f9018c1ed1'
'b7a95f89fe5cb46e50ff25df7adc18b4'
--
cgit v0.12
From 9b3d5cb2a36836482a2409d54bf183a1af879fe3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:48:42 -0500
Subject: autofs: 5.0.8 refs #961
---
.../0001-autofs-5.0.5-include-krb5-library.patch | 206 ---------------------
....0.5-remove-ERR_remove_state-openssl-call.patch | 59 ------
abs/extra/autofs/PKGBUILD | 48 ++---
abs/extra/autofs/auto.master | 6 -
abs/extra/autofs/auto.misc | 7 -
abs/extra/autofs/autofs | 50 -----
abs/extra/autofs/autofs.conf.d | 4 -
abs/extra/autofs/autofs.install | 4 -
8 files changed, 20 insertions(+), 364 deletions(-)
delete mode 100644 abs/extra/autofs/0001-autofs-5.0.5-include-krb5-library.patch
delete mode 100644 abs/extra/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
delete mode 100644 abs/extra/autofs/auto.master
delete mode 100644 abs/extra/autofs/auto.misc
delete mode 100644 abs/extra/autofs/autofs
delete mode 100644 abs/extra/autofs/autofs.conf.d
delete mode 100644 abs/extra/autofs/autofs.install
diff --git a/abs/extra/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/abs/extra/autofs/0001-autofs-5.0.5-include-krb5-library.patch
deleted file mode 100644
index 572ca97..0000000
--- a/abs/extra/autofs/0001-autofs-5.0.5-include-krb5-library.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001
-From: Ian Kent <raven@themaw.net>
-Date: Tue, 10 Aug 2010 15:48:21 +0800
-Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library
-
-Since the Cyrus SASL module calls Kerberos directly we should be
-linking against the Kerberos librarys.
----
- Makefile.conf.in | 2 +
- aclocal.m4 | 19 +++++++++++++++
- configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- configure.in | 5 +++-
- modules/Makefile | 4 +-
- 5 files changed, 93 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.conf.in b/Makefile.conf.in
-index f0287c3..a9bcf8c 100644
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@
- SASL = @HAVE_SASL@
- LIBSASL= @LIBSASL@
- SASL_FLAGS = @SASL_FLAGS@
-+KRB5_LIBS=@KRB5_LIBS@
-+KRB5_FLAGS=@KRB5_FLAGS@
-
- # NIS+ support: yes (1) no (0)
- NISPLUS = @HAVE_NISPLUS@
-diff --git a/aclocal.m4 b/aclocal.m4
-index e7f1a30..750a159 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -215,6 +215,25 @@ else
- fi])
-
- dnl --------------------------------------------------------------------------
-+dnl AF_CHECK_KRB5
-+dnl
-+dnl Check for Kerberos 5
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([AF_CHECK_KRB5],
-+[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no)
-+AC_MSG_CHECKING(for Kerberos library)
-+if test "$KRB5_CONFIG" = "no"
-+then
-+ AC_MSG_RESULT(no)
-+ HAVE_KRB5=0
-+else
-+ AC_MSG_RESULT(yes)
-+ HAVE_KRB5=1
-+ KRB5_LIBS=`$KRB5_CONFIG --libs`
-+ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
-+fi])
-+
-+dnl --------------------------------------------------------------------------
- dnl AF_CHECK_LIBHESIOD
- dnl
- dnl Check for lib hesiod
-diff --git a/configure b/configure
-index 159f25f..500411c 100755
---- a/configure
-+++ b/configure
-@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS
- LIBOBJS
- DAEMON_LDFLAGS
- DAEMON_CFLAGS
-+KRB5_FLAGS
-+KRB5_LIBS
- LIBSASL
- HAVE_SASL
- SASL_FLAGS
-@@ -657,6 +659,7 @@ LIBHESIOD
- HAVE_HESIOD
- LIBRESOLV
- LIBNSL
-+KRB5_CONFIG
- XML_CONFIG
- PATH_RPCGEN
- RPCGEN
-@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; }
- fi
- fi
-
--# LDAP SASL auth need libxml
-+# LDAP SASL auth needs libxml and Kerberos
- for ac_prog in xml2-config
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3801,6 +3804,66 @@ _ACEOF
- fi
- fi
- fi
-+for ac_prog in krb5-config
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $KRB5_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
-+if test -n "$KRB5_CONFIG"; then
-+ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-+$as_echo "$KRB5_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ test -n "$KRB5_CONFIG" && break
-+done
-+test -n "$KRB5_CONFIG" || KRB5_CONFIG="no"
-+
-+{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5
-+$as_echo_n "checking for Kerberos library... " >&6; }
-+if test "$KRB5_CONFIG" = "no"
-+then
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ HAVE_KRB5=0
-+else
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ HAVE_KRB5=1
-+ KRB5_LIBS=`$KRB5_CONFIG --libs`
-+ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
-+fi
-
- #
- # glibc/libc 6 new libraries
-@@ -5178,6 +5241,8 @@ fi
-
-
-
-+
-+
- LDFLAGS="${AF_tmp_ldflags}"
-
- #
-diff --git a/configure.in b/configure.in
-index f649a58..70b45e8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath)
- #
- AF_SLOPPY_MOUNT()
-
--# LDAP SASL auth need libxml
-+# LDAP SASL auth needs libxml and Kerberos
- AF_CHECK_LIBXML()
-+AF_CHECK_KRB5()
-
- #
- # glibc/libc 6 new libraries
-@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS)
- AC_SUBST(SASL_FLAGS)
- AC_SUBST(HAVE_SASL)
- AC_SUBST(LIBSASL)
-+AC_SUBST(KRB5_LIBS)
-+AC_SUBST(KRB5_FLAGS)
- LDFLAGS="${AF_tmp_ldflags}"
-
- #
-diff --git a/modules/Makefile b/modules/Makefile
-index 13b3bd8..2389196 100644
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1)
- MODS += lookup_ldap.so
- ifeq ($(SASL), 1)
- SASL_OBJ = cyrus-sasl.o
-- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
-- LIBLDAP += $(LIBSASL) $(XML_LIBS)
-+ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE
-+ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS)
- endif
- endif
-
---
-1.7.5.1
-
diff --git a/abs/extra/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/abs/extra/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
deleted file mode 100644
index e4e480e..0000000
--- a/abs/extra/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001
-From: Ian Kent <raven@themaw.net>
-Date: Wed, 11 Aug 2010 09:33:09 +0800
-Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call
-
-autofs should never have had to use ERR_remove_state() so remove that call.
-
-Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry
-picking Kerberos related patches from the 5.0.6 development branch.
-
-Conflicts:
-
- CHANGELOG
-
-Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
----
- CHANGELOG | 4 ++++
- modules/lookup_ldap.c | 12 +-----------
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index e734cb3..1a20a81 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,3 +1,7 @@
-+??/??/20?? autofs-5.0.6
-+-----------------------
-+- remove ERR_remove_state() openssl call.
-+
- 03/09/2009 autofs-5.0.5
- -----------------------
- - fix dumb libxml2 check
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index 2ecf5fe..1221c2c 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c
- int rv;
-
- #ifdef WITH_SASL
-- /*
-- * The OpenSSL library can't handle having its message and error
-- * string database loaded multiple times and segfaults if the
-- * TLS environment is not reset at the right times. As there
-- * is no ldap_stop_tls call in the openldap library we have
-- * to do the job ourselves, here and in lookup_done when the
-- * module is closed.
-- */
-- if (ctxt->use_tls == LDAP_TLS_RELEASE) {
-- ERR_remove_state(0);
-+ if (ctxt->use_tls == LDAP_TLS_RELEASE)
- ctxt->use_tls = LDAP_TLS_INIT;
-- }
- autofs_sasl_unbind(ctxt);
- #endif
-
---
-1.7.5.1
-
diff --git a/abs/extra/autofs/PKGBUILD b/abs/extra/autofs/PKGBUILD
index 3663f03..0618dae 100644
--- a/abs/extra/autofs/PKGBUILD
+++ b/abs/extra/autofs/PKGBUILD
@@ -1,37 +1,37 @@
-# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $
+# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=autofs
-pkgver=5.0.7
+pkgver=5.0.8
pkgrel=1
pkgdesc='A kernel-based automounter for Linux.'
arch=('i686' 'x86_64')
url='http://freshmeat.net/projects/autofs'
license=('GPL2')
depends=('libxml2')
-makedepends=('libldap' 'krb5')
+makedepends=('libldap' 'krb5' 'kmod')
optdepends=('krb5: for LDAP support')
-backup=('etc/autofs/auto.master'
- 'etc/autofs/auto.misc'
- 'etc/conf.d/autofs')
+backup=('etc/default/autofs'
+ 'etc/autofs/auto.master'
+ 'etc/autofs/auto.misc')
options=(!makeflags)
-install='autofs.install'
-source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
- 'autofs'
- 'autofs.conf.d'
- 'auto.master'
- 'auto.misc')
+source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \
+ -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master
+}
- sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
- Makefile.rules
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \
+ ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \
+ --with-mapdir=/etc/autofs --without-hesiod \
--enable-ignore-busy --with-systemd
make
}
@@ -40,16 +40,8 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make INSTALLROOT="${pkgdir}" install
-
- install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master"
- install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc"
- install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs"
- install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs"
-
- install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service"
+ rm -r "$pkgdir/run"
+ install -dm755 "$pkgdir/etc/autofs/auto.master.d"
}
-md5sums=('bc46838dece83c02d800ff144ed9f431'
- 'e307bf6d2638e46eeb916cf42fe029b2'
- '47f597c870410055e0fdb66103daf928'
- 'a6cefb591e77b31b79dbb7243646c96b'
- 'd8a15ec9186c5c0b36e5cea1e2739e8a')
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/autofs/auto.master b/abs/extra/autofs/auto.master
deleted file mode 100644
index be4ea73..0000000
--- a/abs/extra/autofs/auto.master
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sample auto.master file
-# Format of this file:
-# mountpoint map options
-# For details of the format look at autofs(5).
-
-#/media /etc/autofs/auto.media
diff --git a/abs/extra/autofs/auto.misc b/abs/extra/autofs/auto.misc
deleted file mode 100644
index 5691566..0000000
--- a/abs/extra/autofs/auto.misc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is an automounter map and it has the following format
-# key [ -mount-options-separated-by-comma ] location
-# Details may be found in the autofs(5) manpage
-
-cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom
-floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl
-usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
diff --git a/abs/extra/autofs/autofs b/abs/extra/autofs/autofs
deleted file mode 100644
index 08bd3e1..0000000
--- a/abs/extra/autofs/autofs
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-daemon_name=autofs
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
-
-if [ ! -z "$TIMEOUT" ]; then
- daemonoptions="--timeout=$TIMEOUT $daemonoptions"
-fi
-
-PID=`cat /var/run/autofs-running 2> /dev/null`
-case "$1" in
- start)
- stat_busy "Starting $daemon_name daemon"
- [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon $daemon_name
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping $daemon_name daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon $daemon_name
- stat_done
- fi
- ;;
- restart)
- stat_busy "Restarting $daemon_name daemon"
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
- ;;
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0
diff --git a/abs/extra/autofs/autofs.conf.d b/abs/extra/autofs/autofs.conf.d
deleted file mode 100644
index bc82491..0000000
--- a/abs/extra/autofs/autofs.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#localoptions='rsize=8192,wsize=8192'
-
-# e.g. --timeout=60
-daemonoptions=''
diff --git a/abs/extra/autofs/autofs.install b/abs/extra/autofs/autofs.install
deleted file mode 100644
index 34ae75f..0000000
--- a/abs/extra/autofs/autofs.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install(){
- echo "> In autofs5 --ghost option isn't valid. In order to start autofs you"
- echo "> must remove that option from your /etc/conf.d/autofs."
-}
--
cgit v0.12
From edfc437426e7dd540b35ea7cd436b886e5c46866 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:49:53 -0500
Subject: cups: 1.7.0 refs #961
---
abs/extra/cups/PKGBUILD | 37 ++++++-----
abs/extra/cups/cups-dbus-utf8.patch | 106 +++++++++++++++++++++++++++++++
abs/extra/cups/cups-systemd-socket.patch | 4 +-
3 files changed, 127 insertions(+), 20 deletions(-)
create mode 100644 abs/extra/cups/cups-dbus-utf8.patch
diff --git a/abs/extra/cups/PKGBUILD b/abs/extra/cups/PKGBUILD
index 63bb641..08a3e19 100644
--- a/abs/extra/cups/PKGBUILD
+++ b/abs/extra/cups/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id$
+# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.7.1
-pkgrel=4
+pkgver=1.7.0
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
- 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
- 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
+ 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd')
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
cups.logrotate cups.pam
@@ -20,6 +19,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cups-no-gzip-man.patch
# FC
cups-systemd-socket.patch
+ cups-dbus-utf8.patch
cups-res_init.patch
cups-avahi-address.patch
cups-enum-all.patch
@@ -31,13 +31,14 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
get-ppd-file-for-statically-configured-ipp-shared-queues.patch
ppd-poll-with-client-conf.patch)
-md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
+md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- 'cf2f881967b0531ec49bcb5d0e9573a8'
+ '555a1c71151ce990e176315b46e3de2f'
+ 'a2a88b3a3257c3b5fd3edcc169e6aca4'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
@@ -68,6 +69,9 @@ prepare() {
# various bugfixes (upstream reports/SVN or Fedora/Debian
+ # Ensure attributes are valid UTF-8 in dbus notifier
+ patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
+
# Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
# Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -108,10 +112,9 @@ build() {
--enable-pam=yes \
--enable-raw-printing \
--enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-openssl \
+ --enable-ssl=yes --enable-gnutls \
--enable-threads \
--enable-avahi\
- --enable-libpaper \
--with-php=/usr/bin/php-cgi \
--with-optim="$CFLAGS"
make
@@ -119,14 +122,15 @@ build() {
check() {
cd ${pkgbase}-${pkgver}
-#./run-stp-tests.sh: line 782: 6307 Aborted (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
-#FAIL: 87 error messages, expected 33.
+ #httpAddrGetList(workstation64): FAIL
+ #1 TESTS FAILED!
+ #make[1]: *** [testhttp] Error 1
make -k check || /bin/true
}
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('openssl' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
+depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
backup=(etc/cups/client.conf)
cd ${pkgbase}-${pkgver}
@@ -158,8 +162,7 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
- 'libusb' 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support')
cd ${pkgbase}-${pkgver}
@@ -180,8 +183,8 @@ optdepends=('xdg-utils: xdg .desktop file support')
# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- # remove directory from package, it will be recreated at each server start
- rm -rf ${pkgdir}/run
+ # remove directory from package, we create it in cups rc.d file
+ rm -rf ${pkgdir}/var/run
# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
diff --git a/abs/extra/cups/cups-dbus-utf8.patch b/abs/extra/cups/cups-dbus-utf8.patch
new file mode 100644
index 0000000..0bcd4a1
--- /dev/null
+++ b/abs/extra/cups/cups-dbus-utf8.patch
@@ -0,0 +1,106 @@
+diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
+--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000
++++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000
+@@ -31,6 +31,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <assert.h>
++#include <locale.h>
++#include <wchar.h>
+
+ #ifdef HAVE_DBUS
+ # include <dbus/dbus.h>
+@@ -157,10 +160,82 @@ enum
+ * Local functions...
+ */
+
+-static int acquire_lock(int *fd, char *lockfile, size_t locksize);
++static int acquire_lock(int *fd, char *lockfile, size_t locksize);
++static const char *validate_utf8(const char *str);
+
+
+ /*
++ * 'validate_utf8()' - Convert to valid UTF-8
++ */
++
++static const char *
++validate_utf8 (const char *str)
++{
++ static char *buffer = NULL;
++ static size_t buflen = 0;
++ char *p;
++ size_t str_len;
++ unsigned int i;
++ mbstate_t instate, outstate;
++
++ if (str == NULL)
++ {
++ free (buffer);
++ return (NULL);
++ }
++
++ /* Is it already valid? */
++ if (mbstowcs (NULL, str, 0) != (size_t) -1)
++ return str;
++
++ /* Make sure our buffer is at least as large as the input string */
++ str_len = strlen (str);
++ if (str_len > buflen)
++ {
++ if (buffer == NULL)
++ /* Set encoding type to UTF-8 the first time we need to */
++ setlocale (LC_CTYPE, "en_US.UTF-8");
++
++ buflen = str_len + 1;
++ buffer = realloc (buffer, buflen);
++ }
++
++ memset (&instate, '\0', sizeof (mbstate_t));
++ memset (&outstate, '\0', sizeof (mbstate_t));
++ p = buffer;
++ i = 0;
++ while (i < str_len)
++ {
++ wchar_t wc;
++ size_t used, written;
++ mbstate_t orig_instate = instate;
++ used = mbrtowc (&wc, str + i, str_len - i, &instate);
++ switch (used)
++ {
++ case (size_t) -2:
++ case (size_t) -1:
++ wc = L'?'; /* so replacement is never longer than original char */
++ instate = orig_instate;
++ /* fallthru */
++ case 0:
++ used = 1;
++ }
++
++ written = wcrtomb (p, wc, &outstate);
++ if (written != -1)
++ {
++ p += written;
++ assert (p - buffer < buflen);
++ }
++
++ i += used;
++ }
++
++ *p = '\0';
++ return buffer;
++}
++
++/*
+ * 'main()' - Read events and send DBUS notifications.
+ */
+
+@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm
+ attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
+ if (attr)
+ {
+- const char *val = ippGetString(attr, 0, NULL);
++ const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
+ if (!dbus_message_iter_append_string(&iter, &val))
+ goto bail;
+ }
diff --git a/abs/extra/cups/cups-systemd-socket.patch b/abs/extra/cups/cups-systemd-socket.patch
index ad13a6d..cfbe933 100644
--- a/abs/extra/cups/cups-systemd-socket.patch
+++ b/abs/extra/cups/cups-systemd-socket.patch
@@ -117,14 +117,12 @@ diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.s
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+ListenStream=@DEFAULT_IPP_PORT@
-+BindIPv6Only=ipv6-only
+
+[Install]
+WantedBy=sockets.target
--
cgit v0.12
From 67c5698d8b76e2020442bb6327625cb1396064d3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:50:32 -0500
Subject: hddtemp: .03-beta refs #961
---
abs/extra/hddtemp/PKGBUILD | 15 ++++-----------
abs/extra/hddtemp/conf.d | 2 --
abs/extra/hddtemp/rc.d | 39 ---------------------------------------
abs/extra/hddtemp/service | 3 +--
4 files changed, 5 insertions(+), 54 deletions(-)
delete mode 100644 abs/extra/hddtemp/conf.d
delete mode 100644 abs/extra/hddtemp/rc.d
diff --git a/abs/extra/hddtemp/PKGBUILD b/abs/extra/hddtemp/PKGBUILD
index 94073ce..dcf2b6b 100644
--- a/abs/extra/hddtemp/PKGBUILD
+++ b/abs/extra/hddtemp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $
+# $Id: PKGBUILD 198097 2013-10-30 12:47:12Z allan $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -9,24 +9,18 @@ pkgname=hddtemp
_origver=0.3-beta15
_patchver=${_origver}-52
pkgver=${_patchver//-/.}
-pkgrel=1
+pkgrel=2
pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
url='https://savannah.nongnu.org/projects/hddtemp/'
license=('GPL')
arch=('i686' 'x86_64')
-backup=('etc/conf.d/hddtemp')
source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2"
"http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz"
- 'rc.d'
- 'conf.d'
'service')
sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b'
'b9bcdd0537c1540e55e5056445b571ea61d5a4a3'
- '71159486b1505ec6acfb7585e0d8fbe78afe54ec'
- 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808'
- '501fcf4faf8b2689d010f9cbbf39f917211f611f')
+ '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147')
-options=('!libtool')
build() {
cd "${srcdir}/${pkgname}-${_origver}"
@@ -35,6 +29,7 @@ build() {
./configure \
--prefix=/usr \
+ --sbindir=/usr/bin \
--mandir=/usr/share/man \
--with-db-path="/usr/share/${pkgname}/hddtemp.db"
@@ -48,6 +43,4 @@ package() {
install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db"
install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service"
- install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp"
- install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp"
}
diff --git a/abs/extra/hddtemp/conf.d b/abs/extra/hddtemp/conf.d
deleted file mode 100644
index 6a1e18e..0000000
--- a/abs/extra/hddtemp/conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-PARAMS="-q -l 127.0.0.1"
-DRIVES="/dev/sda"
diff --git a/abs/extra/hddtemp/rc.d b/abs/extra/hddtemp/rc.d
deleted file mode 100644
index 62f0908..0000000
--- a/abs/extra/hddtemp/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARAMS=
-DRIVES=
-[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
-PID=$(pidof -o %PPID /usr/sbin/hddtemp)
-case "$1" in
- start)
- stat_busy "Starting HDDTemp"
- [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon hddtemp
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping HDDTemp"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon hddtemp
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/hddtemp/service b/abs/extra/hddtemp/service
index bc56d16..992b898 100644
--- a/abs/extra/hddtemp/service
+++ b/abs/extra/hddtemp/service
@@ -2,8 +2,7 @@
Description=Hard drive temperature monitor daemon
[Service]
-EnvironmentFile=/etc/conf.d/hddtemp
-ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
+ExecStart=/usr/bin/hddtemp -dF /dev/sda
[Install]
WantedBy=multi-user.target
--
cgit v0.12
From fa6a68637286986ee0c0bdbe58fae8c13466983f Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:51:04 -0500
Subject: lcdproc: .5.6 refs #961
---
abs/extra/lcdproc/PKGBUILD | 37 +++++++++++++++++--------------------
abs/extra/lcdproc/lcdd | 38 --------------------------------------
abs/extra/lcdproc/lcdd.service | 11 +++++++++++
3 files changed, 28 insertions(+), 58 deletions(-)
delete mode 100755 abs/extra/lcdproc/lcdd
create mode 100644 abs/extra/lcdproc/lcdd.service
diff --git a/abs/extra/lcdproc/PKGBUILD b/abs/extra/lcdproc/PKGBUILD
index 21aa4e8..3106af2 100644
--- a/abs/extra/lcdproc/PKGBUILD
+++ b/abs/extra/lcdproc/PKGBUILD
@@ -1,31 +1,30 @@
+# $Id: PKGBUILD 102962 2013-12-25 04:58:31Z bgyorgy $
# Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com>
# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
+
pkgname=lcdproc
pkgver=0.5.6
-pkgrel=1
+pkgrel=4
pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
+arch=('i686' 'x86_64')
url="http://lcdproc.omnipotent.net/"
-license="GPL"
-depends=('libusb-compat')
-optdepends=(
- 'perl: needed for some lcdproc tools'
-)
-backup=(
- 'etc/LCDd.conf'
+license=('GPL')
+depends=('libftdi-compat')
+optdepends=('perl: needed for some lcdproc tools')
+backup=('etc/LCDd.conf'
'etc/lcdexec.conf'
'etc/lcdproc.conf'
- 'etc/lcdvc.conf'
-)
-arch=('i686' 'x86_64')
-source=(
- "http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-pre1.tar.gz"
- 'lcdd'
-)
+ 'etc/lcdvc.conf')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'lcdd.service')
+sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a'
+ '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638')
build() {
- cd "$pkgname-$pkgver-pre1"
+ cd "$pkgname-$pkgver"
./configure \
--prefix=/usr \
+ --sbindir=/usr/bin \
--sysconfdir=/etc \
--enable-libusb \
--enable-lcdproc-menus \
@@ -35,10 +34,8 @@ build() {
}
package() {
- cd "$pkgname-$pkgver-pre1"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf"
- install -Dm755 "$srcdir/lcdd" "$pkgdir/etc/rc.d/lcdd"
+ install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service"
}
-md5sums=('2175376ebefc18280b494e5f0a68329b'
- '56f52dcccd6e129a9cf84cd1a0452d56')
diff --git a/abs/extra/lcdproc/lcdd b/abs/extra/lcdproc/lcdd
deleted file mode 100755
index a124c00..0000000
--- a/abs/extra/lcdproc/lcdd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/LCDd`
-case "$1" in
- start)
- stat_busy "Starting LCDd daemon"
- [ -z "$PID" ] && /usr/sbin/LCDd -c /etc/LCDd.conf
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/lcdd.pid
- add_daemon lcdd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping LCDd daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/lcdd.pid
- rm_daemon lcdd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/lcdproc/lcdd.service b/abs/extra/lcdproc/lcdd.service
new file mode 100644
index 0000000..6b0072d
--- /dev/null
+++ b/abs/extra/lcdproc/lcdd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LCD display driver
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/LCDd -c /etc/LCDd.conf
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 98884293d83a99ca10e7d745f8fb73714b3bd8fc Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:51:37 -0500
Subject: libbonobo: recompile for bin changes refs #961
---
abs/extra/libbonobo/PKGBUILD | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/abs/extra/libbonobo/PKGBUILD b/abs/extra/libbonobo/PKGBUILD
index 177b162..153464c 100644
--- a/abs/extra/libbonobo/PKGBUILD
+++ b/abs/extra/libbonobo/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 151065 2012-02-24 17:44:58Z ibiru $
+# $Id: PKGBUILD 198129 2013-10-30 12:57:52Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libbonobo
pkgver=2.32.1
-pkgrel=2
+pkgrel=4
pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
arch=(i686 x86_64)
license=('GPL' 'LGPL')
-depends=('orbit2' 'libxml2' 'glib2')
-makedepends=('intltool' 'pkgconfig' 'flex')
-options=('!libtool')
+depends=('orbit2' 'libxml2' 'glib2' 'popt')
+makedepends=('intltool' 'pkgconfig')
backup=('etc/bonobo-activation/bonobo-activation-config.xml')
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-${pkgver}.tar.bz2
@@ -18,12 +17,21 @@ install=libbonobo.install
sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b'
'081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
+ ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/bonobo
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/"
}
--
cgit v0.12
From 1a7155936ea17b6f1b1ffd31aaed8a34371a0e9f Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:52:03 -0500
Subject: net-snmp 5.7.2 refs #961
---
abs/extra/net-snmp/PKGBUILD | 46 ++++++++++++++++++------------------
abs/extra/net-snmp/snmpd.confd | 5 ----
abs/extra/net-snmp/snmpd.rc | 39 ------------------------------
abs/extra/net-snmp/snmpd.service | 12 ++++++++++
abs/extra/net-snmp/snmptrapd.service | 12 ++++++++++
5 files changed, 47 insertions(+), 67 deletions(-)
delete mode 100644 abs/extra/net-snmp/snmpd.confd
delete mode 100644 abs/extra/net-snmp/snmpd.rc
create mode 100644 abs/extra/net-snmp/snmpd.service
create mode 100644 abs/extra/net-snmp/snmptrapd.service
diff --git a/abs/extra/net-snmp/PKGBUILD b/abs/extra/net-snmp/PKGBUILD
index d70068f..4e003ed 100644
--- a/abs/extra/net-snmp/PKGBUILD
+++ b/abs/extra/net-snmp/PKGBUILD
@@ -1,40 +1,39 @@
-# $Id: PKGBUILD 160499 2012-06-02 10:26:47Z bluewind $
-# Maintainer:
+# $Id: PKGBUILD 198340 2013-10-30 14:16:21Z allan $
+# Maintainer:
# Contributor: Dale Blount <dale@archlinux.org>
pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=3
+pkgver=5.7.2
+pkgrel=8
pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
arch=('i686' 'x86_64')
url="http://www.net-snmp.org/"
license=('BSD')
depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application'
+makedepends=('python2-setuptools')
+optdepends=('perl-term-readkey: for snmpcheck application'
'perl-tk: for snmpcheck and tkmib applications'
'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!makeflags' '!emptydirs')
+options=('!emptydirs' '!makeflags')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
- snmpd.confd snmpd.rc libnl32.patch)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
- '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
- 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
- '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
+ snmpd.service snmptrapd.service libnl32.patch)
+sha1sums=('c493027907f32400648244d81117a126aecd27ee'
+ 'SKIP'
+ '84e32c54d32e6b608747054e04a3ddfe6d6638cc'
+ '0244e91c7baa0abebfb5c0560e8ce04c966c5992'
'74a9848b95f63378eb1753fc309d2b74de5afb0f')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
+prepare() {
+ cd ${pkgname}-${pkgver}
+# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
patch -Np1 -i "$srcdir/libnl32.patch"
autoreconf -f -i
+}
- sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
+build() {
+ cd ${pkgname}-${pkgver}
PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
- --sysconfdir=/etc \
+ --sysconfdir=/etc --sbindir=/usr/bin \
--mandir=/usr/share/man \
--enable-ucd-snmp-compatibility \
--enable-ipv6 \
@@ -50,9 +49,10 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
+ sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile
make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
- install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
- install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
+ install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
+ install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service"
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/abs/extra/net-snmp/snmpd.confd b/abs/extra/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09b..0000000
--- a/abs/extra/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/abs/extra/net-snmp/snmpd.rc b/abs/extra/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f..0000000
--- a/abs/extra/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
- start)
- stat_busy "Starting Net-SNMP"
- [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/snmpd.pid
- add_daemon snmpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Net-SNMP"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/snmpd.pid
- rm_daemon snmpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/net-snmp/snmpd.service b/abs/extra/net-snmp/snmpd.service
new file mode 100644
index 0000000..e9f713c
--- /dev/null
+++ b/abs/extra/net-snmp/snmpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/bin/snmpd -p /run/snmpd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/abs/extra/net-snmp/snmptrapd.service b/abs/extra/net-snmp/snmptrapd.service
new file mode 100644
index 0000000..50eee7a
--- /dev/null
+++ b/abs/extra/net-snmp/snmptrapd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Simple Network Management Protocol (SNMP) TRAP Daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/snmptrapd.pid
+ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 246d1ee4b7f16459456838d12c8036c7a97823c1 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:52:35 -0500
Subject: network-ups-tools: 2.7.2 refs #961
---
abs/extra/network-ups-tools/PKGBUILD | 68 ++++++++++++---------
abs/extra/network-ups-tools/finish.upsd | 16 -----
.../network-ups-tools/network-ups-tools.tar.gz | Bin 1722 -> 0 bytes
.../network-ups-tools/nut-driver.service.patch | 14 -----
abs/extra/network-ups-tools/run.upsd | 21 -------
abs/extra/network-ups-tools/upsd.init | 43 -------------
6 files changed, 39 insertions(+), 123 deletions(-)
delete mode 100644 abs/extra/network-ups-tools/finish.upsd
delete mode 100644 abs/extra/network-ups-tools/network-ups-tools.tar.gz
delete mode 100644 abs/extra/network-ups-tools/nut-driver.service.patch
delete mode 100644 abs/extra/network-ups-tools/run.upsd
delete mode 100644 abs/extra/network-ups-tools/upsd.init
diff --git a/abs/extra/network-ups-tools/PKGBUILD b/abs/extra/network-ups-tools/PKGBUILD
index 50afbcc..1a422ff 100644
--- a/abs/extra/network-ups-tools/PKGBUILD
+++ b/abs/extra/network-ups-tools/PKGBUILD
@@ -1,57 +1,67 @@
-# Maintainer: Alex Reznichenko <sa5gap@yandex.ru>
+# Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
+# Contributor: Alex Reznichenko <sa5gap@yandex.ru>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Giuseppe Lucarelli <luk@rebelsoft.org>
+# Contributor: Dan Ziemba <zman0900@gmail.com>
pkgname=network-ups-tools
-pkgver=2.6.5
-pkgrel=2
+pkgver=2.7.2
+pkgrel=1
pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware"
arch=('i686' 'x86_64')
url="http://www.networkupstools.org/"
license=('GPL2')
-depends=('openssl' 'libusb-compat')
-makedepends=()
+depends=('openssl' 'libusb-compat' 'libltdl' 'neon' 'net-snmp')
+makedepends=('asciidoc')
backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf})
install=nut.install
-source=("http://www.networkupstools.org/source/2.6/nut-$pkgver.tar.gz"
- 'upsd.init' 'nut-driver.service.patch')
+source=("http://www.networkupstools.org/source/2.7/nut-${pkgver}.tar.gz"
+ "http://www.networkupstools.org/source/2.7/nut-${pkgver}.tar.gz.sig")
options=('!emptydirs' '!libtool')
-md5sums=('e6eac4fa04baff0d0a827d64efe81a7e'
- '089ea4a56552253328d17603ff5670cc'
- 'ee3aa25a08caca24f51951ee1f090c44')
+sha256sums=('4d5365359b059d96dfcb77458f361a114d26c84f1297ffcd0c6c166f7200376d'
+ 'SKIP')
build() {
-
- cd $srcdir/nut-$pkgver
+ cd "$srcdir/nut-$pkgver"
./configure \
--without-wrap \
--with-user=ups \
--with-group=nut \
+ --disable-static \
+ --with-serial \
--with-usb \
+ --with-doc=html-single \
+ --without-avahi \
+ --with-snmp \
+ --with-neon \
+ --without-powerman \
+ --without-ipmi \
+ --without-freeipmi \
+ --with-libltdl \
+ --without-cgi \
--prefix=/usr \
--with-udev-dir=/usr/lib/udev \
--with-systemdsystemunitdir=/lib/systemd/system \
--datadir=/usr/share/ups \
- --sysconfdir=/etc/ups || return 1
-
- make || return 1
-
+ --sbindir=/usr/bin \
+ --with-drvpath=/usr/bin \
+ --sysconfdir=/etc/ups \
+ --with-openssl
+ make
}
package() {
+ cd "$srcdir/nut-$pkgver"
+ make DESTDIR="$pkgdir" install
- cd $srcdir/nut-$pkgver
- make DESTDIR=$pkgdir install || return 1
-
- install -D -m755 $startdir/upsd.init $pkgdir/etc/rc.d/upsd || return 1
- install -D -m644 conf/ups.conf.sample $pkgdir/etc/ups/ups.conf
- install -D -m640 conf/upsd.conf.sample $pkgdir/etc/ups/upsd.conf
- install -D -m640 conf/upsd.users.sample $pkgdir/etc/ups/upsd.users
- install -D -m640 conf/upsmon.conf.sample $pkgdir/etc/ups/upsmon.conf
- install -D -m644 conf/upssched.conf.sample $pkgdir/etc/ups/upssched.conf
-
- # Fix systemd's nut-driver.service
- cd $pkgdir
- patch -p1 < ../nut-driver.service.patch
+ install -D -m644 "conf/ups.conf.sample" "$pkgdir/etc/ups/ups.conf"
+ install -D -m640 "conf/upsd.conf.sample" "$pkgdir/etc/ups/upsd.conf"
+ install -D -m640 "conf/upsd.users.sample" "$pkgdir/etc/ups/upsd.users"
+ install -D -m640 "conf/upsmon.conf.sample" "$pkgdir/etc/ups/upsmon.conf"
+ install -D -m644 "conf/upssched.conf.sample" "$pkgdir/etc/ups/upssched.conf"
+ install -d -v -m755 "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
+ install -v -m 644 docs/*.html "$pkgdir/usr/share/doc/network-ups-tools"
+ install -v -m 644 docs/images/*.png "$pkgdir/usr/share/doc/network-ups-tools/images"
+ install -v -m 644 docs/images/cables/*.{png,jpg} "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
}
diff --git a/abs/extra/network-ups-tools/finish.upsd b/abs/extra/network-ups-tools/finish.upsd
deleted file mode 100644
index 8eb335b..0000000
--- a/abs/extra/network-ups-tools/finish.upsd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/upsd`
- stat_runit "Stopping UPSd Daemon"
- /usr/bin/upsdrvctl stop &> /dev/null
- /usr/sbin/upsmon -c stop &> /dev/null
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon upsd
- stat_done
- fi
diff --git a/abs/extra/network-ups-tools/network-ups-tools.tar.gz b/abs/extra/network-ups-tools/network-ups-tools.tar.gz
deleted file mode 100644
index eeb2ed6..0000000
Binary files a/abs/extra/network-ups-tools/network-ups-tools.tar.gz and /dev/null differ
diff --git a/abs/extra/network-ups-tools/nut-driver.service.patch b/abs/extra/network-ups-tools/nut-driver.service.patch
deleted file mode 100644
index fec8116..0000000
--- a/abs/extra/network-ups-tools/nut-driver.service.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pkg/usr/lib/systemd/system/nut-driver.service 2012-10-15 21:50:08.216981122 +0400
-+++ pkg/usr/lib/systemd/system/nut-driver.service 2012-10-15 22:08:44.826990389 +0400
-@@ -4,7 +4,9 @@
- StopWhenUnneeded=yes
-
- [Service]
--ExecStart=${exec_prefix}/bin/upsdrvctl start
--ExecStop=${exec_prefix}/bin/upsdrvctl stop
-+ExecStart=/usr/bin/upsdrvctl start
-+ExecStop=/usr/bin/upsdrvctl stop
- Type=forking
-
-+[Install]
-+WantedBy=multi-user.target
diff --git a/abs/extra/network-ups-tools/run.upsd b/abs/extra/network-ups-tools/run.upsd
deleted file mode 100644
index 83be88d..0000000
--- a/abs/extra/network-ups-tools/run.upsd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/upsd`
-
- stat_runit "Starting UPSd Daemon"
- /usr/bin/upsdrvctl start &> /dev/null
- [ -z "$PID" ] && /usr/sbin/upsd &>/dev/null
- /usr/sbin/upsmon &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon upsd
- stat_done
- fi
-
- while [ -n $PID ] ; do
- sleep 60
- done
diff --git a/abs/extra/network-ups-tools/upsd.init b/abs/extra/network-ups-tools/upsd.init
deleted file mode 100644
index acdd115..0000000
--- a/abs/extra/network-ups-tools/upsd.init
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/upsd`
-case "$1" in
- start)
- stat_busy "Starting UPSd Daemon"
- /usr/bin/upsdrvctl start &> /dev/null
- [ -z "$PID" ] && /usr/sbin/upsd &>/dev/null
- /usr/sbin/upsmon &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon upsd
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping UPSd Daemon"
- /usr/sbin/upsmon -c stop &> /dev/null
- /usr/sbin/upsd -c stop &> /dev/null
- /usr/bin/upsdrvctl stop &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon upsd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- *)
- cho "usage: $0 {start|stop|restart}"
-esac
-exit 0
--
cgit v0.12
From 152cc5390f1c1ecbd12fe3117b0119a2266b2383 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:53:00 -0500
Subject: ntfs-3g: recompile for bin changes
refs #961
---
abs/extra/ntfs-3g_ntfsprogs/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 116ab72..d329507 100644
--- a/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $
+# $Id: PKGBUILD 198347 2013-10-30 14:18:55Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas B�chler <thomas.archlinux.org>
@@ -6,7 +6,7 @@
pkgbase=ntfs-3g_ntfsprogs
pkgname=ntfs-3g
pkgver=2013.1.13
-pkgrel=3
+pkgrel=4
pkgdesc="NTFS filesystem utilities"
arch=('i686' 'x86_64')
url="http://www.tuxera.com/community/ntfs-3g-download/"
@@ -15,7 +15,6 @@ depends=('util-linux' 'fuse')
conflicts=('ntfsprogs')
provides=('ntfsprogs')
replaces=('ntfsprogs')
-options=('!libtool')
source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
@@ -29,7 +28,8 @@ build() {
./configure --prefix=/usr \
--with-fuse=external --disable-static \
--enable-posix-acls --disable-ldconfig \
- --mandir=/usr/share/man --sbin=/usr/bin
+ --mandir=/usr/share/man --sbin=/usr/bin \
+ --enable-extras
make
}
--
cgit v0.12
From b19d9dc77d73e4a9c5b880f09e3db2b9df7cb75a Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:53:47 -0500
Subject: nvram-wakeup: recompile for bin changes
refs #961
---
abs/extra/nvram-wakup/PKGBUILD | 33 ++++++++++++++++++++++-----------
abs/extra/nvram-wakup/__changelog | 3 +++
2 files changed, 25 insertions(+), 11 deletions(-)
create mode 100644 abs/extra/nvram-wakup/__changelog
diff --git a/abs/extra/nvram-wakup/PKGBUILD b/abs/extra/nvram-wakup/PKGBUILD
index c434716..494b861 100755
--- a/abs/extra/nvram-wakup/PKGBUILD
+++ b/abs/extra/nvram-wakup/PKGBUILD
@@ -1,16 +1,27 @@
-pkgname=nvram-wakup
+# Contributor: Andreas Baumann <abaumann@yahoo.com>
+
+pkgname=nvram-wakeup
pkgver=1.1
-pkgrel=1
-pkgdesc="set the wakeup time of the localpc"
-license="GPL"
+pkgrel=2
+pkgdesc="Reads and writes the WakeUp time in the BIOS."
arch=(i686 x86_64)
-url="http://sourceforge.net/projects/nvram-wakeup/"
-source=("http://downloads.sourceforge.net/project/nvram-wakeup/nvram-wakup-1.1.tar.gz?use_mirror=kent")
+url="http://sourceforge.net/projects/nvram-wakeup"
+license="GPL"
+depends=('bash')
+source=(http://downloads.sourceforge.net/project/nvram-wakeup/nvram-wakup-${pkgver}.tar.gz)
+md5sums=('ebd6e276167ba4351ecb1ea2bd368422')
+options=('!docs')
build() {
- cd $startdir/src/$pkgname-$pkgver
- make || return 1
- make prefix=$startdir/pkg/usr install
-}
+ cd $srcdir/nvram-wakup-$pkgver
-md5sums=('ebd6e276167ba4351ecb1ea2bd368422')
+ # standard Makefile variables (DESTDIR and prefix)
+ sed -i 's@${prefix}@${DESTDIR}${prefix}@g' Makefile
+ # FHS compliant location of man pages is /usr/share/man, not /usr/man
+ sed -i 's@${DESTDIR}${prefix}/man@${DESTDIR}${prefix}/share/man@g' Makefile
+ sed -i 's|/sbin$|/bin|g' Makefile
+
+
+ make || return 1
+ make DESTDIR=$pkgdir prefix=/usr install
+}
diff --git a/abs/extra/nvram-wakup/__changelog b/abs/extra/nvram-wakup/__changelog
new file mode 100644
index 0000000..9635654
--- /dev/null
+++ b/abs/extra/nvram-wakup/__changelog
@@ -0,0 +1,3 @@
+modified makefile to use bin instead of /sbin
+ sed -i 's|/sbin$|/bin|g' Makefile
+
--
cgit v0.12
From 761255a29243dc2766436ac69a71c30cca87ecd4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:54:08 -0500
Subject: openslp: recompile for bin changes
refs #961
---
abs/extra/openslp/PKGBUILD | 20 +++++++++++++-------
abs/extra/openslp/openslp.service | 11 +++++++++++
abs/extra/openslp/rc.slpd | 38 --------------------------------------
3 files changed, 24 insertions(+), 45 deletions(-)
create mode 100644 abs/extra/openslp/openslp.service
delete mode 100755 abs/extra/openslp/rc.slpd
diff --git a/abs/extra/openslp/PKGBUILD b/abs/extra/openslp/PKGBUILD
index 70e0833..d1008b8 100644
--- a/abs/extra/openslp/PKGBUILD
+++ b/abs/extra/openslp/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 150461 2012-02-18 00:02:24Z allan $
+# $Id: PKGBUILD 198356 2013-10-30 14:22:17Z allan $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=openslp
pkgver=1.2.1
-pkgrel=4
+pkgrel=7
pkgdesc="Open-source implementation of Service Location Protocol"
arch=('i686' 'x86_64')
url="http://www.openslp.org"
license=('BSD')
depends=('bash' 'openssl')
backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd)
-md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
+ openslp.service)
+md5sums=('ff9999d1b44017281dd00ed2c4d32330'
+ '90eea4426492287ebfc01b2056a3ef9d')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --disable-static \
+ --enable-slpv1 \
+ --enable-slpv2-security # service would fail to start without this
make
}
@@ -24,5 +30,5 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd
+ install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service
}
diff --git a/abs/extra/openslp/openslp.service b/abs/extra/openslp/openslp.service
new file mode 100644
index 0000000..a3c306a
--- /dev/null
+++ b/abs/extra/openslp/openslp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Service Location Protocol
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/abs/extra/openslp/rc.slpd b/abs/extra/openslp/rc.slpd
deleted file mode 100755
index 4330c37..0000000
--- a/abs/extra/openslp/rc.slpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/slpd`
-case "$1" in
- start)
- stat_busy "Starting SLPD"
- [ -z "$PID" ] && /usr/sbin/slpd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/slpd.pid
- add_daemon slpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping SLPD"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/slpd.pid
- rm_daemon slpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
--
cgit v0.12
From ef2a0c8b6785730d7ef65b5ba4f98dc5c669209d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:54:25 -0500
Subject: powertop 2.5 refs #961
---
abs/extra/powertop/PKGBUILD | 18 ++++++++----------
abs/extra/powertop/powertop.changelog | 6 ++++++
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/abs/extra/powertop/PKGBUILD b/abs/extra/powertop/PKGBUILD
index efec607..fe3b066 100644
--- a/abs/extra/powertop/PKGBUILD
+++ b/abs/extra/powertop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78981 2012-10-28 15:59:46Z jlichtblau $
+# $Id: PKGBUILD 101505 2013-11-26 18:13:32Z bpiotrowski $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Xilon <xilonmu@gmail.com>
pkgname=powertop
-pkgver=2.1.1
+pkgver=2.5
pkgrel=1
pkgdesc='A tool to diagnose issues with power consumption and power management'
arch=('i686' 'x86_64')
@@ -12,20 +12,18 @@ url='https://01.org/powertop/'
license=('GPL2')
depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
changelog=$pkgname.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/tarball/v2.1.1)
-#https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
-sha256sums=('e925230cc9006dbc226aec4dea389b97a0f906a7997b33aca40a1d6bc7568dc4')
+source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
+sha256sums=('8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b')
build() {
- cd ${srcdir}/*-$pkgname-*
+ cd "$srcdir/$pkgname-$pkgver"
- ./autogen.sh
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --sbindir=/usr/bin
make
}
package() {
- cd ${srcdir}/*-$pkgname-*
+ cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="$pkgdir" install
}
diff --git a/abs/extra/powertop/powertop.changelog b/abs/extra/powertop/powertop.changelog
index 9a53fc3..1abb367 100644
--- a/abs/extra/powertop/powertop.changelog
+++ b/abs/extra/powertop/powertop.changelog
@@ -1,3 +1,9 @@
+2013-03-23 Evangelos Foutras <evangelos@foutrelis.com>
+ * powertop 2.3-1
+
+2013-01-05 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+ * powertop 2.2-1
+
2012-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
* powertop 2.1.1-1
--
cgit v0.12
From 786eef48b2fb22dff520b45560b124225a1155dc Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:54:48 -0500
Subject: smartmon tools: 6.3 refs #961
---
abs/extra/smartmontools/PKGBUILD | 47 ++++++++++++++++++---------
abs/extra/smartmontools/__changelog | 2 --
abs/extra/smartmontools/smartd | 35 --------------------
abs/extra/smartmontools/smartd.conf | 1 +
abs/extra/smartmontools/smartmontools.install | 24 --------------
5 files changed, 33 insertions(+), 76 deletions(-)
delete mode 100644 abs/extra/smartmontools/__changelog
delete mode 100644 abs/extra/smartmontools/smartd
create mode 100644 abs/extra/smartmontools/smartd.conf
delete mode 100644 abs/extra/smartmontools/smartmontools.install
diff --git a/abs/extra/smartmontools/PKGBUILD b/abs/extra/smartmontools/PKGBUILD
index fe12bd5..685750d 100644
--- a/abs/extra/smartmontools/PKGBUILD
+++ b/abs/extra/smartmontools/PKGBUILD
@@ -1,28 +1,45 @@
-# $Id: PKGBUILD 6701 2008-07-27 13:29:59Z giovanni $
+# $Id: PKGBUILD 219339 2014-08-05 17:28:35Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jeff Mickey <jeff@archlinux.org>
# Contributor: Jani Talikka <jani.talikka@gmail.com>
+# Contributor: Ralf Barth <archlinux.org@haggy.org>
pkgname=smartmontools
-pkgver=5.41
+pkgver=6.3
pkgrel=1
-pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
+pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
url="http://smartmontools.sourceforge.net"
license=('GPL')
arch=('i686' 'x86_64')
-depends=('gcc-libs')
-backup=('etc/smartd.conf')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-install=smartmontools.install
+depends=('gcc-libs' 'libcap-ng' 'bash')
+optdepends=('heirloom-mailx: to get mail alerts to work')
+backup=('etc/smartd.conf'
+ 'etc/conf.d/smartd')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'smartd.conf')
+md5sums=('2ea0c62206e110192a97b59291b17f54'
+ '28c1b80c41dac52d433961dcfb4f70e0')
-build()
-{
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/src/linux-2.6.39-LinHES
- make || return 1
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-drivedb \
+ --with-libcap-ng=yes \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+ make
}
+
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service
+ sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service
+
+ make DESTDIR="${pkgdir}" install
+
+ rm -rf ${pkgdir}/etc/rc.d
+ install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd"
}
-md5sums=('4577886bea79d4ff12bd9a7d323ce692')
diff --git a/abs/extra/smartmontools/__changelog b/abs/extra/smartmontools/__changelog
deleted file mode 100644
index 8e0d8a6..0000000
--- a/abs/extra/smartmontools/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-* remove the rc script. runit script in runit-scripts pkg
-* added smartmontools.install
diff --git a/abs/extra/smartmontools/smartd b/abs/extra/smartmontools/smartd
deleted file mode 100644
index 5fcc414..0000000
--- a/abs/extra/smartmontools/smartd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
- case "$1" in
-
- start)
- stat_busy "Starting smartd"
- /usr/sbin/smartd &>/dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- else
- add_daemon smartd
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping smartd"
- kill -9 `pidof /usr/sbin/smartd` &>/dev/null
- rm_daemon smartd
- stat_done
- ;;
-
- restart)
- stat_busy "Restarting smartd ..."
- $0 stop
- $0 start
- stat_done
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
- esac
diff --git a/abs/extra/smartmontools/smartd.conf b/abs/extra/smartmontools/smartd.conf
new file mode 100644
index 0000000..f14870a
--- /dev/null
+++ b/abs/extra/smartmontools/smartd.conf
@@ -0,0 +1 @@
+SMARTD_ARGS=""
diff --git a/abs/extra/smartmontools/smartmontools.install b/abs/extra/smartmontools/smartmontools.install
deleted file mode 100644
index f2baacd..0000000
--- a/abs/extra/smartmontools/smartmontools.install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-post_install() {
-
- echo ""
- echo "==> Configure your /etc/smart.conf config file and then"
- echo "==> $ sudo add_service.sh smartd"
- echo "==> to start the monitoring service."
-
-}
-
-post_upgrade() {
-
- post_install
-
-}
-
-pre_remove() {
-
- if [ -L /service/smartd ]; then
- remove_service.sh smartd
- fi
-
-}
--
cgit v0.12
From 7db67d17bc76eb6f9d2aedf686a71a0a2193c9a8 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:55:13 -0500
Subject: xfsdump: 3.1.3
refs #961
---
abs/extra/xfsdump/PKGBUILD | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
mode change 100644 => 100755 abs/extra/xfsdump/PKGBUILD
diff --git a/abs/extra/xfsdump/PKGBUILD b/abs/extra/xfsdump/PKGBUILD
old mode 100644
new mode 100755
index 33e7415..54370cf
--- a/abs/extra/xfsdump/PKGBUILD
+++ b/abs/extra/xfsdump/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 26569 2009-02-09 18:40:22Z paul $
-# Maintainer: judd <jvinet@zeroflux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer: dkaylor <dpkaylor@gmail.com>
+
pkgname=xfsdump
-pkgver=3.1.0
+pkgver=3.1.3
pkgrel=1
pkgdesc="Additional XFS filesystem utilities"
arch=(i686 x86_64)
-license=('LGPL')
url="http://oss.sgi.com/projects/xfs/"
-depends=('xfsprogs>=3.1.8' 'attr>=2.4.39' 'acl>=2.2.45' 'dmapi')
-options=('!makeflags')
-source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-${pkgver}.tar.gz)
-options=(!emptydirs)
+license=('LGPL')
+depends=('xfsprogs>=3.1.0' 'attr>=2.4.43' 'acl>=2.2.47' 'dmapi>=2.2.10')
+options=('!makeflags' '!emptydirs' '!libtool')
+source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz{,.sig})
build() {
- cd $startdir/src/xfsdump-$pkgver
- autoconf
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
- make || return 1
- make prefix=$startdir/pkg/usr install
- # fixes
- rm -f $startdir/pkg/usr/lib/*.la
- rm -f $startdir/pkg/usr/bin/{xfsdump,xfsrestore}
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DIST_ROOT="${pkgdir}" install
+
+ # hack to merge binaries from /sbin and /usr/sbin into /usr/bin #
+ mkdir -p $pkgdir/usr/bin
+ mv $pkgdir/{sbin/*,usr/sbin/xfsinvutil} $pkgdir/usr/bin
+ rm -rf $pkgdir/{sbin,usr/sbin}
+
+ chown -R root $pkgdir
+ chgrp -R root $pkgdir
}
-md5sums=('abe035537d0f325c4f2dbacc0d2b6fd6')
+md5sums=('aad7160b88db24c0510c001debd689be'
+ 'SKIP')
--
cgit v0.12
From e3c8287bbfe4624db681895fbcb24aee88df6652 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 12:55:34 -0500
Subject: xinetd: recompile for bin changes
refs #961
---
abs/extra/xinetd/PKGBUILD | 26 ++++++++++++++++----------
abs/extra/xinetd/fix-CVE-2013-4342.patch | 13 +++++++++++++
abs/extra/xinetd/xinetd.service | 2 +-
3 files changed, 30 insertions(+), 11 deletions(-)
create mode 100644 abs/extra/xinetd/fix-CVE-2013-4342.patch
diff --git a/abs/extra/xinetd/PKGBUILD b/abs/extra/xinetd/PKGBUILD
index 3ed7dee..53d5b93 100644
--- a/abs/extra/xinetd/PKGBUILD
+++ b/abs/extra/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $
+# $Id: PKGBUILD 196783 2013-10-19 06:36:43Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=xinetd
pkgver=2.3.15
-pkgrel=2
+pkgrel=4
pkgdesc="A secure replacement for inetd"
arch=('i686' 'x86_64')
url="http://www.xinetd.org/"
@@ -13,29 +13,35 @@ optdepends=('perl: for xconv.pl script')
backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
xinetd.conf
- xinetd
servers
services
- xinetd.service)
+ xinetd.service
+ fix-CVE-2013-4342.patch)
md5sums=('77358478fd58efa6366accae99b8b04c'
'f109f699a07bc8cfb5791060f5e87f9e'
- 'ea37a2794f202e6b953d9b6956dad16a'
'21f47b4aa20921cfaddddd9f9a407f81'
'9fa2061dc7dd738c8424251deb86f81e'
- '08466ed714ea8ba42ad81f6fb3aa62e7')
+ '38be35b6e7146dc59902e243d9063b4c'
+ 'b14615c73753ceffbcc96d5e08f3c18d')
-build() {
+prepare() {
cd $srcdir/$pkgname-$pkgver
sed -i "s#${prefix}/man#${prefix}/share/man#" configure
- ./configure --prefix=/usr --without-libwrap
+ # fix #37310
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1006100#c
+ patch -Np1 -i $srcdir/fix-CVE-2013-4342.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap
make
}
package() {
cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
+ make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install
- install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd
install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
diff --git a/abs/extra/xinetd/fix-CVE-2013-4342.patch b/abs/extra/xinetd/fix-CVE-2013-4342.patch
new file mode 100644
index 0000000..83506c9
--- /dev/null
+++ b/abs/extra/xinetd/fix-CVE-2013-4342.patch
@@ -0,0 +1,13 @@
+diff --git a/xinetd/builtins.c b/xinetd/builtins.c
+index e61502f..a414cf3 100644
+--- a/xinetd/builtins.c
++++ b/xinetd/builtins.c
+@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
+ if( SC_IS_INTERNAL( scp ) ) {
+ SC_INTERNAL(scp, nserp);
+ } else {
+- exec_server(nserp);
++ child_process(nserp);
+ }
+ }
+
diff --git a/abs/extra/xinetd/xinetd.service b/abs/extra/xinetd/xinetd.service
index c6f6271..1c587e2 100644
--- a/abs/extra/xinetd/xinetd.service
+++ b/abs/extra/xinetd/xinetd.service
@@ -3,7 +3,7 @@ Description=A secure replacement for inetd
After=network.target
[Service]
-ExecStart=/usr/sbin/xinetd -dontfork
+ExecStart=/usr/bin/xinetd -dontfork
ExecReload=/bin/kill -HUP $MAINPID
[Install]
--
cgit v0.12
From b5d3f2084461907ff3cd2df0eee5f0965be7d817 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 13:04:32 -0500
Subject: cups: 1.7.5
refs #961
---
abs/extra/cups/PKGBUILD | 42 +++++------
abs/extra/cups/cups-dbus-utf8.patch | 106 --------------------------
abs/extra/cups/cups-systemd-socket.patch | 123 ++++++++++++++++---------------
3 files changed, 84 insertions(+), 187 deletions(-)
delete mode 100644 abs/extra/cups/cups-dbus-utf8.patch
diff --git a/abs/extra/cups/PKGBUILD b/abs/extra/cups/PKGBUILD
index 08a3e19..3975850 100644
--- a/abs/extra/cups/PKGBUILD
+++ b/abs/extra/cups/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $
+# $Id: PKGBUILD 218449 2014-07-31 13:11:09Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.7.5
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
- 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
+ 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
+ 'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
+ http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.sig}
cups.logrotate cups.pam
# improve build and linking
cups-no-export-ssllibs.patch
@@ -19,7 +20,6 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cups-no-gzip-man.patch
# FC
cups-systemd-socket.patch
- cups-dbus-utf8.patch
cups-res_init.patch
cups-avahi-address.patch
cups-enum-all.patch
@@ -31,14 +31,14 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
get-ppd-file-for-statically-configured-ipp-shared-queues.patch
ppd-poll-with-client-conf.patch)
-md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
- 'f861b18f4446c43918c8643dcbbd7f6d'
+md5sums=('5d893edc2957005f78e2b2423fdace2e'
+ 'SKIP'
+ '26e9b4e65c0a4d76db5737c9b156fd80'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- '555a1c71151ce990e176315b46e3de2f'
- 'a2a88b3a3257c3b5fd3edcc169e6aca4'
+ '8162e1d05947bd59fa29ba40ac565fec'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
@@ -52,7 +52,7 @@ md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
prepare() {
cd ${pkgbase}-${pkgver}
-
+#return 1
# add systemd socket support - Fedora patch, also used in Gentoo
# modified now to the changes done by Gentoo in their svn ebuild
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
@@ -69,9 +69,6 @@ prepare() {
# various bugfixes (upstream reports/SVN or Fedora/Debian
- # Ensure attributes are valid UTF-8 in dbus notifier
- patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
-
# Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
# Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -112,9 +109,10 @@ build() {
--enable-pam=yes \
--enable-raw-printing \
--enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-gnutls \
+ --enable-ssl=yes --enable-openssl \
--enable-threads \
--enable-avahi\
+ --enable-libpaper \
--with-php=/usr/bin/php-cgi \
--with-optim="$CFLAGS"
make
@@ -122,15 +120,12 @@ build() {
check() {
cd ${pkgbase}-${pkgver}
- #httpAddrGetList(workstation64): FAIL
- #1 TESTS FAILED!
- #make[1]: *** [testhttp] Error 1
make -k check || /bin/true
}
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
+depends=('openssl' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
backup=(etc/cups/client.conf)
cd ${pkgbase}-${pkgver}
@@ -162,7 +157,8 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord'
+ 'libusb' 'dbus' 'systemd' 'libpaper' 'hicolor-icon-theme')
optdepends=('xdg-utils: xdg .desktop file support')
cd ${pkgbase}-${pkgver}
@@ -183,8 +179,8 @@ optdepends=('xdg-utils: xdg .desktop file support')
# install ssl directory where to store the certs, solves some samba issues
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- # remove directory from package, we create it in cups rc.d file
- rm -rf ${pkgdir}/var/run
+ # remove directory from package, it will be recreated at each server start
+ rm -rf ${pkgdir}/run
# install some more configuration files that will get filled by cupsd
touch ${pkgdir}/etc/cups/printers.conf
diff --git a/abs/extra/cups/cups-dbus-utf8.patch b/abs/extra/cups/cups-dbus-utf8.patch
deleted file mode 100644
index 0bcd4a1..0000000
--- a/abs/extra/cups/cups-dbus-utf8.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
---- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000
-+++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000
-@@ -31,6 +31,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <assert.h>
-+#include <locale.h>
-+#include <wchar.h>
-
- #ifdef HAVE_DBUS
- # include <dbus/dbus.h>
-@@ -157,10 +160,82 @@ enum
- * Local functions...
- */
-
--static int acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static int acquire_lock(int *fd, char *lockfile, size_t locksize);
-+static const char *validate_utf8(const char *str);
-
-
- /*
-+ * 'validate_utf8()' - Convert to valid UTF-8
-+ */
-+
-+static const char *
-+validate_utf8 (const char *str)
-+{
-+ static char *buffer = NULL;
-+ static size_t buflen = 0;
-+ char *p;
-+ size_t str_len;
-+ unsigned int i;
-+ mbstate_t instate, outstate;
-+
-+ if (str == NULL)
-+ {
-+ free (buffer);
-+ return (NULL);
-+ }
-+
-+ /* Is it already valid? */
-+ if (mbstowcs (NULL, str, 0) != (size_t) -1)
-+ return str;
-+
-+ /* Make sure our buffer is at least as large as the input string */
-+ str_len = strlen (str);
-+ if (str_len > buflen)
-+ {
-+ if (buffer == NULL)
-+ /* Set encoding type to UTF-8 the first time we need to */
-+ setlocale (LC_CTYPE, "en_US.UTF-8");
-+
-+ buflen = str_len + 1;
-+ buffer = realloc (buffer, buflen);
-+ }
-+
-+ memset (&instate, '\0', sizeof (mbstate_t));
-+ memset (&outstate, '\0', sizeof (mbstate_t));
-+ p = buffer;
-+ i = 0;
-+ while (i < str_len)
-+ {
-+ wchar_t wc;
-+ size_t used, written;
-+ mbstate_t orig_instate = instate;
-+ used = mbrtowc (&wc, str + i, str_len - i, &instate);
-+ switch (used)
-+ {
-+ case (size_t) -2:
-+ case (size_t) -1:
-+ wc = L'?'; /* so replacement is never longer than original char */
-+ instate = orig_instate;
-+ /* fallthru */
-+ case 0:
-+ used = 1;
-+ }
-+
-+ written = wcrtomb (p, wc, &outstate);
-+ if (written != -1)
-+ {
-+ p += written;
-+ assert (p - buffer < buflen);
-+ }
-+
-+ i += used;
-+ }
-+
-+ *p = '\0';
-+ return buffer;
-+}
-+
-+/*
- * 'main()' - Read events and send DBUS notifications.
- */
-
-@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm
- attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
- if (attr)
- {
-- const char *val = ippGetString(attr, 0, NULL);
-+ const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
- if (!dbus_message_iter_append_string(&iter, &val))
- goto bail;
- }
diff --git a/abs/extra/cups/cups-systemd-socket.patch b/abs/extra/cups/cups-systemd-socket.patch
index cfbe933..2eef708 100644
--- a/abs/extra/cups/cups-systemd-socket.patch
+++ b/abs/extra/cups/cups-systemd-socket.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
---- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/config.h.in.systemd-socket cups-1.7.2/config.h.in
+--- cups-1.7.2/config.h.in.systemd-socket 2014-02-27 16:57:59.000000000 +0100
++++ cups-1.7.2/config.h.in 2014-04-17 14:05:04.104472016 +0200
@@ -451,6 +451,13 @@
@@ -15,9 +15,9 @@ diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
* Various scripting languages...
*/
-diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
---- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
-+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.7.2/config-scripts/cups-systemd.m4
+--- cups-1.7.2/config-scripts/cups-systemd.m4.systemd-socket 2014-04-17 14:05:04.104472016 +0200
++++ cups-1.7.2/config-scripts/cups-systemd.m4 2014-04-17 14:05:04.104472016 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl "$Id$"
@@ -55,9 +55,9 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+dnl
+dnl "$Id$"
+dnl
-diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
---- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
-+++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
+diff -up cups-1.7.2/configure.in.systemd-socket cups-1.7.2/configure.in
+--- cups-1.7.2/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
++++ cups-1.7.2/configure.in 2014-04-17 14:05:04.104472016 +0200
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
@@ -76,10 +76,10 @@ diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
desktop/cups.desktop
doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html
-diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
---- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
-+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
-@@ -1046,7 +1046,7 @@ cups_read_client_conf(
+diff -up cups-1.7.2/cups/usersys.c.systemd-socket cups-1.7.2/cups/usersys.c
+--- cups-1.7.2/cups/usersys.c.systemd-socket 2014-03-05 22:22:12.000000000 +0100
++++ cups-1.7.2/cups/usersys.c 2014-04-17 14:05:04.105472002 +0200
+@@ -1050,7 +1050,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -88,9 +88,9 @@ diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
---- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
-+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
+diff -up cups-1.7.2/data/cups.path.in.systemd-socket cups-1.7.2/data/cups.path.in
+--- cups-1.7.2/data/cups.path.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.path.in 2014-04-17 14:05:04.105472002 +0200
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printer Service Spool
@@ -100,35 +100,38 @@ diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path
+
+[Install]
+WantedBy=multi-user.target
-diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
---- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
-+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
-@@ -0,0 +1,10 @@
+diff -up cups-1.7.2/data/cups.service.in.systemd-socket cups-1.7.2/data/cups.service.in
+--- cups-1.7.2/data/cups.service.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.service.in 2014-04-17 14:05:04.105472002 +0200
+@@ -0,0 +1,11 @@
+[Unit]
+Description=CUPS Printing Service
+
+[Service]
++Type=notify
+ExecStart=@sbindir@/cupsd -f
+PrivateTmp=true
+
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
-diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
---- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
-+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
-@@ -0,0 +1,8 @@
+diff -up cups-1.7.2/data/cups.socket.in.systemd-socket cups-1.7.2/data/cups.socket.in
+--- cups-1.7.2/data/cups.socket.in.systemd-socket 2014-04-17 14:05:04.105472002 +0200
++++ cups-1.7.2/data/cups.socket.in 2014-04-17 14:05:04.105472002 +0200
+@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=@DEFAULT_IPP_PORT@
++BindIPv6Only=ipv6-only
+
+[Install]
+WantedBy=sockets.target
-diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
---- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
+diff -up cups-1.7.2/data/Makefile.systemd-socket cups-1.7.2/data/Makefile
+--- cups-1.7.2/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/data/Makefile 2014-04-17 14:05:04.106471988 +0200
@@ -100,6 +100,12 @@ install-data:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done
@@ -152,9 +155,9 @@ diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
#
-diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
---- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
-+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
+diff -up cups-1.7.2/Makedefs.in.systemd-socket cups-1.7.2/Makedefs.in
+--- cups-1.7.2/Makedefs.in.systemd-socket 2014-04-17 14:05:04.092472182 +0200
++++ cups-1.7.2/Makedefs.in 2014-04-17 14:05:04.106471988 +0200
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
@@ -171,7 +174,7 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
+@@ -232,6 +234,7 @@ PAMFILE = @PAMFILE@
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@
@@ -179,10 +182,10 @@ diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
#
-diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
---- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
-@@ -77,6 +77,9 @@ typedef struct
+diff -up cups-1.7.2/scheduler/client.h.systemd-socket cups-1.7.2/scheduler/client.h
+--- cups-1.7.2/scheduler/client.h.systemd-socket 2013-08-02 00:23:18.000000000 +0200
++++ cups-1.7.2/scheduler/client.h 2014-04-17 14:05:04.106471988 +0200
+@@ -79,6 +79,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
http_encryption_t encryption; /* To encrypt or not to encrypt... */
@@ -192,9 +195,9 @@ diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/cli
} cupsd_listener_t;
-diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
---- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
+diff -up cups-1.7.2/scheduler/listen.c.systemd-socket cups-1.7.2/scheduler/listen.c
+--- cups-1.7.2/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/scheduler/listen.c 2014-04-17 14:05:04.107471974 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void)
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@@ -208,19 +211,10 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
{
#ifdef WIN32
closesocket(lis->fd);
-diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
---- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
-+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
-@@ -26,6 +26,8 @@
- * launchd_checkin() - Check-in with launchd and collect the listening
- * fds.
- * launchd_checkout() - Update the launchd KeepAlive file as needed.
-+ * systemd_checkin() - Check-in with systemd and collect the
-+ * listening fds.
- * parent_handler() - Catch USR1/CHLD signals...
- * process_children() - Process all dead children...
- * select_timeout() - Calculate the select timeout value.
-@@ -62,6 +64,10 @@
+diff -up cups-1.7.2/scheduler/main.c.systemd-socket cups-1.7.2/scheduler/main.c
+--- cups-1.7.2/scheduler/main.c.systemd-socket 2014-04-17 14:05:04.052472738 +0200
++++ cups-1.7.2/scheduler/main.c 2014-04-17 14:09:39.102634667 +0200
+@@ -39,6 +39,10 @@
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
@@ -231,7 +225,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -83,6 +89,9 @@
+@@ -64,6 +68,9 @@
static void launchd_checkin(void);
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
@@ -241,7 +235,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
static void parent_handler(int sig);
static void process_children(void);
static void sigchld_handler(int sig);
-@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
+@@ -563,6 +570,13 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -255,7 +249,20 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* Startup the server...
*/
-@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
+@@ -654,6 +668,12 @@ main(int argc, /* I - Number of comm
+ "Scheduler started via launchd.");
+ else
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++#endif /* HAVE_SYSTEMD */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL,
+ "Scheduler started in foreground.");
+@@ -751,6 +771,15 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@@ -271,7 +278,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* Startup the server...
*/
-@@ -1511,6 +1536,102 @@ launchd_checkout(void)
+@@ -1500,6 +1529,102 @@ launchd_checkout(void)
}
#endif /* HAVE_LAUNCHD */
@@ -374,9 +381,9 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
---- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
-+++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
+diff -up cups-1.7.2/scheduler/Makefile.systemd-socket cups-1.7.2/scheduler/Makefile
+--- cups-1.7.2/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7.2/scheduler/Makefile 2014-04-17 14:05:04.108471960 +0200
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
--
cgit v0.12
From b89c550af6853616fbc83bd61744b2b2b04c6875 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 13:19:53 -0500
Subject: core/libtxc_dxtn: 1.0.1 Needed for mesa dri drivers
---
abs/core/libtxc_dxtn/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 abs/core/libtxc_dxtn/PKGBUILD
diff --git a/abs/core/libtxc_dxtn/PKGBUILD b/abs/core/libtxc_dxtn/PKGBUILD
new file mode 100644
index 0000000..b408d6f
--- /dev/null
+++ b/abs/core/libtxc_dxtn/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 198250 2013-10-30 13:43:41Z allan $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+pkgname=libtxc_dxtn
+pkgver=1.0.1
+pkgrel=5
+arch=(i686 x86_64)
+pkgdesc="S3 Texture Compression (S3TC) library for Mesa"
+url="http://dri.freedesktop.org/wiki/S3TC"
+license=(custom:BSD)
+depends=(mesa)
+source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('7105107f07ac49753f4b61ba9d0c79c5')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # License
+ mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+ sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \
+ > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
--
cgit v0.12
From 4bcecbbe9042ee7b2d002525e53b4af86abb8139 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 14:51:12 -0500
Subject: xf86-video-vmware: 13.0.1 updated due to mesa update to 10
---
abs/core/xf86-video-vmware/PKGBUILD | 30 +-
abs/core/xf86-video-vmware/git_fixes.diff | 894 -----------
.../xf86-video-vmware/xatracker-v2-fixes.patch | 1583 ++++++++++++++++++++
3 files changed, 1601 insertions(+), 906 deletions(-)
delete mode 100644 abs/core/xf86-video-vmware/git_fixes.diff
create mode 100644 abs/core/xf86-video-vmware/xatracker-v2-fixes.patch
diff --git a/abs/core/xf86-video-vmware/PKGBUILD b/abs/core/xf86-video-vmware/PKGBUILD
index fe55462..488d62a 100644
--- a/abs/core/xf86-video-vmware/PKGBUILD
+++ b/abs/core/xf86-video-vmware/PKGBUILD
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD 168595 2012-10-13 11:46:27Z andyrtr $
+# $Id: PKGBUILD 202951 2013-12-29 08:00:15Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vmware
-pkgver=12.0.2
-pkgrel=2
+pkgver=13.0.1
+pkgrel=3
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
+depends=('libdrm' 'svga-dri' 'mesa>=10.0')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13')
conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha1sums=('efa47f365d88da245804a9934719ff860ed04f95'
- 'ad475b37e2614f365533a40da0fb5b9e2709e3c6')
+options=('!emptydirs')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ xatracker-v2-fixes.patch)
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d'
+ '7ab392cbc6258dc36df14ef60072c655d850bcfb6885111b41bcfe25dc1faacc')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # grab from upstream git repo, needed for mesa>10.0
+ patch -Np1 -i ../xatracker-v2-fixes.patch
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git_fixes.diff
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --enable-vmwarectrl-client
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/abs/core/xf86-video-vmware/git_fixes.diff b/abs/core/xf86-video-vmware/git_fixes.diff
deleted file mode 100644
index 8589416..0000000
--- a/abs/core/xf86-video-vmware/git_fixes.diff
+++ /dev/null
@@ -1,894 +0,0 @@
-From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 20 Apr 2012 20:24:26 +0000
-Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
-
-This fixes a failed assertion in the gallium/svga driver in the
-svga_texture_get_handle() function. The texture resource wasn't
-getting created with the PIPE_BIND_SHARED flag so the !cachable
-assertion would fail and the X session would abort. This didn't
-happen with release builds.
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
-index 2a18762..8b30e45 100644
---- a/vmwgfx/vmwgfx_xa_surface.c
-+++ b/vmwgfx/vmwgfx_xa_surface.c
-@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
-
- vpix->staging_format = format;
- vpix->staging_remove_flags = 0;
-- vpix->staging_add_flags = XA_FLAG_RENDER_TARGET;
-+ vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
-
- return TRUE;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 06 Jun 2012 08:58:01 +0000
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/saa/saa.c b/saa/saa.c
-index 173c090..f2d68e9 100644
---- a/saa/saa.c
-+++ b/saa/saa.c
-@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
- * screen private, before calling down to the next CloseScreen.
- */
- Bool
--saa_close_screen(int i, ScreenPtr pScreen)
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
- struct saa_screen_priv *sscreen = saa_screen(pScreen);
- struct saa_driver *driver = sscreen->driver;
-@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
-
- free(sscreen);
-
-- return (*pScreen->CloseScreen) (i, pScreen);
-+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
-
- struct saa_driver *
-diff --git a/saa/saa.h b/saa/saa.h
-index c7aa3b6..4e5ced5 100644
---- a/saa/saa.h
-+++ b/saa/saa.h
-@@ -44,6 +44,8 @@
- #include <damage.h>
- #include <picturestr.h>
-
-+#include "../src/compat-api.h"
-+
- #define SAA_VERSION_MAJOR 0
- #define SAA_VERSION_MINOR 1
-
-@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
- saa_bitmap_to_region(PixmapPtr pPix);
-
- extern _X_EXPORT Bool
--saa_close_screen(int i, ScreenPtr pScreen);
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
-
- extern _X_EXPORT Bool
- saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04c9e0d..b0dd147 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,6 +37,7 @@ endif
- vmware_drv_la_SOURCES = \
- bits2pixels.c \
- bits2pixels.h \
-+ compat-api.h \
- guest_os.h \
- includeCheck.h \
- svga_escape.h \
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 0000000..6bc946f
---- a/dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+ it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
-+
-+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS pScrn
-+
-+#define XF86_SCRN_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff --git a/src/vmware.c b/src/vmware.c
-index e3892f1..41201f1 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
- pScrn->pScreen->rootDepth),
- (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
-
-- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE);
-- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE);
-+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
-+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
- }
-
- vgaHWProtect(pScrn, FALSE);
-@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
- }
-
- static void
--VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags)
-+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
- /* FIXME */
- }
-@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
- }
-
- static Bool
--VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- ScreenPtr save = &pVMWARE->ScrnFuncs;
-
-@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
- pScrn->DriverFunc = NULL;
- #endif
-
-- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
-
- static Bool
-@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1,
- }
-
- static Bool
--VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn;
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- vgaHWPtr hwp;
- VMWAREPtr pVMWARE;
- OptionInfoPtr options;
- Bool useXinerama = TRUE;
-
-- /* Get the ScrnInfoRec */
-- pScrn = xf86Screens[pScreen->myNum];
- pVMWARE = VMWAREPTR(pScrn);
-
-
-@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
-
- /* Set the viewport if supported */
-- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
-
- /*
- * Setup the screen's visuals, and initialise the framebuffer
-@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
-
- static Bool
--VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
--
-+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- ScreenPtr pScreen = pScrn->pScreen;
-
- pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
-@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- }
-
- static Bool
--VMWAREEnterVT(int scrnIndex, int flags)
-+VMWAREEnterVT(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-
- /*
-@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags)
- }
-
- static void
--VMWARELeaveVT(int scrnIndex, int flags)
-+VMWARELeaveVT(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-
- /*
-@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags)
- }
-
- static void
--VMWAREFreeScreen(int scrnIndex, int flags)
-+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
-+ SCRN_INFO_PTR(arg);
- /*
- * If the vgahw module is used vgaHWFreeHWRec() would be called
- * here.
- */
-- VMWAREFreeRec(xf86Screens[scrnIndex]);
-+ VMWAREFreeRec(pScrn);
- }
-
- static ModeStatus
--VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
- return MODE_OK;
- }
-diff --git a/src/vmware.h b/src/vmware.h
-index 458390a..4818e16 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -177,7 +177,7 @@ typedef struct {
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
-
- static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
-- return xf86Screens[s->myNum];
-+ return xf86ScreenToScrn(s);
- }
-
- #define MIN(a,b) ((a)<(b)?(a):(b))
-diff --git a/src/vmware_common.h b/src/vmware_common.h
-index 9cd7194..5629c10 100644
---- a/src/vmware_common.h
-+++ b/src/vmware_common.h
-@@ -32,6 +32,8 @@
- #include <X11/extensions/panoramiXproto.h>
- #include <xf86.h>
-
-+#include "compat-api.h"
-+
- xXineramaScreenInfo *
- VMWAREParseTopologyString(ScrnInfoPtr pScrn,
- const char *topology,
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 1b82ac4..7de0772 100644
---- a/vmwgfx/vmwgfx_dri2.c
-+++ b/vmwgfx/vmwgfx_dri2.c
-@@ -83,7 +83,7 @@ static Bool
- dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
- {
- ScreenPtr pScreen = pDraw->pScreen;
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- BufferPrivatePtr private = buffer->driverPrivate;
- PixmapPtr pPixmap;
-@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
- Bool
- xorg_dri2_init(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- DRI2InfoRec dri2info;
- int major, minor;
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index ed1eb8c..9959ffb 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -107,14 +107,13 @@ typedef uint8_t uint8;
- */
-
- static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
--static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc,
-- char **argv);
--static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags);
--static void drv_adjust_frame(int scrnIndex, int x, int y, int flags);
--static Bool drv_enter_vt(int scrnIndex, int flags);
--static void drv_leave_vt(int scrnIndex, int flags);
--static void drv_free_screen(int scrnIndex, int flags);
--static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
-+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
-+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
-+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
-+static void drv_leave_vt(VT_FUNC_ARGS_DECL);
-+static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
-+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
- int flags);
-
- extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
-@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn)
- * Internal function definitions
- */
-
--static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen);
-+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
-
- /*
- * Internal functions
-@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
-
- void xorg_flush(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- PixmapPtr pixmap = NULL;
-@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen)
- free(pixmaps);
- }
-
--static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
-- pointer pReadmask)
-+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
- {
-- ScreenPtr pScreen = screenInfo.screens[i];
-- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]);
-+ SCREEN_PTR(arg);
-+ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
-
- vmwgfx_swap(ms, pScreen, BlockHandler);
-- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
-+ pScreen->BlockHandler(BLOCKHANDLER_ARGS);
- vmwgfx_swap(ms, pScreen, BlockHandler);
-
- vmwgfx_flush_dri2(pScreen);
-@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
- static Bool
- drv_create_screen_resources(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- Bool ret;
-
-@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen)
- if (!ret)
- return ret;
-
-- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
-
-- return drv_enter_vt(pScreen->myNum, 1);
-+ return drv_enter_vt(VT_FUNC_ARGS);
- }
-
- static Bool
-@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn)
- static Bool
- vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- {
-- ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
- modesettingPtr ms = modesettingPTR(pScrn);
-@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- static Bool
- vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- {
-- ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
- modesettingPtr ms = modesettingPTR(pScrn);
-@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
-
-
- static Bool
--drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+drv_screen_init(SCREEN_INIT_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- VisualPtr visual;
-
-@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
-
- static void
--drv_adjust_frame(int scrnIndex, int x, int y, int flags)
-+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86OutputPtr output = config->output[config->compat_output];
- xf86CrtcPtr crtc = output->crtc;
-@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags)
- }
-
- static void
--drv_free_screen(int scrnIndex, int flags)
-+drv_free_screen(FREE_SCREEN_ARGS_DECL)
- {
-- drv_free_rec(xf86Screens[scrnIndex]);
-+ SCRN_INFO_PTR(arg);
-+ drv_free_rec(pScrn);
- }
-
- static void
--drv_leave_vt(int scrnIndex, int flags)
-+drv_leave_vt(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
- modesettingPtr ms = modesettingPTR(pScrn);
-
- vmwgfx_cursor_bypass(ms->fd, 0, 0);
-@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags)
- * This gets called when gaining control of the VT, and from ScreenInit().
- */
- static Bool
--drv_enter_vt(int scrnIndex, int flags)
-+drv_enter_vt(VT_FUNC_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
-
- if (!drv_set_master(pScrn))
- return FALSE;
-@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags)
- }
-
- static Bool
--drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags)
-+drv_switch_mode(SWITCH_MODE_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ SCRN_INFO_PTR(arg);
-
- return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
-
- static Bool
--drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-+drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
-- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
-
- if (ms->cursor) {
-@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
- xorg_dri2_close(pScreen);
-
- if (pScrn->vtSema)
-- pScrn->LeaveVT(scrnIndex, 0);
-+ pScrn->LeaveVT(VT_FUNC_ARGS);
-
- pScrn->vtSema = FALSE;
-
-@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
- if (ms->xat)
- xa_tracker_destroy(ms->xat);
-
-- return (*pScreen->CloseScreen) (scrnIndex, pScreen);
-+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
-
- static ModeStatus
--drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
- return MODE_OK;
- }
-diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
-index 4fcfed6..f78a85f 100644
---- a/vmwgfx/vmwgfx_driver.h
-+++ b/vmwgfx/vmwgfx_driver.h
-@@ -46,6 +46,7 @@
- #include <xa_tracker.h>
- #include <xf86Module.h>
-
-+#include "../src/compat-api.h"
- #ifdef DRI2
- #include <dri2.h>
- #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3))
-@@ -118,9 +119,9 @@ typedef struct _modesettingRec
- ScreenBlockHandlerProcPtr saved_BlockHandler;
- CreateScreenResourcesProcPtr saved_CreateScreenResources;
- CloseScreenProcPtr saved_CloseScreen;
-- Bool (*saved_EnterVT)(int, int);
-- void (*saved_LeaveVT)(int, int);
-- void (*saved_AdjustFrame)(int, int, int, int);
-+ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
-+ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
-+ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
- Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
- Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
-
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 469598a..63df3a1 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen)
- struct vmwgfx_saa *vsaa =
- to_vmwgfx_saa(saa_get_driver(pScreen));
- struct _WsbmListHead *list, *next;
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-
- if (!pScrn->vtSema)
- return;
-@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
- struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
- struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap);
- struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix);
-- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen);
-
- /*
- * Make dri2 drawables up to date, or add them to the flush list
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index af53379..449266b 100644
---- a/vmwgfx/vmwgfx_tex_video.c
-+++ b/vmwgfx/vmwgfx_tex_video.c
-@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn,
- DrawablePtr pDraw)
- {
- struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data;
-- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
- PixmapPtr pPixmap;
- INT32 x1, x2, y1, y2;
- BoxRec dstBox;
-@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports)
- static XF86VideoAdaptorPtr
- xorg_setup_textured_adapter(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- XF86VideoAdaptorPtr adapt;
- XF86AttributePtr attrs;
-@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen)
- void
- xorg_xv_init(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
- XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL;
- XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL;
---
-cgit v0.9.0.2-2-gbebe
-From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Fri, 15 Jun 2012 15:56:59 +0000
-Subject: vmware: Fix up some warnings after new compat API change.
-
-Fixes multiple instances of these warnings on x86_64:
-../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration]
-../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs]
-../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default]
-Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index 4818e16..be113bb 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,6 +18,7 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
-
-+#include "compat-api.h"
-
- #include <X11/extensions/panoramiXproto.h>
-
---
-cgit v0.9.0.2-2-gbebe
-From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 16 Jun 2012 13:43:52 +0000
-Subject: vmware: drop infoFromScreen inline in favour of new interface
-
-This also should fix the build regression introduced with the fix
-for this macro.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index be113bb..028dff3 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,8 +18,6 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
-
--#include "compat-api.h"
--
- #include <X11/extensions/panoramiXproto.h>
-
- #ifdef XSERVER_LIBPCIACCESS
-@@ -177,10 +175,6 @@ typedef struct {
-
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
-
--static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
-- return xf86ScreenToScrn(s);
--}
--
- #define MIN(a,b) ((a)<(b)?(a):(b))
- #define MAX(a,b) ((a)>(b)?(a):(b))
- #define ABS(x) (((x) >= 0) ? (x) : -(x))
-diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
-index 2e2effb..93dacc0 100644
---- a/src/vmwarecurs.c
-+++ b/src/vmwarecurs.c
-@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
- #endif
-
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "bits2pixels.h"
-
- static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
- static Bool
- vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
- {
-- ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
- pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src )
- static Bool
- vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
- {
-- ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n",
- pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -283,7 +284,7 @@ Bool
- vmwareCursorInit(ScreenPtr pScreen)
- {
- xf86CursorInfoPtr infoPtr;
-- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- Bool ret;
-
- TRACEPOINT
-@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
- void
- vmwareCursorCloseScreen(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- #ifdef RENDER
- PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
- void
- vmwareCursorHookWrappers(ScreenPtr pScreen)
- {
-- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- #ifdef RENDER
- PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
- #endif
-@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
- unsigned int format, unsigned long planeMask, char *pBinImage)
- {
- ScreenPtr pScreen = src->pScreen;
-- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
-+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
- BoxRec box;
- Bool hidden = FALSE;
-
-@@ -412,7 +413,7 @@ static void
- VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
- {
- ScreenPtr pScreen = pWin->drawable.pScreen;
-- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
-+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
- BoxPtr pBB;
- Bool hidden = FALSE;
-
-@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
- CARD16 width, CARD16 height)
- {
- ScreenPtr pScreen = pDst->pDrawable->pScreen;
-- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- PictureScreenPtr ps = GetPictureScreen(pScreen);
- BoxRec box;
- Bool hidden = FALSE;
-diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
-index 71f21fe..745c71f 100644
---- a/src/vmwarevideo.c
-+++ b/src/vmwarevideo.c
-@@ -39,6 +39,7 @@
- #endif
-
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "xf86xv.h"
- #include "fourcc.h"
- #include "svga_escape.h"
-@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE)
- Bool
- vmwareVideoInit(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
- XF86VideoAdaptorPtr newAdaptor = NULL;
- int numAdaptors;
-@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen)
- void
- vmwareVideoEnd(ScreenPtr pScreen)
- {
-- ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- VMWAREVideoPtr pVid;
- int i;
---
-cgit v0.9.0.2-2-gbebe
-From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 03 Jul 2012 12:50:30 +0000
-Subject: vmware: avoid warnings about shadowing 'i'
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..205ac59 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -46,7 +46,7 @@
- #define SCREEN_ARG_TYPE int
- #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-
--#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
-
- #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
---
-cgit v0.9.0.2-2-gbebe
-From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001
-From: Jakob Bornecrantz <jakob@vmware.com>
-Date: Tue, 29 May 2012 21:01:14 +0000
-Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy
-
-Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
-index eaf87b2..fec04c0 100644
---- a/vmwgfx/vmwgfx_crtc.c
-+++ b/vmwgfx/vmwgfx_crtc.c
-@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
- static void
- crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
- {
-- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
-+ ScreenPtr pScreen;
-
-+ if (rotate_pixmap == NULL)
-+ return;
-+
-+ pScreen = rotate_pixmap->drawable.pScreen;
- pScreen->DestroyPixmap(rotate_pixmap);
- }
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch b/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch
new file mode 100644
index 0000000..9b8ed54
--- /dev/null
+++ b/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch
@@ -0,0 +1,1583 @@
+From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Mon, 10 Jun 2013 13:31:31 -0400
+Subject: [PATCH 01/11] vmwgfx: update for XA API changes
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 2 +-
+ vmwgfx/vmwgfx_dri2.c | 5 +++--
+ vmwgfx/vmwgfx_driver.c | 3 ++-
+ vmwgfx/vmwgfx_saa.c | 20 ++++++++++++++------
+ vmwgfx/vmwgfx_tex_video.c | 5 +++--
+ 5 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0631bcc..dccfb27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 7de0772..2f007f0 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_destroy(srf);
++ xa_surface_unref(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 7863ba2..3002285 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 63df3a1..ed3c1ee 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ (int) to_hw,
+ (struct xa_box *) REGION_RECTS(reg),
+ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
+ if (vpix->gmr)
+ vmwgfx_dmabuf_unmap(vpix->gmr);
+ if (ret)
+@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
++ xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
++ &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_destroy(hw);
++ xa_surface_unref(hw);
+ return FALSE;
+ }
+
+@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+
+ if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ return FALSE;
+ }
+
+@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
+ return;
+ }
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static Bool
+@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
+
+ xa_composite_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static void
+@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 449266b..2971ed7 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+
+ for (i=0; i<3; ++i) {
+ if (priv->yuv[i]) {
+- xa_surface_destroy(priv->yuv[i]);
++ xa_surface_unref(priv->yuv[i]);
+ priv->yuv[i] = NULL;
+ }
+ for (j=0; j<2; ++j) {
+@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ REGION_RESET(pScrn->pScreen, ®, &box);
+ }
+
+- if (xa_surface_handle(srf, &handle, &stride) != 0) {
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &handle, &stride) != 0) {
+ ret = BadAlloc;
+ break;
+ }
+--
+1.8.5.1
+
+
+From 835ce4698f916ba080f4132988fd4caf898e0b1e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 26 Sep 2013 01:25:33 -0700
+Subject: [PATCH 02/11] vmwgfx: Avoid HW operations when not master
+
+Note that for DRI2, a dri2_copy_region becomes a NOP when not master.
+Additionally, all dri2 operations that lead to a potential kernel
+access will return FALSE.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_dri2.c | 13 +++++++++++++
+ vmwgfx/vmwgfx_driver.c | 3 +++
+ vmwgfx/vmwgfx_saa.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ vmwgfx/vmwgfx_saa.h | 8 ++++++++
+ vmwgfx/vmwgfx_saa_priv.h | 2 ++
+ vmwgfx/vmwgfx_xa_surface.c | 6 ++++++
+ 6 files changed, 75 insertions(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 2f007f0..57f2d9d 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -138,6 +138,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ return TRUE;
+ case DRI2BufferStencil:
+ case DRI2BufferDepthStencil:
++ if (!pScrn->vtSema)
++ return FALSE;
+
+ depth = (format) ? vmwgfx_zs_format_to_depth(format) : 32;
+
+@@ -155,6 +157,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+
+ break;
+ case DRI2BufferDepth:
++ if (!pScrn->vtSema)
++ return FALSE;
++
+ depth = (format) ? vmwgfx_z_format_to_depth(format) :
+ pDraw->bitsPerPixel;
+
+@@ -291,6 +296,14 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
+ DrawablePtr dst_draw;
+ RegionPtr myClip;
+ GCPtr gc;
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
++
++ /*
++ * This is a fragile protection against HW operations when not master.
++ * Needs to be blocked higher up in the dri2 code.
++ */
++ if (!pScrn->vtSema)
++ return;
+
+ /*
+ * In driCreateBuffers we dewrap windows into the
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 3002285..eeaea4b 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1116,6 +1116,7 @@ drv_leave_vt(VT_FUNC_ARGS_DECL)
+
+ vmwgfx_cursor_bypass(ms->fd, 0, 0);
+ vmwgfx_disable_scanout(pScrn);
++ vmwgfx_saa_drop_master(pScrn->pScreen);
+
+ if (drmDropMaster(ms->fd))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+@@ -1136,6 +1137,8 @@ drv_enter_vt(VT_FUNC_ARGS_DECL)
+ if (!drv_set_master(pScrn))
+ return FALSE;
+
++ vmwgfx_saa_set_master(pScrn->pScreen);
++
+ if (!xf86SetDesiredModes(pScrn))
+ return FALSE;
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index ed3c1ee..5534ca3 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -423,6 +423,7 @@ vmwgfx_create_pixmap(struct saa_driver *driver, struct saa_pixmap *spix,
+
+ WSBMINITLISTHEAD(&vpix->sync_x_head);
+ WSBMINITLISTHEAD(&vpix->scanout_list);
++ WSBMINITLISTHEAD(&vpix->pixmap_list);
+
+ return TRUE;
+ }
+@@ -499,6 +500,7 @@ vmwgfx_destroy_pixmap(struct saa_driver *driver, PixmapPtr pixmap)
+ */
+
+ vmwgfx_pixmap_remove_present(vpix);
++ WSBMLISTDELINIT(&vpix->pixmap_list);
+ WSBMLISTDELINIT(&vpix->sync_x_head);
+
+ if (vpix->hw_is_dri2_fronts)
+@@ -627,6 +629,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+ int bpp, int devkind, void *pixdata)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ ScreenPtr pScreen = pixmap->drawable.pScreen;
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
+ unsigned int old_height;
+ unsigned int old_width;
+ unsigned int old_pitch;
+@@ -670,6 +674,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+
+ vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
+ vmwgfx_pixmap_free_storage(vpix);
++ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
++
+ return TRUE;
+
+ out_no_modify:
+@@ -860,7 +866,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+ Bool has_valid_hw;
+
+ if (!vsaa->xat || !SAA_PM_IS_SOLID(&dst_pixmap->drawable, plane_mask) ||
+- alu != GXcopy)
++ alu != GXcopy || !vsaa->is_master)
+ return FALSE;
+
+ src_vpix = vmwgfx_saa_pixmap(src_pixmap);
+@@ -1057,6 +1063,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
+ RegionRec empty;
+ struct xa_composite *xa_comp;
+
++ if (!vsaa->is_master)
++ return FALSE;
++
+ REGION_NULL(pScreen, &empty);
+
+ /*
+@@ -1367,7 +1376,9 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
++ vsaa->is_master = TRUE;
+ WSBMINITLISTHEAD(&vsaa->sync_x_list);
++ WSBMINITLISTHEAD(&vsaa->pixmaps);
+
+ vsaa->driver = vmwgfx_saa_driver;
+ vsaa->vcomp = vmwgfx_alloc_composite();
+@@ -1518,3 +1529,34 @@ vmwgfx_scanout_unref(struct vmwgfx_screen_entry *entry)
+ entry->pixmap = NULL;
+ pixmap->drawable.pScreen->DestroyPixmap(pixmap);
+ }
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++
++ vsaa->is_master = TRUE;
++}
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++ struct _WsbmListHead *list;
++ struct vmwgfx_saa_pixmap *vpix;
++ struct saa_pixmap *spix;
++
++ WSBMLISTFOREACH(list, &vsaa->pixmaps) {
++ vpix = WSBMLISTENTRY(list, struct vmwgfx_saa_pixmap, pixmap_list);
++ spix = &vpix->base;
++
++ if (!vpix->hw)
++ continue;
++
++ (void) vmwgfx_download_from_hw(&vsaa->driver, spix->pixmap,
++ &spix->dirty_hw);
++ REGION_EMPTY(draw->pScreen, &spix->dirty_hw);
++ }
++
++ vsaa->is_master = FALSE;
++}
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index bb8ec96..d8aa3d3 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -54,6 +54,7 @@ struct vmwgfx_saa_pixmap {
+ int hw_is_dri2_fronts;
+ struct _WsbmListHead sync_x_head;
+ struct _WsbmListHead scanout_list;
++ struct _WsbmListHead pixmap_list;
+
+ uint32_t xa_flags;
+ uint32_t staging_add_flags;
+@@ -107,4 +108,11 @@ Bool
+ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ uint32_t add_flags, uint32_t remove_flags,
+ RegionPtr region);
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen);
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen);
++
+ #endif
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 5f46dee..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -54,8 +54,10 @@ struct vmwgfx_saa {
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
++ Bool is_master;
+ void (*present_flush) (ScreenPtr pScreen);
+ struct _WsbmListHead sync_x_list;
++ struct _WsbmListHead pixmaps;
+ struct vmwgfx_composite *vcomp;
+ };
+
+diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
+index 8b30e45..2f23c57 100644
+--- a/vmwgfx/vmwgfx_xa_surface.c
++++ b/vmwgfx/vmwgfx_xa_surface.c
+@@ -362,6 +362,12 @@ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ Bool
+ vmwgfx_hw_dri2_validate(PixmapPtr pixmap, unsigned int depth)
+ {
++ struct vmwgfx_saa *vsaa =
++ to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen));
++
++ if (!vsaa->is_master)
++ return FALSE;
++
+ return (vmwgfx_hw_dri2_stage(pixmap, depth) &&
+ vmwgfx_hw_commit(pixmap) &&
+ vmwgfx_hw_validate(pixmap, NULL));
+--
+1.8.5.1
+
+
+From 7192acf9f0bf8e7176ab0b803b861a858623f709 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 20:36:57 +0200
+Subject: [PATCH 03/11] vmwgfx: Implement textured video completely on top of
+ XA.
+
+Remove device-specific hacks. This may increase resource usage a little
+on old hardware revisions, but we don't need separate code paths on
+different hardware revisions.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_tex_video.c | 109 ++++++----------------------------------------
+ 1 file changed, 14 insertions(+), 95 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 2971ed7..a0a4f4a 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -111,8 +111,7 @@ struct xorg_xv_port_priv {
+ int hue;
+
+ int current_set;
+- struct vmwgfx_dmabuf *bounce[2][3];
+- struct xa_surface *yuv[3];
++ struct xa_surface *yuv[2][3];
+
+ int drm_fd;
+
+@@ -198,14 +197,10 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ priv->fence = NULL;
+
+ for (i=0; i<3; ++i) {
+- if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[i]);
+- priv->yuv[i] = NULL;
+- }
+ for (j=0; j<2; ++j) {
+- if (priv->bounce[j][i]) {
+- vmwgfx_dmabuf_destroy(priv->bounce[j][i]);
+- priv->bounce[0][i] = NULL;
++ if (priv->yuv[i]) {
++ xa_surface_unref(priv->yuv[j][i]);
++ priv->yuv[j][i] = NULL;
+ }
+ }
+ }
+@@ -297,11 +292,9 @@ static int
+ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ int width, int height)
+ {
+- struct xa_surface **yuv = priv->yuv;
+- struct vmwgfx_dmabuf **bounce = priv->bounce[priv->current_set];
++ struct xa_surface **yuv = priv->yuv[priv->current_set];
+ int ret = 0;
+ int i;
+- size_t size;
+
+ for (i=0; i<3; ++i) {
+
+@@ -334,19 +327,6 @@ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ if (ret || !yuv[i])
+ return BadAlloc;
+
+- size = width * height;
+-
+- if (bounce[i] && (bounce[i]->size < size ||
+- bounce[i]->size > 2*size)) {
+- vmwgfx_dmabuf_destroy(bounce[i]);
+- bounce[i] = NULL;
+- }
+-
+- if (!bounce[i]) {
+- bounce[i] = vmwgfx_dmabuf_alloc(priv->drm_fd, size);
+- if (!bounce[i])
+- return BadAlloc;
+- }
+ }
+ return Success;
+ }
+@@ -413,28 +393,20 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ unsigned short w, unsigned short h)
+ {
+ int i;
+- struct vmwgfx_dmabuf **bounce = port->bounce[port->current_set];
++ struct xa_surface **yuv = port->yuv[port->current_set];
+ char *ymap, *vmap, *umap;
+ unsigned char y1, y2, u, v;
+ int yidx, uidx, vidx;
+ int y_array_size = w * h;
+ int ret = BadAlloc;
+
+- /*
+- * Here, we could use xa_surface_[map|unmap], but given the size of
+- * the yuv textures, that could stress the xa tracker dma buffer pool,
+- * particularaly with multiple videos rendering simultaneously.
+- *
+- * Instead, cheat and allocate vmwgfx dma buffers directly.
+- */
+-
+- ymap = (char *)vmwgfx_dmabuf_map(bounce[0]);
++ ymap = xa_surface_map(port->r, yuv[0], XA_MAP_WRITE);
+ if (!ymap)
+ return BadAlloc;
+- umap = (char *)vmwgfx_dmabuf_map(bounce[1]);
++ umap = xa_surface_map(port->r, yuv[1], XA_MAP_WRITE);
+ if (!umap)
+ goto out_no_umap;
+- vmap = (char *)vmwgfx_dmabuf_map(bounce[2]);
++ vmap = xa_surface_map(port->r, yuv[2], XA_MAP_WRITE);
+ if (!vmap)
+ goto out_no_vmap;
+
+@@ -493,65 +465,11 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ }
+
+ ret = Success;
+- vmwgfx_dmabuf_unmap(bounce[2]);
++ xa_surface_unmap(yuv[2]);
+ out_no_vmap:
+- vmwgfx_dmabuf_unmap(bounce[1]);
++ xa_surface_unmap(yuv[1]);
+ out_no_umap:
+- vmwgfx_dmabuf_unmap(bounce[0]);
+-
+- if (ret == Success) {
+- struct xa_surface *srf;
+- struct vmwgfx_dmabuf *buf;
+- uint32_t handle;
+- unsigned int stride;
+- BoxRec box;
+- RegionRec reg;
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_INIT(pScrn->pScreen, ®, &box, 1);
+-
+- for (i=0; i<3; ++i) {
+- srf = port->yuv[i];
+- buf = bounce[i];
+-
+- if (i == 1) {
+- switch(id) {
+- case FOURCC_YV12:
+- h /= 2;
+- /* Fall through */
+- case FOURCC_YUY2:
+- case FOURCC_UYVY:
+- w /= 2;
+- break;
+- default:
+- break;
+- }
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_RESET(pScrn->pScreen, ®, &box);
+- }
+-
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &handle, &stride) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+-
+- if (vmwgfx_dma(0, 0, ®, buf, w, handle, 1) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+- }
+- REGION_UNINIT(pScrn->pScreen, ®);
+- }
++ xa_surface_unmap(yuv[0]);
+
+ return ret;
+ }
+@@ -610,7 +528,8 @@ display_video(ScreenPtr pScreen, struct xorg_xv_port_priv *pPriv, int id,
+ (struct xa_box *)REGION_RECTS(dstRegion),
+ REGION_NUM_RECTS(dstRegion),
+ pPriv->cm,
+- vpix->hw, pPriv->yuv);
++ vpix->hw,
++ pPriv->yuv[pPriv->current_set ]);
+
+ saa_pixmap_dirty(pPixmap, TRUE, dstRegion);
+ DamageRegionProcessPending(&pPixmap->drawable);
+--
+1.8.5.1
+
+
+From 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 21:50:40 +0200
+Subject: [PATCH 04/11] vmwgfx: Get rid of device-specific DMA code
+
+It's rarely used and things seem to work well enough on top of XA.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 -----------------------------------------------
+ vmwgfx/vmwgfx_drmi.h | 5 ---
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 -
+ 4 files changed, 26 insertions(+), 136 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 496a16b..1e23f4a 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,109 +284,6 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
+-{
+- BoxPtr clips = REGION_RECTS(region);
+- unsigned int num_clips = REGION_NUM_RECTS(region);
+- struct drm_vmw_execbuf_arg arg;
+- struct drm_vmw_fence_rep rep;
+- int ret;
+- unsigned int size;
+- unsigned i;
+- SVGA3dCopyBox *cb;
+- SVGA3dCmdSurfaceDMASuffix *suffix;
+- SVGA3dCmdSurfaceDMA *body;
+- struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
+-
+- struct {
+- SVGA3dCmdHeader header;
+- SVGA3dCmdSurfaceDMA body;
+- SVGA3dCopyBox cb;
+- } *cmd;
+-
+- if (num_clips == 0)
+- return 0;
+-
+- size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cmd = malloc(size);
+- if (!cmd)
+- return -1;
+-
+- cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
+- cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cb = &cmd->cb;
+-
+- suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
+- suffix->suffixSize = sizeof(*suffix);
+- suffix->maximumOffset = (uint32_t) -1;
+- suffix->flags.discard = 0;
+- suffix->flags.unsynchronized = 0;
+- suffix->flags.reserved = 0;
+-
+- body = &cmd->body;
+- body->guest.ptr.gmrId = buf->gmr_id;
+- body->guest.ptr.offset = buf->gmr_offset;
+- body->guest.pitch = buf_pitch;
+- body->host.sid = surface_handle;
+- body->host.face = 0;
+- body->host.mipmap = 0;
+-
+- body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
+- SVGA3D_READ_HOST_VRAM);
+-
+-
+- for (i=0; i < num_clips; i++, cb++, clips++) {
+- cb->x = (uint16_t) clips->x1 + host_x;
+- cb->y = (uint16_t) clips->y1 + host_y;
+- cb->z = 0;
+- cb->srcx = (uint16_t) clips->x1;
+- cb->srcy = (uint16_t) clips->y1;
+- cb->srcz = 0;
+- cb->w = (uint16_t) (clips->x2 - clips->x1);
+- cb->h = (uint16_t) (clips->y2 - clips->y1);
+- cb->d = 1;
+-#if 0
+- LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
+- cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
+- to_surface ? "to" : "from");
+-#endif
+-
+- }
+-
+- memset(&arg, 0, sizeof(arg));
+- memset(&rep, 0, sizeof(rep));
+-
+- rep.error = -EFAULT;
+- arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
+- arg.commands = (unsigned long)cmd;
+- arg.command_size = size;
+- arg.throttle_us = 0;
+- arg.version = DRM_VMW_EXECBUF_VERSION;
+-
+- ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
+- if (ret) {
+- LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
+- }
+-
+- free(cmd);
+-
+- if (rep.error == 0) {
+- ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
+- if (ret) {
+- LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
+- strerror(-ret));
+- vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
+- }
+- }
+-
+- return 0;
+-}
+-
+-int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index 2435009..fff728a 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,11 +60,6 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
+-
+-extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 5534ca3..fd80682 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -279,40 +279,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ void *data = vpix->malloc;
++ int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
+- if (vpix->gmr && vsaa->can_optimize_dma) {
+- uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
+- goto out_err;
+- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+- to_hw) != 0)
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
+ goto out_err;
+- } else {
+- void *data = vpix->malloc;
+- int ret;
++ }
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
+- goto out_err;
+- }
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++
++ if (ret)
++ goto out_err;
++
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
+- }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1372,7 +1372,6 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
+- vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 16583b0..f5f45ba 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,7 +50,6 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
+- Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon, 28 Oct 2013 18:21:29 -0400
+Subject: [PATCH 05/11] vmwgfx: handle changes of DamageUnregister API in
+ 1.14.99.2
+
+Fix is inspired from the intel driver.
+
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index fd80682..346e7f4 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -26,6 +26,7 @@
+ */
+
+ #include <xorg-server.h>
++#include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+ #include <xf86drmMode.h>
+@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
+ if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
+ return;
+
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
++ DamageUnregister(spix->damage);
++#else
+ DamageUnregister(&pixmap->drawable, spix->damage);
++#endif
++
+ DamageDestroy(spix->damage);
+ spix->damage = NULL;
+ }
+--
+1.8.5.1
+
+
+From 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 28 Nov 2013 02:02:20 -0800
+Subject: [PATCH 06/11] vmwgfx: Fix some compilation warnings and indentations
+
+Most of the compilation warnings we're seeing are due to bad xorg headers,
+but fix the ones we can fix in the driver. Some indentation fixes as well.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ src/vmware_bootstrap.c | 2 --
+ src/vmwarevideo.c | 4 ++--
+ vmwgfx/vmwgfx_driver.c | 1 -
+ vmwgfx/vmwgfx_output.c | 2 +-
+ vmwgfx/vmwgfx_overlay.c | 4 ++--
+ vmwgfx/vmwgfx_tex_video.c | 26 +++++++++++++-------------
+ 6 files changed, 18 insertions(+), 21 deletions(-)
+
+diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c
+index ea5be19..bb58325 100644
+--- a/src/vmware_bootstrap.c
++++ b/src/vmware_bootstrap.c
+@@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv,
+ intptr_t match_data)
+ {
+ ScrnInfoPtr scrn = NULL;
+- EntityInfoPtr entity;
+
+ scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
+@@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv,
+ scrn->Probe = NULL;
+ }
+
+- entity = xf86GetEntityInfo(entity_num);
+ switch (DEVICE_ID(device)) {
+ case PCI_DEVICE_ID_VMWARE_SVGA2:
+ case PCI_DEVICE_ID_VMWARE_SVGA:
+diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
+index 745c71f..8d7d171 100644
+--- a/src/vmwarevideo.c
++++ b/src/vmwarevideo.c
+@@ -82,7 +82,7 @@
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index eeaea4b..bfc07f8 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -658,7 +658,6 @@ void xorg_flush(ScreenPtr pScreen)
+ if (crtc->enabled) {
+ pixmap = crtc_get_scanout(crtc);
+ if (pixmap) {
+- unsigned int j;
+
+ /*
+ * Remove duplicates.
+diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c
+index 4f52f1d..f9e4263 100644
+--- a/vmwgfx/vmwgfx_output.c
++++ b/vmwgfx/vmwgfx_output.c
+@@ -60,7 +60,7 @@ struct output_private
+ Bool is_implicit;
+ };
+
+-static char *output_enum_list[] = {
++static const char *output_enum_list[] = {
+ "Unknown",
+ "VGA",
+ "DVI",
+diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
+index 6624a10..986dd06 100644
+--- a/vmwgfx/vmwgfx_overlay.c
++++ b/vmwgfx/vmwgfx_overlay.c
+@@ -84,7 +84,7 @@ typedef uint8_t uint8;
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -110,7 +110,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index a0a4f4a..3ba40ef 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -70,11 +70,11 @@ static const float bt_709[] = {
+ static Atom xvBrightness, xvContrast, xvSaturation, xvHue;
+
+ #define NUM_TEXTURED_ATTRIBUTES 4
+-static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
+- {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
++static const XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
++ {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
+ };
+
+ #define NUM_FORMATS 3
+@@ -82,7 +82,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+ {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+ };
+
+-static XF86VideoEncodingRec DummyEncoding[1] = {
++static const XF86VideoEncodingRec DummyEncoding[1] = {
+ {
+ 0,
+ "XV_IMAGE",
+@@ -416,16 +416,16 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ switch (id) {
+ case FOURCC_YV12: {
+ int pitches[3], offsets[3];
+- unsigned char *y, *u, *v;
++ unsigned char *yp, *up, *vp;
+ query_image_attributes(pScrn, FOURCC_YV12,
+ &w, &h, pitches, offsets);
+
+- y = buf + offsets[0];
+- v = buf + offsets[1];
+- u = buf + offsets[2];
+- memcpy(ymap, y, w*h);
+- memcpy(vmap, v, w*h/4);
+- memcpy(umap, u, w*h/4);
++ yp = buf + offsets[0];
++ vp = buf + offsets[1];
++ up = buf + offsets[2];
++ memcpy(ymap, yp, w*h);
++ memcpy(vmap, vp, w*h/4);
++ memcpy(umap, up, w*h/4);
+ break;
+ }
+ case FOURCC_UYVY:
+--
+1.8.5.1
+
+
+From a40cbd7b4fa19219849b4b0a48f07538772c3e22 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 5 Dec 2013 02:58:47 -0800
+Subject: [PATCH 07/11] vmwgfx: Support also XA version 1 v2
+
+We need to support also XA version 1, since we want to be backwards
+compatible with older mesa releases.
+Unfortunately, the intended way of detecting XA major version at
+compile-time was broken on mesa 10 so we need a workaround that tests
+for XA version 2 at config time.
+
+v2: Update the test for XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 10 +++++++++-
+ vmwgfx/vmwgfx_dri2.c | 5 ++---
+ vmwgfx/vmwgfx_driver.c | 3 +--
+ vmwgfx/vmwgfx_saa.c | 12 +++++-------
+ vmwgfx/vmwgfx_saa.h | 12 ++++++++++++
+ vmwgfx/vmwgfx_tex_video.c | 2 +-
+ 6 files changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dccfb27..123356c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,15 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
++#
++# Early versions of mesa 10 forgot to bump the XA major version number in
++# the xa_tracker.h header
++#
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
++ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
++ [AC_DEFINE([HAVE_XA_2], 1,
++ [Has version 2 of XA])])],
++ [],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 57f2d9d..4c74a6b 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -206,8 +206,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &buffer->name, &buffer->pitch) != 0)
++ if (_xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -228,7 +227,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_unref(srf);
++ xa_surface_destroy(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index bfc07f8..6301c29 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,8 +617,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0) {
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 346e7f4..1459933 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -146,7 +146,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -451,7 +451,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -698,8 +698,7 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
+- &vsaa->src_handle, &dummy) != 0)
++ _xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -800,7 +799,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_unref(hw);
++ xa_surface_destroy(hw);
+ return FALSE;
+ }
+
+@@ -1459,8 +1458,7 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index d8aa3d3..5e1f40c 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -115,4 +115,16 @@ vmwgfx_saa_set_master(ScreenPtr pScreen);
+ void
+ vmwgfx_saa_drop_master(ScreenPtr pScreen);
+
++#if (XA_TRACKER_VERSION_MAJOR <= 1) && !defined(HAVE_XA_2)
++
++#define _xa_surface_handle(_a, _b, _c) xa_surface_handle(_a, _b, _c)
++#define xa_context_flush(_a)
++
++#else
++
++#define xa_surface_destroy(_a) xa_surface_unref(_a)
++#define _xa_surface_handle(_a, _b, _c) \
++ xa_surface_handle(_a, xa_handle_type_shared, _b, _c)
++
++#endif /* (XA_TRACKER_VERSION_MAJOR <= 1) */
+ #endif
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 3ba40ef..9fd8f22 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ for (i=0; i<3; ++i) {
+ for (j=0; j<2; ++j) {
+ if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[j][i]);
++ xa_surface_destroy(priv->yuv[j][i]);
+ priv->yuv[j][i] = NULL;
+ }
+ }
+--
+1.8.5.1
+
+
+From c36cbcefb8526944141eb431e1e736dc4485a36e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 9 Dec 2013 00:19:55 -0800
+Subject: [PATCH 08/11] vmwgfx: Remove stray 1
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 1459933..28819c1 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -1230,7 +1230,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
+ */
+
+ if (vpix->hw && vpix->hw_is_dri2_fronts) {
+- if (1 && pScrn->vtSema &&
++ if (pScrn->vtSema &&
+ vmwgfx_upload_to_hw(driver, pixmap, &spix->dirty_shadow)) {
+
+ REGION_EMPTY(vsaa->pScreen, &spix->dirty_shadow);
+--
+1.8.5.1
+
+
+From 4af6062ce281a7f4aaa50985fe757e9569208ee1 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 04:59:49 -0800
+Subject: [PATCH 09/11] Revert "vmwgfx: Get rid of device-specific DMA code"
+
+This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932.
+
+Reverting this because using direct DMA for shared pixmaps should
+boost performance. It should be usable both in a composited environment
+and when running hosted. Need to retest the DMA flaws I saw before disabling
+this code.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++
+ vmwgfx/vmwgfx_drmi.h | 5 +++
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 +
+ 4 files changed, 136 insertions(+), 26 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 1e23f4a..496a16b 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,6 +284,109 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
++{
++ BoxPtr clips = REGION_RECTS(region);
++ unsigned int num_clips = REGION_NUM_RECTS(region);
++ struct drm_vmw_execbuf_arg arg;
++ struct drm_vmw_fence_rep rep;
++ int ret;
++ unsigned int size;
++ unsigned i;
++ SVGA3dCopyBox *cb;
++ SVGA3dCmdSurfaceDMASuffix *suffix;
++ SVGA3dCmdSurfaceDMA *body;
++ struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
++
++ struct {
++ SVGA3dCmdHeader header;
++ SVGA3dCmdSurfaceDMA body;
++ SVGA3dCopyBox cb;
++ } *cmd;
++
++ if (num_clips == 0)
++ return 0;
++
++ size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cmd = malloc(size);
++ if (!cmd)
++ return -1;
++
++ cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
++ cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cb = &cmd->cb;
++
++ suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
++ suffix->suffixSize = sizeof(*suffix);
++ suffix->maximumOffset = (uint32_t) -1;
++ suffix->flags.discard = 0;
++ suffix->flags.unsynchronized = 0;
++ suffix->flags.reserved = 0;
++
++ body = &cmd->body;
++ body->guest.ptr.gmrId = buf->gmr_id;
++ body->guest.ptr.offset = buf->gmr_offset;
++ body->guest.pitch = buf_pitch;
++ body->host.sid = surface_handle;
++ body->host.face = 0;
++ body->host.mipmap = 0;
++
++ body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
++ SVGA3D_READ_HOST_VRAM);
++
++
++ for (i=0; i < num_clips; i++, cb++, clips++) {
++ cb->x = (uint16_t) clips->x1 + host_x;
++ cb->y = (uint16_t) clips->y1 + host_y;
++ cb->z = 0;
++ cb->srcx = (uint16_t) clips->x1;
++ cb->srcy = (uint16_t) clips->y1;
++ cb->srcz = 0;
++ cb->w = (uint16_t) (clips->x2 - clips->x1);
++ cb->h = (uint16_t) (clips->y2 - clips->y1);
++ cb->d = 1;
++#if 0
++ LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
++ cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
++ to_surface ? "to" : "from");
++#endif
++
++ }
++
++ memset(&arg, 0, sizeof(arg));
++ memset(&rep, 0, sizeof(rep));
++
++ rep.error = -EFAULT;
++ arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
++ arg.commands = (unsigned long)cmd;
++ arg.command_size = size;
++ arg.throttle_us = 0;
++ arg.version = DRM_VMW_EXECBUF_VERSION;
++
++ ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
++ if (ret) {
++ LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
++ }
++
++ free(cmd);
++
++ if (rep.error == 0) {
++ ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
++ if (ret) {
++ LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
++ strerror(-ret));
++ vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
++ }
++ }
++
++ return 0;
++}
++
++int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index fff728a..2435009 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,6 +60,11 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
++
++extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 28819c1..96275a5 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -285,40 +285,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
+- void *data = vpix->malloc;
+- int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
++ if (vpix->gmr && vsaa->can_optimize_dma) {
++ uint32_t handle, dummy;
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+- }
+-
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+-
+- if (ret)
+- goto out_err;
++ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
++ to_hw) != 0)
++ goto out_err;
++ } else {
++ void *data = vpix->malloc;
++ int ret;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
++ goto out_err;
++ }
+
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
++ }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1377,6 +1377,7 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
++ vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index f5f45ba..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,6 +50,7 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
++ Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 06:54:02 -0800
+Subject: [PATCH 10/11] vmwgfx: Really allow XA version 2.
+
+When XA starts to correctly advertise version 2, we didn't allow it.
+Fix this.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 6301c29..4e28097 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -79,7 +79,7 @@ typedef uint8_t uint8;
+
+ #define XA_VERSION_MINOR_REQUIRED 0
+ #define XA_VERSION_MAJOR_REQUIRED 1
+-#define XA_VERSION_MAJOR_COMPAT 1
++#define XA_VERSION_MAJOR_COMPAT 2
+
+ #define DRM_VERSION_MAJOR_REQUIRED 2
+ #define DRM_VERSION_MINOR_REQUIRED 3
+--
+1.8.5.1
+
+
+From f45a551e9b70ccec8f92df02747d4e2af299cf8c Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 16 Dec 2013 10:38:21 +0100
+Subject: [PATCH 11/11] vmwgfx: Fix compile breakage on XA version 1.
+
+A recent revert brought back code that assumed XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: trivial
+---
+ vmwgfx/vmwgfx_saa.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 96275a5..e76bd09 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -292,8 +292,7 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+--
+1.8.5.1
+
--
cgit v0.12
From 03be181cda2353fc29541712759d8044e2743da5 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 16 Aug 2014 14:52:15 -0500
Subject: wiiuse: changed depends to bluez-libs otherwise it got caught in the
bluez5 updates dep check and stopped the upgrade
---
abs/extra/wiiuse/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/extra/wiiuse/PKGBUILD b/abs/extra/wiiuse/PKGBUILD
index d8b1e2b..50c376b 100644
--- a/abs/extra/wiiuse/PKGBUILD
+++ b/abs/extra/wiiuse/PKGBUILD
@@ -1,11 +1,11 @@
#Contributor:Andrea Tarocchi <valdar@email.it>
pkgname=wiiuse
pkgver=0.12
-pkgrel=2
+pkgrel=3
pkgdesc="Wiiuse is a library written in C that connects with several Nintendo Wii remotes."
arch=(i686 x86_64)
url="http://wiiuse.sourceforge.net/"
-depends=('bluez')
+depends=('bluez-libs')
license="GPL3"
install=wiiuse.install
postfix=_src.tar.gz
--
cgit v0.12
From 9b93d67c55bb90ec0a1f4ea2b4a8cf04f7b1fb47 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 17 Aug 2014 18:06:37 -0500
Subject: LinHES-system: add idle check for Standby mode in idle.py If Standby
mode is detected the it's assumed the FE is idle.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/idle.py | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 7d57587..04d0d50 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -119,7 +119,7 @@ md5sums=('a10cb96850951ae835c46f41f92463b2'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
- '0c6cab59e09c82e40f6e627c96d5a5f6'
+ '69ecfe682f1b61c2c4c95d890b9f523c'
'a94fe6d980f4b810f2e2ae5352084b39'
'384956b4fd9bf40907856bab0e67b169'
'f4ce577e2ab1b6dbf9def46a8ab86e2d'
diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py
index 6b813b4..4575e7d 100755
--- a/abs/core/LinHES-system/idle.py
+++ b/abs/core/LinHES-system/idle.py
@@ -48,7 +48,7 @@ def dailywake_check(cmdargs,cursor):
print "error"
return True
- # Check for time periods that cross midnight
+ # Check for time periods that cross midnight
if (p1End < p1Start):
if (now > p1End):
p1End = p1End + timedelta(days=1)
@@ -188,7 +188,7 @@ def userlogins_check(cmdargs):
msg(cmdargs," Checking for users logged in...")
users=subprocess.check_output("who")
names=([x.split() for x in users.splitlines()])
- for i in names:
+ for i in names:
if (i[0] == "mythtv" and i[4] == "(:0)"):
msg(cmdargs," Ignoring %s %s" %(i[0],i[4]))
else:
@@ -202,6 +202,9 @@ def userlogins_check(cmdargs):
return True
def mythfe_check(cmdargs,cursor,mythDB):
+ #checks to see if a frontend is considered idle
+ # True means FE is idle
+
if ( cmdargs.runningfe ):
msg(cmdargs," Checking for running and playing mythfrontends...")
else:
@@ -216,11 +219,16 @@ def mythfe_check(cmdargs,cursor,mythDB):
for i in frontends:
try:
msg(cmdargs," Checking %s's mythfrontend status..." %i)
- frontend = mythDB.getFrontend(''.join(i))
+ frontend = mythDB.getFrontend(''.join(i))
if ( cmdargs.runningfe ):
msg(cmdargs," %s's mythfrontend is RUNNING." %i)
return False
- location = frontend.sendQuery('Location')
+ location = frontend.sendQuery('Location')
+
+ if location == "standbymode":
+ msg(cmdargs," %s's mythfrontend is in StandbyMode." %i)
+ return True
+
if ( location.startswith('Playback ') ):
msg(cmdargs," %s's mythfrontend is PLAYING." %i)
return False
@@ -229,6 +237,7 @@ def mythfe_check(cmdargs,cursor,mythDB):
if '.xml' in location or 'mainmenu' in location:
msg(cmdargs," %s's mythfrontend is in MENUS." %i)
else:
+ #FE is not in menus, so it must be active in a plugin
msg(cmdargs," %s's mythfrontend is NOT in menus." %i)
return False
except:
--
cgit v0.12
From 6b44b0fc2469ec3d8d5b35d42a84653c64aa4945 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 17 Aug 2014 18:07:38 -0500
Subject: supplemental-web / xymon: Add restart MBE to web interface. Tweaks
to css for call log
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/frame.css | 117 +++++++++++++-------------
abs/core/supplemental-web/contents/process.py | 9 +-
abs/core/xymon/PKGBUILD | 4 +-
abs/core/xymon/hbnotes.py | 32 ++++---
5 files changed, 89 insertions(+), 75 deletions(-)
mode change 100644 => 100755 abs/core/supplemental-web/contents/process.py
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index dd73d51..42bbf6a 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=15
+pkgrel=17
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index 59da3c7..63a6121 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -1,12 +1,12 @@
* /* Our "universal rule" */
{
- padding: 0px;
- margin: 0px;
- border: 0px;
+ padding: 0px;
+ margin: 0px;
+ border: 0px;
}
body {
/* background: url("page_background.jpg") repeat-y #9FA9B3; */
- background-color: #191c26;
+ background-color: #191c26;
//background-color: #ebb81c;
//background-image: -webkit-gradient(linear, left top, left bottom, from(#ebb81c), to(#0072bc)); /* Saf4+, Chrome */
@@ -38,27 +38,27 @@ body {
#mainContainer {
clear: both;
- width: 770px;
- margin: 10px auto;
- text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
- display: block;
+ width: 770px;
+ margin: 10px auto;
+ text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
+ display: block;
}
#header {
- color: #fff;
- text-align: center;
+ color: #fff;
+ text-align: center;
}
#content {
- float: left; /* Our content is going to be left aligned */
- width: 320px; /* And it's going to have a 320px width */
- /*background: #D9D9D9;*/
- margin-left:60px;
+ float: left; /* Our content is going to be left aligned */
+ width: 320px; /* And it's going to have a 320px width */
+ /*background: #D9D9D9;*/
+ margin-left:60px;
}
#column {
- float: right; /* Our column is going to be right aligned */
- width: 320px; /* And it's going to have a 320px width */
- /*background: #8A8AE6;*/
- margin-right:60px;
+ float: right; /* Our column is going to be right aligned */
+ width: 320px; /* And it's going to have a 320px width */
+ /*background: #8A8AE6;*/
+ margin-right:60px;
}
#resultbox {
@@ -79,8 +79,8 @@ body {
#netContainer {
clear: both;
width: 770px;
- margin: 10px auto;
- display: block;
+ margin: 10px auto;
+ display: block;
}
img.center {
@@ -93,10 +93,10 @@ img.center {
}
#footer {
- clear: both; /* We have to clear our floats */
- width: 770px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
- margin: 0px auto; /* We need to center the footer also */
- color: gold;
+ clear: both; /* We have to clear our floats */
+ width: 770px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
+ margin: 0px auto; /* We need to center the footer also */
+ color: gold;
text-align: center;
font-size: 10px;
}
@@ -115,9 +115,9 @@ img.center {
}
#navlist a:link
{
- color: #fff;
+ color: #fff;
# background-color: #FDB14F;
- text-decoration: underline;
+ text-decoration: underline;
}
@@ -125,45 +125,48 @@ img.center {
#navlist a:visited
{
# color: #FDB14F;
- color: gold;
- text-decoration: underline;
+ color: gold;
+ text-decoration: underline;
}
table.sample {
- border-width: 4px;
- border-spacing: 2px;
- border-style: outset;
- border-color: #808080;
- border-collapse: separate;
- width:300px;
+ border-width: 4px;
+ border-spacing: 2px;
+ border-style: outset;
+ border-color: #808080;
+ border-collapse: separate;
+ width:300px;
}
table.sample td {
- border-width: 1px;
- padding: 1px;
- border-style: inset;
- border-color: #808080;
- /*width:300px;*/
- -moz-border-radius: ;
+ border-width: 1px;
+ padding: 1px;
+ border-style: inset;
+ border-color: #808080;
+ /*width:300px;*/
+ -moz-border-radius: ;
}
table.calllog {
- border-width: 4px;
- border-spacing: 2px;
- border-style: outset;
- border-color: #808080;
- border-collapse: separate;
- width:500px;
+ border-width: 4px;
+ border-spacing: 2px;
+ border-style: outset;
+ border-color: #808080;
+ border-collapse: separate;
+ width:500px;
+ margin-left:auto;
+ margin-right:auto;
+ body {text-align:center;}
}
table.calllog td {
- border-width: 1px;
- padding: 1px;
- border-style: inset;
- border-color: #808080;
- /*width:300px;*/
- -moz-border-radius: ;
+ border-width: 1px;
+ padding: 1px;
+ border-style: inset;
+ border-color: #808080;
+ /*width:300px;*/
+ -moz-border-radius: ;
}
@@ -202,9 +205,9 @@ table.calllog td {
a:link
{
- color: #fff;
+ color: #fff;
# background-color: #FDB14F;
- text-decoration: underline;
+ text-decoration: underline;
# margin-left:10px;
@@ -213,9 +216,9 @@ a:link
a:visited
{
# color: #FDB14F;
- color: gold;
- text-decoration: underline;
- margin-left:10px;
+ color: gold;
+ text-decoration: underline;
+ margin-left:10px;
}
#submitbutton {
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
old mode 100644
new mode 100755
index 988ebfc..7ad9af6
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -257,7 +257,12 @@ def go_kill(myhost,kill_type):
results=os.popen(command,'r')
return results
-
+def go_restart_mbe_local():
+ cmd = "/usr/LH/bin/lh_backend_control.sh restart &"
+ #results=os.popen(cmd,'r')
+ os.popen(cmd,'r')
+ results = ["Attempting restart of backend service"]
+ return results
@@ -342,6 +347,8 @@ if __name__ == '__main__':
mylogfile=go_kill(myhost,kill_type)
elif selection == "Upload":
mylogfile = go_upload(up_file)
+ elif selection == "RestartMBE":
+ mylogfile = go_restart_mbe_local()
cgiprint(contentheader) # content header
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 69507d4..3f25614 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=('xymonserver' 'xymonclient')
pkgver=4.3.17
-pkgrel=1
+pkgrel=2
pkgdesc="Xymon is a system for monitoring of hosts and networks"
license="GPL"
arch=('i686' 'x86_64')
@@ -138,7 +138,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
'758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
- '9610356bd8c1f0b6d9f4a7a33b385e16'
+ '07c8312b7eb0dd943f80f81a81d6de2c'
'526c169e020b570b5b02661a831aa4e6'
'166279c006c3ef7bf0c21537cf89fc83'
'80d9cfac86c6d96836e6f406e35e7cf5'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index 6967aa4..3171cb0 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -167,7 +167,7 @@ def create_dot_file():
results=os.popen(cmd,'r')
return frontonly,masterbackend,masterbacked_w_fe,slave_w_fe,slave,stand_alone
-
+
@@ -205,7 +205,7 @@ def createdropdown(currenthostype):
#This is for the d/l backup option
dropdown+='''
-
+ </br>
<input name="param2" type="radio" value="Dbackup" />Download Backup: </>
<select name="param7">\n\n </br>'''
@@ -216,18 +216,16 @@ def createdropdown(currenthostype):
dropdown+='''
</select>
- <br>
+ </br>
+ </br>
<input name="param2" type="radio" value="Optimize" />Optimize Database<br />
'''
+
if currenthostype == "Master_backend":
- dropdown+='<input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (except master backend)<br /> \n'
- #dropdown+='''<input name="param2" type="radio" value="UpdateAll" />Update All Systems </> <select name="param5">
- #<option value="Myth_only">Myth only</option>
- #<option value="All"> Full System</option>
- #</select>
- #</br>
- #</br>
- #</br>'''
+ dropdown+='</br><input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (except master backend)<br /> \n'
+
+ #Add option to restart MBE
+ dropdown+='</br> <input name="param2" type="radio" value="RestartMBE" />Restart MBE service<br /> \n'
dropdown+=''' </br></br>\n'''
return dropdown
@@ -403,24 +401,29 @@ function Do_it ()
buttonform_bottom='''
+ </br>
<input name="param2" type="radio" value="Update" />Update System: </>
<select name="param3">
<option value="Myth_only">Myth only</option>
<option value="All"> Full System</option>
</select>
</br>
-
+ </br>
<input name="param2" type="radio" value="Kill" />Restart Interface: </>
<select name="param6">
<option value="killX">Full UI</option>
<option value="killmyth">MythFrontend</option>
</select>
</br>
-
+ </br>
<input name="param2" type="radio" value="Shutdown" />Shutdown System<br />
+ </br>
<input name="param2" type="radio" value="Reboot" />Reboot System<br />
+ </br>
<input name="param2" type="radio" value="WOL" />Wake on LAN<br />
+ </br>
<input name="hiddenparam" type="hidden" value="
+ </br>
'''
oldurlform=''' "/>
@@ -441,6 +444,7 @@ function Do_it ()
if currenthostype == "Master_backend" or currenthostype == "Standalone":
mbeoptions=createdropdown(currenthostype)
+
else:
mbeoptions=''
returnurl="/xymon/notes/"
@@ -525,7 +529,7 @@ def main(argv):
slave_w_fe,
slave,
stand_alone)
-
+
if __name__ == "__main__":
main(sys.argv[1:])
--
cgit v0.12
From ee4bbb1b3c9fe04d285e1d3cd5746b7a26043a5d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 19 Aug 2014 13:55:16 -0500
Subject: supplemental-web: Add menu item for frontend status. The page takes a
bit to load because it queries the frontends in real time, every time. We
need to add a please wait screen or some other dialog box in the future.
Also removed remyth from the menu because it's a dead product.
refs #973
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/fe_status.py | 132 +++++++++++++++++++++
abs/core/supplemental-web/contents/fe_status.shtml | 12 ++
abs/core/supplemental-web/contents/header.html | 3 +-
4 files changed, 147 insertions(+), 2 deletions(-)
create mode 100644 abs/core/supplemental-web/contents/fe_status.py
create mode 100644 abs/core/supplemental-web/contents/fe_status.shtml
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 42bbf6a..3f9e8ef 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/fe_status.py b/abs/core/supplemental-web/contents/fe_status.py
new file mode 100644
index 0000000..49bbf95
--- /dev/null
+++ b/abs/core/supplemental-web/contents/fe_status.py
@@ -0,0 +1,132 @@
+#!/usr/bin/python2
+
+import urllib2
+import xml.etree.ElementTree as ET
+import socket
+from MythTV import Frontend
+import sys
+#socket.setdefaulttimeout(1)
+#socket.setdefaulttimeout(.00001)
+
+def msg(msg):
+ #if cmdargs.silent is False:
+ print "%s" %msg
+
+
+def parse_xml(frontend):
+ temp_dict = {'state':" --- ",
+ 'title':" --- ",
+ 'location':" --- "}
+ url = "http://%s:6547/Frontend/GetStatus" %frontend
+ try:
+ request = urllib2.Request(url)
+ xml = urllib2.urlopen(request,timeout=1)
+ tree = ET.parse(xml)
+ root = tree.getroot()
+ except:
+ msg(" Couldn't connect to %s" %frontend)
+ return temp_dict
+
+ lst = root.find("State")
+ for item in lst:
+ try:
+ keyitem = (item.find('Key').text).strip()
+ valueitem = (item.find('Value').text).strip()
+ except:
+ continue
+ if keyitem == "state":
+ temp_dict['state'] = valueitem
+
+ elif keyitem == "title":
+ temp_dict['title'] = valueitem
+
+ elif keyitem == "currentlocation":
+ temp_dict['location'] = valueitem
+
+ return temp_dict
+
+
+def mythfe_status(cursor,mythDB):
+ frontends=list(Frontend.fromUPNP())
+ status_dict={}
+ #try:
+ #frontends = mythDB.getFrontends() #use cursor instead so it doesn't test connection
+ #cursor.execute("select hostname from settings where value = 'FrontendIdleTimeout'")
+ #frontends=cursor.fetchall()
+ #except:
+ #msg("Excptions")
+ #return
+
+ for i in frontends:
+ try:
+ fe_hostname = socket.gethostbyaddr(i.host)[0]
+ except:
+ print "DNS lookup failed for %s" %i.host
+ fe_hostname = i.host
+ status_dict[fe_hostname] = parse_xml(i.host)
+
+ return status_dict
+
+
+def print_html(status_dict):
+ print '<div> <p></p>'
+ print '</br> </br> '
+ print '<table class="calllog">'
+
+ #print "Current state of all online frontends"
+ #print '</br> </br> '
+
+ #print status_dict
+ row = '''
+<tr>
+ <td> %s </td>
+ <td> %s </td>
+ <td> %s </td>
+ <td> %s </td>
+</tr>
+'''
+ print row %(" Frontend "," State "," Title "," MythTV Location")
+ for fe in status_dict.keys():
+ temp_dict = status_dict[fe]
+ print row %(fe,
+ temp_dict['state'],
+ temp_dict['title'],
+ temp_dict['location'])
+
+ print "</table>"
+ print '</div>'
+
+ print '''
+ <div id="footer">
+ </br>
+ <p>Offline systems will not be listed</p>
+ </div>
+'''
+
+
+def main():
+ try:
+ from MythTV import MythDB
+ mythDB = MythDB()
+ cursor = mythDB.cursor()
+ db_conn=True
+ except:
+ msg("Couldn't connect to MythTV database.")
+ db_conn=False
+
+ try:
+ from MythTV import MythBE
+ mythBE = MythBE()
+ be_conn=True
+ except:
+ msg("Couldn't connect to MythTV backend.")
+ be_conn=False
+
+ if (db_conn):
+ status_dict = mythfe_status(cursor,mythDB)
+ print_html(status_dict)
+
+
+
+if __name__ == "__main__":
+ main()
diff --git a/abs/core/supplemental-web/contents/fe_status.shtml b/abs/core/supplemental-web/contents/fe_status.shtml
new file mode 100644
index 0000000..d821600
--- /dev/null
+++ b/abs/core/supplemental-web/contents/fe_status.shtml
@@ -0,0 +1,12 @@
+<html>
+ <head>
+ <style type="text/css">@import "/frame.css";</style>
+ </head>
+ <body>
+ <div id="header">
+ <h1>LinHES Frontend Status </h1>
+
+ </div>
+ <!--#exec cmd="/root/fe_status.py" -->
+ </body>
+</html>
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index 032acd1..772cb52 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -59,9 +59,10 @@ function beStatus()
<ul>
<!-- <li><a onClick=r() >MythBackend Status</a></li> -->
<li><a href="calllog.shtml">Call Log</a></li>
+ <li><a href="fe_status.shtml">Frontend status</a></li>
<li><a href="mythexport/setup.cgi">MythExport</a></li>
<li><a href="mythexpress.html">MythExpress</a></li>
- <li><a href="remyth.html" >ReMyth</a></li>
+<!-- <li><a href="remyth.html" >ReMyth</a></li> -->
<li><a href="zm">ZoneMinder</a></li>
</ul>
</li>
--
cgit v0.12
From d8d2aae879a6204510120d6056df61ae0f249c3c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 19 Aug 2014 14:24:00 -0500
Subject: system-templates: update path for halt in cron template.
---
abs/core/system-templates/PKGBUILD | 2 +-
abs/core/system-templates/templates/cron.template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index aec22f1..4492e51 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=30
+pkgrel=31
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/cron.template b/abs/core/system-templates/templates/cron.template
index 3fcea10..7914cba 100644
--- a/abs/core/system-templates/templates/cron.template
+++ b/abs/core/system-templates/templates/cron.template
@@ -1,4 +1,4 @@
# <minute> <hour> <day> <month> <dow> <command>
-00 HOUR * * * /usr/bin/sudo /sbin/halt-runit >/dev/null 2>&1
\ No newline at end of file
+00 HOUR * * * /usr/bin/sudo /sbin/halt >/dev/null 2>&1
\ No newline at end of file
--
cgit v0.12
From 684d6d5183cd2a664461de2c1768e79ab719edb6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 19 Aug 2014 14:24:34 -0500
Subject: LinHES-config: minor update to help. systemconfig.py -h will not list
all the available modules
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/systemconfig.py | 36 ++++++++++++++++++++++++++++++----
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 978e0db..adf5d69 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=2
+pkgrel=3
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -171,7 +171,7 @@ md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
'299c24c0820fc9c483c820db2595e3cb'
'73ed13881c748375296454746c865cd2'
'781f161a79c3188a31c8615b8258b241'
- '18370d92ba6b467bcc4996c377e1fa1f'
+ '888a6c57f272d9fa3e77e216a421562b'
'2596460462cf6c889cf8f95485537b20'
'dc3c5270691a62600475705f4cb78b56'
'4804aa93aaad3dfcfff08cd9ffd68836'
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index ed19675..c7cbb8a 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -33,7 +33,35 @@ logging.getLogger('').addHandler(infofile)
def usage():
- logging.info("tell people how to use this")
+ logging.info("List of available modules")
+ logging.info("more then one module by be called")
+ logging.info("Ex: misc,sleep,audio")
+ cmd_list = ["misc",
+ "sleep",
+ "hostype",
+ "hostypec" ,
+ "advanced" ,
+ "audio" ,
+ "network" ,
+ "advancedX" ,
+ "webuser" ,
+ "restartfe" ,
+ "reloadfe" ,
+ "ddns" ,
+ "screensaver" ,
+ "ir" ,
+ "user",
+ "software",
+ "plugins",
+ "smolt",
+ "all",
+ "func",
+ "supplemental",
+ "vnc",
+ "fileshare",
+ "config_xml"]
+ for i in cmd_list:
+ logging.info(i)
def setup_x(systemconfig):
if mv_common.read_config(mv_common.module_config,"xorg") == False :
@@ -95,9 +123,9 @@ def generate_config_xml(uuid,dbhost):
</UPnP>
</Configuration>
'''
-
-
-
+
+
+
configxml= configxml_t %(dbhost,uuid)
return configxml
--
cgit v0.12
From 1a2725f42178e9f3f33e17559629a43256ad80c0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 19 Sep 2014 14:20:00 -0500
Subject: xymon: hbnotes.py func hostnames were failing due to a stray </br>
in the code
---
abs/core/xymon/PKGBUILD | 6 +++---
abs/core/xymon/hbnotes.py | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
mode change 100644 => 100755 abs/core/xymon/hbnotes.py
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 3f25614..f8cb26b 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=('xymonserver' 'xymonclient')
pkgver=4.3.17
-pkgrel=2
+pkgrel=3
pkgdesc="Xymon is a system for monitoring of hosts and networks"
license="GPL"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-
'alerts.cfg' 'hobbit_myth_data.py' 'logrotate-server.xymon'
'logrotate-client.xymon' 'log_list.sh' 'client-local.cfg.patch'
'led_themes.tar.gz' 'xymon-server.rules' 'hosts.cfg.patch')
-depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5')
+depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz')
install=xymon.install
build() {
@@ -138,7 +138,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
'758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
- '07c8312b7eb0dd943f80f81a81d6de2c'
+ '3e39cdc95a0f9320b4e805417ce16eea'
'526c169e020b570b5b02661a831aa4e6'
'166279c006c3ef7bf0c21537cf89fc83'
'80d9cfac86c6d96836e6f406e35e7cf5'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
old mode 100644
new mode 100755
index 3171cb0..ca9d39d
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -411,8 +411,8 @@ function Do_it ()
</br>
<input name="param2" type="radio" value="Kill" />Restart Interface: </>
<select name="param6">
- <option value="killX">Full UI</option>
<option value="killmyth">MythFrontend</option>
+ <option value="killX">Full UI</option>
</select>
</br>
</br>
@@ -423,7 +423,6 @@ function Do_it ()
<input name="param2" type="radio" value="WOL" />Wake on LAN<br />
</br>
<input name="hiddenparam" type="hidden" value="
- </br>
'''
oldurlform=''' "/>
--
cgit v0.12
From ad7da086568778579b2f81cedf7aa4690e220b6e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 19:42:31 +0000
Subject: mythtv, mythplugins, mythinstall; update to 0.27.3-fixes
---
abs/core/mythinstall/PKGBUILD | 4 +--
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
.../stable-0.27/mythtv/menu-xml/mainmenu.xml.patch | 32 ++++------------------
5 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index a116ec6..ada24b9 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
-pkgver=8.1
-pkgrel=14
+pkgver=8.2
+pkgrel=1
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 86f58a6..5cec5ad 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-2720f457c590465af558fe0720aa9f019fa4b26f
+e2f46569ac53030345efa74782ae44cee3ec5a79
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 72ce020..1e6bcd3 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('mytharchive'
'mythnews'
'mythweather'
'mythzoneminder')
-pkgver=0.27.1
+pkgver=0.27.3
pkgrel=2
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 469b682..ce5a044 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythtv
-pkgver=0.27.1
+pkgver=0.27.3
pkgrel=2
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
diff --git a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
index 73a8940..3ddce0b 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/mainmenu.xml.patch
@@ -1,37 +1,15 @@
---- themes/defaultmenu/mainmenu.xml.orig 2012-07-29 21:39:46.000000000 +0000
-+++ themes/defaultmenu/mainmenu.xml 2012-07-29 21:41:50.000000000 +0000
-@@ -1,5 +1,11 @@
- <?xml version="1.0" encoding="UTF-8" ?>
- <mythmenu name="MAIN">
-+ <button>
-+ <type>TV_WATCH_TV</type>
-+ <text>Watch TV</text>
-+ <description>Watch live television</description>
-+ <action>TV_WATCH_LIVE</action>
-+ </button>
+--- themes/defaultmenu/mainmenu.xml.orig 2014-09-02 20:03:34.658600292 +0000
++++ themes/defaultmenu/mainmenu.xml 2014-09-03 15:49:34.820056829 +0000
+@@ -45,9 +45,9 @@
<button>
- <type>MENU_MEDIA_LIBRARY</type>
-@@ -30,18 +36,11 @@
- </button>
-
- <button>
-- <type>TV_WATCH_TV</type>
-- <text>Watch TV</text>
-- <description>Watch live television</description>
-- <action>TV_WATCH_LIVE</action>
-- </button>
--
-- <button>
<type>MENU_UTILITIES_SETUP</type>
- <text>Setup</text>
- <description>Configure MythTV and plugins</description>
- <action>MENU main_settings.xml</action>
-- <password>SetupPinCode</password>
+ <text>Service Menu</text>
+ <description>Configure your system</description>
-+ <action>MENU linhes.xml</action>
-+ <password>SetupPinCode</password>
++ <action>MENU linhes.xml</action>
+ <password>SetupPinCode</password>
</button>
- </mythmenu>
--
cgit v0.12
From 133c9ea02b7b87ecd6f85cdf4be4f82870860648 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 20:13:59 +0000
Subject: runit-scripts: mythbackend run, mythexpress run, remyth run - don't
use su in exec
At some point after su was updated runit can no longer manage process started with su and gives runsv not running errors when starting/stoping services. chpst is bundled with runit and is used as a replacement. However mythbackend gives tuner permissions errors when run with chpst on my systems. Using sudo to start mythbackend doesn't give the tuner errors and runit can manage the process. frontend alos uses su but I am not sure of a solution there.
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/mythbackend/run | 2 +-
abs/core/runit-scripts/runitscripts/services/mythexpress/run | 3 +--
abs/core/runit-scripts/runitscripts/services/remyth/run | 3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 7cef4f0..d43e59f 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.2
-pkgrel=1
+pkgrel=2
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
index 8afd737..d97cf21 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
@@ -79,5 +79,5 @@ export HOME=/root
stat_runit "Starting Primary MythBackend"
fi
- exec su mythtv -c "/usr/bin/mythbackend -q --syslog local6"
+ exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6
# fi
diff --git a/abs/core/runit-scripts/runitscripts/services/mythexpress/run b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
index 7410f43..06e4a1b 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexpress/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
@@ -5,5 +5,4 @@ export TERM=linux
. /etc/rc.d/functions
/usr/bin/svwaitup -s 10 /service/avahi
stat_runit "Starting MythExpress"
-exec su http -s/bin/bash -c "node /usr/mythexpress/app.js"
-
+exec chpst -u http node /usr/mythexpress/app.js
diff --git a/abs/core/runit-scripts/runitscripts/services/remyth/run b/abs/core/runit-scripts/runitscripts/services/remyth/run
index 430d535..9667b87 100755
--- a/abs/core/runit-scripts/runitscripts/services/remyth/run
+++ b/abs/core/runit-scripts/runitscripts/services/remyth/run
@@ -6,5 +6,4 @@ export TERM=linux
/usr/bin/svwaitup -s 10 /service/avahi
stat_runit "Starting ReMyth"
-exec su http -s/bin/bash -c "node /usr/remyth/server.js"
-
+exec chpst -u http node /usr/remyth/app.js
--
cgit v0.12
From 0c17a053b445a1d240750fc0cc3f1df7d647d807 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 20:51:33 +0000
Subject: nspr: update to 4.10.7. dep of nss
---
abs/extra/nspr/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/extra/nspr/PKGBUILD b/abs/extra/nspr/PKGBUILD
index 3dd4de0..19538ba 100644
--- a/abs/extra/nspr/PKGBUILD
+++ b/abs/extra/nspr/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=nspr
-pkgver=4.10
-pkgrel=2
+pkgver=4.10.7
+pkgrel=1
pkgdesc="Netscape Portable Runtime"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/nspr/"
@@ -13,12 +13,13 @@ depends=('glibc')
makedepends=('zip')
options=('!emptydirs')
source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f5466def95726b3c900d8a0227bdd034')
+md5sums=('6e06919e4b56efed501e05d8b45ec10e')
+sha1sums=('f62972d7c66d4621d6262c5bd9b5723fa67b6bff')
build() {
cd $pkgname-$pkgver
- if [[ $CARCH = x86_64 ]]; then
+ if [ "$CARCH" = "x86_64" ]; then
_confflags="--enable-64bit"
else
_confflags=""
@@ -37,7 +38,6 @@ package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
- chmod 644 "$pkgdir"/usr/lib/*.a
ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
"$pkgdir/usr/include/nspr/md"
--
cgit v0.12
From 102445f85bb8878dcd571ed86b51c718a0de73d9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 21:04:02 +0000
Subject: patch: update to 2.7.1
---
abs/core/patch/PKGBUILD | 48 +++++++------
...1-initialize-data-structures-early-enough.patch | 81 ++++++++++++++++++++++
2 files changed, 108 insertions(+), 21 deletions(-)
create mode 100644 abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch
diff --git a/abs/core/patch/PKGBUILD b/abs/core/patch/PKGBUILD
index 8c0185f..8171a3a 100644
--- a/abs/core/patch/PKGBUILD
+++ b/abs/core/patch/PKGBUILD
@@ -1,40 +1,46 @@
-# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=patch
-pkgver=2.6.1
+pkgver=2.7.1
pkgrel=3
-pkgdesc="A utility to apply patch files to original sources"
+pkgdesc='A utility to apply patch files to original sources'
arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html"
+url='http://www.gnu.org/software/patch/patch.html'
license=('GPL')
groups=('base-devel')
-depends=('glibc')
+depends=('glibc' 'attr')
makedepends=('ed')
-optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
- patch-2.6.1-get-arg.patch)
-md5sums=('d758eb96d3f75047efc004a720d33daf'
- 'f7953f3e472fae5118815e6138372e22'
- '45cd5709adbbcdcb3ab95dc43559c07c')
+optdepends=('ed: for patch -e functionality')
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+ 'patch-2.7.1-initialize-data-structures-early-enough.patch')
+md5sums=('e9ae5393426d3ad783a300a338c09b72'
+ 'SKIP'
+ 'dc6367a7cd49933d4006c246789e98da')
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+prepare() {
+ # Fix segfault on non-numeric strip-count
+ # (also segfaults on nonexistent directory passed to -d)
+ # http://savannah.gnu.org/bugs/?37500
+ patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch
+}
- # Fixed argument type for --get
- # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
- patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch
- ./configure --prefix=/usr --mandir=/usr/share/man
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
make
}
check() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd $pkgname-$pkgver
make check
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch b/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch
new file mode 100644
index 0000000..046edc3
--- /dev/null
+++ b/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch
@@ -0,0 +1,81 @@
+From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Thu, 4 Oct 2012 12:33:09 +0200
+Subject: [PATCH] Initialize data structures early enough
+
+* src/patch.c (main): Initialize data structures early enough, before error
+paths can access them.
+* tests/bad-usage: Test bad command line usage.
+* tests/Makefile.am (TESTS): Add bad-usage here.
+---
+ src/patch.c | 8 ++++----
+ tests/Makefile.am | 1 +
+ tests/bad-usage | 18 ++++++++++++++++++
+ 3 files changed, 23 insertions(+), 4 deletions(-)
+ create mode 100644 tests/bad-usage
+
+diff --git a/src/patch.c b/src/patch.c
+index 828943b..0255fbb 100644
+--- a/src/patch.c
++++ b/src/patch.c
+@@ -150,6 +150,10 @@ main (int argc, char **argv)
+ else if ((version_control = getenv ("VERSION_CONTROL")))
+ version_control_context = "$VERSION_CONTROL";
+
++ init_backup_hash_table ();
++ init_files_to_delete ();
++ init_files_to_output ();
++
+ /* parse switches */
+ Argc = argc;
+ Argv = argv;
+@@ -162,10 +166,6 @@ main (int argc, char **argv)
+ if (make_backups | backup_if_mismatch)
+ backup_type = get_version (version_control_context, version_control);
+
+- init_backup_hash_table ();
+- init_files_to_delete ();
+- init_files_to_output ();
+-
+ init_output (&outstate);
+ if (outfile)
+ outstate.ofp = open_outfile (outfile);
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 02fc6de..5cea52d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -20,6 +20,7 @@ TESTS = \
+ asymmetric-hunks \
+ backup-prefix-suffix \
+ bad-filenames \
++ bad-usage \
+ concat-git-diff \
+ copy-rename \
+ corrupt-reject-files \
+diff --git a/tests/bad-usage b/tests/bad-usage
+new file mode 100644
+index 0000000..022eeda
+--- /dev/null
++++ b/tests/bad-usage
+@@ -0,0 +1,18 @@
++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc.
++#
++# Copying and distribution of this file, with or without modification,
++# in any medium, are permitted without royalty provided the copyright
++# notice and this notice are preserved.
++
++. $srcdir/test-lib.sh
++
++require_cat
++use_local_patch
++use_tmpdir
++
++# ==============================================================
++
++check 'patch -px || echo "status: $?"' <<EOF
++$PATCH: **** strip count x is not a number
++status: 2
++EOF
+--
+1.8.0.3
+
--
cgit v0.12
From 89eba0f77d104e230d4dee26671ae1bdc4f3f52d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 21:11:09 +0000
Subject: patch: remove old patch
---
abs/core/patch/patch-2.6.1-get-arg.patch | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 abs/core/patch/patch-2.6.1-get-arg.patch
diff --git a/abs/core/patch/patch-2.6.1-get-arg.patch b/abs/core/patch/patch-2.6.1-get-arg.patch
deleted file mode 100644
index 45f3bc8..0000000
--- a/abs/core/patch/patch-2.6.1-get-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
- {"remove-empty-files", no_argument, NULL, 'E'},
- {"force", no_argument, NULL, 'f'},
- {"fuzz", required_argument, NULL, 'F'},
-- {"get", no_argument, NULL, 'g'},
-+ {"get", required_argument, NULL, 'g'},
- {"input", required_argument, NULL, 'i'},
- {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
--
cgit v0.12
From 307d3f0f2218af2ab2ec5d17b6efba93278eeed1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 21:14:50 +0000
Subject: nss: update to 3.17
---
abs/extra/nss/PKGBUILD | 67 ++-
abs/extra/nss/add_spi+cacert_ca_certs.patch | 624 --------------------------
abs/extra/nss/ca-certificates-mozilla.install | 11 +
abs/extra/nss/certdata2pem.py-loudness.patch | 13 +
4 files changed, 70 insertions(+), 645 deletions(-)
delete mode 100644 abs/extra/nss/add_spi+cacert_ca_certs.patch
create mode 100644 abs/extra/nss/ca-certificates-mozilla.install
create mode 100644 abs/extra/nss/certdata2pem.py-loudness.patch
diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD
index 09c9d97..d948ba2 100644
--- a/abs/extra/nss/PKGBUILD
+++ b/abs/extra/nss/PKGBUILD
@@ -1,34 +1,36 @@
# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=nss
-pkgver=3.15.1
-pkgrel=1
+pkgbase=nss
+pkgname=(nss ca-certificates-mozilla)
+pkgver=3.17
+pkgrel=3
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
-_nsprver=4.10
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip' '!makeflags')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+_nsprver=4.10.7
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
+makedepends=('perl' 'python2')
+options=('!strip' '!makeflags' 'staticlibs')
+source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
+ "certdata2pem.py::http://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?id=15470c64b5464d273556a290b1e7b50b32a2e5a0"
nss.pc.in
nss-config.in
ssl-renegotiate-transitional.patch
- add_spi+cacert_ca_certs.patch)
-sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
- 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
- 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
- '8a964a744ba098711b80c0d279a2993524e8eb92'
- 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
+ certdata2pem.py-loudness.patch)
+sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81'
+ '57bd6f309736825fc0edbf7d522726224764520595dfdddd0dba59158839e863'
+ 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+ 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+ '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
+ '90f8e72fbcca9ce907dcf6565bcd95ca23d2da5d87caee64c141ac54680f8703')
prepare() {
- cd $pkgname-$pkgver
+ mkdir certs
+ patch --follow-symlinks certdata2pem.py certdata2pem.py-loudness.patch
- # Add CAcert and spi-inc.org CA certificates.
- # See http://wiki.cacert.org/NSSLib for how to generate
- patch -Np1 -i ../add_spi+cacert_ca_certs.patch
+ cd nss-$pkgver
# Adds transitional SSL renegotiate support - patch from Debian
patch -Np3 -i ../ssl-renegotiate-transitional.patch
@@ -36,12 +38,18 @@ prepare() {
# Respect LDFLAGS
sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
-i nss/coreconf/rules.mk
+
+ ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
}
build() {
- cd $pkgname-$pkgver/nss
+ cd certs
+ python2 ../certdata2pem.py
+ printf "mozilla/%s\n" *.crt > mozilla.conf
+ test -s mozilla.conf
+ cd ../nss-$pkgver/nss
export BUILD_OPT=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
@@ -56,8 +64,8 @@ build() {
make
}
-package() {
- cd $pkgname-$pkgver
+package_nss() {
+ cd nss-$pkgver
install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
@@ -94,4 +102,21 @@ package() {
cd ../../public/nss
install -t "$pkgdir/usr/include/nss" -m644 *.h
+
+ rm "$pkgdir/usr/lib/libnssckbi.so"
+ ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
+}
+
+package_ca-certificates-mozilla() {
+ pkgdesc="Mozilla's set of trusted CA certificates"
+ depends=(ca-certificates-utils)
+ install=ca-certificates-mozilla.install
+
+ cd certs
+
+ local _certdir="$pkgdir/usr/share/ca-certificates/mozilla"
+ install -d "$_certdir"
+ install -t "$_certdir" -m644 *.crt
+
+ install -Dm644 mozilla.conf "$pkgdir/etc/ca-certificates/conf.d/mozilla.conf"
}
diff --git a/abs/extra/nss/add_spi+cacert_ca_certs.patch b/abs/extra/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index 14c65e0..0000000
--- a/abs/extra/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,624 +0,0 @@
---- security/nss/lib/ckfw/builtins/certdata.txt.orig 2012-08-19 16:22:51.726895174 +0200
-+++ security/nss/lib/ckfw/builtins/certdata.txt 2012-08-19 17:40:41.233306703 +0200
-@@ -24454,3 +24454,621 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Serial Number: 0 (0x0)
-+# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Not Valid Before: Sun Mar 30 12:29:49 2003
-+# Not Valid After : Tue Mar 29 12:29:49 2033
-+# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B
-+# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for "CAcert.org Class 1 Root CA"
-+# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Serial Number: 0 (0x0)
-+# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Not Valid Before: Sun Mar 30 12:29:49 2003
-+# Not Valid After : Tue Mar 29 12:29:49 2033
-+# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B
-+# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Serial Number: 672138 (0xa418a)
-+# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc.
-+# Not Valid Before: Mon May 23 17:48:02 2011
-+# Not Valid After : Thu May 20 17:48:02 2021
-+# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42
-+# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\003\012\101\212
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\131\060\202\005\101\240\003\002\001\002\002\003\012
-+\101\212\060\015\006\011\052\206\110\206\367\015\001\001\013\005
-+\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157
-+\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031
-+\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040
-+\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052
-+\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162
-+\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015
-+\061\061\060\065\062\063\061\067\064\070\060\062\132\027\015\062
-+\061\060\065\062\060\061\067\064\070\060\062\132\060\124\061\024
-+\060\022\006\003\125\004\012\023\013\103\101\143\145\162\164\040
-+\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162\164
-+\056\157\162\147\061\034\060\032\006\003\125\004\003\023\023\103
-+\101\143\145\162\164\040\103\154\141\163\163\040\063\040\122\157
-+\157\164\060\202\002\042\060\015\006\011\052\206\110\206\367\015
-+\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202
-+\002\001\000\253\111\065\021\110\174\322\046\176\123\224\317\103
-+\251\335\050\327\102\052\213\363\207\170\031\130\174\017\236\332
-+\211\175\341\373\353\162\220\015\164\241\226\144\253\237\240\044
-+\231\163\332\342\125\166\307\027\173\365\004\254\106\270\303\276
-+\177\144\215\020\154\044\363\141\234\300\362\220\372\121\346\365
-+\151\001\143\303\017\126\342\112\102\317\342\104\214\045\050\250
-+\305\171\011\175\106\271\212\363\351\363\064\051\010\105\344\034
-+\237\313\224\004\034\201\250\024\263\230\145\304\103\354\116\202
-+\215\011\321\275\252\133\215\222\320\354\336\220\305\177\012\302
-+\343\353\346\061\132\136\164\076\227\063\131\350\303\003\075\140
-+\063\277\367\321\157\107\304\315\356\142\203\122\156\056\010\232
-+\244\331\025\030\221\246\205\222\107\260\256\110\353\155\267\041
-+\354\205\032\150\162\065\253\377\360\020\135\300\364\224\247\152
-+\325\073\222\176\114\220\005\176\223\301\054\213\244\216\142\164
-+\025\161\156\013\161\003\352\257\025\070\232\324\322\005\162\157
-+\214\371\053\353\132\162\045\371\071\106\343\162\033\076\004\303
-+\144\047\042\020\052\212\117\130\247\003\255\276\264\056\023\355
-+\135\252\110\327\325\175\324\052\173\134\372\106\004\120\344\314
-+\016\102\133\214\355\333\362\317\374\226\223\340\333\021\066\124
-+\142\064\070\217\014\140\233\073\227\126\070\255\363\322\133\213
-+\240\133\352\116\226\270\174\327\325\240\206\160\100\323\221\051
-+\267\242\074\255\365\214\273\317\032\222\212\344\064\173\300\330
-+\154\137\351\012\302\303\247\040\232\132\337\054\135\122\134\272
-+\107\325\233\357\044\050\160\070\040\057\325\177\051\300\262\101
-+\003\150\222\314\340\234\314\227\113\105\357\072\020\012\253\160
-+\072\230\225\160\255\065\261\352\205\053\244\034\200\041\061\251
-+\256\140\172\200\046\110\000\270\001\300\223\143\125\042\221\074
-+\126\347\257\333\072\045\363\217\061\124\352\046\213\201\131\371
-+\241\321\123\021\305\173\235\003\366\164\021\340\155\261\054\077
-+\054\206\221\231\161\232\246\167\213\064\140\321\024\264\054\254
-+\235\257\214\020\323\237\304\152\370\157\023\374\163\131\367\146
-+\102\164\036\212\343\370\334\322\157\230\234\313\107\230\225\100
-+\005\373\351\002\003\001\000\001\243\202\002\015\060\202\002\011
-+\060\035\006\003\125\035\016\004\026\004\024\165\250\161\140\114
-+\210\023\360\170\331\211\167\265\155\305\211\337\274\261\172\060
-+\201\243\006\003\125\035\043\004\201\233\060\201\230\200\024\026
-+\265\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262
-+\071\030\321\241\175\244\173\060\171\061\020\060\016\006\003\125
-+\004\012\023\007\122\157\157\164\040\103\101\061\036\060\034\006
-+\003\125\004\013\023\025\150\164\164\160\072\057\057\167\167\167
-+\056\143\141\143\145\162\164\056\157\162\147\061\042\060\040\006
-+\003\125\004\003\023\031\103\101\040\103\145\162\164\040\123\151
-+\147\156\151\156\147\040\101\165\164\150\157\162\151\164\171\061
-+\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022
-+\163\165\160\160\157\162\164\100\143\141\143\145\162\164\056\157
-+\162\147\202\001\000\060\017\006\003\125\035\023\001\001\377\004
-+\005\060\003\001\001\377\060\135\006\010\053\006\001\005\005\007
-+\001\001\004\121\060\117\060\043\006\010\053\006\001\005\005\007
-+\060\001\206\027\150\164\164\160\072\057\057\157\143\163\160\056
-+\103\101\143\145\162\164\056\157\162\147\057\060\050\006\010\053
-+\006\001\005\005\007\060\002\206\034\150\164\164\160\072\057\057
-+\167\167\167\056\103\101\143\145\162\164\056\157\162\147\057\143
-+\141\056\143\162\164\060\112\006\003\125\035\040\004\103\060\101
-+\060\077\006\010\053\006\001\004\001\201\220\112\060\063\060\061
-+\006\010\053\006\001\005\005\007\002\001\026\045\150\164\164\160
-+\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157\162
-+\147\057\151\156\144\145\170\056\160\150\160\077\151\144\075\061
-+\060\060\064\006\011\140\206\110\001\206\370\102\001\010\004\047
-+\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101\143
-+\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160\150
-+\160\077\151\144\075\061\060\060\120\006\011\140\206\110\001\206
-+\370\102\001\015\004\103\026\101\124\157\040\147\145\164\040\171
-+\157\165\162\040\157\167\156\040\143\145\162\164\151\146\151\143
-+\141\164\145\040\146\157\162\040\106\122\105\105\054\040\147\157
-+\040\164\157\040\150\164\164\160\072\057\057\167\167\167\056\103
-+\101\143\145\162\164\056\157\162\147\060\015\006\011\052\206\110
-+\206\367\015\001\001\013\005\000\003\202\002\001\000\051\050\205
-+\256\104\251\271\257\244\171\023\360\250\243\053\227\140\363\134
-+\356\343\057\301\366\342\146\240\021\256\066\067\072\166\025\004
-+\123\352\102\365\371\352\300\025\330\246\202\331\344\141\256\162
-+\013\051\134\220\103\350\101\262\341\167\333\002\023\104\170\107
-+\125\257\130\374\314\230\366\105\271\321\040\370\330\041\007\376
-+\155\252\163\324\263\306\007\351\011\205\314\073\362\266\276\054
-+\034\045\325\161\214\071\265\056\352\276\030\201\272\260\223\270
-+\017\343\346\327\046\214\061\132\162\003\204\122\346\246\365\063
-+\042\105\012\310\013\015\212\270\066\157\220\011\241\253\275\327
-+\325\116\056\161\242\324\256\372\247\124\053\353\065\215\132\267
-+\124\210\057\356\164\237\355\110\026\312\015\110\320\224\323\254
-+\244\242\366\044\337\222\343\275\353\103\100\221\156\034\030\216
-+\126\264\202\022\363\251\223\237\324\274\234\255\234\165\356\132
-+\227\033\225\347\164\055\034\017\260\054\227\237\373\251\063\071
-+\172\347\003\072\222\216\042\366\214\015\344\331\176\015\166\030
-+\367\001\371\357\226\226\242\125\163\300\074\161\264\035\032\126
-+\103\267\303\012\215\162\374\342\020\011\013\101\316\214\224\240
-+\371\003\375\161\163\113\212\127\063\345\216\164\176\025\001\000
-+\346\314\112\034\347\177\225\031\055\305\245\014\213\273\265\355
-+\205\263\134\323\337\270\271\362\312\307\015\001\024\254\160\130
-+\305\214\215\063\324\235\146\243\032\120\225\043\374\110\340\006
-+\103\022\331\315\247\206\071\057\066\162\243\200\020\344\341\363
-+\321\313\133\032\300\344\200\232\174\023\163\006\117\333\243\153
-+\044\012\272\263\034\274\112\170\273\345\343\165\070\245\110\247
-+\242\036\257\166\324\136\367\070\206\126\132\211\316\326\303\247
-+\171\262\122\240\306\361\205\264\045\214\362\077\226\263\020\331
-+\215\154\127\073\237\157\206\072\030\202\042\066\310\260\221\070
-+\333\052\241\223\252\204\077\365\047\145\256\163\325\310\325\323
-+\167\352\113\235\307\101\273\307\300\343\240\077\344\175\244\215
-+\163\346\022\113\337\241\163\163\163\072\200\350\325\313\216\057
-+\313\352\023\247\326\101\213\254\372\074\211\327\044\365\116\264
-+\340\141\222\267\363\067\230\304\276\226\243\267\212
-+END
-+
-+# Trust for "CAcert.org Class 3 Root CA"
-+# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
-+# Serial Number: 672138 (0xa418a)
-+# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc.
-+# Not Valid Before: Mon May 23 17:48:02 2011
-+# Not Valid After : Thu May 20 17:48:02 2021
-+# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42
-+# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\255\174\077\144\374\104\071\376\364\351\013\350\364\174\154\372
-+\212\255\375\316
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\367\045\022\202\116\147\265\320\215\222\267\174\013\206\172\102
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\003\012\101\212
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest"
-+#
-+# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
-+# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
-+# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
-+# Not Valid Before: Tue May 13 08:07:56 2008
-+# Not Valid After : Fri May 11 08:07:56 2018
-+# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78
-+# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for "Software in the Public Interest"
-+# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
-+# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
-+# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
-+# Not Valid Before: Tue May 13 08:07:56 2008
-+# Not Valid After : Fri May 11 08:07:56 2018
-+# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78
-+# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
-+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/abs/extra/nss/ca-certificates-mozilla.install b/abs/extra/nss/ca-certificates-mozilla.install
new file mode 100644
index 0000000..0edbb0d
--- /dev/null
+++ b/abs/extra/nss/ca-certificates-mozilla.install
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/update-ca-certificates --fresh &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ post_install
+}
diff --git a/abs/extra/nss/certdata2pem.py-loudness.patch b/abs/extra/nss/certdata2pem.py-loudness.patch
new file mode 100644
index 0000000..5ae0d4c
--- /dev/null
+++ b/abs/extra/nss/certdata2pem.py-loudness.patch
@@ -0,0 +1,13 @@
+--- certdata2pem.py 2014-08-24 15:16:24.927192958 +0200
++++ certdata2pem.py.loudness 2014-08-24 15:17:30.193535402 +0200
+@@ -104,9 +104,7 @@
+ trust[obj['CKA_LABEL']] = True
+ elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED',
+ 'CKT_NSS_NOT_TRUSTED'):
+- print '!'*74
+- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
+- print '!'*74
++ print "Certificate %s untrusted, ignoring." % obj['CKA_LABEL']
+ else:
+ print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
+ (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
--
cgit v0.12
From 7d56dcda529364e60504685ca16f0e284bb306c7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 21 Sep 2014 21:44:44 +0000
Subject: google-chrome: update to 37.0.2062.120
---
abs/extra/google-chrome/PKGBUILD | 47 +-
abs/extra/google-chrome/__changelog | 1 -
abs/extra/google-chrome/eula_text.html | 902 ++++++++++++++++++++++++++
abs/extra/google-chrome/google-chrome.install | 12 +-
4 files changed, 935 insertions(+), 27 deletions(-)
create mode 100644 abs/extra/google-chrome/eula_text.html
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 987100f..a8906a0 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,52 +5,59 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=35.0.1916.114
+pkgver=37.0.2062.120
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
url="https://www.google.com/chrome"
license=('custom:chrome')
-depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' 'icu'
- 'libgcrypt' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
+depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme'
+ 'icu' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
-provides=("google-chrome=${pkgver}")
+provides=("google-chrome=$pkgver")
replaces=('chromium')
options=('!emptydirs' '!strip')
-install=${pkgname}.install
+install=$pkgname.install
_channel=stable
-_arch=i386
-[ "${CARCH}" = 'x86_64' ] && _arch=amd64
-source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb")
-md5sums=('c4a88b4234f42c783441f760f5fc6070')
-[ "${CARCH}" = 'x86_64' ] && md5sums[0]='622a495960f247eca2f14eb2eccb5303'
+_arch=amd64
+[[ $CARCH = i686 ]] && _arch=i386
+source=("google-chrome-${_channel}_${pkgver}_$_arch.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_$_arch.deb"
+ 'eula_text.html')
+md5sums=('ad13b2cd986933a57cf348dc0efc50cf'
+ 'b7e752f549b215ac77f284b6486794b6')
+[[ $CARCH = i686 ]] && md5sums[0]='fc4fd42aa00222a7df9ad89417f8d219'
package() {
msg2 "Extracting the data.tar.lzma"
- bsdtar -xf data.tar.lzma -C "${pkgdir}/"
+ bsdtar -xf data.tar.lzma -C "$pkgdir/"
msg2 "Moving stuff in place"
# Icons
for i in 16 22 24 32 48 64 128 256; do
- install -Dm644 "${pkgdir}"/opt/google/chrome/product_logo_${i}.png \
- "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
+ install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_$i.png \
+ "$pkgdir"/usr/share/icons/hicolor/${i}x$i/apps/google-chrome.png
done
# Man page
- gzip "${pkgdir}"/usr/share/man/man1/google-chrome.1
+ gzip "$pkgdir"/usr/share/man/man1/google-chrome.1
# License
- install -d "${pkgdir}"/usr/share/licenses/google-chrome/
- curl -Ls https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html \
- -o "${pkgdir}"/usr/share/licenses/google-chrome/eula_text.html
+ install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html
msg2 "Symlinking missing Udev lib"
- ln -s /usr/lib/libudev.so.1 "${pkgdir}"/opt/google/chrome/libudev.so.0
+ ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
+
+ msg2 "Fixing Chrome icon resolution"
+ _name=$(echo ${source/_*} | sed 's/.*/\u&/')
+ sed -i "/Exec=/i\StartupWMClass=$_name" "$pkgdir"/usr/share/applications/google-chrome.desktop
+
+ msg2 "Adding support for CHROMIUM_USER_FLAGS"
+ sed -i 's/ "$@"/"$CHROMIUM_USER_FLAGS" "$@"/' "$pkgdir"/opt/google/chrome/google-chrome
msg2 "Removing unnecessities (e.g. Debian Cron job)"
- rm -r "${pkgdir}"/etc/cron.daily/ "${pkgdir}"/opt/google/chrome/cron/
- rm "${pkgdir}"/opt/google/chrome/product_logo_*.png
+ rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
+ rm "$pkgdir"/opt/google/chrome/product_logo_*.png
msg2 "Rename google-chrome-stable to google-chrome"
mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
index 4a64955..289a6f2 100644
--- a/abs/extra/google-chrome/__changelog
+++ b/abs/extra/google-chrome/__changelog
@@ -2,5 +2,4 @@ Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
- PKGBUILD: add replaces chromium
- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
- PKGBUILD: Rename google-chrome-stable to google-chrome"
-- PKGBUILD: Change dep libgcrypt15 to libgcrypt
- PKGBUILD: Add dep libcups
diff --git a/abs/extra/google-chrome/eula_text.html b/abs/extra/google-chrome/eula_text.html
new file mode 100644
index 0000000..b45cb21
--- /dev/null
+++ b/abs/extra/google-chrome/eula_text.html
@@ -0,0 +1,902 @@
+<!DOCTYPE html>
+<!-- saved from url=(0068)https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html -->
+<html class="js consumer" lang="en" id="linux"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <script type="text/javascript" async="" src="./Google Chrome Terms of Service_files/ga.js"></script><script>
+(function(e, p){
+ var m = location.href.match(/platform=(win8|win|mac|linux|cros)/);
+ e.id = (m && m[1]) ||
+ (p.indexOf('Windows NT 6.2') > -1 ? 'win8' : p.indexOf('Windows') > -1 ? 'win' : p.indexOf('Mac') > -1 ? 'mac' : p.indexOf('CrOS') > -1 ? 'cros' : 'linux');
+ e.className = e.className.replace(/\bno-js\b/,'js');
+ })(document.documentElement, window.navigator.userAgent)
+ </script>
+ <meta charset="utf-8">
+ <meta content="initial-scale=1, minimum-scale=1, width=device-width" name="viewport">
+ <meta content="Google Chrome Terms of Service" name="description">
+ <title>
+ Google Chrome Terms of Service
+ </title>
+ <link href="https://plus.google.com/100585555255542998765" rel="publisher">
+ <link href="https://www.google.com/images/icons/product/chrome-32.png" rel="icon" type="image/ico">
+ <style>
+body {
+ font-family: Arial;
+ font-size: 13px;
+ }
+ </style>
+ <script src="./Google Chrome Terms of Service_files/autotrack.js">
+</script><style type="text/css"></style>
+ <script>
+new gweb.analytics.AutoTrack({
+ profile: 'UA-26908291-1'
+ });
+ </script>
+ <style type="text/css">.st {word-wrap: break-word;}</style></head>
+ <body class="" id="grid">
+ <div class="browser-eula" id="main">
+ <div class="compact">
+ <h2>
+ Google Chrome Terms of Service
+ </h2>
+ <p>
+ These Terms of Service apply to the executable code version of Google Chrome. Source code
+ for Google Chrome is available free of charge under open source software license
+ agreements at http://code.google.com/chromium/terms.html.
+ </p>
+ <p>
+ <strong>1. Your relationship with Google</strong>
+ </p>
+ <p>
+ 1.1 Your use of Google’s products, software, services and web sites (referred to
+ collectively as the “Services” in this document and excluding any services provided to
+ you by Google under a separate written agreement) is subject to the terms of a legal
+ agreement between you and Google. “Google” means Google Inc., whose principal place of
+ business is at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. This
+ document explains how the agreement is made up, and sets out some of the terms of that
+ agreement.
+ </p>
+ <p>
+ 1.2 Unless otherwise agreed in writing with Google, your agreement with Google will
+ always include, at a minimum, the terms and conditions set out in this document. These
+ are referred to below as the “Universal Terms”. Open source software licenses for Google
+ Chrome source code constitute separate written agreements. To the limited extent that the
+ open source software licenses expressly supersede these Universal Terms, the open source
+ licenses govern your agreement with Google for the use of Google Chrome or specific
+ included components of Google Chrome.
+ </p>
+ <p>
+ 1.3 Your agreement with Google will also include the terms set forth below in the Google
+ Chrome Additional Terms of Service and terms of any Legal Notices applicable to the
+ Services, in addition to the Universal Terms. All of these are referred to below as the
+ “Additional Terms”. Where Additional Terms apply to a Service, these will be accessible
+ for you to read either within, or through your use of, that Service.
+ </p>
+ <p>
+ 1.4 The Universal Terms, together with the Additional Terms, form a legally binding
+ agreement between you and Google in relation to your use of the Services. It is important
+ that you take the time to read them carefully. Collectively, this legal agreement is
+ referred to below as the “Terms”.
+ </p>
+ <p>
+ 1.5 If there is any contradiction between what the Additional Terms say and what the
+ Universal Terms say, then the Additional Terms shall take precedence in relation to that
+ Service.
+ </p>
+ <p>
+ <strong>2. Accepting the Terms</strong>
+ </p>
+ <p>
+ 2.1 In order to use the Services, you must first agree to the Terms. You may not use the
+ Services if you do not accept the Terms.
+ </p>
+ <p>
+ 2.2 You can accept the Terms by:
+ </p>
+ <p>
+ (A) clicking to accept or agree to the Terms, where this option is made available to you
+ by Google in the user interface for any Service; or
+ </p>
+ <p>
+ (B) by actually using the Services. In this case, you understand and agree that Google
+ will treat your use of the Services as acceptance of the Terms from that point onwards.
+ </p>
+ <p>
+ <strong>3. Language of the Terms</strong>
+ </p>
+ <p>
+ 3.1 Where Google has provided you with a translation of the English language version of
+ the Terms, then you agree that the translation is provided for your convenience only and
+ that the English language versions of the Terms will govern your relationship with
+ Google.
+ </p>
+ <p>
+ 3.2 If there is any contradiction between what the English language version of the Terms
+ says and what a translation says, then the English language version shall take
+ precedence.
+ </p>
+ <p>
+ <strong>4. Provision of the Services by Google</strong>
+ </p>
+ <p>
+ 4.1 Google has subsidiaries and affiliated legal entities around the world (“Subsidiaries
+ and Affiliates”). Sometimes, these companies will be providing the Services to you on
+ behalf of Google itself. You acknowledge and agree that Subsidiaries and Affiliates will
+ be entitled to provide the Services to you.
+ </p>
+ <p>
+ 4.2 Google is constantly innovating in order to provide the best possible experience for
+ its users. You acknowledge and agree that the form and nature of the Services which
+ Google provides may change from time to time without prior notice to you.
+ </p>
+ <p>
+ 4.3 As part of this continuing innovation, you acknowledge and agree that Google may stop
+ (permanently or temporarily) providing the Services (or any features within the Services)
+ to you or to users generally at Google’s sole discretion, without prior notice to you.
+ You may stop using the Services at any time. You do not need to specifically inform
+ Google when you stop using the Services.
+ </p>
+ <p>
+ 4.4 You acknowledge and agree that if Google disables access to your account, you may be
+ prevented from accessing the Services, your account details or any files or other content
+ which is contained in your account.
+ </p>
+ <p>
+ <strong>5. Use of the Services by you</strong>
+ </p>
+ <p>
+ 5.1 You agree to use the Services only for purposes that are permitted by (a) the Terms
+ and (b) any applicable law, regulation or generally accepted practices or guidelines in
+ the relevant jurisdictions (including any laws regarding the export of data or software
+ to and from the United States or other relevant countries).
+ </p>
+ <p>
+ 5.2 You agree that you will not engage in any activity that interferes with or disrupts
+ the Services (or the servers and networks which are connected to the Services).
+ </p>
+ <p>
+ 5.3 Unless you have been specifically permitted to do so in a separate agreement with
+ Google, you agree that you will not reproduce, duplicate, copy, sell, trade or resell the
+ Services for any purpose.
+ </p>
+ <p>
+ 5.4 You agree that you are solely responsible for (and that Google has no responsibility
+ to you or to any third party for) any breach of your obligations under the Terms and for
+ the consequences (including any loss or damage which Google may suffer) of any such
+ breach.
+ </p>
+ <p>
+ <strong>6. Privacy and your personal information</strong>
+ </p>
+ <p>
+ 6.1 For information about Google’s data protection practices, please read Google’s
+ privacy policy at http://www.google.com/privacy.html and at
+ http://www.google.com/chrome/intl/en/privacy.html. This policy explains how Google treats
+ your personal information, and protects your privacy, when you use the Services.
+ </p>
+ <p>
+ 6.2 You agree to the use of your data in accordance with Google’s privacy policies.
+ </p>
+ <p>
+ <strong>7. Content in the Services</strong>
+ </p>
+ <p>
+ 7.1 You understand that all information (such as data files, written text, computer
+ software, music, audio files or other sounds, photographs, videos or other images) which
+ you may have access to as part of, or through your use of, the Services are the sole
+ responsibility of the person from which such content originated. All such information is
+ referred to below as the “Content.”
+ </p>
+ <p>
+ 7.2 You should be aware that Content presented to you as part of the Services, including
+ but not limited to advertisements in the Services and sponsored Content within the
+ Services may be protected by intellectual property rights which are owned by the sponsors
+ or advertisers who provide that Content to Google (or by other persons or companies on
+ their behalf). You may not modify, rent, lease, loan, sell, distribute or create
+ derivative works based on this Content (either in whole or in part) unless you have been
+ specifically told that you may do so by Google or by the owners of that Content, in a
+ separate agreement.
+ </p>
+ <p>
+ 7.3 Google reserves the right (but shall have no obligation) to pre-screen, review, flag,
+ filter, modify, refuse or remove any or all Content from any Service. For some of the
+ Services, Google may provide tools to filter out explicit sexual content. These tools
+ include the SafeSearch preference settings (see
+ http://www.google.com/help/customize.html#safe). In addition, there are commercially
+ available services and software to limit access to material that you may find
+ objectionable.
+ </p>
+ <p>
+ 7.4 You understand that by using the Services you may be exposed to Content that you may
+ find offensive, indecent or objectionable and that, in this respect, you use the Services
+ at your own risk.
+ </p>
+ <p>
+ 7.5 You agree that you are solely responsible for (and that Google has no responsibility
+ to you or to any third party for) any Content that you create, transmit or display while
+ using the Services and for the consequences of your actions (including any loss or damage
+ which Google may suffer) by doing so.
+ </p>
+ <p>
+ <strong>8. Proprietary rights</strong>
+ </p>
+ <p>
+ 8.1 You acknowledge and agree that Google (or Google’s licensors) own all legal right,
+ title and interest in and to the Services, including any intellectual property rights
+ which subsist in the Services (whether those rights happen to be registered or not, and
+ wherever in the world those rights may exist).
+ </p>
+ <p>
+ 8.2 Unless you have agreed otherwise in writing with Google, nothing in the Terms gives
+ you a right to use any of Google’s trade names, trade marks, service marks, logos, domain
+ names, and other distinctive brand features.
+ </p>
+ <p>
+ 8.3 If you have been given an explicit right to use any of these brand features in a
+ separate written agreement with Google, then you agree that your use of such features
+ shall be in compliance with that agreement, any applicable provisions of the Terms, and
+ Google's brand feature use guidelines as updated from time to time. These guidelines can
+ be viewed online at http://www.google.com/permissions/guidelines.html (or such other URL
+ as Google may provide for this purpose from time to time).
+ </p>
+ <p>
+ 8.4 Google acknowledges and agrees that it obtains no right, title or interest from you
+ (or your licensors) under these Terms in or to any Content that you submit, post,
+ transmit or display on, or through, the Services, including any intellectual property
+ rights which subsist in that Content (whether those rights happen to be registered or
+ not, and wherever in the world those rights may exist). Unless you have agreed otherwise
+ in writing with Google, you agree that you are responsible for protecting and enforcing
+ those rights and that Google has no obligation to do so on your behalf.
+ </p>
+ <p>
+ 8.5 You agree that you shall not remove, obscure, or alter any proprietary rights notices
+ (including copyright and trade mark notices) which may be affixed to or contained within
+ the Services.
+ </p>
+ <p>
+ 8.6 Unless you have been expressly authorized to do so in writing by Google, you agree
+ that in using the Services, you will not use any trade mark, service mark, trade name,
+ logo of any company or organization in a way that is likely or intended to cause
+ confusion about the owner or authorized user of such marks, names or logos.
+ </p>
+ <p>
+ <strong>9. License from Google</strong>
+ </p>
+ <p>
+ 9.1 Google gives you a personal, worldwide, royalty-free, non-assignable and
+ non-exclusive license to use the software provided to you by Google as part of the
+ Services as provided to you by Google (referred to as the “Software” below). This license
+ is for the sole purpose of enabling you to use and enjoy the benefit of the Services as
+ provided by Google, in the manner permitted by the Terms.
+ </p>
+ <p>
+ 9.2 Subject to section 1.2, you may not (and you may not permit anyone else to) copy,
+ modify, create a derivative work of, reverse engineer, decompile or otherwise attempt to
+ extract the source code of the Software or any part thereof, unless this is expressly
+ permitted or required by law, or unless you have been specifically told that you may do
+ so by Google, in writing.
+ </p>
+ <p>
+ 9.3 Subject to section 1.2, unless Google has given you specific written permission to do
+ so, you may not assign (or grant a sub-license of) your rights to use the Software, grant
+ a security interest in or over your rights to use the Software, or otherwise transfer any
+ part of your rights to use the Software.
+ </p>
+ <p>
+ <strong>10. Content license from you</strong>
+ </p>
+ <p>
+ 10.1 You retain copyright and any other rights you already hold in Content which you
+ submit, post or display on or through, the Services.
+ </p>
+ <p>
+ <strong>11. Software updates</strong>
+ </p>
+ <p>
+ 11.1 The Software which you use may automatically download and install updates from time
+ to time from Google. These updates are designed to improve, enhance and further develop
+ the Services and may take the form of bug fixes, enhanced functions, new software modules
+ and completely new versions. You agree to receive such updates (and permit Google to
+ deliver these to you) as part of your use of the Services.
+ </p>
+ <p>
+ <strong>12. Ending your relationship with Google</strong>
+ </p>
+ <p>
+ 12.1 The Terms will continue to apply until terminated by either you or Google as set out
+ below.
+ </p>
+ <p>
+ 12.2 Google may at any time, terminate its legal agreement with you if:
+ </p>
+ <p>
+ (A) you have breached any provision of the Terms (or have acted in manner which clearly
+ shows that you do not intend to, or are unable to comply with the provisions of the
+ Terms); or
+ </p>
+ <p>
+ (B) Google is required to do so by law (for example, where the provision of the Services
+ to you is, or becomes, unlawful); or
+ </p>
+ <p>
+ (C) the partner with whom Google offered the Services to you has terminated its
+ relationship with Google or ceased to offer the Services to you; or
+ </p>
+ <p>
+ (D) Google is transitioning to no longer providing the Services to users in the country
+ in which you are resident or from which you use the service; or
+ </p>
+ <p>
+ (E) the provision of the Services to you by Google is, in Google’s opinion, no longer
+ commercially viable.
+ </p>
+ <p>
+ 12.3 Nothing in this Section shall affect Google’s rights regarding provision of Services
+ under Section 4 of the Terms.
+ </p>
+ <p>
+ 12.4 When these Terms come to an end, all of the legal rights, obligations and
+ liabilities that you and Google have benefited from, been subject to (or which have
+ accrued over time whilst the Terms have been in force) or which are expressed to continue
+ indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 19.7
+ shall continue to apply to such rights, obligations and liabilities indefinitely.
+ </p>
+ <p>
+ <strong>13. EXCLUSION OF WARRANTIES</strong>
+ </p>
+ <p>
+ 13.1 NOTHING IN THESE TERMS, INCLUDING SECTIONS 13 AND 14, SHALL EXCLUDE OR LIMIT
+ GOOGLE’S WARRANTY OR LIABILITY FOR LOSSES WHICH MAY NOT BE LAWFULLY EXCLUDED OR LIMITED
+ BY APPLICABLE LAW. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR
+ CONDITIONS OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR LOSS OR DAMAGE CAUSED BY
+ NEGLIGENCE, BREACH OF CONTRACT OR BREACH OF IMPLIED TERMS, OR INCIDENTAL OR CONSEQUENTIAL
+ DAMAGES. ACCORDINGLY, ONLY THE LIMITATIONS WHICH ARE LAWFUL IN YOUR JURISDICTION WILL
+ APPLY TO YOU AND OUR LIABILITY WILL BE LIMITED TO THE MAXIMUM EXTENT PERMITTED BY LAW.
+ </p>
+ <p>
+ 13.2 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SERVICES IS AT YOUR SOLE
+ RISK AND THAT THE SERVICES ARE PROVIDED "AS IS" AND “AS AVAILABLE.”
+ </p>
+ <p>
+ 13.3 IN PARTICULAR, GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS DO NOT
+ REPRESENT OR WARRANT TO YOU THAT:
+ </p>
+ <p>
+ (A) YOUR USE OF THE SERVICES WILL MEET YOUR REQUIREMENTS,
+ </p>
+ <p>
+ (B) YOUR USE OF THE SERVICES WILL BE UNINTERRUPTED, TIMELY, SECURE OR FREE FROM ERROR,
+ </p>
+ <p>
+ (C) ANY INFORMATION OBTAINED BY YOU AS A RESULT OF YOUR USE OF THE SERVICES WILL BE
+ ACCURATE OR RELIABLE, AND
+ </p>
+ <p>
+ (D) THAT DEFECTS IN THE OPERATION OR FUNCTIONALITY OF ANY SOFTWARE PROVIDED TO YOU AS
+ PART OF THE SERVICES WILL BE CORRECTED.
+ </p>
+ <p>
+ 13.4 ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SERVICES IS
+ DONE AT YOUR OWN DISCRETION AND RISK AND THAT YOU WILL BE SOLELY RESPONSIBLE FOR ANY
+ DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM THE
+ DOWNLOAD OF ANY SUCH MATERIAL.
+ </p>
+ <p>
+ 13.5 NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED BY YOU FROM GOOGLE OR
+ THROUGH OR FROM THE SERVICES SHALL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN THE TERMS.
+ </p>
+ <p>
+ 13.6 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND,
+ WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND
+ CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ </p>
+ <p>
+ <strong>14. LIMITATION OF LIABILITY</strong>
+ </p>
+ <p>
+ 14.1 SUBJECT TO OVERALL PROVISION IN PARAGRAPH 13.1 ABOVE, YOU EXPRESSLY UNDERSTAND AND
+ AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE
+ TO YOU FOR:
+ </p>
+ <p>
+ (A) ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES WHICH
+ MAY BE INCURRED BY YOU, HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY.. THIS SHALL
+ INCLUDE, BUT NOT BE LIMITED TO, ANY LOSS OF PROFIT (WHETHER INCURRED DIRECTLY OR
+ INDIRECTLY), ANY LOSS OF GOODWILL OR BUSINESS REPUTATION, ANY LOSS OF DATA SUFFERED, COST
+ OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR OTHER INTANGIBLE LOSS;
+ </p>
+ <p>
+ (B) ANY LOSS OR DAMAGE WHICH MAY BE INCURRED BY YOU, INCLUDING BUT NOT LIMITED TO LOSS OR
+ DAMAGE AS A RESULT OF:
+ </p>
+ <p>
+ (I) ANY RELIANCE PLACED BY YOU ON THE COMPLETENESS, ACCURACY OR EXISTENCE OF ANY
+ ADVERTISING, OR AS A RESULT OF ANY RELATIONSHIP OR TRANSACTION BETWEEN YOU AND ANY
+ ADVERTISER OR SPONSOR WHOSE ADVERTISING APPEARS ON THE SERVICES;
+ </p>
+ <p>
+ (II) ANY CHANGES WHICH GOOGLE MAY MAKE TO THE SERVICES, OR FOR ANY PERMANENT OR TEMPORARY
+ CESSATION IN THE PROVISION OF THE SERVICES (OR ANY FEATURES WITHIN THE SERVICES);
+ </p>
+ <p>
+ (III) THE DELETION OF, CORRUPTION OF, OR FAILURE TO STORE, ANY CONTENT AND OTHER
+ COMMUNICATIONS DATA MAINTAINED OR TRANSMITTED BY OR THROUGH YOUR USE OF THE SERVICES;
+ </p>
+ <p>
+ (IV) YOUR FAILURE TO PROVIDE GOOGLE WITH ACCURATE ACCOUNT INFORMATION;
+ </p>
+ <p>
+ (V) YOUR FAILURE TO KEEP YOUR PASSWORD OR ACCOUNT DETAILS SECURE AND CONFIDENTIAL;
+ </p>
+ <p>
+ 14.2 THE LIMITATIONS ON GOOGLE’S LIABILITY TO YOU IN PARAGRAPH 14.1 ABOVE SHALL APPLY
+ WHETHER OR NOT GOOGLE HAS BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF
+ ANY SUCH LOSSES ARISING.
+ </p>
+ <p>
+ <strong>15. Copyright and trade mark policies</strong>
+ </p>
+ <p>
+ 15.1 It is Google’s policy to respond to notices of alleged copyright infringement that
+ comply with applicable international intellectual property law (including, in the United
+ States, the Digital Millennium Copyright Act) and to terminating the accounts of repeat
+ infringers. Details of Google’s policy can be found at http://www.google.com/dmca.html.
+ </p>
+ <p>
+ 15.2 Google operates a trade mark complaints procedure in respect of Google’s advertising
+ business, details of which can be found at http://www.google.com/tm_complaint.html.
+ </p>
+ <p>
+ <strong>16. Advertisements</strong>
+ </p>
+ <p>
+ 16.1 Some of the Services are supported by advertising revenue and may display
+ advertisements and promotions. These advertisements may be targeted to the content of
+ information stored on the Services, queries made through the Services or other
+ information.
+ </p>
+ <p>
+ 16.2 The manner, mode and extent of advertising by Google on the Services are subject to
+ change without specific notice to you.
+ </p>
+ <p>
+ 16.3 In consideration for Google granting you access to and use of the Services, you
+ agree that Google may place such advertising on the Services.
+ </p>
+ <p>
+ <strong>17. Other content</strong>
+ </p>
+ <p>
+ 17.1 The Services may include hyperlinks to other web sites or content or resources.
+ Google may have no control over any web sites or resources which are provided by
+ companies or persons other than Google.
+ </p>
+ <p>
+ 17.2 You acknowledge and agree that Google is not responsible for the availability of any
+ such external sites or resources, and does not endorse any advertising, products or other
+ materials on or available from such web sites or resources.
+ </p>
+ <p>
+ 17.3 You acknowledge and agree that Google is not liable for any loss or damage which may
+ be incurred by you as a result of the availability of those external sites or resources,
+ or as a result of any reliance placed by you on the completeness, accuracy or existence
+ of any advertising, products or other materials on, or available from, such web sites or
+ resources.
+ </p>
+ <p>
+ <strong>18. Changes to the Terms</strong>
+ </p>
+ <p>
+ 18.1 Google may make changes to the Universal Terms or Additional Terms from time to
+ time. When these changes are made, Google will make a new copy of the Universal Terms
+ available at http://www.google.com/chrome/intl/en/eula_text.html and any new Additional
+ Terms will be made available to you from within, or through, the affected Services.
+ </p>
+ <p>
+ 18.2 You understand and agree that if you use the Services after the date on which the
+ Universal Terms or Additional Terms have changed, Google will treat your use as
+ acceptance of the updated Universal Terms or Additional Terms.
+ </p>
+ <p>
+ <strong>19. General legal terms</strong>
+ </p>
+ <p>
+ 19.1 Sometimes when you use the Services, you may (as a result of, or in connection with
+ your use of the Services) use a service or download a piece of software, or purchase
+ goods, which are provided by another person or company. Your use of these other services,
+ software or goods may be subject to separate terms between you and the company or person
+ concerned. If so, the Terms do not affect your legal relationship with these other
+ companies or individuals.
+ </p>
+ <p>
+ 19.2 The Terms constitute the whole legal agreement between you and Google and govern
+ your use of the Services (but excluding any services which Google may provide to you
+ under a separate written agreement), and completely replace any prior agreements between
+ you and Google in relation to the Services.
+ </p>
+ <p>
+ 19.3 You agree that Google may provide you with notices, including those regarding
+ changes to the Terms, by email, regular mail, or postings on the Services.
+ </p>
+ <p>
+ 19.4 You agree that if Google does not exercise or enforce any legal right or remedy
+ which is contained in the Terms (or which Google has the benefit of under any applicable
+ law), this will not be taken to be a formal waiver of Google’s rights and that those
+ rights or remedies will still be available to Google.
+ </p>
+ <p>
+ 19.5 If any court of law, having the jurisdiction to decide on this matter, rules that
+ any provision of these Terms is invalid, then that provision will be removed from the
+ Terms without affecting the rest of the Terms. The remaining provisions of the Terms will
+ continue to be valid and enforceable.
+ </p>
+ <p>
+ 19.6 You acknowledge and agree that each member of the group of companies of which Google
+ is the parent shall be third party beneficiaries to the Terms and that such other
+ companies shall be entitled to directly enforce, and rely upon, any provision of the
+ Terms which confers a benefit on (or rights in favor of) them. Other than this, no other
+ person or company shall be third party beneficiaries to the Terms.
+ </p>
+ <p>
+ 19.7 The Terms, and your relationship with Google under the Terms, shall be governed by
+ the laws of the State of California without regard to its conflict of laws provisions.
+ You and Google agree to submit to the exclusive jurisdiction of the courts located within
+ the county of Santa Clara, California to resolve any legal matter arising from the Terms.
+ Notwithstanding this, you agree that Google shall still be allowed to apply for
+ injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+ </p>
+ <p>
+ <strong>20. Additional Terms for Extensions for Google Chrome</strong>
+ </p>
+ <p>
+ 20.1 These terms in this section apply if you install extensions on your copy of Google
+ Chrome. Extensions are small software programs, developed by Google or third parties,
+ that can modify and enhance the functionality of Google Chrome. Extensions may have
+ greater privileges to access your browser or your computer than regular webpages,
+ including the ability to read and modify your private data.
+ </p>
+ <p>
+ 20.2 From time to time, Google Chrome may check with remote servers (hosted by Google or
+ by third parties) for available updates to extensions, including but not limited to bug
+ fixes or enhanced functionality. You agree that such updates will be automatically
+ requested, downloaded, and installed without further notice to you.
+ </p>
+ <p>
+ 20.3 From time to time, Google may discover an extension that violates Google developer
+ terms or other legal agreements, laws, regulations or policies. Google Chrome will
+ periodically download a list of such extensions from Google’s servers. You agree that
+ Google may remotely disable or remove any such extension from user systems in its sole
+ discretion.
+ </p>
+ <p>
+ <strong>21. Additional Terms for Enterprise Use</strong>
+ </p>
+ <p>
+ 21.1 If you are a business entity, then the individual accepting on behalf of the entity
+ (for the avoidance of doubt, for business entities, in these Terms, "you" means the
+ entity) represents and warrants that he or she has the authority to act on your behalf,
+ that you represent that you are duly authorized to do business in the country or
+ countries where you operate, and that your employees, officers, representatives, and
+ other agents accessing the Service are duly authorized to access Google Chrome and to
+ legally bind you to these Terms.
+ </p>
+ <p>
+ 21.2 Subject to the Terms, and in addition to the license grant in Section 9, Google
+ grants you a non-exclusive, non-transferable license to reproduce, distribute, install,
+ and use Google Chrome solely on machines intended for use by your employees, officers,
+ representatives, and agents in connection with your business entity, and provided that
+ their use of Google Chrome will be subject to the Terms.
+ </p>
+ <p>
+ August 12, 2010
+ </p><br>
+ <hr>
+ <br>
+ <h2>
+ Google Chrome Additional Terms of Service
+ </h2>
+ <p>
+ <strong>MPEGLA</strong>
+ </p>
+ <p>
+ THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND
+ NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD
+ ( “AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A
+ PERSONAL AND NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PARTNER LICENSED TO
+ PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE.
+ ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM.
+ </p>
+ <p>
+ <strong>Adobe</strong>
+ </p>
+ <p>
+ Google Chrome may include one or more components provided by Adobe Systems Incorporated
+ and Adobe Software Ireland Limited (collectively “Adobe”). Your use of the Adobe software
+ as provided by Google (“Adobe Software”) is subject to the following additional terms
+ (the “Adobe Terms”). You, the entity receiving the Adobe Software, will be hereinafter
+ referred to as “Sublicensee.”
+ </p>
+ <p>
+ 1. License Restrictions.
+ </p>
+ <p>
+ (a) Flash Player, Version 10.x is designed only as a browser plug-in. Sublicensee may not
+ modify or distribute this Adobe Software for use as anything but a browser plug-in for
+ playing back content on a web page. For example, Sublicensee will not modify this Adobe
+ Software in order to allow interoperation with applications that run outside of the
+ browser (e.g., standalone applications, widgets, device UI).
+ </p>
+ <p>
+ (b) Sublicensee will not expose any APIs of the Flash Player, Version 10.x through a
+ browser plug-in interface in such a way that allows such extension to be used to playback
+ content from a web page as a stand-alone application.
+ </p>
+ <p>
+ (c) The Chrome-Reader Software may not be used to render any PDF or EPUB documents that
+ utilize digital rights management protocols or systems other than Adobe DRM.
+ </p>
+ <p>
+ (d) Adobe DRM must be enabled in the Chrome-Reader Software for all Adobe DRM protected
+ PDF and EPUB documents.
+ </p>
+ <p>
+ (e) The Chrome-Reader Software may not, other than as explicitly permitted by the
+ technical specifications, disable any capabilities provided by Adobe in the Adobe
+ Software, including but not limited to, support for PDF and EPUB formats and Adobe DRM.
+ </p>
+ <p>
+ 2. Electronic Transmission. Sublicensee may allow the download of the Adobe Software from
+ a web site, the Internet, an intranet, or similar technology (an, “Electronic
+ Transmissions”) provided that Sublicensee agrees that any distributions of the Adobe
+ Software by Sublicensee, including those on CD-ROM, DVD-ROM or other storage media and
+ Electronic Transmissions, if expressly permitted, shall be subject to reasonable security
+ measures to prevent unauthorized use. With relation to Electronic Transmissions approved
+ hereunder, Sublicensee agrees to employ any reasonable use restrictions set by Adobe,
+ including those related to security and/or the restriction of distribution to end users
+ of the Sublicensee Product.
+ </p>
+ <p>
+ 3. EULA and Distribution Terms.
+ </p>
+ <p>
+ (a) Sublicensee shall ensure that the Adobe Software is distributed to end users under an
+ enforceable end user license agreement, in favor of Sublicensee and its suppliers
+ containing at least each of the following minimum terms (the “End-User License”): (i) a
+ prohibition against distribution and copying, (ii) a prohibition against modifications
+ and derivative works, (iii) a prohibition against decompiling, reverse engineering,
+ disassembling, and otherwise reducing the Adobe Software to a human-perceivable form,
+ (iv) a provision indicating ownership of Sublicensee Product (as defined in Section 8) by
+ Sublicensee and its licensors, (v) a disclaimer of indirect, special, incidental,
+ punitive, and consequential damages, and (vi) other industry standard disclaimers and
+ limitations, including, as applicable: a disclaimer of all applicable statutory
+ warranties, to the full extent allowed by law.
+ </p>
+ <p>
+ (b) Sublicensee shall ensure that the Adobe Software is distributed to Sublicensee’s
+ distributors under an enforceable distribution license agreement, in favor of Sublicensee
+ and its suppliers containing terms as protective of Adobe as the Adobe Terms.
+ </p>
+ <p>
+ 4. Opensource. Sublicensee will not directly or indirectly grant, or purport to grant, to
+ any third party any rights or immunities under Adobe’s intellectual property or
+ proprietary rights that will subject such intellectual property to an open source license
+ or scheme in which there is or could be interpreted to be a requirement that as a
+ condition of use, modification and/or distribution, the Adobe Software be: (i) disclosed
+ or distributed in source code form; (ii) licensed for the purpose of making derivative
+ works; or (iii) redistributable at no charge. For clarification purposes, the foregoing
+ restriction does not preclude Sublicensee from distributing, and Sublicensee will
+ distribute the Adobe Software as bundled with the Google Software, without charge.
+ </p>
+ <p>
+ 5. Additional Terms. With respect to any update, upgrade, new versions of the Adobe
+ Software (collectively “Upgrades”) provided to Sublicenses, Adobe reserves the right to
+ require additional terms and conditions applicable solely to the Upgrade and future
+ versions thereof, and solely to the extent that such restrictions are imposed by Adobe on
+ all licensees of such Upgrade. If Sublicensee does not agree to such additional terms or
+ conditions, Sublicensee will have no license rights with respect to such Upgrade, and
+ Sublicensee’s license rights with respect to the Adobe Software will terminate
+ automatically on the 90th day from the date such additional terms are made available to
+ Sublicensee.
+ </p>
+ <p>
+ 6. Proprietary Rights Notices. Sublicensee shall not, and shall require its distributors
+ not to, delete or in any manner alter the copyright notices, trademarks, logos or related
+ notices, or other proprietary rights notices of Adobe (and its licensors, if any)
+ appearing on or within the Adobe Software or accompanying materials.
+ </p>
+ <p>
+ 7. Technical Requirements. Sublicensee and its distributors may only distribute Adobe
+ Software and/or Upgrade on devices that (i) meet the technical specifications posted on
+ http://www.adobe.com/mobile/licensees, (or a successor web site thereto), and (ii) has
+ been verified by Adobe as set forth below.
+ </p>
+ <p>
+ 8. Verification and Update. Sublicensee must submit to Adobe each Sublicensee product
+ (and each version thereof) containing the Adobe Software and/or Upgrade (“Sublicensee
+ Product”) that do not meet the Device Verification exemption criteria to be communicated
+ by Google, for Adobe to verify. Sublicensee shall pay for each submission made by
+ Sublicensee by procuring verification packages at Adobe’s then-current terms set forth at
+ http://flashmobile.adobe.com/. Sublicensee Product that has not passed verification may
+ not be distributed. Verification will be accomplished in accordance with Adobe’s
+ then-current process described at http://flashmobile.adobe.com/ (“Verification”).
+ </p>
+ <p>
+ 9. Profiles and Device Central. Sublicensee will be prompted to enter certain profile
+ information about the Sublicensee Products either as part of the Verification process or
+ some other method, and Sublicensee will provide such information, to Adobe. Adobe may (i)
+ use such profile information as reasonably necessary to verify the Sublicensee Product
+ (if such product is subject to Verification), and (ii) display such profile information
+ in “Adobe Device Intelligence system,” located at
+ https://devices.adobe.com/partnerportal/, and made available through Adobe’s authoring
+ and development tools and services to enable developers and end users to see how content
+ or applications are displayed in Sublicensee Products (e.g. how video images appear in
+ certain phones).
+ </p>
+ <p>
+ 10. Export. Sublicensee acknowledges that the laws and regulations of the United States
+ restrict the export and re-export of commodities and technical data of United States
+ origin, which may include the Adobe Software. Sublicensee agrees that it will not export
+ or re-export the Adobe Software, without the appropriate United States and foreign
+ governmental clearances, if any.
+ </p>
+ <p>
+ 11. Technology Pass-through Terms.
+ </p>
+ <p>
+ (a) Except pursuant to applicable permissions or agreements therefor, from or with the
+ applicable parties, Sublicensees shall not use and shall not allow the use of, the Adobe
+ Software for the encoding or decoding of mp3 audio only (.mp3) data on any non-pc device
+ (e.g., mobile phone or set-top box), nor may the mp3 encoders or decoders contained in
+ the Adobe Software be used or accessed by any product other than the Adobe Software. The
+ Adobe Software may be used for the encoding or decoding of MP3 data contained within a
+ swf or flv file, which contains video, picture or other data. Sublicensee shall
+ acknowledge that use of the Adobe Software for non-PC devices, as described in the
+ prohibitions in this section, may require the payment of licensing royalties or other
+ amounts to third parties who may hold intellectual property rights related to the MP3
+ technology and that Adobe nor Sublicensee has not paid any royalties or other amounts on
+ account of third party intellectual property rights for such use. If Sublicensee requires
+ an MP3 encoder or decoder for such use, Sublicensee is responsible for obtaining the
+ necessary intellectual property license, including any applicable patent rights.
+ </p>
+ <p>
+ (b) Sublicensee will not use, copy, reproduce and modify (i) the On2 source code
+ (provided hereunder as a component of the Source Code) as necessary to enable the Adobe
+ Software to decode video in the Flash video file format (.flv or .f4v), and (ii) the
+ Sorenson Spark source code (provided hereunder as a component of the Source Code) for the
+ limited purpose of making bug fixes and performance enhancements to the Adobe Software.
+ All codecs provided with the Adobe Software may only be used and distributed as an
+ integrated part of the Adobe Software and may not be accessed by any other application,
+ including other Google applications.
+ </p>
+ <p>
+ (c) The Source Code may be provided with an AAC codec and/or HE-AAC codec (“the AAC
+ Codec”). Use of the AAC Codec is conditioned on Sublicensee obtaining a proper patent
+ license covering necessary patents as provided by VIA Licensing, for end products on or
+ in which the AAC Codec will be used. Sublicensee acknowledges and agrees that Adobe is
+ not providing a patent license for an AAC Codec under this Agreement to Sublicensee or
+ its sublicensees.
+ </p>
+ <p>
+ (d) THE SOURCE CODE MAY CONTAIN CODE LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR
+ THE PERSONAL NON-COMMERCIAL USE OF A CONSUMER TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE
+ AVC STANDARD ("AVC VIDEO") AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER
+ ENGAGED IN A PERSONAL NON-COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER
+ LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR WILL BE IMPLIED FOR ANY OTHER
+ USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. See
+ http://www.mpegla.com
+ </p>
+ <p>
+ 12. Update. Sublicensee will not circumvent Google’s or Adobe’s efforts to update the
+ Adobe Software in all Sublicensee’s products incorporating the Adobe Software as bundled
+ with the Google Software (“Sublicensee Products”).
+ </p>
+ <p>
+ 13. Attribution and Proprietary Notices. Sublicensee will list the Adobe Software in
+ publicly available Sublicensee Product specifications and include appropriate Adobe
+ Software branding (specifically excluding the Adobe corporate logo) on the Sublicensee
+ Product packaging or marketing materials in a manner consistent with branding of other
+ third party products contained within the Sublicensee Product.
+ </p>
+ <p>
+ 14. No Warranty. THE ADOBE SOFTWARE IS MADE AVAILABLE TO SUBLICENSEE FOR USE AND
+ REPRODUCTION “AS IS” AND ADOBE MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. ADOBE AND
+ ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS OBTAINED BY USING THE
+ ADOBE SOFTWARE. EXCEPT FOR ANY WARRANTY, CONDITION, REPRESENTATION OR TERM TO THE EXTENT
+ TO WHICH THE SAME CANNOT OR MAY NOT BE EXCLUDED OR LIMITED BY LAW APPLICABLE TO
+ SUBLICENSEEIN SUBLICENSEE’S JURISDICTION, ADOBE AND ITS SUPPLIERS MAKE NO WARRANTIES,
+ CONDITIONS, REPRESENTATIONS, OR TERMS (EXPRESS OR IMPLIED WHETHER BY STATUTE, COMMON LAW,
+ CUSTOM, USAGE OR OTHERWISE) AS TO ANY MATTER INCLUDING WITHOUT LIMITATION NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS, MERCHANTABILITY, INTEGRATION, SATISFACTORY QUALITY, OR FITNESS FOR
+ ANY PARTICULAR PURPOSE. SUBLICENSEE AGREES THAT SUBLICENSEE SHALL NOT MAKE ANY WARRANTY,
+ EXPRESS OR IMPLIED, ON BEHALF OF ADOBE.
+ </p>
+ <p>
+ 15. Limitation of Liability. IN NO EVENT WILL ADOBE OR ITS SUPPLIERS BE LIABLE TO
+ SUBLICENSEE FOR ANY DAMAGES, CLAIMS OR COSTS WHATSOEVER OR ANY CONSEQUENTIAL, INDIRECT,
+ OR INCIDENTAL DAMAGES, OR ANY LOST PROFITS OR LOST SAVINGS, EVEN IF AN ADOBE
+ REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS
+ OR FOR ANY CLAIM BY ANY THIRD PARTY. THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO
+ THE EXTENT PERMITTED BY APPLICABLE LAW IN SUBLICENSEE’S JURISDICTION. ADOBE’S AGGREGATE
+ LIABILITY AND THAT OF ITS SUPPLIERS UNDER OR IN CONNECTION WITH THIS AGREEMENT SHALL BE
+ LIMITED TO ONE THOUSAND DOLLARS (US$1,000). Nothing contained in this Agreement limits
+ Adobe’s liability to Sublicensee in the event of death or personal injury resulting from
+ Adobe’s negligence or for the tort of deceit (fraud). Adobe is acting on behalf of its
+ suppliers for the purpose of disclaiming, excluding and/or limiting obligations,
+ warranties and liability as provided in this Agreement, but in no other respects and for
+ no other purpose.
+ </p>
+ <p>
+ 16. Content Protection Terms
+ </p>
+ <p>
+ (a) Definitions.
+ </p>
+ <p>
+ “Compliance and Robustness Rules” means the document setting forth compliance and
+ robustness rules for the Adobe Software located at http://www.adobe.com/mobile/licensees,
+ or a successor web site thereto.
+ </p>
+ <p>
+ “Content Protection Functions” means those aspects of the Adobe Software that are
+ designed to ensure compliance with the Compliance and Robustness Rules, and to prevent
+ playback, copying, modification, redistribution or other actions with respect to digital
+ content distributed for consumption by users of the Adobe Software when such actions are
+ not authorized by the owners of such digital content or its licensed distributors.
+ </p>
+ <p>
+ “Content Protection Code” means code within certain designated versions of the Adobe
+ Software that enables certain Content Protection Functions.
+ </p>
+ <p>
+ “Key” means a cryptographic value contained in the Adobe Software for use in decrypting
+ digital content.
+ </p>
+ <p>
+ (b) License Restrictions. Sublicensee’s right to exercise the licenses with respect to
+ the Adobe Software is subject to the following additional restrictions and obligations.
+ Sublicensee will ensure that Sublicensee’s customers comply with these restrictions and
+ obligations to the same extent imposed on Sublicensee with respect to the Adobe Software;
+ any failure by Sublicensee’s customers to comply with these additional restrictions and
+ obligations shall be treated as a material breach by Sublicensee.
+ </p>
+ <p>
+ b.1. Sublicensee and customers may only distribute the Adobe Software that meets the
+ Robustness and Compliance Rules as so confirmed by Sublicensee during the verification
+ process described above in the Adobe Terms.
+ </p>
+ <p>
+ b.2. Sublicensee shall not (i) circumvent the Content Protection Functions of either the
+ Adobe Software or any related Adobe Software that is used to encrypt or decrypt digital
+ content for authorized consumption by users of the Adobe Software, or (ii) develop or
+ distribute products that are designed to circumvent the Content Protection Functions of
+ either the Adobe Software or any Adobe Software that is used to encrypt or decrypt
+ digital content for authorized consumption by users of the Adobe Software.
+ </p>
+ <p>
+ (c) The Keys are hereby designated as Adobe’s Confidential Information, and Sublicensee
+ will, with respect to the Keys, adhere to Adobe’s Source Code Handling Procedure (to be
+ provided by Adobe upon request).
+ </p>
+ <p>
+ (d) Injunctive Relief. Sublicensee agrees that a breach of this Agreement may compromise
+ the Content Protection Functions of the Adobe Software and may cause unique and lasting
+ harm to the interests of Adobe and owners of digital content that rely on such Content
+ Protection Functions, and that monetary damages may be inadequate to compensate fully for
+ such harm. Therefore, Sublicensee further agrees that Adobe may be entitled to seek
+ injunctive relief to prevent or limit the harm caused by any such breach, in addition to
+ monetary damages.
+ </p>
+ <p>
+ 17. Intended Third-party Beneficiary. Adobe Systems Incorporated and Adobe Software
+ Ireland Limited are the intended third-party beneficiaries of Google’s agreement with
+ Sublicensee with respect to the Adobe Software, including but not limited to, the Adobe
+ Terms. Sublicensee agrees, notwithstanding anything to the contrary in its agreement with
+ Google, that Google may disclose Sublicensee’s identity to Adobe and certify in writing
+ that Sublicensee has entered into a license agreement with Google which includes the
+ Adobe Terms. Sublicensee must have an agreement with each of its licensees, and if such
+ licensees are allowed to redistribute the Adobe Software, such agreement will include the
+ Adobe Terms.
+ </p>
+ </div>
+ </div>
+
+</body></html>
\ No newline at end of file
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index b44a73e..c958cc3 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -1,16 +1,16 @@
# Colored makepkg-like functions
msg_blue() {
- printf "${BLUE}==>${ALL_OFF}${BOLD} ${1}${ALL_OFF}\n"
+ printf "${blue}==>${bold} $1${all_off}\n"
}
note() {
- printf "${BLUE}==>${ALL_OFF}${YELLOW} NOTE:${ALL_OFF}${BOLD} ${1}${ALL_OFF}\n"
+ printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
}
-ALL_OFF="$(tput sgr0)"
-BOLD="$(tput bold)"
-BLUE="${BOLD}$(tput setaf 4)"
-YELLOW="${BOLD}$(tput setaf 3)"
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
_update() {
msg_blue "Updating desktop MIME database..."
--
cgit v0.12
From 5259b198540c286d46d78cdeb1a2dffdb9779329 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 22 Sep 2014 13:59:16 +0000
Subject: dvb-firmware: disable xc5000 no_poweroff
not needed with the drivers in the kernel
---
abs/core/dvb-firmware/PKGBUILD | 12 ++++++------
abs/core/dvb-firmware/xc5000.conf | 5 ++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD
index b03deac..59fe759 100644
--- a/abs/core/dvb-firmware/PKGBUILD
+++ b/abs/core/dvb-firmware/PKGBUILD
@@ -3,19 +3,19 @@
pkgname=dvb-firmware
pkgver=1
-pkgrel=19
+pkgrel=20
pkgdesc="Firmware for DVB cards"
replaces=('hd3000firmware')
arch=('i586' 'i686' 'x86_64')
url="http://linuxtv.org/"
source=(dvb-firmware.tar.bz2 xc5000.conf)
-build() {
- cd $startdir/src/
- mkdir -p $startdir/pkg/lib/firmware
- cp -a dvb-fw/* $startdir/pkg/lib/firmware
+package() {
+ cd $srcdir
+ mkdir -p ${pkgdir}/lib/firmware
+ cp -a dvb-fw/* ${pkgdir}/lib/firmware
mkdir -p ${pkgdir}/etc/modprobe.d/
install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/"
}
md5sums=('d2ba68a1e49adbb71431295fc96cda60'
- '08529c85be55836394d1047b85b869a3')
+ 'ad7db39e2a2afe3ffc7e65fd5822517d')
diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf
index 4124136..1b98fb0 100644
--- a/abs/core/dvb-firmware/xc5000.conf
+++ b/abs/core/dvb-firmware/xc5000.conf
@@ -1,6 +1,5 @@
# xc5000
-# Disable power cycling and firmware reloads
+# Disable power cycling and firmware reloads caused by device sleeping
#
-# When v4l-dvb is installed no_poweroff=1 is no longer needed.
#
-options xc5000 no_poweroff=1
+#options xc5000 no_poweroff=1
--
cgit v0.12
From f23f97abfd157cc02be0f088ea6c248953f9bb1f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 22 Sep 2014 17:32:59 +0000
Subject: systemd: recompile
---
abs/core/systemd/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD
index de605e8..ff7a51d 100755
--- a/abs/core/systemd/PKGBUILD
+++ b/abs/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=208
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
--
cgit v0.12
From 4b74af3a1a584a48b2aa6cb866137e2509a89706 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 00:04:27 +0000
Subject: ca-certificates: update
---
abs/core/ca-certificates/PKGBUILD | 76 +++++++++++++---------
.../ca-certificates/ca-certificates-utils.install | 29 +++++++++
abs/core/ca-certificates/ca-certificates.install | 23 -------
3 files changed, 74 insertions(+), 54 deletions(-)
create mode 100644 abs/core/ca-certificates/ca-certificates-utils.install
delete mode 100644 abs/core/ca-certificates/ca-certificates.install
diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD
index 3c293a7..a5edf22 100644
--- a/abs/core/ca-certificates/PKGBUILD
+++ b/abs/core/ca-certificates/PKGBUILD
@@ -1,43 +1,57 @@
# $Id$
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-pkgname=ca-certificates
-pkgver=20140325
-pkgrel=1
+pkgbase=ca-certificates
+pkgname=(ca-certificates-utils ca-certificates)
+pkgver=20140923
+pkgrel=2
pkgdesc='Common CA certificates'
arch=('any')
-url='http://packages.qa.debian.org/c/ca-certificates.html'
-license=('MPL' 'GPL')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz")
-depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
-makedepends=('python2')
-install='ca-certificates.install'
-backup=('etc/ca-certificates.conf')
-sha256sums=('c0e3d8c517995db2737f7f1a9b69d654b8823fa6d337871c6ce111fcf083454a')
+url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
+license=('GPL2')
+depends=('sh' 'p11-kit')
+makedepends=('asciidoc')
+_commit=f81c301
+source=("update-ca-trust::$url/plain/update-ca-trust?id=$_commit"
+ "update-ca-trust.8.txt::$url/plain/update-ca-trust.8.txt?id=$_commit")
+sha256sums=('75ef2f4b0fddd2ca3c69b234a6abb66fd732e4af96814b65dcedb0dd52018381'
+ 'd31ac2bb5f1941aea0ac1e51861af7be224b6bb85820e30bb30793112aa785ba')
+
+_confdir=/etc/$pkgbase
+_datadir=/usr/share/$pkgbase
prepare() {
- cd ${srcdir}/${pkgname}
- sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
- sed 's|python|python2|g' -i mozilla/Makefile
+ sed -i "s:/etc/pki/ca-trust:${_confdir}:g" update-ca-trust
}
-build() {
- cd ${srcdir}/${pkgname}
- make SUBDIRS=mozilla
+package_ca-certificates-utils() {
+ pkgdesc+=" (utilities)"
+ install=ca-certificates-utils.install
+ provides=(ca-certificates ca-certificates-java)
+ conflicts=(ca-certificates-java)
+ replaces=(ca-certificates-java)
+
+ asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt
+ xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml
+
+ install -D update-ca-trust "${pkgdir}/usr/bin/update-ca-trust"
+ install -Dm644 update-ca-trust.8 "${pkgdir}/usr/share/man/man8/update-ca-trust.8"
+
+ install -d "${pkgdir}"{${_confdir},${_datadir}}/trust-source/{anchors,blacklist}
+
+ _extractdir="${pkgdir}${_confdir}/extracted"
+ _ssldir="${pkgdir}/etc/ssl"
+
+ install -d "${_ssldir}/certs/java" "${_extractdir}"/{openssl,pem,java}
+ ln -sr "${_extractdir}/openssl/ca-bundle.trust.crt" "${_ssldir}/certs/ca-bundle.trust.crt"
+ ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/certs/ca-bundle.crt"
+ ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/cert.pem"
+ ln -sr "${_extractdir}/java/cacerts" "${_ssldir}/certs/java/cacerts"
}
-package() {
- cd ${srcdir}/${pkgname}
- install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
- make install SUBDIRS=mozilla DESTDIR=${pkgdir}
- mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
- install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
-
- (
- echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
- echo "# see update-ca-certificates man page"
- echo "# "
- cd ${pkgdir}/usr/share/ca-certificates
- find . -name '*.crt' | sort | cut -b3-
- ) > ${pkgdir}/etc/ca-certificates.conf
+package_ca-certificates() {
+ pkgdesc+=" (default providers)"
+ depends=(ca-certificates-{mozilla,cacert})
}
+
+# vim:set noet ts=8 sw=8:
diff --git a/abs/core/ca-certificates/ca-certificates-utils.install b/abs/core/ca-certificates/ca-certificates-utils.install
new file mode 100644
index 0000000..bf18c7f
--- /dev/null
+++ b/abs/core/ca-certificates/ca-certificates-utils.install
@@ -0,0 +1,29 @@
+export LC_ALL=C
+
+post_install() {
+ usr/bin/update-ca-trust
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 20140923-2) < 0 )); then
+ find /etc/ssl/certs -type l -print | while read symlink; do
+ case $(readlink $symlink) in
+ /usr/share/ca-certificates*) rm -f $symlink;;
+ esac
+ done
+ find /etc/ssl/certs -type l -print | while read symlink; do
+ test -f $symlink || rm -f $symlink
+ done
+ rm -f /etc/ssl/certs/ca-certificates.crt
+ fi
+}
+
+post_upgrade() {
+ usr/bin/update-ca-trust
+}
+
+pre_remove() {
+ usr/bin/update-ca-trust
+}
+
+# vim:set noet ts=8 sw=8:
diff --git a/abs/core/ca-certificates/ca-certificates.install b/abs/core/ca-certificates/ca-certificates.install
deleted file mode 100644
index cbd88e6..0000000
--- a/abs/core/ca-certificates/ca-certificates.install
+++ /dev/null
@@ -1,23 +0,0 @@
-export LC_ALL=C
-
-post_install() {
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
-}
-
-post_upgrade() {
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
-}
-
-pre_remove() {
- # clean up certificates
- local _backup=$(mktemp)
- mv etc/ca-certificates.conf ${_backup}
- echo > etc/ca-certificates.conf
- usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
- mv ${_backup} etc/ca-certificates.conf
-}
-
-post_remove() {
- # remove the cert file if it is empty
- [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt
-}
--
cgit v0.12
From f71e002e46efe03078d1fdb4b9461ed72dd7658c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 00:14:13 +0000
Subject: p11-kit: update to 20.7
---
abs/core/p11-kit/PKGBUILD | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/abs/core/p11-kit/PKGBUILD b/abs/core/p11-kit/PKGBUILD
index 639a279..6c74929 100644
--- a/abs/core/p11-kit/PKGBUILD
+++ b/abs/core/p11-kit/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $
+# $Id$
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=p11-kit
-pkgver=0.12
-pkgrel=1
+pkgver=0.20.7
+pkgrel=2
pkgdesc="Library to work with PKCS#11 modules"
arch=(i686 x86_64)
url="http://p11-glue.freedesktop.org"
license=('BSD')
-depends=(glibc)
-options=(!libtool)
-source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('66baf7ddde982d1b7294d3bd63be7446')
+depends=('glibc' 'libtasn1' 'libffi')
+source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('6648cad01a3080b685b8b3bf7372c91a'
+ 'SKIP')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
- --with-module-path=/usr/lib/pkcs11
+ --with-module-path=/usr/lib/pkcs11 \
+ --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
make
}
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
--
cgit v0.12
From b83ba0e3e6ab6dad181c0e6b8cbcf9b5d785185f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 00:39:12 +0000
Subject: ca-certificates-cacert: dep of ca-certificates
---
abs/core/ca-certificates-cacert/LICENSE | 34 ++++++++++++++++++++++
abs/core/ca-certificates-cacert/PKGBUILD | 26 +++++++++++++++++
.../ca-certificates-cacert.install | 11 +++++++
3 files changed, 71 insertions(+)
create mode 100644 abs/core/ca-certificates-cacert/LICENSE
create mode 100644 abs/core/ca-certificates-cacert/PKGBUILD
create mode 100644 abs/core/ca-certificates-cacert/ca-certificates-cacert.install
diff --git a/abs/core/ca-certificates-cacert/LICENSE b/abs/core/ca-certificates-cacert/LICENSE
new file mode 100644
index 0000000..d62429c
--- /dev/null
+++ b/abs/core/ca-certificates-cacert/LICENSE
@@ -0,0 +1,34 @@
+Root Distribution License
+
+1. Terms
+
+"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.
+"CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.
+"Member" means a natural or legal person who has agreed to the CAcert Community Agreement.
+"Certificate" means any certificate or like device to which CAcert Inc's digital signature has been affixed.
+"CAcert Root Certificates" means any certificate issued by CAcert Inc to itself for the purposes of signing further CAcert Roots or for signing certificates of Members.
+"RELY" means the human act in taking on a risk or liability on the basis of the claim(s) bound within a certificate issued by CAcert.
+"Embedded" means a certificate that is contained within a software application or hardware system, when and only when, that software application or system is distributed in binary form only.
+
+2. Copyright
+
+CAcert Root Certificates are Copyright CAcert Incorporated. All rights reserved.
+
+3. License
+
+You may copy and distribute CAcert Root Certificates only in accordance with this license.
+
+CAcert Inc grants you a free, non-exclusive license to copy and distribute CAcert Root Certificates in any medium, with or without modification, provided that the following conditions are met:
+
+ - Redistributions of Embedded CAcert Root Certificates must take reasonable steps to inform the recipient of the disclaimer in section 4 or reproduce this license and copyright notice in full in the documentation provided with the distribution.
+ - Redistributions in all other forms must reproduce this license and copyright notice in full.
+
+4. Disclaimer
+
+THE CACERT ROOT CERTIFICATES ARE PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED TO THE MAXIMUM EXTENT PERMITTED BY LAW. IN NO EVENT SHALL CACERT INC, ITS MEMBERS, AGENTS, SUBSIDIARIES OR RELATED PARTIES BE LIABLE TO THE LICENSEE OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THESE CERTIFICATES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IN ANY EVENT, CACERT'S LIABILITY SHALL NOT EXCEED $1,000.00 AUSTRALIAN DOLLARS.
+
+THIS LICENSE SPECIFICALLY DOES NOT PERMIT YOU TO RELY UPON ANY CERTIFICATES ISSUED BY CACERT INC. IF YOU WISH TO RELY ON CERTIFICATES ISSUED BY CACERT INC, YOU MUST ENTER INTO A SEPARATE AGREEMENT WITH CACERT INC.
+
+5. Statutory Rights
+
+Nothing in this license affects any statutory rights that cannot be waived or limited by contract. In the event that any provision of this license is held to be invalid or unenforceable, the remaining provisions of this license remain in full force and effect.
diff --git a/abs/core/ca-certificates-cacert/PKGBUILD b/abs/core/ca-certificates-cacert/PKGBUILD
new file mode 100644
index 0000000..f8bfeff
--- /dev/null
+++ b/abs/core/ca-certificates-cacert/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=ca-certificates-cacert
+pkgver=20140824
+pkgrel=2
+pkgdesc="CAcert.org root certificates"
+arch=(any)
+url="https://www.cacert.org/index.php?id=3"
+license=('custom:RDL')
+depends=(ca-certificates-utils)
+install=ca-certificates-cacert.install
+source=(CAcert.org_root.crt::http://www.cacert.org/certs/root.crt
+ CAcert.org_class3.crt::http://www.cacert.org/certs/class3.crt
+ LICENSE)
+sha256sums=('c0e0773a79dceb622ef6410577c19c1e177fb2eb9c623a49340de3c9f1de2560'
+ 'f5badaa5da1cc05b110a9492455a2c2790d00c7175dcf3a7bcb5441af71bf84f'
+ '2d9007a467e72d437ecfa13cc605c371e98a469f1aac4c890be74f953559833c')
+
+package() {
+ local _certdir="$pkgdir/usr/share/ca-certificates/trust-source/anchors"
+ install -d "$_certdir"
+ install -t "$_certdir" -m644 *.crt
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/abs/core/ca-certificates-cacert/ca-certificates-cacert.install b/abs/core/ca-certificates-cacert/ca-certificates-cacert.install
new file mode 100644
index 0000000..433c35a
--- /dev/null
+++ b/abs/core/ca-certificates-cacert/ca-certificates-cacert.install
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/update-ca-trust
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ post_install
+}
--
cgit v0.12
From 4bbba0604ff23298d109397862c5f88cdec32a2c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 00:49:50 +0000
Subject: nss: update to 3.17-4
---
abs/extra/nss/PKGBUILD | 34 +++--
abs/extra/nss/bundle.sh | 54 +++++++
abs/extra/nss/ca-certificates-mozilla.install | 2 +-
abs/extra/nss/certdata2pem.py | 199 ++++++++++++++++++++++++++
abs/extra/nss/certdata2pem.py-loudness.patch | 13 --
5 files changed, 270 insertions(+), 32 deletions(-)
create mode 100644 abs/extra/nss/bundle.sh
create mode 100644 abs/extra/nss/certdata2pem.py
delete mode 100644 abs/extra/nss/certdata2pem.py-loudness.patch
diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD
index d948ba2..7a06cec 100644
--- a/abs/extra/nss/PKGBUILD
+++ b/abs/extra/nss/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.17
-pkgrel=3
+pkgrel=4
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -14,21 +14,20 @@ depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
makedepends=('perl' 'python2')
options=('!strip' '!makeflags' 'staticlibs')
source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
- "certdata2pem.py::http://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?id=15470c64b5464d273556a290b1e7b50b32a2e5a0"
+ certdata2pem.py
+ bundle.sh
nss.pc.in
nss-config.in
- ssl-renegotiate-transitional.patch
- certdata2pem.py-loudness.patch)
+ ssl-renegotiate-transitional.patch)
sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81'
- '57bd6f309736825fc0edbf7d522726224764520595dfdddd0dba59158839e863'
+ 'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
+ '045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
- '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
- '90f8e72fbcca9ce907dcf6565bcd95ca23d2da5d87caee64c141ac54680f8703')
+ '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97')
prepare() {
mkdir certs
- patch --follow-symlinks certdata2pem.py certdata2pem.py-loudness.patch
cd nss-$pkgver
@@ -40,16 +39,18 @@ prepare() {
-i nss/coreconf/rules.mk
ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
+ ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
}
build() {
cd certs
python2 ../certdata2pem.py
- printf "mozilla/%s\n" *.crt > mozilla.conf
- test -s mozilla.conf
- cd ../nss-$pkgver/nss
+ cd ..
+ sh bundle.sh
+
+ cd nss-$pkgver/nss
export BUILD_OPT=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
@@ -112,11 +113,8 @@ package_ca-certificates-mozilla() {
depends=(ca-certificates-utils)
install=ca-certificates-mozilla.install
- cd certs
-
- local _certdir="$pkgdir/usr/share/ca-certificates/mozilla"
- install -d "$_certdir"
- install -t "$_certdir" -m644 *.crt
-
- install -Dm644 mozilla.conf "$pkgdir/etc/ca-certificates/conf.d/mozilla.conf"
+ local _certdir="$pkgdir/usr/share/ca-certificates/trust-source"
+ install -Dm644 ca-bundle.trust.crt "$_certdir/mozilla.trust.crt"
+ install -Dm644 ca-bundle.neutral-trust.crt "$_certdir/mozilla.neutral-trust.crt"
+ install -Dm644 ca-bundle.supplement.p11-kit "$_certdir/mozilla.supplement.p11-kit"
}
diff --git a/abs/extra/nss/bundle.sh b/abs/extra/nss/bundle.sh
new file mode 100644
index 0000000..253e64a
--- /dev/null
+++ b/abs/extra/nss/bundle.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+# From Fedora's ca-certificates.spec
+
+(
+ cat <<EOF
+# This is a bundle of X.509 certificates of public Certificate
+# Authorities. It was generated from the Mozilla root CA list.
+# These certificates are in the OpenSSL "TRUSTED CERTIFICATE"
+# format and have trust bits set accordingly.
+# An exception are auxiliary certificates, without positive or negative
+# trust, but are used to assist in finding a preferred trust path.
+# Those neutral certificates use the plain BEGIN CERTIFICATE format.
+#
+# Source: nss/lib/ckfw/builtins/certdata.txt
+# Source: nss/lib/ckfw/builtins/nssckbi.h
+#
+# Generated from:
+EOF
+ cat certs/nssckbi.h | grep -w NSS_BUILTINS_LIBRARY_VERSION | awk '{print "# " $2 " " $3}'
+ echo '#'
+) > ca-bundle.trust.crt
+for f in certs/*.crt; do
+ echo "processing $f"
+ tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
+ distbits=`sed -n '/^# openssl-distrust/{s/^.*=//;p;}' $f`
+ alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'`
+ targs=""
+ if [ -n "$tbits" ]; then
+ for t in $tbits; do
+ targs="${targs} -addtrust $t"
+ done
+ fi
+ if [ -n "$distbits" ]; then
+ for t in $distbits; do
+ targs="${targs} -addreject $t"
+ done
+ fi
+ if [ -n "$targs" ]; then
+ echo "trust flags $targs for $f" >> info.trust
+ openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> ca-bundle.trust.crt
+ else
+ echo "no trust flags for $f" >> info.notrust
+ # p11-kit-trust defines empty trust lists as "rejected for all purposes".
+ # That's why we use the simple file format
+ # (BEGIN CERTIFICATE, no trust information)
+ # because p11-kit-trust will treat it as a certificate with neutral trust.
+ # This means we cannot use the -setalias feature for neutral trust certs.
+ openssl x509 -text -in "$f" >> ca-bundle.neutral-trust.crt
+ fi
+done
+
+for p in certs/*.p11-kit; do
+ cat "$p" >> ca-bundle.supplement.p11-kit
+done
diff --git a/abs/extra/nss/ca-certificates-mozilla.install b/abs/extra/nss/ca-certificates-mozilla.install
index 0edbb0d..433c35a 100644
--- a/abs/extra/nss/ca-certificates-mozilla.install
+++ b/abs/extra/nss/ca-certificates-mozilla.install
@@ -1,5 +1,5 @@
post_install() {
- usr/bin/update-ca-certificates --fresh &>/dev/null
+ usr/bin/update-ca-trust
}
post_upgrade() {
diff --git a/abs/extra/nss/certdata2pem.py b/abs/extra/nss/certdata2pem.py
new file mode 100644
index 0000000..175de1a
--- /dev/null
+++ b/abs/extra/nss/certdata2pem.py
@@ -0,0 +1,199 @@
+#!/usr/bin/python
+# vim:set et sw=4:
+#
+# certdata2pem.py - splits certdata.txt into multiple files
+#
+# Copyright (C) 2009 Philipp Kern <pkern@debian.org>
+# Copyright (C) 2013 Kai Engert <kaie@redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+import base64
+import os.path
+import re
+import sys
+import textwrap
+import urllib
+
+objects = []
+
+def printable_serial(obj):
+ return ".".join(map(lambda x:str(ord(x)), obj['CKA_SERIAL_NUMBER']))
+
+# Dirty file parser.
+in_data, in_multiline, in_obj = False, False, False
+field, type, value, obj = None, None, None, dict()
+for line in open('certdata.txt', 'r'):
+ # Ignore the file header.
+ if not in_data:
+ if line.startswith('BEGINDATA'):
+ in_data = True
+ continue
+ # Ignore comment lines.
+ if line.startswith('#'):
+ continue
+ # Empty lines are significant if we are inside an object.
+ if in_obj and len(line.strip()) == 0:
+ objects.append(obj)
+ obj = dict()
+ in_obj = False
+ continue
+ if len(line.strip()) == 0:
+ continue
+ if in_multiline:
+ if not line.startswith('END'):
+ if type == 'MULTILINE_OCTAL':
+ line = line.strip()
+ for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
+ value += chr(int(i.group(1), 8))
+ else:
+ value += line
+ continue
+ obj[field] = value
+ in_multiline = False
+ continue
+ if line.startswith('CKA_CLASS'):
+ in_obj = True
+ line_parts = line.strip().split(' ', 2)
+ if len(line_parts) > 2:
+ field, type = line_parts[0:2]
+ value = ' '.join(line_parts[2:])
+ elif len(line_parts) == 2:
+ field, type = line_parts
+ value = None
+ else:
+ raise NotImplementedError, 'line_parts < 2 not supported.\n' + line
+ if type == 'MULTILINE_OCTAL':
+ in_multiline = True
+ value = ""
+ continue
+ obj[field] = value
+if len(obj.items()) > 0:
+ objects.append(obj)
+
+# Build up trust database.
+trustmap = dict()
+for obj in objects:
+ if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
+ continue
+ key = obj['CKA_LABEL'] + printable_serial(obj)
+ trustmap[key] = obj
+ print " added trust", key
+
+# Build up cert database.
+certmap = dict()
+for obj in objects:
+ if obj['CKA_CLASS'] != 'CKO_CERTIFICATE':
+ continue
+ key = obj['CKA_LABEL'] + printable_serial(obj)
+ certmap[key] = obj
+ print " added cert", key
+
+def obj_to_filename(obj):
+ label = obj['CKA_LABEL'][1:-1]
+ label = label.replace('/', '_')\
+ .replace(' ', '_')\
+ .replace('(', '=')\
+ .replace(')', '=')\
+ .replace(',', '_')
+ label = re.sub(r'\\x[0-9a-fA-F]{2}', lambda m:chr(int(m.group(0)[2:], 16)), label)
+ serial = printable_serial(obj)
+ return label + ":" + serial
+
+trust_types = {
+ "CKA_TRUST_DIGITAL_SIGNATURE": "digital-signature",
+ "CKA_TRUST_NON_REPUDIATION": "non-repudiation",
+ "CKA_TRUST_KEY_ENCIPHERMENT": "key-encipherment",
+ "CKA_TRUST_DATA_ENCIPHERMENT": "data-encipherment",
+ "CKA_TRUST_KEY_AGREEMENT": "key-agreement",
+ "CKA_TRUST_KEY_CERT_SIGN": "cert-sign",
+ "CKA_TRUST_CRL_SIGN": "crl-sign",
+ "CKA_TRUST_SERVER_AUTH": "server-auth",
+ "CKA_TRUST_CLIENT_AUTH": "client-auth",
+ "CKA_TRUST_CODE_SIGNING": "code-signing",
+ "CKA_TRUST_EMAIL_PROTECTION": "email-protection",
+ "CKA_TRUST_IPSEC_END_SYSTEM": "ipsec-end-system",
+ "CKA_TRUST_IPSEC_TUNNEL": "ipsec-tunnel",
+ "CKA_TRUST_IPSEC_USER": "ipsec-user",
+ "CKA_TRUST_TIME_STAMPING": "time-stamping",
+ "CKA_TRUST_STEP_UP_APPROVED": "step-up-approved",
+}
+
+openssl_trust = {
+ "CKA_TRUST_SERVER_AUTH": "serverAuth",
+ "CKA_TRUST_CLIENT_AUTH": "clientAuth",
+ "CKA_TRUST_CODE_SIGNING": "codeSigning",
+ "CKA_TRUST_EMAIL_PROTECTION": "emailProtection",
+}
+
+for tobj in objects:
+ if tobj['CKA_CLASS'] == 'CKO_NSS_TRUST':
+ key = tobj['CKA_LABEL'] + printable_serial(tobj)
+ print "producing trust for " + key
+ trustbits = []
+ distrustbits = []
+ openssl_trustflags = []
+ openssl_distrustflags = []
+ for t in trust_types.keys():
+ if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
+ trustbits.append(t)
+ if t in openssl_trust:
+ openssl_trustflags.append(openssl_trust[t])
+ if tobj.has_key(t) and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
+ distrustbits.append(t)
+ if t in openssl_trust:
+ openssl_distrustflags.append(openssl_trust[t])
+
+ fname = obj_to_filename(tobj)
+ try:
+ obj = certmap[key]
+ except:
+ obj = None
+
+ if obj != None:
+ fname += ".crt"
+ else:
+ fname += ".p11-kit"
+
+ f = open(fname, 'w')
+ if obj != None:
+ f.write("# alias=%s\n"%tobj['CKA_LABEL'])
+ f.write("# trust=" + " ".join(trustbits) + "\n")
+ f.write("# distrust=" + " ".join(distrustbits) + "\n")
+ if openssl_trustflags:
+ f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
+ if openssl_distrustflags:
+ f.write("# openssl-distrust=" + " ".join(openssl_distrustflags) + "\n")
+ f.write("-----BEGIN CERTIFICATE-----\n")
+ f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
+ f.write("\n-----END CERTIFICATE-----\n")
+ else:
+ f.write("[p11-kit-object-v1]\n")
+ f.write("label: ");
+ f.write(tobj['CKA_LABEL']);
+ f.write("\n")
+ f.write("class: certificate\n")
+ f.write("certificate-type: x-509\n")
+ f.write("issuer: \"");
+ f.write(urllib.quote(tobj['CKA_ISSUER']));
+ f.write("\"\n")
+ f.write("serial-number: \"");
+ f.write(urllib.quote(tobj['CKA_SERIAL_NUMBER']));
+ f.write("\"\n")
+ if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'):
+ f.write("x-distrusted: true\n")
+ f.write("\n\n")
+ print " -> written as '%s', trust = %s, openssl-trust = %s, distrust = %s, openssl-distrust = %s" % (fname, trustbits, openssl_trustflags, distrustbits, openssl_distrustflags)
diff --git a/abs/extra/nss/certdata2pem.py-loudness.patch b/abs/extra/nss/certdata2pem.py-loudness.patch
deleted file mode 100644
index 5ae0d4c..0000000
--- a/abs/extra/nss/certdata2pem.py-loudness.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- certdata2pem.py 2014-08-24 15:16:24.927192958 +0200
-+++ certdata2pem.py.loudness 2014-08-24 15:17:30.193535402 +0200
-@@ -104,9 +104,7 @@
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED',
- 'CKT_NSS_NOT_TRUSTED'):
-- print '!'*74
-- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
-- print '!'*74
-+ print "Certificate %s untrusted, ignoring." % obj['CKA_LABEL']
- else:
- print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
- (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
--
cgit v0.12
From 79d5baf7831c76a799a5e73f6e21e877dccc133c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 13:02:26 +0000
Subject: ca-certificates-java: replaced by ca-certificates-utils
---
abs/extra/ca-certificates-java/PKGBUILD | 46 ----------------------
.../ca-certificates-java.install | 18 ---------
abs/extra/ca-certificates-java/init-jks-keystore | 10 -----
abs/extra/ca-certificates-java/jks-keystore.hook | 15 -------
4 files changed, 89 deletions(-)
delete mode 100644 abs/extra/ca-certificates-java/PKGBUILD
delete mode 100644 abs/extra/ca-certificates-java/ca-certificates-java.install
delete mode 100644 abs/extra/ca-certificates-java/init-jks-keystore
delete mode 100644 abs/extra/ca-certificates-java/jks-keystore.hook
diff --git a/abs/extra/ca-certificates-java/PKGBUILD b/abs/extra/ca-certificates-java/PKGBUILD
deleted file mode 100644
index cafb68d..0000000
--- a/abs/extra/ca-certificates-java/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=ca-certificates-java
-pkgver=20130815
-pkgrel=1
-pkgdesc='Common CA certificates (JKS keystore)'
-arch=('any')
-url='http://packages.qa.debian.org/c/ca-certificates-java.html'
-license=('GPL')
-depends=('ca-certificates')
-makedepends=('jdk7-openjdk')
-checkdepends=('junit')
-install='ca-certificates-java.install'
-backup=('etc/default/cacerts')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
- 'init-jks-keystore' 'jks-keystore.hook')
-md5sums=('f93e4762800515d6f12ceb397e80a150'
- '75eeca3f443f4b5a17ed5ac81875f1e9'
- '6dd4f915aee0df51260083e00b7fa012')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- javac -target 1.6 -source 1.6 UpdateCertificates.java
- jar cfe ca-certificates-java.jar UpdateCertificates *.class
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- javac -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar \
- UpdateCertificatesTest.java Exceptions.java
- java -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar:. \
- org.junit.runner.JUnitCore \
- UpdateCertificatesTest
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- install -d -m755 ${pkgdir}/etc/ssl/certs/java
- install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
- install -D -m644 ca-certificates-java.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
- install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/bin/init-jks-keystore
- install -D -m755 ${srcdir}/jks-keystore.hook ${pkgdir}/etc/ca-certificates/update.d/jks-keystore
-}
diff --git a/abs/extra/ca-certificates-java/ca-certificates-java.install b/abs/extra/ca-certificates-java/ca-certificates-java.install
deleted file mode 100644
index 3cbcb16..0000000
--- a/abs/extra/ca-certificates-java/ca-certificates-java.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- if [ ! -f etc/ssl/certs/java/cacerts ]; then
- if which java >/dev/null 2>&1; then
- usr/bin/init-jks-keystore
- fi
- fi
-}
-
-post_upgrade() {
- if [ $(vercmp $2 20110426-2) -lt 0 ]; then
- mv etc/ssl/certs/java/cacerts etc/ssl/certs/java/cacerts.pacsave
- fi
- post_install
-}
-
-post_remove() {
- rm -rf etc/ssl/certs/java
-}
diff --git a/abs/extra/ca-certificates-java/init-jks-keystore b/abs/extra/ca-certificates-java/init-jks-keystore
deleted file mode 100644
index 0758420..0000000
--- a/abs/extra/ca-certificates-java/init-jks-keystore
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-storepass='changeit'
-. /etc/default/cacerts
-
-JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
-
-find /etc/ssl/certs -name '*.pem' -printf "+%p\n" | \
- java -jar $JAR -storepass "$storepass" >/dev/null
-echo "done."
diff --git a/abs/extra/ca-certificates-java/jks-keystore.hook b/abs/extra/ca-certificates-java/jks-keystore.hook
deleted file mode 100644
index 67d9eda..0000000
--- a/abs/extra/ca-certificates-java/jks-keystore.hook
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-storepass='changeit'
-. /etc/default/cacerts
-
-echo ""
-if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then
- echo "updates of cacerts keystore disabled."
- exit 0
-fi
-
-JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
-
-java -jar $JAR -storepass "$storepass"
-echo "done."
--
cgit v0.12
From 92fb0b186e45636629bf664be894bce17d647227 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 13:46:48 +0000
Subject: mythexpress: update to latest
---
abs/extra/mythexpress/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/mythexpress/PKGBUILD b/abs/extra/mythexpress/PKGBUILD
index 51e5c32..6db4c3f 100755
--- a/abs/extra/mythexpress/PKGBUILD
+++ b/abs/extra/mythexpress/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mythexpress
-pkgver=20131218
+pkgver=20140923
pkgrel=1
pkgdesc="MythExpress is a browser-based interface to MythTV HTTP streaming capability"
arch=('i686' 'x86_64')
--
cgit v0.12
From f8ce667472792cb6d00949bce1488e2303c1cc4b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 15:36:36 +0000
Subject: nodejs: update to 0.10.32
---
abs/extra/nodejs/PKGBUILD | 69 ++++++++++++++++++++++++++++++++++-------------
1 file changed, 50 insertions(+), 19 deletions(-)
diff --git a/abs/extra/nodejs/PKGBUILD b/abs/extra/nodejs/PKGBUILD
index 7cada4d..2bb2da5 100644
--- a/abs/extra/nodejs/PKGBUILD
+++ b/abs/extra/nodejs/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 78912 2012-10-27 18:07:12Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: James Campos <james.r.campos@gmail.com>
# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -8,20 +9,31 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
pkgname=nodejs
-pkgver=0.8.14
-pkgrel=1
+pkgver=0.10.32
+_npmver=2.0.2
+pkgrel=3
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64')
url='http://nodejs.org/'
license=('MIT')
-depends=('openssl' 'python2' 'v8')
-checkdepends=('curl') # curl used for check()
+depends=('openssl')
+provides=('nodejs-node-gyp')
+makedepends=('python2' 'git' 'procps-ng')
+optdepends=('python2: for node-gyp')
+checkdepends=('curl')
options=('!emptydirs')
-source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-md5sums=('284fd2c7578064c339d9cf6a3a475ac7')
+source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
+ git+https://github.com/npm/npm.git#tag=v$_npmver)
+sha256sums=('c2120d0e3d2d191654cb11dbc0a33a7216d53732173317681da9502be0030f10'
+ 'SKIP')
-build() {
- cd node-v${pkgver}
+prepare() {
+ cd node-v$pkgver
+
+ # We need newer version of npm to fix bugs
+ rm -r deps/npm
+ ln -s "$srcdir/npm" deps
+ rm -r "$srcdir/npm/.git"
msg 'Fixing for python2 name'
find -type f -exec sed \
@@ -30,32 +42,51 @@ build() {
-e 's_^#!/usr/bin/python$_&2_' \
-e "s_'python'_'python2'_" -i {} \;
find test/ -type f -exec sed 's_python _python2 _' -i {} \;
- export PYTHON=python2
+}
+
+build() {
+ cd node-v$pkgver
+ export PYTHON=python2
./configure \
--prefix=/usr \
--shared-openssl
make
+
+ cd ../npm
+ ../node-v$pkgver/node cli.js install ronn marked
+ PATH="$srcdir/node-v$pkgver:$PATH" make
+ ../node-v$pkgver/node cli.js uninstall ronn marked
}
check() {
- cd node-v${pkgver}
- make test || true
+ cd node-v$pkgver
+ make test || warning "Tests failed"
}
package() {
- cd node-v${pkgver}
+ cd node-v$pkgver
- make DESTDIR=$pkgdir install
+ make DESTDIR="$pkgdir" install
# install docs as per user request
- install -d $pkgdir/usr/share/doc/nodejs
- cp -r doc/api/*.html \
- $pkgdir/usr/share/doc/nodejs
+ install -d "$pkgdir"/usr/share/doc/nodejs
+ cp -r doc/api/{*.html,assets} \
+ "$pkgdir"/usr/share/doc/nodejs
install -D -m644 LICENSE \
- $pkgdir/usr/share/licenses/nodejs/LICENSE
+ "$pkgdir"/usr/share/licenses/nodejs/LICENSE
+
+ install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
+ for _dir in man1 man3 man5 man7; do
+ cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
+ for _file in *; do
+ ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
+ done
+ done
+
+ ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
}
# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 91fbd154061ff8b53cc7eb647e64b72a67c562b2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 15:37:02 +0000
Subject: mythexpress: recompile
---
abs/extra/mythexpress/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/mythexpress/PKGBUILD b/abs/extra/mythexpress/PKGBUILD
index 6db4c3f..d0d3dc6 100755
--- a/abs/extra/mythexpress/PKGBUILD
+++ b/abs/extra/mythexpress/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythexpress
pkgver=20140923
-pkgrel=1
+pkgrel=2
pkgdesc="MythExpress is a browser-based interface to MythTV HTTP streaming capability"
arch=('i686' 'x86_64')
url="https://github.com/MythTV-Clients/MythExpress"
--
cgit v0.12
From c448687a1bb25b3bec0f424c8dc0ab1a41d12681 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 23 Sep 2014 18:25:05 +0000
Subject: linhes-theme: change all corner radius to macth selected buttons
show channel icon when there is no coverart.
---
abs/core/linhes-theme/PKGBUILD | 6 +--
abs/core/linhes-theme/base.xml.patch | 76 +++++++++++++++++++++++++++++++++++-
abs/core/linhes-theme/osd.xml.patch | 31 +++++++++++++--
3 files changed, 105 insertions(+), 8 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 33e2c49..cb85af5 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=3
+pkgrel=4
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -77,8 +77,8 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- 'ed4f8baf431e20babc345e4e2602426f'
- 'cb8c0d63392f6c8c2d8219243fbf47c6'
+ '51e11c48dc73467f7c94644b6db1b840'
+ '71f4fa39d7fefe5443ef0f7bd6820ccd'
'c75c83b90969fb07755062113f858e88'
'9fe3371a8b964a7028126405cfaa330b'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 588ce42..13aba27 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,14 @@
---- base.xml.orig 2014-01-02 20:11:41.055260777 +0000
-+++ base.xml 2014-01-22 01:11:14.443221510 +0000
+--- base.xml.orig 2014-09-23 18:09:09.984607409 +0000
++++ base.xml 2014-09-23 18:09:22.626356280 +0000
+@@ -411,7 +411,7 @@
+ <area>283,436,50,11</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="200" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+
+ <shape name="base_backdrop_line">
@@ -424,7 +424,7 @@
<!-- Base definition of a base popup backdrop -->
@@ -9,3 +18,66 @@
</shape>
<!-- Base definition of a heading group -->
+@@ -863,7 +863,7 @@
+ <type>roundbox</type>
+ <fill color="#1a1a1a" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ <shape name="select_bar_top_highlight">
+ <area>0,0,100%,2</area>
+@@ -956,7 +956,7 @@
+ <type>roundbox</type>
+ <fill color="#333333" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ </group>
+
+@@ -967,7 +967,7 @@
+ <type>roundbox</type>
+ <fill color="#1a1a1a" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ <shape name="select_bar_top_highlight">
+ <area>0,0,100%,2</area>
+@@ -1060,7 +1060,7 @@
+ <type>roundbox</type>
+ <fill color="#333333" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ </group>
+
+@@ -1071,7 +1071,7 @@
+ <type>roundbox</type>
+ <fill color="#1a1a1a" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ <shape name="select_bar_top_highlight">
+ <area>0,0,100%,2</area>
+@@ -1164,7 +1164,7 @@
+ <type>roundbox</type>
+ <fill color="#1a1a1a" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ </group>
+
+@@ -1233,7 +1233,7 @@
+ <type>roundbox</type>
+ <fill color="#333333" alpha="175" />
+ <line color="#454545" alpha="180" width="2" />
+- <cornerradius>90</cornerradius>
++ <cornerradius>5</cornerradius>
+ </shape>
+ </group>
+
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 67748f7..b6cb761 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,6 +1,29 @@
---- osd.xml.orig 2014-01-02 19:56:57.605092545 +0000
-+++ osd.xml 2014-01-02 20:02:34.958563960 +0000
-@@ -996,12 +996,12 @@
+--- osd.xml.orig 2014-09-23 17:43:57.630552593 +0000
++++ osd.xml 2014-09-23 17:46:50.325639736 +0000
+@@ -975,19 +975,19 @@
+ <template>%LONGREPEAT% Size: %FILESIZE_STR%</template>
+ </textarea>
+
+- <textarea name="channum">
++ <textarea name="channum" depends="!coverart">
+ <font>large</font>
+ <area>68,490,162,46</area>
+ <align>allcenter</align>
+ </textarea>
+
+- <textarea name="callsign">
++ <textarea name="callsign" depends="!coverart">
+ <font>large</font>
+ <area>68,634,162,46</area>
+ <align>allcenter</align>
+ </textarea>
+
+- <imagetype name="iconpath">
++ <imagetype name="iconpath" depends="!coverart">
+ <area>84,536,130,98</area>
+ <preserveaspect>true</preserveaspect>
+ <mask>images/osd/masks/osd_program_icon_mask.png</mask>
+@@ -996,12 +996,14 @@
<!-- Commit 6216029d2 makes this show up in both recordings and video. -->
<!-- Since I only want it in video and there is no way to control it. I have no choice but to disable it. -->
@@ -8,6 +31,8 @@
+
<imagetype name="coverart">
<area>70,492,158,186</area>
++ <preserveaspect>true</preserveaspect>
++ <mask>images/masks/watchrecordings_coverart_mask.png</mask>
<alpha>255</alpha>
</imagetype>
--->
--
cgit v0.12
From 1620aea86b123aec654f9f19cb0502379b441118 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 26 Sep 2014 18:25:55 +0000
Subject: webmin: update to 1.700
---
abs/extra/webmin/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD
index bf05a4f..5e0da7e 100644
--- a/abs/extra/webmin/PKGBUILD
+++ b/abs/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
-pkgver=1.680
+pkgver=1.700
pkgrel=1
pkgdesc="a web-based interface for system administration"
arch=(i686 x86_64)
@@ -210,7 +210,7 @@ package() {
# install license
install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
}
-md5sums=('52654bd0fe36e9cace00fa74e49d41d8'
+md5sums=('e5261114a6a6ed10caf570d3239ed5b7'
'b0b3e3fb231a12e60165b6b4d604dcfa'
'bfebb75bb94029b48c46b7f1ba1aa811'
'fc29ecb6a5cd8c278abe054e60381095')
--
cgit v0.12
From 38f5e9792089593ffefef6155b569b302657a664 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 26 Sep 2014 18:35:17 +0000
Subject: LinHES-system: myth_mtc.py: remove items from inuseprograms that are
older than 4 hours
mythtv housekeeper does this daily, but sometimes that isn't often enough for the mtc script
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/myth_mtc.py | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 04d0d50..ad23218 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -79,7 +79,7 @@ md5sums=('a10cb96850951ae835c46f41f92463b2'
'de32a1c50101265dd7f6ca5037f7a26a'
'301884fb60521627fffd1160b2cf5181'
'76b2637cac0452b3acdbeeb4e8a5474b'
- '8dcdd10f5551a45d6e8681800fafe7e0'
+ '0149e77a12d30f1050dd3990f6f1f123'
'dc3eef2a624754e16805d72bbe488b67'
'617af86b901538817ebdcaf646248dc5'
'542e670e78d117657f93141e9689f54d'
diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py
index db6b42a..b1ec75d 100755
--- a/abs/core/LinHES-system/myth_mtc.py
+++ b/abs/core/LinHES-system/myth_mtc.py
@@ -29,7 +29,7 @@ def optimize():
cursor.execute("SHOW tables")
result = cursor.fetchall()
except:
- print " Problem getting tables from database"
+ print "\n%s Problem getting tables from the database" %(get_timestamp())
return
ops=["REPAIR","OPTIMIZE","ANALYZE"]
for row in result:
@@ -39,6 +39,16 @@ def optimize():
cmd= "%s table %s" %(op,ctable)
cursor.execute(cmd)
+def cleanup_inuseprograms():
+ fourHoursAgo=datetime.datetime.today() - datetime.timedelta(hours=4)
+ cmd="DELETE FROM inuseprograms WHERE lastupdatetime < '%s';" %fourHoursAgo
+ try:
+ cursor = mythtv.db.cursor()
+ cursor.execute(cmd)
+ except:
+ print "\n%s Problem cleaning inuseprograms in database" %(get_timestamp())
+
+
def bail_if_another_is_running():
cmd = shlex.split("pgrep -u {} -f {}".format(os.getuid(), __file__))
pids = subprocess.check_output(cmd).strip().split('\n')
@@ -74,6 +84,7 @@ bail_if_another_is_running()
starttime=time.time()
ctin=True
while ctin:
+ cleanup_inuseprograms()
ctin=run_stuff()
if ctin:
print "\n%s Waiting 10 minutes before trying again." %(get_timestamp())
@@ -84,4 +95,3 @@ while ctin:
ctin = False
print "\n%s Time Exceeded 50 minutes. Quitting.)" %(get_timestamp())
exit(1)
-
--
cgit v0.12
From f2c351dcd00ccb5c8e1e896a96d5f224f8385164 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 15:12:36 +0000
Subject: mythinstall: check pacman to see if db agrees with installed programs
closes #976
---
.../MythVantage-app/mythinstall/main.cpp | 92 +++++++++++++++++++++-
abs/core/mythinstall/PKGBUILD | 2 +-
2 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
index fa16918..bac24ad 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
@@ -100,8 +100,8 @@ int main(int argc, char **argv)
QString question;
- int FRONTEND_EXIT_NO_MYTHCONTEXT = 1;
- int FRONTEND_EXIT_INVALID_CMDLINE =1 ;
+// int FRONTEND_EXIT_NO_MYTHCONTEXT = 1;
+// int FRONTEND_EXIT_INVALID_CMDLINE =1 ;
QApplication a(argc, argv);
QCoreApplication::setApplicationName("mythinstall");
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
LOG(VB_GENERAL, LOG_INFO, QString("mythinstall: Screen stuff"));
QString tmpArg = (cmdline.toString("screen")) ;
QStringList pairs = QStringList::split(",", tmpArg);
- for (unsigned int index = 0; index < pairs.size(); ++index)
+ for (int index = 0; index < pairs.size(); ++index)
{
if ( pairs[index] == "network" )
{
@@ -305,6 +305,92 @@ int main(int argc, char **argv)
system("cp -f /etc/systemconfig /tmp/systemconfig.bak");
QString olddb = gCoreContext->GetSetting("HostMysqlserver");
QString oldhostype = gCoreContext->GetSetting("HostSystemType");
+
+ //sync db with pacman
+ if (bShowplugins || bShowsoftware)
+ {
+ system("pacman -Q > /tmp/pacman_installed");
+ QString progPacmanNamesArray[] = { "mythappletrailers",
+ "mytharchive",
+ "mythbrowser",
+ "mythgallery",
+ "mythgame",
+ "dolphin-emu",
+ "fceux",
+ "sdlmame",
+ "mednafen",
+ "mupen64plus-svn",
+ "romdb",
+ "snes9x",
+ "xe",
+ "mythmusic",
+ "mythnetvision",
+ "mythnews",
+ "libdvdcss",
+ "mythweather",
+ "mythzoneminder",
+ "huludesktop",
+ "miro",
+ "xbmc",
+ "web-on-linhes",
+ "foldingathome"};
+ QString progDBNamesArray[] = { "Hostpluginmythappletrailers",
+ "Hostpluginmytharchive",
+ "Hostpluginmythbrowser",
+ "Hostpluginmythgallery",
+ "Hostpluginmythgame",
+ "HostpluginmythgameDolphin",
+ "Hostpluginmythgamefceux",
+ "HostpluginmythgameMame",
+ "HostpluginmythgameMednafen",
+ "Hostpluginmythgamemupen64",
+ "HostpluginmythgameROMDB",
+ "Hostpluginmythgamesnes9x",
+ "HostpluginmythgameXe",
+ "Hostpluginmythmusic",
+ "Hostpluginmythnetvision",
+ "Hostpluginmythnews",
+ "Hostpluginmythvideo_dvdcss",
+ "Hostpluginmythweather",
+ "Hostpluginmythzoneminder",
+ "HostHuluDesktop",
+ "HostMiro",
+ "HostXBMC",
+ "Hostwebonlinhes",
+ "Hostfoldingathome"};
+ char cmd[200];
+ int grepstatus;
+ int pacmanNamesArraySize = sizeof(progPacmanNamesArray) / sizeof(progPacmanNamesArray[0]);
+
+ //for loop to run though progPacmanNamesArray
+ for(int i = 0; i < pacmanNamesArraySize; i++)
+ {
+ QByteArray PacName = progPacmanNamesArray[i].toLocal8Bit();
+ const char *PacNameChar = PacName.data();
+ sprintf(cmd, "grep -q '%s ' /tmp/pacman_installed", PacNameChar);
+
+ //LOG(VB_GENERAL, LOG_INFO, QString(progPacmanNamesArray[i]));
+ //LOG(VB_GENERAL, LOG_INFO, QString(progDBNamesArray[i]));
+ QString currDBValue = gCoreContext->GetSetting(progDBNamesArray[i]);
+ //LOG(VB_GENERAL, LOG_INFO, QString(currDBValue));
+ grepstatus = system(cmd);
+ if ( grepstatus != 0 && currDBValue == "1" )
+ {
+ //LOG(VB_GENERAL, LOG_INFO, QString("pkg NOT found and db 1"));
+ gCoreContext->SaveSetting(progDBNamesArray[i],"0" );
+ runconfig = true;
+ }
+ else if ( grepstatus == 0 && currDBValue == "0" )
+ {
+ //LOG(VB_GENERAL, LOG_INFO, QString("pkg found and db 0"));
+ gCoreContext->SaveSetting(progDBNamesArray[i],"1" );
+ runconfig = true;
+ }
+ }
+ system("rm -f /tmp/pacman_installed");
+ }
+ //DONE sync db with pacman
+
runsettings(false,bShowNetwork,bShowHostype,bShowMisc,bShowshutdown,bShowadvanced,bShowsound,bShowadvancedX,bShowAccesscontrol,bShowplugins,bShowsoftware,bShowuser,bShowwebuser,bShowddns,bShowinfrared,bShowscreensaver,bShowsupplemental,bShowremotes_only,bShowvnc,bShowFileshare);
QString newdb = gCoreContext->GetSetting("HostMysqlserver");
QString newhostype = gCoreContext->GetSetting("HostSystemType");
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index ada24b9..b741439 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.2
-pkgrel=1
+pkgrel=2
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From cf5321dbb75fb489f82fd9e66ce7a02d60516645 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 16:06:37 +0000
Subject: update81-82.sh: initial commit
---
abs/core/update81-82.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 107 insertions(+)
create mode 100644 abs/core/update81-82.sh
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
new file mode 100644
index 0000000..f1c6d96
--- /dev/null
+++ b/abs/core/update81-82.sh
@@ -0,0 +1,107 @@
+#!/bin/bash
+#This script should be used to update from R8.1 to R8.2 ONLY
+#
+
+#touch /bin/this_should_stop_it
+
+echo ""
+echo "About to update the OS to LinHES 8.2"
+echo "This process will only work if currently running LinHES 8.1 or later"
+echo "* Please respond with Y to all the yes/no questions"
+echo "* Answer Y to remove sysvinit"
+echo "* If prompted about libgl, select the gl that is appropiate for your system"
+echo ""
+echo "Press Y to continue, any other key to stop"
+
+
+read a
+if [ x$a != "xY" ]
+then
+ echo " Y NOT selected, exiting"
+ exit 3
+fi
+
+
+
+
+
+echo "Downloading filesystem and glibc for later use, please wait"
+wget -q http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz -O filesystem-itermediate.pkg.tar.xz
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "Couldn't download filesystem pkg"
+ exit 1
+else
+ echo "Filesystem pkg downloaded"
+fi
+
+wget -q http://linhes.org/repo/x86_64/core-testing/glibc-2.18-11-x86_64.pkg.tar.xz -O glibc-2.18-11-x86_64.pkg.tar.xz
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "Couldn't download glibc pkg"
+ exit 1
+else
+ echo "glibc pkg downloaded"
+fi
+
+
+
+
+pacman -Sy --noconfirm tdb
+echo "Removing select symlinks and files not in poweroff-scripts package "
+
+rm -f /usr/lib/libtalloc.so.1
+rm -f /usr/lib/libtalloc.so.2
+
+rm -f /usr/sbin/re*
+rm -f /usr/sbin/pow*
+rm -f /usr/sbin/hal*
+rm -f /sbin/re*
+rm -f /sbin/pow*
+rm -f /sbin/hal*
+
+
+pacman -Syu --ignore filesystem,bash,glibc
+pacman -R tcp_wrappers --noconfirm
+pacman -S bash --noconfirm
+
+
+
+
+
+pacman -U ./glibc-2.18-11-x86_64.pkg.tar.xz ./filesystem-itermediate.pkg.tar.xz --noconfirm
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "Filesystem update was unable to install"
+ echo "Please check /bin /usr/sbin /sbin "
+ echo "for packages that need to be updated"
+ exit 2
+fi
+pacman -Su
+
+
+if [ -e /etc/udev/rules.d/80-net-name-slot.rules ]
+then
+ rm -f /etc/udev/rules.d/80-net-name-slot.rules
+fi
+
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+
+pacman -S linux --noconfirm
+pacman -S filesystem --noconfirm
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "Filesystem update was unable to install"
+ echo "Please check /bin /usr/sbin /sbin "
+ echo "for packages that need to be updated"
+ exit 2
+else
+ echo "New filesystem in place"
+ echo "upgrade was a success"
+ echo "please reboot"
+fi
+
--
cgit v0.12
From 0cb1a73b8e97817b28c4b12fc849731d0f33bef2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 16:55:29 +0000
Subject: readline: update to 6.3.006
---
abs/core/readline/PKGBUILD | 71 ++++++++++++++++++++++++++--------------------
1 file changed, 40 insertions(+), 31 deletions(-)
diff --git a/abs/core/readline/PKGBUILD b/abs/core/readline/PKGBUILD
index 037b7e1..f8dfe0d 100644
--- a/abs/core/readline/PKGBUILD
+++ b/abs/core/readline/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=readline
-_basever=6.2
-_patchlevel=004 #prepare for some patches
+_basever=6.3
+_patchlevel=006
pkgver=$_basever.$_patchlevel
pkgrel=1
-pkgdesc="GNU readline library"
+pkgdesc='GNU readline library'
arch=('i686' 'x86_64')
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
+url='http://tiswww.case.edu/php/chet/readline/rltop.html'
license=('GPL')
depends=('glibc' 'ncurses')
backup=('etc/inputrc')
@@ -17,43 +18,51 @@ options=('!emptydirs')
install=readline.install
source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
inputrc)
-if [ $_patchlevel -gt 00 ]; then
- for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
- source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
+
+if [[ $_patchlevel -gt 0 ]]; then
+ for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do
+ source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//.}-$(printf "%03d" $_p){,.sig})
done
fi
-md5sums=('67948acb2ca081f23359d0256e9a271c'
- '928f7d248320a65e43c2dc427e99582b'
- '58d54966c1191db45973cb3191ac621a'
- '83287d52a482f790dfb30ec0a8746669'
- '8e6a51e2e0e6e45a82752e3692c111ac'
- '0665020ea118e8434bd145fb71f452cc'
- '285361ca6d48c51ae2428157e174e812'
- 'c9d5d79718856e711667dede87cb7622'
- '4437205bb1462f5f32e4812b8292c675'
- 'c08e787f50579ce301075c523fa660a4'
- '7e39cad1d349b8ae789e4fc33dbb235f')
-build() {
- cd ${srcdir}/${pkgname}-$_basever
- for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
- msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
- patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
+prepare() {
+ cd $pkgname-$_basever
+ for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do
+ msg "applying patch readline${_basever//.}-$(printf "%03d" $_p)"
+ patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p)
done
- # Remove RPATH from shared objects (FS#14366)
+ # remove RPATH from shared objects (FS#14366)
sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
+}
+
+build() {
+ cd $pkgname-$_basever
# build with -fPIC for x86_64 (FS#15634)
- [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
+ [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
./configure --prefix=/usr
make SHLIB_LIBS=-lncurses
}
package() {
- cd ${srcdir}/${pkgname}-$_basever
- make DESTDIR=${pkgdir} install
-
- install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+ make -C $pkgname-$_basever DESTDIR="$pkgdir" install
+ install -Dm644 inputrc "$pkgdir"/etc/inputrc
}
+
+md5sums=('33c8fb279e981274f485fd91da77e94a'
+ 'SKIP'
+ '58d54966c1191db45973cb3191ac621a'
+ '4343f5ea9b0f42447f102fb61576b398'
+ 'SKIP'
+ '700295212f7e2978577feaee584afddb'
+ 'SKIP'
+ 'af4963862f5156fbf9111c2c6fa86ed7'
+ 'SKIP'
+ '11f9def89803a5052db3ba72394ce14f'
+ 'SKIP'
+ '93721c31cd225393f80cb3aadb165544'
+ 'SKIP'
+ '71dc6ecce66d1489b96595f55d142a52'
+ 'SKIP')
--
cgit v0.12
From 673c045f6d88e17938c25c3fd4a0a78ea0cf0ee7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 17:15:37 +0000
Subject: bash: update to 4.3.027
closes #977
---
abs/core/bash/PKGBUILD | 169 +++++++++------------
...2-do-not-use-memcpy-on-overlapping-memory.patch | 12 --
abs/core/bash/parser-oob-4.2.patch | 85 +++++++++++
abs/core/bash/privmode-setuid-fail.patch | 29 ++++
abs/core/bash/system.bashrc | 6 +-
5 files changed, 186 insertions(+), 115 deletions(-)
delete mode 100644 abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
create mode 100644 abs/core/bash/parser-oob-4.2.patch
create mode 100644 abs/core/bash/privmode-setuid-fail.patch
diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD
index c6f692a..fe5282c 100644
--- a/abs/core/bash/PKGBUILD
+++ b/abs/core/bash/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
-_basever=4.2
-_patchlevel=045 #prepare for some patches
+_basever=4.3
+_patchlevel=027
pkgver=$_basever.$_patchlevel
-pkgrel=5
-pkgdesc="The GNU Bourne Again shell"
+pkgrel=1
+pkgdesc='The GNU Bourne Again shell'
arch=('i686' 'x86_64')
license=('GPL')
-url="http://www.gnu.org/software/bash/bash.html"
+url='http://www.gnu.org/software/bash/bash.html'
groups=('base')
backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.1' 'glibc')
+depends=('readline>=6.3' 'glibc')
+optdepends=('bash-completion: for tab completion')
provides=('sh')
install=bash.install
source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
@@ -22,26 +24,32 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
dot.bash_logout
system.bashrc
system.bash_logout
- bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
-if [ $_patchlevel -gt 000 ]; then
- for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
- source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
- done
+ privmode-setuid-fail.patch
+ parser-oob-4.2.patch)
+
+if [[ $((10#${_patchlevel})) -gt 0 ]]; then
+ for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
+ source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//.}-$(printf "%03d" $_p){,.sig})
+ done
fi
prepare() {
- cd ${srcdir}/${pkgname}-$_basever
+ cd $pkgname-$_basever
- for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
- msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
- patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+ for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do
+ msg "applying patch bash${_basever//.}-$(printf "%03d" $_p)"
+ patch -p0 -i ../bash${_basever//.}-$(printf "%03d" $_p)
done
-
- patch -p1 -i $srcdir/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
+
+ # http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663)
+ patch -p0 -i ../privmode-setuid-fail.patch
+
+ # CVE-2014-7169 patches
+ patch -p0 -i ../parser-oob-4.2.patch
}
build() {
- cd ${srcdir}/${pkgname}-$_basever
+ cd $pkgname-$_basever
_bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
-DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
@@ -55,123 +63,84 @@ build() {
}
check() {
- cd ${srcdir}/${pkgname}-$_basever
- make check
+ make -C $pkgname-$_basever check
}
package() {
- cd ${srcdir}/${pkgname}-$_basever
- make DESTDIR=${pkgdir} install
-
- ln -s bash ${pkgdir}/usr/bin/sh
+ make -C $pkgname-$_basever DESTDIR="$pkgdir" install
+ ln -s bash "$pkgdir"/usr/bin/sh
- install -dm755 ${pkgdir}/etc/skel/
-
+ install -dm755 "$pkgdir"/etc/skel/
# system-wide configuration files
- install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
- install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
-
+ install -m644 system.bashrc $pkgdir/etc/bash.bashrc
+ install -m644 system.bash_logout "$pkgdir"/etc/bash.bash_logout
+
# user configuration file skeletons
- install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
- install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
- install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
+ install -m644 dot.bashrc "$pkgdir"/etc/skel/.bashrc
+ install -m644 dot.bash_profile "$pkgdir"/etc/skel/.bash_profile
+ install -m644 dot.bash_logout "$pkgdir"/etc/skel/.bash_logout
}
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
+md5sums=('81348932d5da294953e15d4814c74dd1'
'SKIP'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
- '3546099a1b2f667adc9794f52e78e35b'
+ '561949793177116b7be29a07c385ba8b'
'472f536d7c9e8250dc4568ec4cfaf294'
- '9e55d01f2d9dda4a0c96031b25d19f45'
- '1100bc1dda2cdc06ac44d7e5d17864a3'
- 'SKIP'
- '30e7948079921d3261efcc6a40722135'
- 'SKIP'
- '9ea06decec43a198f3d7cf29acc602f8'
- 'SKIP'
- 'fb48f6134d7b013135929476aa0c250c'
- 'SKIP'
- 'e70e45de33426b38153b390be0dbbcd4'
- 'SKIP'
- 'ce4e5c484993705b27daa151eca242c2'
- 'SKIP'
- '88d1f96db29461767602e2546803bda7'
- 'SKIP'
- '24c574bf6d6a581e300823d9c1276af6'
- 'SKIP'
- '4c5835f2fbab36c4292bb334977e5b6d'
- 'SKIP'
- '0a51602b535ef661ee707be6c8bdb373'
- 'SKIP'
- '58deacf3d57cbd75575444ff6a3b0806'
- 'SKIP'
- '72d5059820015231483bb7415d09e9db'
- 'SKIP'
- '608336ebe215984ef126e3c29d2d3409'
- 'SKIP'
- 'ed19da878e3f630834c62b9d9dcc6fce'
- 'SKIP'
- '2d07daba0b8ca8f876d2aa052ff594b4'
- 'SKIP'
- '53d246537e1fffd1aaa02ba5c056211c'
- 'SKIP'
- '304fd129a58fee2d8a34f8b4704db0aa'
- 'SKIP'
- '6921a0b4228fe89b6537a5c29f027c89'
- 'SKIP'
- '1195d85447f3d048d2c9bcd075fa765c'
+ 'a577d42e38249d298d6a8d4bf2823883'
+ '461145288c8ffbf05c0f90554b2aa885'
+ '1ab682b4e36afa4cf1b426aa7ac81c0d'
'SKIP'
- 'b09000bba08da6ac753124593850cdf7'
+ '8fc22cf50ec85da00f6af3d66f7ddc1b'
'SKIP'
- '09d3f96a16b881334cfaee0cf320b47e'
+ 'a41728eca78858758e26b5dea64ae506'
'SKIP'
- '597bf71a2aac6feb510b7505cdd3d4f7'
+ 'bf8d53d227829d67235927689a03cc7a'
'SKIP'
- '3fab459b4e09daea529cacad025b13b3'
+ 'c0c00935c8b8ffff76e8ab77e7be7d15'
'SKIP'
- '4ad8d11e72afc6090e701073ff034cf4'
+ '6f01e364cd092faa28dd7119f47ddb5f'
'SKIP'
- 'c7d2493e44490f01dd20bdc8feb0a6a7'
+ 'dcf471d222bcd83283d3094e6ceeb6f8'
'SKIP'
- '9f19c199dd8d1fa9254eebe738759272'
+ 'f7553416646dc26c266454c78a916d36'
'SKIP'
- 'a6ed82daf034587aee2f2581ba5fe829'
+ '7e73d2151f4064b484a4ba2c4b09960e'
'SKIP'
- 'da9265aa2527fd4a7481baa3e0550287'
+ 'a275463d21735bb6d7161f9fbd320d8f'
'SKIP'
- 'ec444d229e8899fbaaf6fc7de2d82ae6'
+ 'c17103ee20420d77e46b224c8d3fceda'
'SKIP'
- 'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
+ '3e2a057a19d02b3f92a3a09eacbc03ae'
'SKIP'
- '89390ff6a3c2ef7e09dd4b8b097a8e56'
+ 'fb377143a996d4ff087a2771bc8332f9'
'SKIP'
- 'eee08003395c417f677d1a4bf8c548ee'
+ '1a1aaecc99a9d0cbc310e8e247dcc8b6'
'SKIP'
- '2fe070dd6d75d8ff16f269184a16e9c4'
+ '4f04387458a3c1b4d460d199f49991a8'
'SKIP'
- '4e610506c1711bf3483b965800ac3d5d'
+ '90e759709720c4f877525bebc9d5dc06'
'SKIP'
- '7cd9bfdf7cbfd45274d07620ee94c8d9'
+ '11e4046e1b86070f6adbb7ffc89641be'
'SKIP'
- '9c3142956064d175a880bcb186e51ef9'
+ 'cd5a9b46f5bea0dc0248c93c7dfac011'
'SKIP'
- 'c10692f447d4966c879f8fb8d7c8ebc9'
+ 'cff4dc024d9d3456888aaaf8a36ca774'
'SKIP'
- '9ef3c308cde413e95866c1266cfb4e98'
+ '167839c5f147347f4a03d88ab97ff787'
'SKIP'
- 'cd48f57a404498d4e5c73a3501c4b1a5'
+ '1d350671c48dec30b34d8b81f09cd79d'
'SKIP'
- '00a2371b6c05acbfce6bc850c6d982f8'
+ '11c349af66a55481a3215ef2520bec36'
'SKIP'
- '7bc4942a66ca4024ee964db7ede07896'
+ 'b3cb0d80fd0c47728264405cbb3b23c7'
'SKIP'
- '1cf7701017ebfc8e129de92c8f8b798c'
+ 'b5ea5600942acceb4b6f07313d2de74e'
'SKIP'
- '9e61168fca692d8d1a733c389a63712e'
+ '193c06f578d38ffdbaebae9c51a7551f'
'SKIP'
- 'b4b11d64b45ea9ec50dcc74c6c3861f6'
+ '922578e2be7ed03729454e92ee8d3f3a'
'SKIP'
- '1661bcc83c4715f54368877452ff2247'
+ '8ff6948b16f2db5c29b1b9ae1085bbe7'
'SKIP')
diff --git a/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
deleted file mode 100644
index c621f0a..0000000
--- a/abs/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur bash-4.2-orig/general.c bash-4.2/general.c
---- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000
-+++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000
-@@ -766,7 +766,7 @@
- *nbeg++ = '.';
-
- nlen = nend - ntail;
-- memcpy (nbeg, ntail, nlen);
-+ memmove (nbeg, ntail, nlen);
- nbeg[nlen] = '\0';
-
- return name;
diff --git a/abs/core/bash/parser-oob-4.2.patch b/abs/core/bash/parser-oob-4.2.patch
new file mode 100644
index 0000000..2ef5c48
--- /dev/null
+++ b/abs/core/bash/parser-oob-4.2.patch
@@ -0,0 +1,85 @@
+--- ../bash-4.2-orig/parse.y 2014-09-25 13:07:59.218209276 +0200
++++ parse.y 2014-09-25 15:26:52.813159810 +0200
+@@ -264,9 +264,21 @@
+
+ /* Variables to manage the task of reading here documents, because we need to
+ defer the reading until after a complete command has been collected. */
+-static REDIRECT *redir_stack[10];
++static REDIRECT **redir_stack;
+ int need_here_doc;
+
++/* Pushes REDIR onto redir_stack, resizing it as needed. */
++static void
++push_redir_stack (REDIRECT *redir)
++{
++ /* Guard against oveflow. */
++ if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack))
++ abort ();
++ redir_stack = xrealloc (redir_stack,
++ (need_here_doc + 1) * sizeof (*redir_stack));
++ redir_stack[need_here_doc++] = redir;
++}
++
+ /* Where shell input comes from. History expansion is performed on each
+ line when the shell is interactive. */
+ static char *shell_input_line = (char *)NULL;
+@@ -519,42 +531,42 @@
+ source.dest = 0;
+ redir.filename = $2;
+ $$ = make_redirection (source, r_reading_until, redir, 0);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | NUMBER LESS_LESS WORD
+ {
+ source.dest = $1;
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until, redir, 0);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | REDIR_WORD LESS_LESS WORD
+ {
+ source.filename = $1;
+ redir.filename = $3;
+ $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | LESS_LESS_MINUS WORD
+ {
+ source.dest = 0;
+ redir.filename = $2;
+ $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | NUMBER LESS_LESS_MINUS WORD
+ {
+ source.dest = $1;
+ redir.filename = $3;
+ $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | REDIR_WORD LESS_LESS_MINUS WORD
+ {
+ source.filename = $1;
+ redir.filename = $3;
+ $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
+- redir_stack[need_here_doc++] = $$;
++ push_redir_stack ($$);
+ }
+ | LESS_LESS_LESS WORD
+ {
+@@ -4757,7 +4769,7 @@
+ case CASE:
+ case SELECT:
+ case FOR:
+- if (word_top < MAX_CASE_NEST)
++ if (word_top + 1 < MAX_CASE_NEST)
+ word_top++;
+ word_lineno[word_top] = line_number;
+ break;
+
+
diff --git a/abs/core/bash/privmode-setuid-fail.patch b/abs/core/bash/privmode-setuid-fail.patch
new file mode 100644
index 0000000..059857d
--- /dev/null
+++ b/abs/core/bash/privmode-setuid-fail.patch
@@ -0,0 +1,29 @@
+*** ../bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500
+--- shell.c 2014-06-06 16:29:01.000000000 -0400
+***************
+*** 1227,1232 ****
+ disable_priv_mode ()
+ {
+! setuid (current_user.uid);
+! setgid (current_user.gid);
+ current_user.euid = current_user.uid;
+ current_user.egid = current_user.gid;
+--- 1229,1246 ----
+ disable_priv_mode ()
+ {
+! int e;
+!
+! if (setuid (current_user.uid) < 0)
+! {
+! e = errno;
+! sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
+! #if defined (EXIT_ON_SETUID_FAILURE)
+! if (e == EAGAIN)
+! exit (e);
+! #endif
+! }
+! if (setgid (current_user.gid) < 0)
+! sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
+!
+ current_user.euid = current_user.uid;
+ current_user.egid = current_user.gid;
diff --git a/abs/core/bash/system.bashrc b/abs/core/bash/system.bashrc
index a2231e8..4d7a643 100644
--- a/abs/core/bash/system.bashrc
+++ b/abs/core/bash/system.bashrc
@@ -12,11 +12,11 @@ PS4='+ '
case ${TERM} in
xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
- PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-
+ PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+
;;
screen)
- PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
+ PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
;;
esac
--
cgit v0.12
From b46b91670e7637bdb1eaf89f70dfcbeb61e7100a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 17:22:10 +0000
Subject: update81-82.sh: use curl instead of wget as some systems don't have
wget installed
---
abs/core/update81-82.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index f1c6d96..60c1a02 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -26,7 +26,7 @@ fi
echo "Downloading filesystem and glibc for later use, please wait"
-wget -q http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz -O filesystem-itermediate.pkg.tar.xz
+curl -o filesystem-itermediate.pkg.tar.xz http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz
rc=$?
if [ $rc != 0 ]
then
@@ -36,7 +36,7 @@ else
echo "Filesystem pkg downloaded"
fi
-wget -q http://linhes.org/repo/x86_64/core-testing/glibc-2.18-11-x86_64.pkg.tar.xz -O glibc-2.18-11-x86_64.pkg.tar.xz
+curl -o glibc-2.18-11-x86_64.pkg.tar.xz http://linhes.org/repo/x86_64/core-testing/glibc-2.18-11-x86_64.pkg.tar.xz
rc=$?
if [ $rc != 0 ]
then
--
cgit v0.12
From 928a56f0fbd6890b8f793eacc5498cf7e5f27324 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 20:09:54 +0000
Subject: lzo: replaces lzo2
---
abs/core/lzo/PKGBUILD | 43 +++++++++++++++++++++++++++++++++++++++++++
abs/core/lzo2/PKGBUILD | 36 ------------------------------------
2 files changed, 43 insertions(+), 36 deletions(-)
create mode 100644 abs/core/lzo/PKGBUILD
delete mode 100644 abs/core/lzo2/PKGBUILD
diff --git a/abs/core/lzo/PKGBUILD b/abs/core/lzo/PKGBUILD
new file mode 100644
index 0000000..3cbf9e7
--- /dev/null
+++ b/abs/core/lzo/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id$
+# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
+# Maintainer: dorphell <dorphell@archlinux.org>
+pkgname=lzo
+pkgver=2.08
+pkgrel=3
+pkgdesc="Portable lossless data compression library"
+arch=('i686' 'x86_64')
+url="http://www.oberhumer.com/opensource/lzo"
+license=('GPL')
+depends=('glibc')
+provides=("lzo2=$pkgver")
+replaces=('lzo2')
+conflicts=('lzo2')
+source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
+md5sums=('fcec64c26a0f4f4901468f360029678f')
+
+build() {
+ cd "${srcdir}/lzo-${pkgver}"
+ ./configure --prefix=/usr --enable-shared
+ make
+
+ # build minilzo
+ gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
+ gcc $LDFLAGS -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
+}
+
+check() {
+ cd "${srcdir}/lzo-${pkgver}"
+ make test # Larger test
+ make check
+}
+
+package() {
+ cd "${srcdir}/lzo-${pkgver}"
+ make DESTDIR=${pkgdir} install
+
+ # install minilzo
+ install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib
+ install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo
+ cd ${pkgdir}/usr/lib
+ ln -s libminilzo.so.0 libminilzo.so
+}
diff --git a/abs/core/lzo2/PKGBUILD b/abs/core/lzo2/PKGBUILD
deleted file mode 100644
index dd0c5e6..0000000
--- a/abs/core/lzo2/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 136471 2011-08-30 06:25:43Z tpowa $
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-# Maintainer: dorphell <dorphell@archlinux.org>
-pkgname=lzo2
-pkgver=2.06
-pkgrel=1
-pkgdesc="Portable lossless data compression library"
-arch=('i686' 'x86_64')
-url="http://www.oberhumer.com/opensource/lzo"
-license=('GPL')
-depends=('glibc')
-source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
-options=(!libtool)
-md5sums=('95380bd4081f85ef08c5209f4107e9f8')
-
-build() {
- cd "${srcdir}/lzo-${pkgver}"
-
- ./configure --prefix=/usr --enable-shared
- make
-
- # build minilzo
- gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
- gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
-}
-
-package() {
- cd "${srcdir}/lzo-${pkgver}"
- make DESTDIR=${pkgdir} install
-
- # install minilzo
- install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib
- install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo
- cd ${pkgdir}/usr/lib
- ln -s libminilzo.so.0 libminilzo.so
-}
--
cgit v0.12
From 283ff72c8f742f807e4788846447531bc9ae1ea9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 1 Oct 2014 20:24:57 +0000
Subject: python-pillow: initial inclusion. dep of xbmc 13.2
---
abs/core/python_modules/python-pillow/PKGBUILD | 75 +++++++++++++++++++++++
abs/core/python_modules/python-pillow/__changelog | 2 +
2 files changed, 77 insertions(+)
create mode 100644 abs/core/python_modules/python-pillow/PKGBUILD
create mode 100644 abs/core/python_modules/python-pillow/__changelog
diff --git a/abs/core/python_modules/python-pillow/PKGBUILD b/abs/core/python_modules/python-pillow/PKGBUILD
new file mode 100644
index 0000000..fc93f2d
--- /dev/null
+++ b/abs/core/python_modules/python-pillow/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: minder
+
+pkgbase=python-pillow
+#pkgname=(python-pillow python2-pillow)
+pkgname=(python2-pillow)
+pkgver=2.5.3
+pkgrel=2
+_appname=Pillow
+_py2basever=2.7
+_py3basever=3.4m
+pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
+arch=('i686' 'x86_64')
+url="http://python-pillow.github.io/"
+license=('BSD')
+makedepends=('python2-setuptools' 'lcms' 'libwebp' 'tk')
+source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip")
+md5sums=('9879437c28ee0ad6ea04b93d0be2c2d7')
+
+build() {
+ cd "$srcdir"
+ cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver"
+}
+
+#package_python-pillow() {
+# depends=('python' 'lcms' 'libwebp')
+# optdepends=('tk: for the ImageTK module'
+# 'sane: for the Sane module'
+# 'python-pyqt4: for the ImageQt module')
+# cd "$srcdir/$_appname-$pkgver"
+# python3 setup.py install --root="$pkgdir/" --optimize=0
+# pushd Sane
+# python3 setup.py install --root="$pkgdir/" --optimize=0
+# popd
+# install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+# install -dm755 "$pkgdir/usr/include/python$_py3basever/"
+# install -m644 -t "$pkgdir/usr/include/python$_py3basever/" libImaging/*.h
+
+# # clean up bins
+# cd "$pkgdir/usr/bin"
+# for f in *.py; do
+# mv "$f" "${f%.py}"
+# done
+#}
+
+package_python2-pillow() {
+ pkgdesc="Python Imaging Library (PIL) fork. Python2 version."
+ depends=('python2' 'lcms' 'libwebp')
+ optdepends=('tk: for the ImageTK module'
+ 'sane: for the Sane module'
+ 'python2-pyqt4: for the ImageQt module')
+ provides=('python-imaging' 'python2-imaging')
+ conflicts=('python-imaging' 'python2-imaging')
+ replaces=('python2-imaging')
+ cd "$srcdir/${_appname}2-$pkgver"
+ sed -i 's|/usr/local/bin/python$|/usr/bin/env python2|' PIL/OleFileIO.py
+ python2 setup.py install --root="$pkgdir/" --optimize=0
+# pushd Sane
+ python2 setup.py install --root="$pkgdir/" --optimize=0
+# popd
+
+ install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -dm755 "$pkgdir/usr/include/python$_py2basever/"
+ install -m644 -t "$pkgdir/usr/include/python$_py2basever/" libImaging/*.h
+
+ # clean up bins
+ cd "$pkgdir/usr/bin"
+ for f in *.py; do
+ mv "$f" "${f%.py}2"
+ done
+}
+
diff --git a/abs/core/python_modules/python-pillow/__changelog b/abs/core/python_modules/python-pillow/__changelog
new file mode 100644
index 0000000..8e7b951
--- /dev/null
+++ b/abs/core/python_modules/python-pillow/__changelog
@@ -0,0 +1,2 @@
+PKGBUILD - comment out all python 3 stuff and only build for py 2
+PKGBUILD - rm sane dep
--
cgit v0.12
From 41970f7206ead1525f6b4c5df98ab51bf0dc3404 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 00:58:27 +0000
Subject: libwebp: initial inclusion. dep of python-pillow
---
abs/extra/libwebp/PKGBUILD | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 abs/extra/libwebp/PKGBUILD
diff --git a/abs/extra/libwebp/PKGBUILD b/abs/extra/libwebp/PKGBUILD
new file mode 100644
index 0000000..46e13f5
--- /dev/null
+++ b/abs/extra/libwebp/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jon Nordby <jononor@gmail.com>
+
+pkgname=libwebp
+pkgver=0.4.1
+pkgrel=1
+pkgdesc="WebP library and conversion tools"
+arch=(x86_64 i686)
+url="https://developers.google.com/speed/webp/"
+license=(BSD)
+depends=(libpng libjpeg libtiff giflib)
+makedepends=(freeglut mesa glu)
+optdepends=('freeglut: vwebp viewer')
+source=("http://downloads.webmproject.org/releases/webp/$pkgname-$pkgver.tar.gz")
+sha256sums=('00b646e6f66550a8faa998711fe70aabee9ed3bc562a8437c89042901674d027')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-swap-16bit-csp \
+ --enable-experimental \
+ --enable-libwebpmux \
+ --enable-libwebpdemux \
+ --enable-libwebpdecoder \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 9f562b5cd50ca3e346d413ec5f2ff46a46aaa8d1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 01:02:49 +0000
Subject: xbmc & xmbc-pvr-addons: update to 13.2. closes #974.
---
abs/extra/xbmc-pvr-addons/PKGBUILD | 18 +++--
abs/extra/xbmc/PKGBUILD | 99 ++++++++++++++-------------
abs/extra/xbmc/__changelog | 3 +-
abs/extra/xbmc/enable-external-ffmpeg.patch | 100 ----------------------------
abs/extra/xbmc/polkit.rules | 12 ----
abs/extra/xbmc/xbmc.install | 27 +++++---
abs/extra/xbmc/xbmc.service | 16 -----
7 files changed, 77 insertions(+), 198 deletions(-)
delete mode 100644 abs/extra/xbmc/enable-external-ffmpeg.patch
delete mode 100644 abs/extra/xbmc/polkit.rules
delete mode 100644 abs/extra/xbmc/xbmc.service
diff --git a/abs/extra/xbmc-pvr-addons/PKGBUILD b/abs/extra/xbmc-pvr-addons/PKGBUILD
index 56f0e07..91f41f2 100644
--- a/abs/extra/xbmc-pvr-addons/PKGBUILD
+++ b/abs/extra/xbmc-pvr-addons/PKGBUILD
@@ -2,7 +2,8 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xbmc-pvr-addons
-pkgver=20140512
+pkgver=20140610.13.0_Gotham
+_relname=${pkgver:9}
pkgrel=1
pkgdesc="XBMC PVR add-ons for current stable xbmc"
arch=('i686' 'x86_64')
@@ -12,22 +13,19 @@ depends=('xbmc' 'libmysqlclient')
makedepends=('git' 'libmysqlclient' 'boost')
optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
conflicts=('xbmc-pvr-addons-git')
-source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
-md5sums=('SKIP')
-
-pkgver() {
- cd "$srcdir/$pkgname"
- git log -1 --format="%cd" --date=short | tr -d '-'
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${_relname/_/-}.tar.gz")
+#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
+#source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo")
+md5sums=('63f5863393ca869eb6f357a62de76378')
build() {
- cd "$srcdir/$pkgname"
+ cd "$srcdir/$pkgname-${_relname/_/-}"
./bootstrap
./configure --prefix=/usr --enable-addons-with-dependencies
make
}
package() {
- cd "$srcdir/$pkgname"
+ cd "$srcdir/$pkgname-${_relname/_/-}"
make DESTDIR="$pkgdir/" install
}
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 87a9e78..8e6cc91 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -4,49 +4,64 @@
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Maxime Gauduin <alucryd@gmail.com>
_prefix=/usr
pkgname=xbmc
-pkgver=13.0
+pkgver=13.2
_codename=Gotham
-pkgrel=2
+pkgrel=4
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
- 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
- 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image'
- 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump'
- 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng'
- 'avahi' 'bluez-libs' 'tinyxml' 'libcap' 'swig' 'taglib'
- 'java-runtime-headless' 'glu' 'mesa' 'shairplay' 'libxslt' 'ffmpeg')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
- 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
- 'lirc: remote controller support'
- 'udisks: automount external drives'
- 'upower: used to trigger power management functionality'
- 'unrar: access compressed files without unpacking them'
- 'xorg-xinit: autostart xbmc')
+license=('GPL2')
+depends=(
+'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad'
+'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient'
+'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt'
+'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image'
+'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl'
+)
+makedepends=(
+'afpfs-ng' 'libnfs' 'libplist' 'shairplay' 'libcec' 'boost' 'cmake' 'doxygen'
+'gperf' 'jasper' 'java-runtime-headless' 'nasm' 'swig' 'taglib' 'udisks'
+'zip'
+)
+optdepends=(
+'afpfs-ng: Apple File Protocol suport'
+'libnfs: NFS Share support'
+'libplist: AirPlay support'
+'shairplay: AirPlay support'
+'libcec: Pulse-Eight USB-CEC adapter support'
+'polkit: power management'
+'pulseaudio: for pulseaudio support'
+'lirc: remote controller support'
+'unrar: access compressed files without unpacking them'
+'udisks: automount external drives'
+'upower: display battery level'
+)
install="${pkgname}.install"
source=(
- "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz"
- "xbmc.service"
- "polkit.rules"
- "enable-external-ffmpeg.patch"
+ "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz"
"xbmc.sh"
"xbmc_lib.conf"
- )
+)
+#sha256sums=(
+# 'acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585'
+#)
prepare() {
- cd "${srcdir}/xbmc-$pkgver-$_codename"
- patch -p1 -i ../enable-external-ffmpeg.patch
+ cd "$srcdir/xbmc-$pkgver-$_codename"
+
+ find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
+ sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
+ sed 's/python/python2/' -i tools/Linux/xbmc.sh.in
}
build() {
- cd "${srcdir}/xbmc-$pkgver-$_codename"
+ cd "$srcdir/xbmc-$pkgver-$_codename"
# Bootstrapping XBMC
./bootstrap
@@ -83,32 +98,26 @@ build() {
--enable-udev \
--enable-libusb \
--enable-libcec \
- --enable-external-libraries
-
+ --with-lirc-device=/run/lirc/lircd
# Now (finally) build
make
}
package() {
- cd "${srcdir}/xbmc-$pkgver-$_codename"
+ cd "$srcdir/xbmc-$pkgver-$_codename"
# Running make install
- make DESTDIR="${pkgdir}" install
-
- # run feh with python2
- sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+ make DESTDIR="$pkgdir" install
# Tools
- msg2 "Tools"
- install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
- install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+ install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \
+ "${pkgdir}$_prefix/lib/xbmc/"
# Licenses
- msg2 "Copy licenses"
- install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ install -dm755 "${pkgdir}$_prefix/share/licenses/$pkgname"
for licensef in LICENSE.GPL copying.txt; do
- mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef} \
- ${pkgdir}${_prefix}/share/licenses/${pkgname}
+ mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \
+ "${pkgdir}$_prefix/share/licenses/$pkgname"
done
# LinHES stuff
@@ -116,14 +125,8 @@ package() {
install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin
#add in xbmc_lib.conf
install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf
-
- # install systemd service
- install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
- install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
}
-md5sums=('54fafd985b5209859ba6faeb50b8f142'
- 'de331663cc8adc94f2fe44a262cfff58'
- '02f7951824ee13103344f36009c0ef2a'
- '9f9b41cfc1e21b1e7d0bb10d6e85b3c6'
+# vim:set ts=2 sw=2 et:
+md5sums=('d80153b2cc78b88966458ab136e9494f'
'e48a3d87984669ef206e902bc8290ff9'
'71176cb0e5aaa230d7c9634c37245bfb')
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 829f14d..20b50eb 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,3 +1,4 @@
-PKGBUILD - remove libpulse dep
+PKGBUILD - remove libpulse dep and remove --enable-pulse config option
PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
xbmc.install - add gen_lib_xml.py to post_install and post_remove
+xbmc.install - comment out autostart message since we don't use systemd
diff --git a/abs/extra/xbmc/enable-external-ffmpeg.patch b/abs/extra/xbmc/enable-external-ffmpeg.patch
deleted file mode 100644
index 2bc1aaf..0000000
--- a/abs/extra/xbmc/enable-external-ffmpeg.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -rupN a/configure.in b/configure.in
---- a/configure.in 2014-05-03 21:03:25.000000000 +0000
-+++ b/configure.in 2014-05-07 09:56:30.039177391 +0000
-@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
- MAKE="${MAKE:-make}"
- OBJDUMP="${OBJDUMP:-objdump}"
-
--use_external_ffmpeg=no
-+use_external_ffmpeg=yes
- use_static_ffmpeg=no
-
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
-@@ -632,7 +632,7 @@ case $host in
- use_arch="x86"
- use_cpu="i686"
- fi
-- use_static_ffmpeg=yes
-+ use_static_ffmpeg=no
- ;;
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
- ARCH="x86_64-linux"
-@@ -640,7 +640,7 @@ case $host in
- use_arch="x86_64"
- use_cpu="x86_64"
- fi
-- use_static_ffmpeg=yes
-+ use_static_ffmpeg=no
- ;;
- i386-*-freebsd*)
- ARCH="x86-freebsd"
-@@ -696,7 +696,7 @@ case $host in
- use_sdl=no
- use_x11=no
- use_wayland=no
-- use_static_ffmpeg=yes
-+ use_static_ffmpeg=no
- ;;
- arm*-*linux-android*)
- target_platform=target_android
-diff -rupN a/lib/DllAvCodec.h b/lib/DllAvCodec.h
---- a/lib/DllAvCodec.h 2014-05-03 21:03:25.000000000 +0000
-+++ b/lib/DllAvCodec.h 2014-05-07 10:10:06.298165915 +0000
-@@ -43,6 +43,7 @@ extern "C" {
-
- #if (defined USE_EXTERNAL_FFMPEG)
- #include <libavcodec/avcodec.h>
-+ #include <libavutil/frame.h>
- #else
- #include "libavcodec/avcodec.h"
- #endif
-diff -rupN a/lib/DllAvUtil.h b/lib/DllAvUtil.h
---- a/lib/DllAvUtil.h 2014-05-03 21:03:25.000000000 +0000
-+++ b/lib/DllAvUtil.h 2014-05-07 10:17:31.415798448 +0000
-@@ -31,33 +31,19 @@
- #endif
-
- extern "C" {
--#if (defined USE_EXTERNAL_FFMPEG)
-- #include <libavutil/avutil.h>
-- // for av_get_default_channel_layout
-- #include <libavutil/audioconvert.h>
-- #include <libavutil/crc.h>
-- #include <libavutil/fifo.h>
-- // for LIBAVCODEC_VERSION_INT:
-- #include <libavcodec/avcodec.h>
-- // for enum AVSampleFormat
-- #include <libavutil/samplefmt.h>
-- #include <libavutil/opt.h>
-- #include <libavutil/mem.h>
-- #include <libavutil/mathematics.h>
-- #if (defined USE_LIBAV_HACKS)
-- #include "xbmc-libav-hacks/libav_hacks.h"
-- #endif
--#else
-- #include "libavutil/avutil.h"
-- //for av_get_default_channel_layout
-- #include "libavutil/audioconvert.h"
-- #include "libavutil/crc.h"
-- #include "libavutil/opt.h"
-- #include "libavutil/mem.h"
-- #include "libavutil/fifo.h"
-- // for enum AVSampleFormat
-- #include "libavutil/samplefmt.h"
--#endif
-+#include <libavutil/avutil.h>
-+#include <libavutil/frame.h>
-+// for av_get_default_channel_layout
-+#include <libavutil/audioconvert.h>
-+#include <libavutil/crc.h>
-+#include <libavutil/fifo.h>
-+// for LIBAVCODEC_VERSION_INT:
-+#include <libavcodec/avcodec.h>
-+// for enum AVSampleFormat
-+#include <libavutil/samplefmt.h>
-+#include <libavutil/opt.h>
-+#include <libavutil/mem.h>
-+#include <libavutil/mathematics.h>
- }
-
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
diff --git a/abs/extra/xbmc/polkit.rules b/abs/extra/xbmc/polkit.rules
deleted file mode 100644
index 4b6d0fd..0000000
--- a/abs/extra/xbmc/polkit.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (subject.user == "xbmc") {
- polkit.log("action=" + action);
- polkit.log("subject=" + subject);
- if (action.id.indexOf("org.freedesktop.login1.") == 0) {
- return polkit.Result.YES;
- }
- if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
- return polkit.Result.YES;
- }
- }
-});
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index ad3b95a..72d92d8 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -1,21 +1,26 @@
post_install() {
- [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- getent group xbmc > /dev/null || groupadd -r xbmc
- getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
- usermod -a -G xbmc,audio,video,network,optical xbmc
- mkdir -p var/lib/xbmc
- chown -R xbmc:xbmc var/lib/xbmc
+ update_icons
+# update_autostart
gen_lib_xml.py
}
post_upgrade() {
- post_install $1
+ update_icons
+# update_autostart
}
post_remove() {
- [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- getent passwd xbmc > /dev/null && userdel xbmc
+ update_icons
+ update_autostart
gen_lib_xml.py
}
+
+update_icons() {
+ type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+ type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications
+ return 0
+}
+
+update_autostart() {
+ echo "To autostart xbmc standalone read: https://wiki.archlinux.org/index.php/Xbmc#Autostarting_at_boot"
+}
diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service
deleted file mode 100644
index d36ddb0..0000000
--- a/abs/extra/xbmc/xbmc.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service
-Conflicts=getty@tty7.service
-
-[Service]
-User = xbmc
-Group = xbmc
-PAMName=login
-Type = simple
-TTYPath=/dev/tty7
-ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7
-Restart = on-abort
-
-[Install]
-WantedBy = multi-user.target
--
cgit v0.12
From c094238d2a95461fab69c04ca9fa84f72a4fe059 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 01:06:15 +0000
Subject: python-imaging: replaced by python-pillow
---
abs/core/python_modules/python-imaging/PKGBUILD | 41 ----------------------
abs/core/python_modules/python-imaging/__changelog | 1 -
2 files changed, 42 deletions(-)
delete mode 100644 abs/core/python_modules/python-imaging/PKGBUILD
delete mode 100644 abs/core/python_modules/python-imaging/__changelog
diff --git a/abs/core/python_modules/python-imaging/PKGBUILD b/abs/core/python_modules/python-imaging/PKGBUILD
deleted file mode 100644
index d644a4c..0000000
--- a/abs/core/python_modules/python-imaging/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 87626 2010-08-17 13:21:07Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python-imaging
-pkgver=1.1.7
-pkgrel=6
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2')
-makedepends=('tk')
-optdepends=('tk')
-provides=("pil=$pkgver")
-conflicts=('pil')
-replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
- cd $srcdir/Imaging-$pkgver
- python2 setup.py build_ext
-}
-
-package() {
- cd $srcdir/Imaging-$pkgver
- python2 setup.py install --root=$pkgdir
- install -dm755 $pkgdir/usr/include/python2.6/
- install -m644 -t $pkgdir/usr/include/python2.6/ libImaging/*.h
-
- # do not have files ending in .py in /usr/bin
- for f in pildriver pilprint pilconvert pilfile pilfont; do
- mv $pkgdir/usr/bin/$f{.py,}
- done
-
- # Install license
- install -Dm644 $srcdir/Imaging-$pkgver/README \
- $pkgdir/usr/share/licenses/$pkgname/README
-}
-
diff --git a/abs/core/python_modules/python-imaging/__changelog b/abs/core/python_modules/python-imaging/__changelog
deleted file mode 100644
index de150f5..0000000
--- a/abs/core/python_modules/python-imaging/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-__change so that it builds against python2.6 instead of python2.7
--
cgit v0.12
From f4369a17f28692e42ef8264f5850d4a4a0d15aaf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 13:10:51 +0000
Subject: mythtv & mythplugins: update to latest -fixes.
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 6 +++---
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 5cec5ad..921bf3d 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-e2f46569ac53030345efa74782ae44cee3ec5a79
+629f7112ec77ddd6732ae00378ccf1b7283cbeec
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 1e6bcd3..cbcf82e 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27.3
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
@@ -17,7 +17,7 @@ makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexi
'libvorbis' 'mesa' 'libgl' 'mplayer' "mythtv>=${pkgver}"
'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
- 'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python-imaging'
+ 'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python2-pillow'
'python-pycurl' 'zlib')
source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch'
'cdparanoia.patch')
@@ -50,7 +50,7 @@ build() {
package_mytharchive() {
pkgdesc="Create DVDs or archive recorded shows in MythTV"
depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' "mythtv>=${pkgver}"
- 'python-imaging')
+ 'python2-pillow')
cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive"
patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1
patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index ce5a044..9a4cc81 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27.3
-pkgrel=2
+pkgrel=3
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 115cadecb464d5fd48af6ddb56774bae80cc4b59 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 13:19:45 +0000
Subject: mythtv: remove old stable-0.25
---
.../mythtv/stable-0.25/git_src/checkout_mythtv.sh | 40 -
.../mythtv/stable-0.25/git_src/checkout_mythweb.sh | 38 -
abs/core/mythtv/stable-0.25/git_src/git_hash | 1 -
abs/core/mythtv/stable-0.25/git_src/git_hash_web | 1 -
abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 135 --
.../mythtv/stable-0.25/mythplugins/__changelog | 1 -
.../stable-0.25/mythplugins/mythburn.py.patch | 285 ---
.../mythplugins/mythplugins-mythzoneminder.install | 11 -
...tect-metadata-loads-from-multiple-threads.patch | 52 -
...e-fe-netcontrol-play-resume-functionality.patch | 27 -
.../mythtv/stable-0.25/mythtv/MythBase.php.patch | 19 -
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 172 --
abs/core/mythtv/stable-0.25/mythtv/__changelog | 5 -
.../stable-0.25/mythtv/bonjour-correction.patch | 32 -
.../mythtv/stable-0.25/mythtv/git_version.patch | 13 -
.../stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml | 98 -
.../stable-0.25/mythtv/menu-xml/dvd_backup.xml | 39 -
.../mythtv/stable-0.25/mythtv/menu-xml/game.xml | 12 -
.../stable-0.25/mythtv/menu-xml/info_menu.xml | 76 -
abs/core/mythtv/stable-0.25/mythtv/menu-xml/is.xml | 3 -
.../stable-0.25/mythtv/menu-xml/library.xml.patch | 26 -
.../mythtv/stable-0.25/mythtv/menu-xml/linhes.xml | 60 -
.../stable-0.25/mythtv/menu-xml/mainmenu.xml.patch | 37 -
.../stable-0.25/mythtv/menu-xml/mythbackup.xml | 20 -
.../stable-0.25/mythtv/menu-xml/mythrestore.xml | 21 -
.../mythtv/menu-xml/optical_menu.xml.patch | 23 -
.../mythtv/menu-xml/original/create_patch.sh | 5 -
.../stable-0.25/mythtv/menu-xml/siriusmenu.xml | 419 -----
.../mythtv/stable-0.25/mythtv/menu-xml/update.xml | 9 -
.../mythtv/stable-0.25/mythtv/menu-xml/update2.xml | 20 -
.../mythtv/menu-xml/util_menu.xml.patch | 16 -
.../mythtv/stable-0.25/mythtv/menu-xml/xmmenu.xml | 574 ------
abs/core/mythtv/stable-0.25/mythtv/myth.sh | 4 -
.../mythtv/stable-0.25/mythtv/myth_settings.patch | 1981 --------------------
abs/core/mythtv/stable-0.25/mythtv/mythbackend | 38 -
abs/core/mythtv/stable-0.25/mythtv/mythbackend.lr | 9 -
abs/core/mythtv/stable-0.25/mythtv/mythbackend.sh | 117 --
abs/core/mythtv/stable-0.25/mythtv/mythfrontend.lr | 9 -
abs/core/mythtv/stable-0.25/mythtv/mythtv.install | 25 -
abs/core/mythtv/stable-0.25/mythtv/pretty | 9 -
.../mythtv/stable-0.25/mythtv/smolt_jump.patch | 10 -
abs/core/mythtv/stable-0.25/mythtv/tmdb3.py | 278 ---
.../mythtv/stable-0.25/mythtv/tmdb3_db_update.py | 47 -
abs/core/mythtv/stable-0.25/mythweb/PKGBUILD | 77 -
.../mythtv/stable-0.25/mythweb/mythweb.include | 8 -
.../mythtv/stable-0.25/mythweb/mythweb.install | 18 -
.../stable-0.25/mythweb/mythweb_gen_light.conf | 1 -
.../mythtv/stable-0.25/mythweb/schedules.php.patch | 16 -
.../mythtv/stable-0.25/mythweb/sorting.php.patch | 19 -
.../stable-0.25/mythweb/tv-schedules.php.patch | 15 -
50 files changed, 4971 deletions(-)
delete mode 100644 abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh
delete mode 100644 abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh
delete mode 100644 abs/core/mythtv/stable-0.25/git_src/git_hash
delete mode 100644 abs/core/mythtv/stable-0.25/git_src/git_hash_web
delete mode 100644 abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
delete mode 100644 abs/core/mythtv/stable-0.25/mythplugins/__changelog
delete mode 100644 abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/__changelog
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/git_version.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/game.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/is.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/original/create_patch.sh
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/siriusmenu.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/update.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/update2.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/util_menu.xml.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/xmmenu.xml
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/myth.sh
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/mythbackend
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/mythbackend.lr
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/mythbackend.sh
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/mythfrontend.lr
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/mythtv.install
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/pretty
delete mode 100644 abs/core/mythtv/stable-0.25/mythtv/smolt_jump.patch
delete mode 100755 abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
delete mode 100755 abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/mythweb.include
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/mythweb.install
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch
delete mode 100644 abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch
diff --git a/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh b/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh
deleted file mode 100644
index 2dc923a..0000000
--- a/abs/core/mythtv/stable-0.25/git_src/checkout_mythtv.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-#Quick script used to checkout the MythTV source
-#This source should be used build all mythplugins & main program
-#76df8e6c8f7b84a157607d8c25fd19f39d8dc830
-_gitroot="https://github.com/MythTV/mythtv.git"
-_gitname="mythtv"
-startdir=`pwd`
-#Set this to True, to update mythtv to the latest.
-#If not true then it will use the hash stored in git_hash
-_current="True"
-
-_checkoutHASH=`cat git_hash`
-
-if [ -d $_gitname ]
-then
- cd $_gitname
- git checkout fixes/0.25
- git pull
- echo "The local files are updated."
-else
- git clone -b fixes/0.25 $_gitroot
-fi
-
-if [ -d $_gitname ]
-then
- cd $_gitname
- if [ $_current == True ]
- then
- git rev-parse HEAD > $startdir/git_hash
- else
- git checkout $_checkoutHASH
- fi
- pwd
- ls
-# cd $_gitname
- sh ./version.sh `pwd`
-fi
-echo "GIT checkout done or server timeout"
-
-
diff --git a/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh b/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh
deleted file mode 100644
index 6e8e67e..0000000
--- a/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#Quick script used to checkout the Mythweb source
-#This source should be used build all mythplugins & main program
-#76df8e6c8f7b84a157607d8c25fd19f39d8dc830
-_gitroot="https://github.com/MythTV/mythweb.git"
-_gitname="mythweb"
-startdir=`pwd`
-#Set this to True, to update mythtv to the latest.
-#If not true then it will use the hash stored in git_hash
-_current="True"
-
-_checkoutHASH=`cat git_hash_web`
-
-if [ -d $_gitname ]
-then
- cd $_gitname
- git checkout fixes/0.25
- git pull
- echo "The local files are updated."
-else
- git clone -b fixes/0.25 $_gitroot
-fi
-
-if [ -d $_gitname ]
-then
- cd $_gitname
- if [ $_current == True ]
- then
- git rev-parse HEAD > $startdir/git_hash_web
- else
- git checkout $_checkoutHASH
- fi
- pwd
- ls
-fi
-echo "GIT checkout done or server timeout"
-
-
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
deleted file mode 100644
index 0d4d167..0000000
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ /dev/null
@@ -1 +0,0 @@
-b5adf034713acfd1923eecad2f96c43be688d0d0
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web
deleted file mode 100644
index 04176fb..0000000
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash_web
+++ /dev/null
@@ -1 +0,0 @@
-48778a639409bc591ee4a6ab4bec543da94e66c1
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
deleted file mode 100644
index 7278249..0000000
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ /dev/null
@@ -1,135 +0,0 @@
-# $Id: PKGBUILD 91281 2010-09-26 06:04:21Z remy $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgbase=mythplugins
-pkgname=('mytharchive'
- 'mythbrowser'
- 'mythgallery'
- 'mythgame'
- 'mythmusic'
- 'mythnetvision'
- 'mythnews'
- 'mythweather'
- 'mythzoneminder')
-pkgver=0.25
-pkgrel=19
-
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org"
-license=('GPL')
-conflicts=('mythmovies')
-makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw2' 'dvdauthor' 'libexif'
- 'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw'
- 'libvisual' 'perl-xml-xpath' 'perl-image-size' 'perl-json'
- 'perl-class-inspector' 'perl-datetime-format-iso8601'
- 'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth'
- 'libcdio' 'fftw')
-
-source=(mythburn.py.patch)
-
-
-#_gitroot="https://github.com/MythTV/mythtv.git"
-#_gitname="mythplugins"
-
-build() {
-
- if [ -e ${srcdir}/mythplugins ]
- then
- rm -rf ${srcdir}/mythplugins
- fi
-
- cd ${startdir}
- msg "copy in myth plugins src"
- cp -rp ../git_src/mythtv/mythplugins $srcdir
- cd ${srcdir}/${pkgbase}
-
-
-
- msg "The local files are updated."
- #find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
- cd ${srcdir}/${pkgbase}
- ./configure --prefix=/usr \
- --enable-all --python=/usr/bin/python2
-
- qmake mythplugins.pro || return 1
- make || return 1
-}
-
-package_mytharchive() {
- pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows"
- depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor' 'm2vrequantiser' 'mjpegtools' 'cdrkit' 'dvd+rw-tools')
-# replaces=('mytharchive')
- cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive"
-
- patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py.patch || return 1
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythbrowser() {
- pkgdesc="Mini web browser for MythTV"
- depends=("mythtv>=${pkgver}")
-# replaces=('mythbrowser')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythbrowser"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythgallery() {
- pkgdesc="Image gallery plugin for MythTV"
- depends=("mythtv>=${pkgver}" 'libexif')
-# replaces=('mythgallery')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythgallery"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythgame() {
- pkgdesc="Game emulator module for MythTV"
- depends=("mythtv>=${pkgver}" 'zlib')
-# replaces=('mythgame')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythgame"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythmusic() {
- pkgdesc="Music playing plugin for MythTV"
- depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual-plugins' 'libcdio' 'fftw' )
-# replaces=('mythmusic')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythnetvision() {
- pkgdesc="MythNetvision plugin for MythTV"
- depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' 'python2-lxml' 'python2' )
-# replaces=('mythnetvision')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythnews() {
- pkgdesc="News checking plugin for MythTV"
- depends=("mythtv>=${pkgver}")
-# replaces=('mythnews')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythnews"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythweather() {
- pkgdesc="Weather checking plugin for MythTV"
- depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size'
- 'perl-class-inspector' 'perl-datetime-format-iso8601'
- 'perl-date-manip' 'perl-json')
-# replaces=('mythweather')
- cd "${srcdir}/${_gitname}/${pkgbase}/mythweather"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-package_mythzoneminder() {
- pkgdesc="Allows for viewing of CCTV cameras through zoneminder"
- depends=("mythtv>=${pkgver}")
-# replaces=('mythzoneminder')
-# install=mythplugins-mythzoneminder.install
- cd "${srcdir}/${_gitname}/${pkgbase}/mythzoneminder"
- make INSTALL_ROOT="${pkgdir}" install || return 1
-}
-
-md5sums=('19446f65722769926bafad220bbc6551')
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/__changelog b/abs/core/mythtv/stable-0.25/mythplugins/__changelog
deleted file mode 100644
index 48cdce8..0000000
--- a/abs/core/mythtv/stable-0.25/mythplugins/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-placeholder
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch b/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch
deleted file mode 100644
index 380385b..0000000
--- a/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- mythburn.py.orig 2012-12-16 15:23:41.000000000 -0600
-+++ mythburn.py 2012-12-18 14:23:56.000000000 -0600
-@@ -44,7 +44,7 @@
-
-
- # version of script - change after each update
--VERSION="0.1.20120304-1"
-+VERSION="0.1.20121218-1"
-
- # keep all temporary files for debugging purposes
- # set this to True before a first run through when testing
-@@ -93,6 +93,7 @@
- from fcntl import ioctl
- import CDROM
- from shutil import copy
-+from subprocess import Popen, PIPE
-
- import MythTV
- from MythTV.altdict import OrdDict
-@@ -425,7 +426,7 @@
- os.remove(os.path.join(root, name))
-
- #############################################################
--# Romoves all the objects from a directory
-+# Removes all the objects from a directory
-
- def deleteEverythingInFolder(folder):
- for root, dirs, files in os.walk(folder, topdown=False):
-@@ -615,7 +616,7 @@
- # of a video file from its stream info file
-
- def getVideoParams(folder):
-- """Returns the video resolution, fps and aspect ratio for the video file from the streamindo.xml file"""
-+ """Returns the video resolution, fps and aspect ratio for the video file from the streaminfo.xml file"""
-
- #open the XML containing information about this file
- infoDOM = xml.dom.minidom.parse(os.path.join(folder, 'streaminfo.xml'))
-@@ -651,14 +652,14 @@
- # Gets the aspect ratio of a video file from its stream info file
-
- def getAspectRatioOfVideo(index):
-- """Returns the aspect ratio of the video file (1.333, 1.778, etc)"""
-+ """Returns the aspect ratio of the original video file (1.333, 1.778, etc)"""
-
- #open the XML containing information about this file
-- infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo.xml'))
-+ infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
-
- #error out if its the wrong XML
- if infoDOM.documentElement.tagName != "file":
-- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml'))
-+ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
- video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
- if video.attributes["aspectratio"].value != 'N/A':
- aspect_ratio = float(video.attributes["aspectratio"].value)
-@@ -679,7 +680,7 @@
-
- #error out if its the wrong XML
- if infoDOM.documentElement.tagName != "file":
-- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
-+ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml'))
-
- video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
- video_start = float(video.attributes["start_time"].value)
-@@ -1432,9 +1433,23 @@
-
- data.rating = str(vid.userrating)
-
-- if doesFileExist(vid.coverfile):
-- data.coverfile = vid.coverfile
-+ data.coverfile = None
-
-+ #Check filename for valid path. If valid return nothing.
-+ if os.path.isfile(str(vid.coverfile)):
-+ write("Coverart is in local directory: %s" % vid.coverfile)
-+ data.coverfile = vid.coverfile
-+ else:
-+ # iterate through storage group directories to get Coverart
-+ for sg in DB.getStorageGroup(groupname='Coverart', hostname=DB.gethostname()):
-+ if os.path.isfile(os.path.join(sg.dirname, str(vid.coverfile))):
-+ write("Coverart is in Storage Groups: %s%s" % (sg.dirname, vid.coverfile))
-+ data.coverfile = os.path.join(sg.dirname, str(vid.coverfile))
-+ break
-+
-+ if data.coverfile == None:
-+ write("No Coverart Found")
-+
- elif file.attributes["type"].value=="file":
- data.type = file.attributes["type"].value
- data.filename = file.attributes["filename"].value
-@@ -1485,6 +1500,30 @@
-
-
- #############################################################
-+# Finds the path of a video file from a Storage Group
-+
-+def getVideoPath(filename):
-+
-+ filepath = None
-+
-+ #Check filename for valid path. If valid return nothing.
-+ if os.path.isfile(filename):
-+ write("Video is in local video directory: %s" % filename)
-+ return (filepath)
-+ else:
-+ # iterate through storage group directories
-+ for sg in DB.getStorageGroup(groupname='Videos', hostname=DB.gethostname()):
-+ wholepath = os.path.join(sg.dirname, filename)
-+ if os.path.isfile(wholepath):
-+ write("Video is in Storage Groups: %s" % wholepath)
-+ filepath = "".join(sg.dirname)
-+ return (filepath)
-+ break
-+
-+ if filepath == None:
-+ write("Video is not in local video directory or Storage Groups")
-+
-+#############################################################
- # Pre-process a single video/recording file
-
- def preProcessFile(file, folder, count):
-@@ -1501,7 +1540,7 @@
- if file.attributes["type"].value == "recording":
- mediafile = file.attributes["filename"].value
- elif file.attributes["type"].value == "video":
-- mediafile = os.path.join(videopath, file.attributes["filename"].value)
-+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
- elif file.attributes["type"].value == "file":
- mediafile = file.attributes["filename"].value
- else:
-@@ -1661,6 +1700,37 @@
- fatalError("Failed while running mytharchivehelper to get stream information.\n"
- "Result: %d, Command was %s" % (result, command))
-
-+ #open the XML containing information about this file
-+ infoDOM = xml.dom.minidom.parse(xmlFilename)
-+
-+ #error out if its the wrong XML
-+ if infoDOM.documentElement.tagName != "file":
-+ fatalError("This info file doesn't look right (%s)." % xmlFilename)
-+
-+ file = infoDOM.getElementsByTagName("file")[0]
-+ video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
-+
-+ #use ffmpeg to get display aspect ratio (DAR) of video
-+ cmd = "mythffmpeg -i " + quoteCmdArg(file.attributes["filename"].value) + " 2>&1"
-+ aspect_ratio = Popen(cmd, shell=True, stdout=PIPE).stdout.read()
-+ if "DAR" in aspect_ratio:
-+ #clean DAR string
-+ aspect_ratio = aspect_ratio.split("DAR ")[-1].split(",")[0]
-+ aspect_ratio = ''.join([c for c in aspect_ratio if c in '1234567890:']).split(":")
-+ else:
-+ #calculate aspect from video size
-+ aspect_ratio = getVideoSize(xmlFilename)
-+
-+ #convert to decimal
-+ aspect_ratio = float(aspect_ratio[0]) / float(aspect_ratio[1])
-+
-+ write("Video %s aspect ratio is: %s" % (filename, aspect_ratio))
-+
-+ #set aspect ratio
-+ video.setAttribute("aspectratio",str(aspect_ratio))
-+
-+ WriteXMLToFile (infoDOM,xmlFilename)
-+
- # print out the streaminfo.xml file to the log
- infoDOM = xml.dom.minidom.parse(xmlFilename)
- write(xmlFilename + ":-\n" + infoDOM.toprettyxml(" ", ""), False)
-@@ -1707,7 +1777,7 @@
- write("Using cutlist: %s" % cutlist_s)
-
- if (localfile != ""):
-- localfile = quoteFilename(localfile)
-+ localfile = quoteCmdArg(localfile)
- if usecutlist == True:
- command = "mythtranscode --mpeg2 --honorcutlist %s --infile %s --outfile %s" % (cutlist_s, quoteCmdArg(localfile), quoteCmdArg(destination))
- else:
-@@ -1973,7 +2043,7 @@
- #############################################################
- # Re-encodes a file to mpeg2
-
--def encodeVideoToMPEG2(source, destvideofile, video, audio1, audio2, aspectratio, profile):
-+def encodeVideoToMPEG2(source, destvideofile, video, folder, audio1, audio2, aspectratio, profile):
- """Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use mythffmpeg"""
-
- profileNode = findEncodingProfile(profile)
-@@ -1998,7 +2068,36 @@
- value = quoteCmdArg(destvideofile)
- if value == "%aspect":
- value = aspectratio
-+ if value == "720x480" or value == "720x576":
-+ videores, fps, videoAR = getVideoParams(folder)
-+ videoWidth = int(videores.split("x")[0])
-+ videoHeight = int(videores.split("x")[1])
-+
-+ #add padding to correct for aspects > than 1.9:1
-+ if float(videoAR) >= 1.9:
-+ #check which video type and set the correct height
-+ if videomode == "ntsc":
-+ videoModeHeight = 480
-+ else:
-+ videoModeHeight = 576
-
-+ #calculate the video height based on the aspect ratio of the video
-+ #multiply by 1.185 to compensate for dvds non-square pixels
-+ calVideoHeight = int(round((720 / float(videoAR)) * 1.185))
-+ if calVideoHeight % 2 == 1:
-+ calVideoHeight = calVideoHeight + 1
-+ #write("calVideoHeight: %s" % calVideoHeight)
-+
-+ #use original video height if the calculated video height is close
-+ if (calVideoHeight + 20 < videoHeight) or (calVideoHeight - 20 > videoHeight):
-+ videoHeight = calVideoHeight
-+
-+ cropPixels = videoModeHeight - videoHeight
-+
-+ write("Crop Pixels Total: %s" % cropPixels)
-+ name = "-vf"
-+ value = "\"scale=720:%d, setsar=1:1, pad=720:%d:0:%d:black\"" % (videoModeHeight - cropPixels, videoModeHeight, cropPixels / 2)
-+
- # only re-encode the audio if it is not already in AC3 format
- if audio1[AUDIO_CODEC] == "AC3":
- if name == "-acodec":
-@@ -2094,10 +2193,6 @@
- outaudiosamplerate = 48000
- outaudiocodec = "ac3"
- deinterlace = 0
-- croptop = 0
-- cropright = 0
-- cropbottom = 0
-- cropleft = 0
- qmin = 5
- qmax = 31
- qdiff = 31
-@@ -2121,14 +2216,6 @@
- outvideores = value
- if name == "-deinterlace":
- deinterlace = 1
-- if name == "-croptop":
-- croptop = value
-- if name == "-cropright":
-- cropright = value
-- if name == "-cropbottom":
-- cropbottom = value
-- if name == "-cropleft":
-- cropleft = value
- if name == "-qmin":
- qmin = value
- if name == "-qmax":
-@@ -4409,7 +4496,7 @@
- elif file.attributes["type"].value=="recording":
- mediafile = file.attributes["filename"].value
- elif file.attributes["type"].value=="video":
-- mediafile=os.path.join(videopath, file.attributes["filename"].value)
-+ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
- elif file.attributes["type"].value=="file":
- mediafile=file.attributes["filename"].value
- else:
-@@ -4547,7 +4634,7 @@
-
- #do the re-encode
- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
-- audio1, audio2, aspectratio, profile)
-+ folder, audio1, audio2, aspectratio, profile)
- mediafile = os.path.join(folder, 'newfile2.mpg')
-
- #remove the old mediafile that was run through mythtranscode
-@@ -4621,7 +4708,7 @@
- elif file.attributes["type"].value=="recording":
- mediafile = file.attributes["filename"].value
- elif file.attributes["type"].value=="video":
-- mediafile=os.path.join(videopath, file.attributes["filename"].value)
-+ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
- elif file.attributes["type"].value=="file":
- mediafile=file.attributes["filename"].value
- else:
-@@ -4701,7 +4788,7 @@
-
- #do the re-encode
- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
-- audio1, audio2, aspectratio, profile)
-+ folder, audio1, audio2, aspectratio, profile)
- mediafile = os.path.join(folder, 'newfile2.mpg')
-
- #remove an intermediate file
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install
deleted file mode 100644
index a4e0c0d..0000000
--- a/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- . /etc/systemconfig
- if [ $SystemType = Master_backend -o $SystemType = Standalone ]
- then
- echo "This looks a zoneminder server install"
- echo "Installing zoneminder"
- #for reference the pacman statement below will not work because of a db lock.
- pacman -S zoneminder
- fi
-
-}
diff --git a/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch b/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
deleted file mode 100644
index d8f4a0c..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Sun, 10 Jun 2012 13:36:42 -0400
-Subject: [PATCH] protect metadata loads from multiple threads
-
----
- mythtv/libs/libmythmetadata/dbaccess.cpp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/mythtv/libs/libmythmetadata/dbaccess.cpp b/mythtv/libs/libmythmetadata/dbaccess.cpp
-index 67cd904..46adb7a 100644
---- a/mythtv/libs/libmythmetadata/dbaccess.cpp
-+++ b/mythtv/libs/libmythmetadata/dbaccess.cpp
-@@ -47,8 +47,11 @@ class SingleValueImp
-
- virtual ~SingleValueImp() {}
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -271,8 +274,11 @@ class MultiValueImp
- .arg(m_value_name).arg(m_table_name).arg(m_id_name);
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -730,8 +736,11 @@ class FileAssociationsImp
- }
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
---
-1.7.2.5
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch b/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch
deleted file mode 100644
index 440a37a..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2fb4b7bb111d7ec256f0b0f96c7271bcc0f61766 Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Fri, 24 Aug 2012 00:17:08 -0400
-Subject: [PATCH 4/4] restore fe netcontrol play/resume functionality
-
----
- mythtv/programs/mythfrontend/playbackbox.cpp | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
-index 734cce1..44bb343 100644
---- a/mythtv/programs/mythfrontend/playbackbox.cpp
-+++ b/mythtv/programs/mythfrontend/playbackbox.cpp
-@@ -3723,7 +3723,9 @@ void PlaybackBox::processNetworkControlCommand(const QString &command)
-
- pginfo.SetPathname(pginfo.GetPlaybackURL());
-
-- PlayX(pginfo, true, true);
-+ bool ignoreBookmark = tokens[1] == "PLAY";
-+
-+ PlayX(pginfo, ignoreBookmark, true);
- }
- else
- {
---
-1.7.2.5
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch b/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch
deleted file mode 100644
index ff1f4b6..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** a/mythtv/bindings/php/MythBase.php.old 2011-04-03 06:05:31.000000000 -0500
---- b/mythtv/bindings/php/MythBase.php 2012-03-27 05:05:16.000000000 -0500
-***************
-*** 51,57 ****
-
- public function __destruct() {
- if (!is_null($this->cacheKey))
-! Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime);
- $this->cacheKey = null;
- }
-
---- 51,57 ----
-
- public function __destruct() {
- if (!is_null($this->cacheKey))
-! Cache::setObject($this->cacheKey, $this, $this->cacheLifetime);
- $this->cacheKey = null;
- }
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
deleted file mode 100644
index 936060b..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ /dev/null
@@ -1,172 +0,0 @@
-# $Id: PKGBUILD 91139 2010-09-23 10:45:09Z remy $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.25
-pkgrel=33
-commit_hash=`cat ../git_src/git_hash`
-pkgdesc="A Homebrew PVR project $commit_hash"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('mysql-clients'
- 'qt'
- 'qtwebkit'
- 'lame'
- 'lirc-utils'
- 'ffmpeg'
- 'fribidi'
- 'perl-soap-lite'
- 'perl-date-manip'
- 'perl-xml-sax'
- 'perl-math-round'
- 'perl-net-upnp'
- 'perl-dbd-mysql'
- 'perl-time-hires'
- 'libavc1394'
- 'wget'
- 'libiec61883'
- 'mysql-python'
- 'python2-lxml'
- 'mesa'
- 'libxinerama'
- 'libxrandr'
- 'faad2'
- 'libvdpau'
- 'libcrystalhd-git'
- 'urlgrabber'
- 'python-pycurl'
- 'avahi'
- 'libcec'
- 'perl-io-socket-inet6'
- 'glew'
- 'openssl'
- 'libxml2'
- 'lsdvd'
- 'dvdbackup'
- 'x264')
-
-#glew for gpu commerical flagging
-#openssl for roap
-#lib xml2 for blu-ray
-
-
-makedepends=('yasm' 'libgl' 'git' 'rsync')
-replaces=()
-groups=('pvr')
-#backup=(/usr/share/mythtv/is.xml)
-#options=(!strip)
-#MAKEFLAGS="-j6"
-install='mythtv.install'
-
-#http://code.mythtv.org/trac/ticket/10504 mythweb php
-#http://code.mythtv.org/trac/ticket/10773 mythexpress
-#http://code.mythtv.org/trac/ticket/10825 mythexpress
-#http://code.mythtv.org/trac/ticket/11032 mythexpress
-#patchs=('myth_settings.patch' 'MythBase.php.patch'
-
-patchs=('myth_settings.patch'
- 'bonjour-correction.patch'
- '0001-protect-metadata-loads-from-multiple-threads.patch'
- '0004-restore-fe-netcontrol-play-resume-functionality.patch')
-
-optdepends=('xmltv: to download tv listings')
-replaces=('mythvideo' 'myththemes')
-conflicts=('mythvideo' 'myththemes')
-source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}`
- 'mythbackend.lr' 'mythfrontend.lr' 'pretty'
- 'tmdb3.py' 'tmdb3_db_update.py')
-
-
-build() {
- if [ -e ${srcdir}/mythtv ]
- then
- rm -rf ${srcdir}/mythtv
- fi
-
- cd ${startdir}
- msg "copy in mythtv src"
- cp -rp ../git_src/mythtv/mythtv $srcdir
- cd ${srcdir}/$pkgname
- echo "#!/bin/bash" > version.sh
- # apply patches
-
- echo "--------------------------applying patches----------------------------------------------------"
- for i in `echo ${patchs[@]:0} `
- do
- echo applying $i
- echo "-----------------------------"
- patch -Np2 -i ${startdir}/src/$i || return 1
- done
- echo "--------------------------done applying patches-----------------------------------------------"
-
- #sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
- #find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- #Fix Python DepreciationWarning
- sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py
-
- #Update tmdb3.py to v3.6 & add tmdb3_db_update.py script & rm tmdb.py
- cp $srcdir/tmdb3*.py $srcdir/mythtv/programs/scripts/metadata/Movie/
- rm -f $srcdir/mythtv/programs/scripts/metadata/Movie/tmdb.py
-
- ARCH=${CARCH/_/-}
- ./configure --prefix=/usr --cpu=${ARCH} \
- --disable-audio-jack \
- --disable-audio-pulse \
- --disable-altivec \
- --disable-distcc \
- --disable-ccache \
- --enable-vdpau \
- --enable-crystalhd \
- --dvb-path=/usr/include \
- --enable-libmp3lame \
- --enable-libx264 \
- --with-bindings=perl,python --python=python2 || return 1
-
- make all || return 1
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- # basic install
- make INSTALL_ROOT="${pkgdir}" install
- # install contrib files
- rsync -arp --exclude .svn --delete-excluded contrib ${pkgdir}/usr/share/mythtv/ || return 1
- # install database structure
- rsync -arp --exclude .svn --delete-excluded database ${pkgdir}/usr/share/mythtv/ || return 1
- # install docs
- rsync -arp --exclude .svn --delete-excluded docs ${pkgdir}/usr/share/mythtv/ || return 1
-
- # patch the xml LinHES style
- cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/
-# mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
- cd ${pkgdir}/usr/share/mythtv
- patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
- patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
- patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1
- #patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
-
- # make log dir
- mkdir -p ${pkgdir}/var/log/mythtv
- chown 1000.1000 ${pkgdir}/var/log/mythtv
- mkdir -p ${pkgdir}/etc/logrotate.d
- cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d
- mkdir -p ${pkgdir}/etc/cron.hourly/
- install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/
-}
-
-md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
- '2babd4b8e146a7538d18dcd55695b0be'
- '322f48528b350f0e6aebfff6eab4c4ee'
- '8e2a055bb3beae04c88a8e603e080422'
- '67f7316c750fba17fa578d10840b9dbd'
- 'ae23e6a8cffbe335fa37bf59978bf7a2'
- 'f735805a80b0d1180dee01f9df1b7004'
- 'f407d6af23e74a49540755420f84fa58'
- '5469d9921b726db750b991c87d226158'
- '187be42b1ffca6badfa539260ffef65e'
- '7460513f6791574eaa0ae0402ffd3688')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/__changelog b/abs/core/mythtv/stable-0.25/mythtv/__changelog
deleted file mode 100644
index 31cdd16..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/__changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-update to 0.25-fixes
-remove xvmc
-added perl-io-socket-inet6 for perl bindings
-added glew for gpu commerical flagging
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch b/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch
deleted file mode 100644
index 9456809..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8929314e77dfc5fe9bcc58f4ace4e7ba6fea9bef Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Tue, 29 May 2012 10:11:38 -0400
-Subject: [PATCH] make backend's bonjour service name dns-compliant
-
----
- mythtv/programs/mythbackend/mediaserver.cpp | 7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/mythtv/programs/mythbackend/mediaserver.cpp b/mythtv/programs/mythbackend/mediaserver.cpp
-index 043140d..19d0eb9 100644
---- a/mythtv/programs/mythbackend/mediaserver.cpp
-+++ b/mythtv/programs/mythbackend/mediaserver.cpp
-@@ -256,13 +256,10 @@ void MediaServer::Init(bool bIsMaster, bool bDisableUPnp /* = false */)
- m_bonjour = new BonjourRegister();
- if (m_bonjour)
- {
-- QByteArray dummy;
- QByteArray name("Mythbackend on ");
- name.append(gCoreContext->GetHostName());
-- m_bonjour->Register(nPort,
-- bIsMaster ? "_mythbackend-master._tcp" :
-- "_mythbackend-slave._tcp",
-- name, dummy);
-+ QByteArray txt(bIsMaster ? "\x0Clevel=master" : "\x0Blevel=slave");
-+ m_bonjour->Register(nPort, "_mythbackend._tcp", name, txt);
- }
- #endif
- }
---
-1.7.2.5
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/git_version.patch b/abs/core/mythtv/stable-0.25/mythtv/git_version.patch
deleted file mode 100644
index 8b1def8..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/git_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mythtv/version.sh b/mythtv/version.sh
-index d2c53af..2cf971f 100755
---- a/mythtv/version.sh
-+++ b/mythtv/version.sh
-@@ -22,7 +22,7 @@ GITREPOPATH="exported"
-
- cd ${GITTREEDIR}
-
--SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown)
-+SOURCE_VERSION=$(git describe | cut -d- -f 3 || echo Unknown)
-
- case "${SOURCE_VERSION}" in
- exported|Unknown)
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
deleted file mode 100644
index b1fa6b5..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<mythmenu name="HOST_SETTINGS">
- <button>
- <type>MV_ACCESS_SETUP_MENU</type>
- <text>Access Control</text>
- <action>EXEC mythinstall -s accesscontrol </action>
- </button>
-
- <button>
- <type>MV_SOFTWARE_MENU</type>
- <text>Add/Remove software</text>
- <action>EXEC mythinstall -s plugins,software </action>
- </button>
-
- <button>
- <type>MV_ADVANCED_SETUP_MENU</type>
- <text>Advanced</text>
- <action>EXEC mythinstall -s advanced</action>
- </button>
-
- <button>
- <type>MV_AUDIO_SETUP_MENU</type>
- <text>Audio Settings</text>
- <action>EXEC mythinstall -s sound </action>
- </button>
-
- <button>
- <type>MV_ADVANCED_X_SETUP_MENU</type>
- <text>Display</text>
- <action>EXEC mythinstall -s advancedX</action>
- </button>
-
- <button>
- <type>MV_NETWORK_SETUP_MENU</type>
- <text>Dynamic DNS</text>
- <action>EXEC mythinstall -s ddns </action>
- </button>
-
- <button>
- <type>MV_FILESHARES_MENU</type>
- <text>File Shares</text>
- <action>EXEC mythinstall -s fileshare</action>
- </button>
-
- <button>
- <type>MV_MISC_SETUP_MENU</type>
- <text>Miscellanous</text>
- <action>EXEC mythinstall -s misc </action>
- </button>
-
- <button>
- <type>MV_NETWORK_SETUP_MENU</type>
- <text>Network</text>
- <action>EXEC mythinstall -s network </action>
- </button>
-
- <button>
- <type>MV_IR_SETUP_MENU</type>
- <text>Remotes</text>
- <action>EXEC mythinstall -s ir </action>
- </button>
-
- <button>
- <type>MV_SCREENSAVER_SETUP_MENU</type>
- <text>Screensaver</text>
- <action>EXEC mythinstall -s screensaver </action>
- </button>
-
- <button>
- <type>MV_SHUTDOWN_SETUP_MENU</type>
- <text>Shutdown Settings</text>
- <action>EXEC mythinstall -s sleep </action>
- </button>
-
- <button>
- <type>MV_SYSTEM_SETUP_MENU</type>
- <text>System Type</text>
- <action>EXEC mythinstall -s hostype </action>
- </button>
-
- <button>
- <type>MV_USER_SETUP_MENU</type>
- <text>User Accounts</text>
- <action>EXEC mythinstall -s user </action>
- </button>
-
- <button>
- <type>MV_VNC_SETUP_MENU</type>
- <text>VNC Service</text>
- <action>EXEC mythinstall -s vnc </action>
- </button>
-
- <button>
- <type>MV_WEBACCESS_SETUP_MENU</type>
- <text>Web Security</text>
- <action>EXEC mythinstall -s webuser </action>
- </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
deleted file mode 100644
index 2647d81..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<mythmenu name="OPTICAL_DISK">
-
- <button>
- <type>DVD_RIP</type>
- <text>Mirror DVD</text>
- <description>Creates a mirror of your DVD</description>
- <action>EXEC /usr/LH/bin/ripD_eject.sh m &</action>
- </button>
-
- <button>
- <type>DVD_RIP</type>
- <text>ISO of DVD</text>
- <description>Creates an ISO of your DVD</description>
- <action>EXEC /usr/LH/bin/ripD_eject.sh i &</action>
- </button>
-
- <button>
- <type>DVD_RIP</type>
- <text>High Quality</text>
- <description>Creates a high quality MPEG4 of your DVD</description>
- <action>EXEC /usr/LH/bin/ripD_eject.sh h &</action>
- </button>
-
- <button>
- <type>DVD_RIP</type>
- <text>Normal Quality</text>
- <description>Creates a normal quality MPEG4 of your DVD</description>
- <action>EXEC /usr/LH/bin/ripD_eject.sh n &</action>
- </button>
-
- <button>
- <type>DVD_RIP</type>
- <text>Low Quality</text>
- <description>Creates a low quality MPEG4 of your DVD</description>
- <action>EXEC /usr/LH/bin/ripD_eject.sh l &</action>
- </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/game.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/game.xml
deleted file mode 100644
index 293a9e6..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/game.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<mythmenu name="GAME">
-
- <button>
- <type>GAME</type>
- <text>MythGame</text>
- <description>Play video games</description>
- <action>PLUGIN mythgame</action>
- <depends>mythgame</depends>
- </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
deleted file mode 100644
index 017f90b..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<mythmenu name="INFO">
-
- <button>
- <type>NEWS</type>
- <text>News Feeds</text>
- <description>Keep up with the news</description>
- <action>PLUGIN mythnews</action>
- <depends>mythnews</depends>
- </button>
-
- <button>
- <type>MYTHTWITTER_TIMELINE</type>
- <text>Twitter</text>
- <description>Send and receive tweets</description>
- <action>JUMP MythTwitter_Timeline</action>
- <depends>mythtwitter</depends>
- </button>
-
- <button>
- <type>WEATHER</type>
- <text>Weather</text>
- <action>PLUGIN mythweather</action>
- <description>Local weather forecast</description>
- <depends>mythweather</depends>
- </button>
-
- <button>
- <type>WEATHER</type>
- <text>Weather Station</text>
- <action>PLUGIN mythwstation</action>
- <depends>mythwstation</depends>
- </button>
-
- <button>
- <type>WEBPAGE</type>
- <text>Web</text>
- <description>Browse the web</description>
- <action>PLUGIN mythbrowser</action>
- <depends>mythbrowser</depends>
- </button>
-
- <button>
- <type>RECIPE</type>
- <text>Recipes</text>
- <description>Start cooking!</description>
- <action>PLUGIN mythRecipe</action>
- <depends>mythrecipe</depends>
- </button>
-
- <button>
- <type>TV_STATUS</type>
- <text>System Status</text>
- <description>See what your system is doing</description>
- <action>TV_STATUS</action>
- </button>
-
- <button>
- <type>ZONEMINDER</type>
- <text>ZoneMinder</text>
- <description>Home surveillance</description>
- <action>PLUGIN mythzoneminder</action>
- <depends>mythzoneminder</depends>
- </button>
-
-<!--
- <button>
- <type>SMOLT</type>
- <text>Hardware profile</text>
- <description>Tell us what hardware you have so we can support it</description>
- <action>PLUGIN mythsmolt</action>
- <depends>mythsmolt</depends>
- </button>
- -->
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/is.xml
deleted file mode 100644
index 88b7e6b..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/is.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<mythmenu name="Internet Steams">
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
deleted file mode 100644
index 8f80928..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- themes/defaultmenu/library.xml.orig 2012-06-10 08:02:54.000000000 +0000
-+++ themes/defaultmenu/library.xml 2012-06-10 08:03:38.000000000 +0000
-@@ -40,6 +40,13 @@
- </button>
-
- <button>
-+ <type>STREAM</type>
-+ <text>Online Content</text>
-+ <description>Play content from online sources</description>
-+ <action>MENU gen_is.xml</action>
-+ </button>
-+
-+ <button>
- <type>IMAGES</type>
- <text>Image Gallery</text>
- <description>Look at Pictures</description>
-@@ -51,8 +58,7 @@
- <type>GAME</type>
- <text>Play Games</text>
- <description>Play video games</description>
-- <action>PLUGIN mythgame</action>
-- <depends>mythgame</depends>
-+ <action>MENU game.xml</action>
- </button>
-
- </mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
deleted file mode 100644
index 342766d..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>SETUP_GENERAL</type>
- <text>MythTV Configuration</text>
- <text lang="IT">Impostazioni</text>
- <text lang="ES">Configuración</text>
- <text lang="DE">Zubehör / Konfiguration</text>
- <text lang="DA">Tilbehør/Indstillinger</text>
- <text lang="IS">Uppsetning</text>
- <text lang="NL">Configuratie</text>
- <text lang="PT">Utensílios</text>
- <text lang="SV">Verktyg / Inställningar</text>
- <text lang="JA">設�~Z</text>
- <text lang="FI">Oheis/Asetukset</text>
- <text lang="ZH_TW">工�~E�/設�~Z</text>
- <text lang="SL">Nastavitve</text>
- <text lang="ET">Utiliidid / sätted</text>
- <text lang="RU">У�~Bили�~B�~K / �~]а�~A�~B�~@ойки</text>
- <text lang="AR">تضب�~Jطات</text>
- <text lang="PL">Narz�~Ydzia / ustawienia</text>
- <text lang="HE">ע�~Vר�~Y�~] / �~T�~R�~Sר�~Uת</text>
- <text lang="HU">Eszközök / Beállítások</text>
- <alttext lang="DE">Verschiedenes</alttext>
- <alttext lang="SV">Inställningar</alttext>
- <alttext lang="ET">Sätted</alttext>
- <alttext lang="RU">�~]а�~A�~B�~@ойки</alttext>
- <alttext lang="AR">تضب�~Jطات</alttext>
- <description>Configure MythTV and plugins</description>
- <description lang="DE">MythTV und Plugins konfigurieren</description>
- <action>MENU util_menu.xml</action>
- </button>
-
- <button>
- <type>LINHES_SETUP</type>
- <text>LinHES Configuration</text>
- <description>Configure LinHES</description>
- <action>MENU HOST_SETTINGS.xml</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>Backup LinHES</text>
- <action>MENU mythbackup.xml</action>
- </button>
-
- <button>
- <type>RESTORE</type>
- <text>Restore LinHES</text>
- <action>MENU mythrestore.xml</action>
- </button>
-
-<!--#Check for updates-->
- <button>
- <type>UPGRADE</type>
- <text>Update LinHES</text>
- <action>MENU update.xml</action>
- </button>
-<!--#Check for updates-->
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
deleted file mode 100644
index 73a8940..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- themes/defaultmenu/mainmenu.xml.orig 2012-07-29 21:39:46.000000000 +0000
-+++ themes/defaultmenu/mainmenu.xml 2012-07-29 21:41:50.000000000 +0000
-@@ -1,5 +1,11 @@
- <?xml version="1.0" encoding="UTF-8" ?>
- <mythmenu name="MAIN">
-+ <button>
-+ <type>TV_WATCH_TV</type>
-+ <text>Watch TV</text>
-+ <description>Watch live television</description>
-+ <action>TV_WATCH_LIVE</action>
-+ </button>
-
- <button>
- <type>MENU_MEDIA_LIBRARY</type>
-@@ -30,18 +36,11 @@
- </button>
-
- <button>
-- <type>TV_WATCH_TV</type>
-- <text>Watch TV</text>
-- <description>Watch live television</description>
-- <action>TV_WATCH_LIVE</action>
-- </button>
--
-- <button>
- <type>MENU_UTILITIES_SETUP</type>
-- <text>Setup</text>
-- <description>Configure MythTV and plugins</description>
-- <action>MENU main_settings.xml</action>
-- <password>SetupPinCode</password>
-+ <text>Service Menu</text>
-+ <description>Configure your system</description>
-+ <action>MENU linhes.xml</action>
-+ <password>SetupPinCode</password>
- </button>
-
- </mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
deleted file mode 100644
index 7890d88..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
- <button>
- <type>BACKUP</type>
- <text>Do you wish to backup?</text>
- <description></description>
- <action>NONE</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/lh_system_backup &</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>No</text>
- <action>UPMENU</action>
- </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
deleted file mode 100644
index 161f13f..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>RESTORE</type>
- <text>Do you wish to restore?</text>
- <description>This will restore from most recent backup.</description>
- <action>NONE</action>
- </button>
-
- <button>
- <type>RESTORE</type>
- <text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/lh_system_restore &</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>No</text>
- <action>UPMENU</action>
- </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
deleted file mode 100644
index b836e85..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- themes/defaultmenu/optical_menu.xml.orig 2012-05-02 18:41:38.000000000 +0000
-+++ themes/defaultmenu/optical_menu.xml 2012-07-30 05:33:03.000000000 +0000
-@@ -17,6 +17,20 @@
- </button>
-
- <button>
-+ <type>DVD_RIP</type>
-+ <text>Backup DVD</text>
-+ <description>Backup your DVDs</description>
-+ <action>MENU dvd_backup.xml</action>
-+ </button>
-+
-+ <button>
-+ <type>DVD_RIP</type>
-+ <text>Import Files from DVD</text>
-+ <description>Import all files from a data DVD</description>
-+ <action>EXEC /usr/LH/bin/importfiles.sh &</action>
-+ </button>
-+
-+ <button>
- <type>MUSIC_RIP</type>
- <text>Import CD</text>
- <description>Import music from an audio CD</description>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/original/create_patch.sh b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/original/create_patch.sh
deleted file mode 100644
index 34d8b8c..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/original/create_patch.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-for i in *.xml
-do
- diff -u $i.orig $i > ../$i.patch
-done
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/siriusmenu.xml
deleted file mode 100644
index e317b36..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/siriusmenu.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<mythmenu name="SIRIUS">
- <button>
- <type>MUSIC</type>
- <text>Sirius Hits 1</text>
- <action>EXEC /usr/bin/cliSipie siriushits1</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>StarLite</text>
- <action>EXEC /usr/bin/cliSipie starlite</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Love</text>
- <action>EXEC /usr/bin/cliSipie siriuslove</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Movin EZ</text>
- <action>EXEC /usr/bin/cliSipie movineasy</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Gold</text>
- <action>EXEC /usr/bin/cliSipie siriusgold</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>'60s Vibrations</text>
- <action>EXEC /usr/bin/cliSipie 60svibrations</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Totally '70s</text>
- <action>EXEC /usr/bin/cliSipie totally70s</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Big '80s</text>
- <action>EXEC /usr/bin/cliSipie big80s</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>ThePulse</text>
- <action>EXEC /usr/bin/cliSipie thepulse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Bridge</text>
- <action>EXEC /usr/bin/cliSipie thebridge</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BBC Radio 1</text>
- <action>EXEC /usr/bin/cliSipie bbcradio1</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Super Shuffle</text>
- <action>EXEC /usr/bin/cliSipie supershuffle</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Elvis Radio</text>
- <action>EXEC /usr/bin/cliSipie elvisradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Classic Vinyl</text>
- <action>EXEC /usr/bin/cliSipie classicvinyl</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Classic Rewind</text>
- <action>EXEC /usr/bin/cliSipie classicrewind</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>TheVault</text>
- <action>EXEC /usr/bin/cliSipie thevault</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Jam_ON</text>
- <action>EXEC /usr/bin/cliSipie jamon</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spectrum</text>
- <action>EXEC /usr/bin/cliSipie thespectrum</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BuzzSaw</text>
- <action>EXEC /usr/bin/cliSipie buzzsaw</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Octane</text>
- <action>EXEC /usr/bin/cliSipie octane</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Alt Nation</text>
- <action>EXEC /usr/bin/cliSipie altnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>1st Wave</text>
- <action>EXEC /usr/bin/cliSipie firstwave</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hair Nation</text>
- <action>EXEC /usr/bin/cliSipie hairnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>'90s Alternative</text>
- <action>EXEC /usr/bin/cliSipie 90salternative</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Garage</text>
- <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Left of Center</text>
- <action>EXEC /usr/bin/cliSipie leftofcenter</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hard Attack</text>
- <action>EXEC /usr/bin/cliSipie hardattack</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Faction</text>
- <action>EXEC /usr/bin/cliSipie faction</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Punk</text>
- <action>EXEC /usr/bin/cliSipie punk</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>The Coffee House</text>
- <action>EXEC /usr/bin/cliSipie coffeehouse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Margaritaville</text>
- <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Disorder</text>
- <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Reggae</text>
- <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Area 33</text>
- <action>EXEC /usr/bin/cliSipie area33</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Boombox</text>
- <action>EXEC /usr/bin/cliSipie boombox</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Chill</text>
- <action>EXEC /usr/bin/cliSipie chill</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>The Beat</text>
- <action>EXEC /usr/bin/cliSipie thebeat</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Strobe</text>
- <action>EXEC /usr/bin/cliSipie thestrobe</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hip-Hop Nation</text>
- <action>EXEC /usr/bin/cliSipie hiphopnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BackSpin</text>
- <action>EXEC /usr/bin/cliSipie backspin</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Shade 45</text>
- <action>EXEC /usr/bin/cliSipie shade45</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hot Jamz</text>
- <action>EXEC /usr/bin/cliSipie hotjamz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Heart & Soul</text>
- <action>EXEC /usr/bin/cliSipie heartandsoul</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>SoulTown</text>
- <action>EXEC /usr/bin/cliSipie soultown</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>New Country</text>
- <action>EXEC /usr/bin/cliSipie newcountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Prime Country</text>
- <action>EXEC /usr/bin/cliSipie primecountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Roadhouse</text>
- <action>EXEC /usr/bin/cliSipie theroadhouse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Outlaw Country</text>
- <action>EXEC /usr/bin/cliSipie outlawcountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Bluegrass</text>
- <action>EXEC /usr/bin/cliSipie bluegrass</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spirit</text>
- <action>EXEC /usr/bin/cliSipie spirit</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Praise</text>
- <action>EXEC /usr/bin/cliSipie praise</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Planet Jazz</text>
- <action>EXEC /usr/bin/cliSipie planetjazz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>JazzCafe</text>
- <action>EXEC /usr/bin/cliSipie jazzcafe</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>PureJazz</text>
- <action>EXEC /usr/bin/cliSipie purejazz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spa 73</text>
- <action>EXEC /usr/bin/cliSipie spa73</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Blues</text>
- <action>EXEC /usr/bin/cliSipie siriusblues</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Siriusly Sinatra</text>
- <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Broadway's Best</text>
- <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Symphony Hall</text>
- <action>EXEC /usr/bin/cliSipie symphonyhall</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Met Opera Radio</text>
- <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Pops</text>
- <action>EXEC /usr/bin/cliSipie siriuspops</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Universo Latino</text>
- <action>EXEC /usr/bin/cliSipie universolatino</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Rumbon</text>
- <action>EXEC /usr/bin/cliSipie rumbon</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Martha Stewart</text>
- <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Stars</text>
- <action>EXEC /usr/bin/cliSipie siriusstars</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>OutQ Gay Radio</text>
- <action>EXEC /usr/bin/cliSipie siriusoutq</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Patriot</text>
- <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Left</text>
- <action>EXEC /usr/bin/cliSipie siriusleft</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>CNN</text>
- <action>EXEC /usr/bin/cliSipie cnn</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>wrn</text>
- <action>EXEC /usr/bin/cliSipie wrn</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Blue Collar Comedy</text>
- <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Raw Dog Comedy</text>
- <action>EXEC /usr/bin/cliSipie rawdog</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Laugh Break Comedy</text>
- <action>EXEC /usr/bin/cliSipie laughbreak</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>thefoxxhole</text>
- <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>lime</text>
- <action>EXEC /usr/bin/cliSipie lime</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Kids Stuff</text>
- <action>EXEC /usr/bin/cliSipie kidsstuff</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Catholic Channel</text>
- <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>EWTN</text>
- <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>christiantalk</text>
- <action>EXEC /usr/bin/cliSipie christiantalk</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius NFL Radio</text>
- <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Maxim Radio</text>
- <action>EXEC /usr/bin/cliSipie maximradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Cosmo Radio</text>
- <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
- </button>
- <button>
- <type>TV_DELETE</type>
- <text>Stop Listening</text>
- <action>EXEC /usr/bin/sipie_kill</action>
- </button>
-
-</mythmenu>
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update.xml
deleted file mode 100644
index d2ac3fe..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>UPGRADE</type>
- <text>Check for Updates</text>
- <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
- </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update2.xml
deleted file mode 100644
index 64388cb..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/update2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>UPGRADE</type>
- <text>Install Updates</text>
- <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action>
- </button>
-
- <button>
- <type>UPGRADE</type>
- <text>Cancel Updates</text>
- <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
- </button>
-
- <button>
- <type>UPGRADE</type>
- <text>View Updates</text>
- <action>MENU update3.xml</action>
- </button>
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/util_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/util_menu.xml.patch
deleted file mode 100644
index 82d303e..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/util_menu.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- themes/defaultmenu/util_menu.xml.orig 2010-11-06 00:40:01.000000000 +0000
-+++ themes/defaultmenu/util_menu.xml 2010-11-06 00:45:42.000000000 +0000
-@@ -17,6 +17,13 @@
- </button>
-
- <button>
-+ <type>VIDEO_SCREENSHOOTER</type>
-+ <text>Thumbnail Generator</text>
-+ <description>Generate thumbnail images for videos</description>
-+ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
-+ </button>
-+
-+ <button>
- <type>SETUP_MENU</type>
- <text>Setup</text>
- <description>Configure MythTV and plugins</description>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/xmmenu.xml
deleted file mode 100644
index 6b26d11..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/xmmenu.xml
+++ /dev/null
@@ -1,574 +0,0 @@
-<!-- Current as of April 25, 2007 -->
-<mythmenu name="XM">
-
- <button>
- <type>MUSIC</type>
- <text>The '40s</text>
- <action>EXEC /usr/bin/xamp kill 4</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '50s</text>
- <action>EXEC /usr/bin/xamp kill 5</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '60s</text>
- <action>EXEC /usr/bin/xamp kill 6</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '70s</text>
- <action>EXEC /usr/bin/xamp kill 7</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '80s</text>
- <action>EXEC /usr/bin/xamp kill 8</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '90s</text>
- <action>EXEC /usr/bin/xamp kill 9</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>America</text>
- <action>EXEC /usr/bin/xamp kill 10</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>X Country</text>
- <action>EXEC /usr/bin/xamp kill 12</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Willie's Place</text>
- <action>EXEC /usr/bin/xamp kill 13</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bluegrass Junction</text>
- <action>EXEC /usr/bin/xamp kill 14</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Village</text>
- <action>EXEC /usr/bin/xamp kill 15</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Highway 16</text>
- <action>EXEC /usr/bin/xamp kill 16</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>US Country</text>
- <action>EXEC /usr/bin/xamp kill 17</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>20 on 20</text>
- <action>EXEC /usr/bin/xamp kill 20</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Heart</text>
- <action>EXEC /usr/bin/xamp kill 23</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Blend</text>
- <action>EXEC /usr/bin/xamp kill 25</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Flight 26</text>
- <action>EXEC /usr/bin/xamp kill 26</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Cinemagic</text>
- <action>EXEC /usr/bin/xamp kill 27</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>On Broadway</text>
- <action>EXEC /usr/bin/xamp kill 28</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>U-Pop</text>
- <action>EXEC /usr/bin/xamp kill 29</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Hitlist</text>
- <action>EXEC /usr/bin/xamp kill 30</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Torch</text>
- <action>EXEC /usr/bin/xamp kill 31</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Message</text>
- <action>EXEC /usr/bin/xamp kill 32</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Spirit</text>
- <action>EXEC /usr/bin/xamp kill 33</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>enLighten</text>
- <action>EXEC /usr/bin/xamp kill 34</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Deep Tracks</text>
- <action>EXEC /usr/bin/xamp kill 40</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Boneyard</text>
- <action>EXEC /usr/bin/xamp kill 41</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Liquid Metal</text>
- <action>EXEC /usr/bin/xamp kill 42</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XMU</text>
- <action>EXEC /usr/bin/xamp kill 43</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fred</text>
- <action>EXEC /usr/bin/xamp kill 44</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Cafe</text>
- <action>EXEC /usr/bin/xamp kill 45</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Top Tracks</text>
- <action>EXEC /usr/bin/xamp kill 46</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Ethel</text>
- <action>EXEC /usr/bin/xamp kill 47</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Squizz</text>
- <action>EXEC /usr/bin/xamp kill 48</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Big Tracks</text>
- <action>EXEC /usr/bin/xamp kill 49</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Loft</text>
- <action>EXEC /usr/bin/xamp kill 50</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Music Lab</text>
- <action>EXEC /usr/bin/xamp kill 51</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Verge</text>
- <action>EXEC /usr/bin/xamp kill 52</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fungus</text>
- <action>EXEC /usr/bin/xamp kill 53</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Lucy</text>
- <action>EXEC /usr/bin/xamp kill 54</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Soul Street</text>
- <action>EXEC /usr/bin/xamp kill 60</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Flow</text>
- <action>EXEC /usr/bin/xamp kill 61</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Suite 62</text>
- <action>EXEC /usr/bin/xamp kill 62</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Groove</text>
- <action>EXEC /usr/bin/xamp kill 64</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Rhyme</text>
- <action>EXEC /usr/bin/xamp kill 65</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>RAW</text>
- <action>EXEC /usr/bin/xamp kill 66</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The City</text>
- <action>EXEC /usr/bin/xamp kill 67</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Heat</text>
- <action>EXEC /usr/bin/xamp kill 68</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Real Jazz</text>
- <action>EXEC /usr/bin/xamp kill 70</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Watercolors</text>
- <action>EXEC /usr/bin/xamp kill 71</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Beyond Jazz</text>
- <action>EXEC /usr/bin/xamp kill 72</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>High Standards</text>
- <action>EXEC /usr/bin/xamp kill 73</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bluesville</text>
- <action>EXEC /usr/bin/xamp kill 74</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Hear Music</text>
- <action>EXEC /usr/bin/xamp kill 75</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fine Tuning</text>
- <action>EXEC /usr/bin/xamp kill 76</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Audio Visions</text>
- <action>EXEC /usr/bin/xamp kill 77</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Escape</text>
- <action>EXEC /usr/bin/xamp kill 78</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>On The Rocks</text>
- <action>EXEC /usr/bin/xamp kill 79</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Move</text>
- <action>EXEC /usr/bin/xamp kill 80</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>BPM</text>
- <action>EXEC /usr/bin/xamp kill 81</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The System</text>
- <action>EXEC /usr/bin/xamp kill 82</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Chrome</text>
- <action>EXEC /usr/bin/xamp kill 83</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM-Chill</text>
- <action>EXEC /usr/bin/xamp kill 84</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fuego</text>
- <action>EXEC /usr/bin/xamp kill 90</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Viva</text>
- <action>EXEC /usr/bin/xamp kill 91</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Aguila</text>
- <action>EXEC /usr/bin/xamp kill 92</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Caliente</text>
- <action>EXEC /usr/bin/xamp kill 94</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Luna</text>
- <action>EXEC /usr/bin/xamp kill 95</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Air Musique</text>
- <action>EXEC /usr/bin/xamp kill 100</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Joint</text>
- <action>EXEC /usr/bin/xamp kill 101</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Sur La Route</text>
- <action>EXEC /usr/bin/xamp kill 102</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>World Zone</text>
- <action>EXEC /usr/bin/xamp kill 103</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Ngoma</text>
- <action>EXEC /usr/bin/xamp kill 104</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Classics</text>
- <action>EXEC /usr/bin/xamp kill 110</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Vox</text>
- <action>EXEC /usr/bin/xamp kill 112</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Pops</text>
- <action>EXEC /usr/bin/xamp kill 113</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Kids</text>
- <action>EXEC /usr/bin/xamp kill 116</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bob Edwards Show</text>
- <action>EXEC /usr/bin/xamp kill 133</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Comedy</text>
- <action>EXEC /usr/bin/xamp kill 150</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Laugh USA</text>
- <action>EXEC /usr/bin/xamp kill 151</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Special X</text>
- <action>EXEC /usr/bin/xamp kill 154</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Agenda</text>
- <action>EXEC /usr/bin/xamp kill 134</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Oprah and Friends</text>
- <action>EXEC /usr/bin/xamp kill 156</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Virus</text>
- <action>EXEC /usr/bin/xamp kill 202</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>1 Hit Wonders</text>
- <action>EXEC /usr/bin/xamp kill 300</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Metalcore</text>
- <action>EXEC /usr/bin/xamp kill 301</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Indie First</text>
- <action>EXEC /usr/bin/xamp kill 302</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Late Night Mix</text>
- <action>EXEC /usr/bin/xamp kill 303</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Sessions@AOL</text>
- <action>EXEC /usr/bin/xamp kill 304</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Shuffle</text>
- <action>EXEC /usr/bin/xamp kill 305</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Rock First</text>
- <action>EXEC /usr/bin/xamp kill 306</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Country First</text>
- <action>EXEC /usr/bin/xamp kill 307</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Hip Hop First</text>
- <action>EXEC /usr/bin/xamp kill 308</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Pop First</text>
- <action>EXEC /usr/bin/xamp kill 309</action>
- </button>
-
- <button>
- <type>TV_DELETE</type>
- <text>Stop Listening</text>
- <action>EXEC /usr/bin/xamp kill</action>
- </button>
-
-</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth.sh b/abs/core/mythtv/stable-0.25/mythtv/myth.sh
deleted file mode 100644
index fb7122c..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/myth.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/usr/local/bin
-# set core file size to 0
-ulimit -c 0
-export MALLOC_CHECK_=0
\ No newline at end of file
diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
deleted file mode 100644
index a96051b..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch
+++ /dev/null
@@ -1,1981 +0,0 @@
-commit 9b4205fa320c06afde8c6d866b854cb12d3ec99c
-Author: root <root@localhost.localdomain>
-Date: Fri Sep 28 14:25:06 2012 -0500
-
- new patch
-
- Signed-off-by: root <root@localhost.localdomain>
-
-diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
-index 84cb01a..6e3c54a 100644
---- a/mythtv/libs/libmythbase/mythcorecontext.cpp
-+++ b/mythtv/libs/libmythbase/mythcorecontext.cpp
-@@ -1260,6 +1260,90 @@ void MythCoreContext::ResetLanguage(void)
- d->language.clear();
- }
-
-+//JM ADDED
-+void MythCoreContext::savesettings_togroup (QString src_hostname,
-+ QString saved_settingsgroupname )
-+{
-+ return d->m_database->savesettings_togroup(src_hostname,
-+ saved_settingsgroupname);
-+}
-+
-+void MythCoreContext::deletesettings(QString delete_hostname,
-+ QString saved_settingsgroupname)
-+{
-+ return d->m_database->deletesettings(delete_hostname,
-+ saved_settingsgroupname);
-+}
-+
-+QMap<QString,QStringList> MythCoreContext::list_settingsgroupname()
-+{
-+ return d->m_database->list_settingsgroupname();
-+}
-+
-+QMap<QString,QStringList> MythCoreContext::diff_settingsgroupname(
-+ QString diff_hostname1,
-+ QString diff_hostname2,
-+ QStringList table_list)
-+{
-+ return d->m_database->diff_settingsgroupname(diff_hostname1,
-+ diff_hostname2,
-+ table_list);
-+}
-+
-+void MythCoreContext::clonesettings(QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool is_full_clone,
-+ QString dest_hostname)
-+{
-+ return d->m_database->clonesettings(src_hostname,
-+ saved_settingsgroupname,
-+ table_list,
-+ is_full_clone,
-+ dest_hostname);
-+}
-+
-+void MythCoreContext::restoresettings(QString dest_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list )
-+{
-+ return d->m_database->restoresettings( dest_hostname,
-+ saved_settingsgroupname,
-+ table_list);
-+}
-+
-+void MythCoreContext::change_hostname(QString old_hostname,
-+ QString new_hostname)
-+{
-+ return d->m_database->change_hostname(old_hostname, new_hostname) ;
-+}
-+
-+bool MythCoreContext::settings_check(QString src_hostname,
-+ QString saved_settingsgroupname)
-+{
-+ return d->m_database->settings_check(src_hostname,saved_settingsgroupname);
-+}
-+
-+void MythCoreContext::import_settings(QMap<QString,QString> vp_map,
-+ QString table)
-+{
-+ return d->m_database->import_settings(vp_map, table);
-+}
-+
-+
-+QMap<QString, QMap<QString,QString> > MythCoreContext::export_settings(
-+ QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list, bool skip_host )
-+{
-+ return d->m_database->export_settings(src_hostname,
-+ saved_settingsgroupname,
-+ table_list , skip_host );
-+}
-+
-+//END JM ADDED
-+
-+
- void MythCoreContext::InitLocale(void )
- {
- if (!d->m_locale)
-diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h
-index 0917313..3f6d5f8 100644
---- a/mythtv/libs/libmythbase/mythcorecontext.h
-+++ b/mythtv/libs/libmythbase/mythcorecontext.h
-@@ -168,6 +168,40 @@ class MBASE_PUBLIC MythCoreContext : public MythObservable, public MythSocketCBs
- QString GetLanguageAndVariant(void);
- void ResetLanguage(void);
-
-+ //JM ADDED
-+ void savesettings_togroup(QString src_hostname,
-+ QString saved_settingsgroupname );
-+
-+ void deletesettings(QString delete_hostname,
-+ QString saved_settingsgroupname);
-+
-+ QMap<QString,QStringList> list_settingsgroupname();
-+ QMap<QString,QStringList> diff_settingsgroupname(QString diff_hostname1,
-+ QString diff_hostname2,
-+ QStringList table_list);
-+
-+ void clonesettings(QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool is_full_clone=TRUE,
-+ QString dest_hostname="");
-+
-+ void restoresettings (QString dest_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list);
-+
-+ void change_hostname (QString old_hostname, QString new_hostname);
-+
-+ bool settings_check (QString src_hostname ,QString saved_settingsgroupname);
-+ void import_settings(QMap<QString,QString> vp_map, QString table);
-+
-+ QMap<QString,QMap <QString,QString> > export_settings(
-+ QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool skip_host = FALSE );
-+ //END JM ADDED
-+
- private:
- MythCoreContextPrivate *d;
-
-diff --git a/mythtv/libs/libmythbase/mythdb.cpp b/mythtv/libs/libmythbase/mythdb.cpp
-index ea30783..e4c1781 100644
---- a/mythtv/libs/libmythbase/mythdb.cpp
-+++ b/mythtv/libs/libmythbase/mythdb.cpp
-@@ -774,7 +774,7 @@ void MythDB::OverrideSettingForSession(
- QString mk = key.toLower(), mk2 = d->m_localhostname + ' ' + mk, mv = value;
- if ("dbschemaver" == mk)
- {
-- LOG(VB_GENERAL, LOG_ERR,
-+ LOG(VB_GENERAL, LOG_ERR,
- QString("ERROR: Refusing to allow override for '%1'.").arg(key));
- return;
- }
-@@ -1055,6 +1055,1015 @@ void MythDB::WriteDelayedSettings(void)
- }
- }
-
-+//JM ADDED
-+void MythDB::savesettings_togroup(QString src_hostname,
-+ QString saved_settingsgroupname )
-+{
-+ LOG(VB_GENERAL, LOG_ERR, QString("Using hostname of : %1")
-+ .arg(src_hostname));
-+ LOG(VB_GENERAL, LOG_ERR, QString("Saving to group: %1")
-+ .arg(saved_settingsgroupname));
-+ if ( settings_check( src_hostname , "current" ) )
-+ {
-+ QStringList table_list;
-+ QString hostname_clause;
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ table_list.append("jumppoints");
-+ if ( src_hostname == "GLOBAL" )
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ hostname_clause ="hostname = :HOSTNAME";
-+
-+ foreach (QString table, table_list)
-+ {
-+ QString dest_tablename = table +"_" + saved_settingsgroupname ;
-+ create_new_table(dest_tablename,table);
-+
-+ QString query_string;
-+ // Remove old saved values
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ query_string = QString("DELETE FROM %1 WHERE %2")
-+ .arg(dest_tablename)
-+ .arg(hostname_clause);
-+
-+ //query_string = QString("DELETE FROM %1 WHERE "
-+ // "hostname = :HOSTNAME").arg(dest_tablename);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" ,src_hostname);
-+ query.exec();
-+
-+ //insert all new settings
-+ query_string = QString("REPLACE INTO %1 "
-+ "SELECT * from %2 where %3")
-+ .arg(dest_tablename)
-+ .arg(table)
-+ .arg(hostname_clause);
-+// query_string = QString("REPLACE INTO %1 "
-+// "SELECT * from %2 where hostname = :HOSTNAME)")
-+// .arg(dest_tablename)
-+// .arg(table);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME",src_hostname);
-+ query.exec();
-+ }
-+ }
-+ else
-+ LOG(VB_GENERAL| VB_STDIO|VB_FLUSH, LOG_ERR,
-+ QString("Couldn't find settings for: %1 \n").arg(src_hostname));
-+ return;
-+
-+};
-+
-+void MythDB::deletesettings(QString delete_hostname,
-+ QString saved_settingsgroupname)
-+{
-+ LOG(VB_GENERAL, LOG_ERR, QString("Using hostname of : %1")
-+ .arg(delete_hostname));
-+ LOG(VB_GENERAL, LOG_ERR, QString("Deleting: %1")
-+ .arg(saved_settingsgroupname));
-+ int tempItem;
-+ QString src_tablename;
-+ QStringList table_list;
-+
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ table_list.append("jumppoints");
-+ QString hostname_clause;
-+ if ( delete_hostname == "GLOBAL" )
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ hostname_clause ="hostname = :HOSTNAME";
-+
-+ foreach (QString table, table_list)
-+ {
-+ src_tablename = find_group_table_name(table, saved_settingsgroupname);
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ // Remove old saved values
-+ if ( does_table_exist(src_tablename))
-+ {
-+ QString query_string = QString("DELETE from %1 "
-+ "WHERE %2")
-+ .arg(src_tablename)
-+ .arg(hostname_clause);
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" ,delete_hostname);
-+ query.exec();
-+
-+ //check if ok to delete table
-+ query_string = QString("SELECT count(*) from %1")
-+ .arg(src_tablename);
-+ query.prepare(query_string);
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ query.next();
-+ tempItem = query.value(0).toInt();
-+ if ( tempItem == 0 )
-+ drop_temp_table(src_tablename);
-+ }
-+ }
-+ else
-+ LOG(VB_GENERAL, LOG_ERR,
-+ QString("Couldn't find table: %1").arg(src_tablename));
-+ }
-+ return;
-+}; // end delete settings
-+
-+
-+QMap<QString,QStringList> MythDB::list_settingsgroupname()
-+{
-+ //Returns a QMAP of "settings_groups: hostname"
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ MSqlQuery subquery(MSqlQuery::InitCon());
-+ QString tempItem;
-+ QString temp_hostnameItem;
-+ QStringList hostname_list;
-+ QMap<QString,QStringList> return_list;
-+ QString full_table_name;
-+ query.prepare( "show tables like \"settings%\" " );
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ full_table_name = query.value(0).toString();
-+ tempItem=query.value(0).toString().remove(QRegExp("settings_"));
-+ if ( tempItem != "distro_default" )
-+ {
-+ //loop over tables looking for hostnames
-+ QString query_string = QString("SELECT DISTINCT "
-+ "hostname from %1")
-+ .arg(full_table_name);
-+ subquery.prepare(query_string);
-+
-+ if (subquery.exec() && subquery.isActive()
-+ && subquery.size() > 0)
-+ {
-+ while (subquery.next())
-+ {
-+ temp_hostnameItem = subquery.value(0).toString();
-+ hostname_list.append(temp_hostnameItem);
-+ }
-+ }
-+ //Special case of naming for the settings table;
-+ //This only affects output.
-+ if ( tempItem == "settings" )
-+ return_list["current"] = hostname_list;
-+ else
-+ return_list[tempItem] = hostname_list;
-+
-+ //reset hostname_list for the next group
-+ hostname_list = QStringList();
-+ }
-+ }
-+ }
-+ return return_list;
-+}; // end list_settingsgroupname
-+
-+QMap<QString,QStringList> MythDB::diff_settingsgroupname(
-+ QString diff_hostname1 ,
-+ QString diff_hostname2,
-+ QStringList table_list )
-+{
-+ // Returns a QMAP of tablename : diff results
-+ LOG(VB_GENERAL, LOG_ERR, QString("Comparing settings for:"));
-+ LOG(VB_GENERAL, LOG_ERR, QString("host 1: %1").arg(diff_hostname1));
-+ LOG(VB_GENERAL, LOG_ERR, QString("host 2: %1").arg(diff_hostname2));
-+
-+ QString qstr;
-+ QString tempItem;
-+ QString tempString;
-+
-+ QStringList diff_list;
-+ QStringList settings_list;
-+ QStringList keybinding_list;
-+
-+ QMap<QString,QStringList> return_list;
-+ if ( table_list.isEmpty() )
-+ {
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ }
-+
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ foreach (QString table, table_list)
-+ {
-+ if ( table == "settings")
-+ {
-+
-+ qstr= "SELECT distinct settings.value, :DIFF_HOSTNAME1 AS `hostname`, settings_a.data, :DIFF_HOSTNAME2 AS `hostname`"
-+ " , settings_b.data FROM settings LEFT JOIN settings AS settings_a ON settings_a.value = settings.value AND settings_a.hostname = :DIFF_HOSTNAME1"
-+ " LEFT JOIN settings AS settings_b ON settings_b.value = settings.value AND settings_b.hostname = :DIFF_HOSTNAME2"
-+ " WHERE settings_a.data != settings_b.data OR "
-+ " (settings_a.data IS NULL AND settings_b.data IS NOT NULL) OR (settings_a.data IS NOT NULL AND settings_b.data IS NULL);";
-+
-+ query.prepare(qstr);
-+ query.bindValue(":DIFF_HOSTNAME1" , diff_hostname1);
-+ query.bindValue(":DIFF_HOSTNAME2" , diff_hostname2);
-+
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ tempString="";
-+ //value
-+ tempItem = query.value(0).toString();
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //hostname_1
-+ tempItem = query.value(1).toString();
-+ if (tempItem.isEmpty())
-+ tempItem=diff_hostname1;
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //data
-+ tempItem = query.value(2).toString();
-+ if (tempItem.isEmpty())
-+ tempItem="NULL";
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //hostname_2
-+ tempItem = query.value(3).toString();
-+ if (tempItem.isEmpty())
-+ tempItem=diff_hostname2;
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //data
-+ tempItem = query.value(4).toString();
-+ if (tempItem.isEmpty())
-+ tempItem="NULL";
-+ tempString.append(tempItem);
-+
-+ settings_list.append(tempString);
-+ }
-+ return_list["Settings"] = settings_list;
-+ }
-+ }
-+ else if ( table == "keybindings")
-+ {
-+
-+ qstr="SELECT distinct keybindings.context, keybindings.action, :DIFF_HOSTNAME1 AS `hostname`, keybindings_a.keylist, :DIFF_HOSTNAME2 AS `hostname`, keybindings_b.keylist FROM keybindings "
-+ " LEFT JOIN keybindings AS keybindings_a ON keybindings_a.context = keybindings.context AND keybindings_a.action = keybindings.action "
-+ " AND keybindings_a.hostname = :DIFF_HOSTNAME1 "
-+ " LEFT JOIN keybindings AS keybindings_b ON keybindings_b.context = keybindings.context "
-+ " AND keybindings_b.action = keybindings.action AND keybindings_b.hostname = :DIFF_HOSTNAME2 "
-+ " WHERE keybindings_a.keylist != keybindings_b.keylist OR "
-+ " (keybindings_a.keylist IS NULL AND keybindings_b.keylist IS NOT NULL) OR (keybindings_a.keylist IS NOT NULL AND keybindings_b.keylist IS NULL);";
-+ query.prepare(qstr);
-+ query.bindValue(":DIFF_HOSTNAME1" , diff_hostname1);
-+ query.bindValue(":DIFF_HOSTNAME2" , diff_hostname2);
-+
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ tempString="";
-+ //context
-+ tempItem = query.value(0).toString();
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //action
-+ tempItem = query.value(1).toString();
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //hostname
-+ tempItem = query.value(2).toString();
-+ if (tempItem.isEmpty())
-+ tempItem=diff_hostname1;
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //keylist
-+ tempItem = query.value(3).toString();
-+ if (tempItem.isEmpty())
-+ tempItem="NULL";
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //hostname
-+ tempItem = query.value(4).toString();
-+ if (tempItem.isEmpty())
-+ tempItem=diff_hostname2;
-+ tempString.append(tempItem);
-+ tempString.append("|");
-+
-+ //keylist
-+ tempItem = query.value(5).toString();
-+ if (tempItem.isEmpty())
-+ tempItem="NULL";
-+ tempString.append(tempItem);
-+ keybinding_list.append(tempString);
-+ }
-+ return_list["Keybindings"] = keybinding_list;
-+ }
-+ }
-+
-+ }
-+ return return_list;
-+}; //end diff_settingsgroupname
-+
-+void MythDB::clonesettings(QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool is_full_clone, QString dest_hostname)
-+{
-+ LOG(VB_GENERAL, LOG_ERR, QString("Using src hostname of : %1")
-+ .arg(src_hostname));
-+ LOG(VB_GENERAL, LOG_ERR, QString("Using dest hostname of : %1")
-+ .arg(dest_hostname));
-+ LOG(VB_GENERAL, LOG_ERR, QString("Cloning setting group: %1")
-+ .arg(saved_settingsgroupname));
-+ LOG(VB_GENERAL, LOG_ERR, QString("Full Copy : %1")
-+ .arg(is_full_clone));
-+
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ QStringList::Iterator it;
-+ QString current_table;
-+ QString dest_tablename;
-+ QString temptable;
-+
-+ if ( table_list.isEmpty() )
-+ {
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ table_list.append("jumppoints");
-+ }
-+
-+ for ( it = table_list.begin(); it != table_list.end(); ++it )
-+ {
-+ current_table = *it ;
-+ dest_tablename = find_group_table_name(current_table,
-+ saved_settingsgroupname);
-+
-+ if ( does_table_exist(dest_tablename))
-+ {
-+ // create temp table for merging settings
-+ temptable="temp_table_" + dest_tablename;
-+ create_temp_table(temptable, current_table );
-+
-+ // copy in stored settings
-+ QString query_string = QString("REPLACE INTO %1 "
-+ "(SELECT * from %2 where hostname = :HOSTNAME)")
-+ .arg(temptable)
-+ .arg(dest_tablename);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME",src_hostname );
-+ query.exec();
-+
-+ // update hostname for dest_hostname
-+ query_string = QString("UPDATE %1 set hostname = :HOSTNAME")
-+ .arg(temptable);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" , dest_hostname );
-+ query.exec();
-+
-+ //if not full clone remove HOST% settings from temp table;
-+ if ( current_table == "settings" && !is_full_clone)
-+ {
-+ query_string = QString("DELETE FROM %1 WHERE "
-+ "hostname=:HOSTNAME and value like 'HOST%' " )
-+ .arg(temptable);
-+
-+ query.prepare(query_string);
-+ query.bindValue( ":HOSTNAME" , dest_hostname );
-+ query.exec();
-+ }
-+
-+ //remove current settings from dest table,
-+ //if not full clone, then leave HOST%
-+ //Need to remove because the old table allows for duplicates
-+
-+ if ( current_table == "settings" && !is_full_clone)
-+ query_string = QString ("DELETE FROM %1 WHERE "
-+ "hostname = :HOSTNAME "
-+ "and value not like 'HOST%'")
-+ .arg(dest_tablename);
-+
-+ else
-+ query_string = QString ("DELETE FROM %1 WHERE "
-+ "hostname = :HOSTNAME ")
-+ .arg(dest_tablename);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME",dest_hostname);
-+ query.exec();
-+
-+ // copy new settings from temp to current
-+ query_string = QString("REPLACE INTO %1 "
-+ "(SELECT * from %2)")
-+ .arg(dest_tablename)
-+ .arg(temptable);
-+
-+ query.prepare(query_string);
-+ query.exec();
-+
-+ // drop temptable
-+ drop_temp_table(temptable);
-+ }
-+ else
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Couldn't find table: %1")
-+ .arg(dest_tablename));
-+ }
-+}; //end clonesettings
-+
-+void MythDB::restoresettings (QString dest_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list )
-+{
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Restoring Settings:"));
-+ LOG(VB_GENERAL, LOG_NOTICE, QString(" src: %1")
-+ .arg(saved_settingsgroupname));
-+ LOG(VB_GENERAL, LOG_NOTICE, QString(" dest:%1")
-+ .arg(dest_hostname));
-+
-+ QString hostname_clause;
-+ if ( dest_hostname == "GLOBAL" )
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ hostname_clause ="hostname = :HOSTNAME";
-+
-+ bool table_check;
-+ if ( saved_settingsgroupname == "distro_default" )
-+ table_check = settings_check ( "distro_default" , saved_settingsgroupname );
-+ else
-+ table_check = settings_check ( dest_hostname , saved_settingsgroupname );
-+
-+
-+ if ( table_check == TRUE )
-+ {
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ QStringList::Iterator it;
-+ QString current_table;
-+ if ( table_list.isEmpty() )
-+ {
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ table_list.append("jumppoints");
-+ }
-+
-+ for ( it = table_list.begin(); it != table_list.end(); ++it )
-+ {
-+ current_table = *it ;
-+ //find tablenames to use
-+ QString src_tablename = find_group_table_name(current_table,
-+ saved_settingsgroupname);
-+
-+ QString temptable="temp_table_" + src_tablename;
-+ if ( ! does_table_exist(src_tablename))
-+ {
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("table does not exist: %1")
-+ .arg(src_tablename));
-+ continue;
-+ }
-+ // create temp table for merging settings
-+ create_temp_table(temptable, current_table );
-+
-+ //could copy in current settings here to account for new stuff
-+
-+
-+
-+ // copy in stored settings
-+ QString query_string;
-+ if ( saved_settingsgroupname == "distro_default" )
-+ { //special case for restoring default settings
-+ query_string = QString("REPLACE INTO %1 "
-+ "(SELECT * from %2 WHERE %3)")
-+ .arg(temptable)
-+ .arg(src_tablename)
-+ .arg(hostname_clause);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME", "distro_default" );
-+ query.exec();
-+
-+ // update hostname in temp table from distro_default
-+ query_string = QString("UPDATE %1 set hostname = :HOSTNAME")
-+ .arg(temptable);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" , dest_hostname );
-+ query.exec();
-+
-+ }
-+ else
-+ { //normal use case
-+ query_string = QString("REPLACE INTO %1 "
-+ "(SELECT * from %2 WHERE %3)")
-+ .arg(temptable)
-+ .arg(src_tablename)
-+ .arg(hostname_clause);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME",dest_hostname );
-+ query.exec();
-+ }
-+
-+ //Remove current settings.
-+ //Need to remove because the old table allows for duplicates
-+ query_string = QString("DELETE FROM %1 WHERE "
-+ "%2")
-+ .arg(current_table)
-+ .arg(hostname_clause);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME",dest_hostname);
-+ query.exec();
-+
-+ // copy new settings from temp to current
-+ query_string = QString("REPLACE INTO %1 "
-+ "(SELECT * from %2)")
-+ .arg(current_table)
-+ .arg(temptable);
-+
-+ query.prepare(query_string);
-+ query.exec();
-+ // drop temptable
-+ drop_temp_table(temptable);
-+ }
-+ }
-+}; //end restore settings
-+
-+void MythDB::change_hostname (QString old_hostname, QString new_hostname)
-+{
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Changing hostname from %1 -> %2")
-+ .arg(old_hostname)
-+ .arg(new_hostname));
-+
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ MSqlQuery sub_query(MSqlQuery::InitCon());
-+ query.prepare( "SHOW TABLES" );
-+
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ QString table_name = query.value(0).toString();
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Scanning %1")
-+ .arg(table_name));
-+
-+ // LOOP OVER TABLES, CHECK IF IT HAS A HOSTNAME FIELD
-+ QString query_string=QString("SHOW COLUMNS from %1 "
-+ "where field='hostname'")
-+ .arg(table_name);
-+ sub_query.prepare(query_string);
-+
-+ if (sub_query.exec() && sub_query.size() > 0)
-+ { //update hostname
-+ LOG(VB_GENERAL, LOG_NOTICE, QString(" Updating hostname in: %1")
-+ .arg(table_name));
-+ query_string = QString("UPDATE %1 SET hostname = :NEW_HOSTNAME "
-+ "WHERE hostname = :OLD_HOSTNAME")
-+ .arg(table_name);
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":NEW_HOSTNAME" , new_hostname);
-+ sub_query.bindValue(":OLD_HOSTNAME" , old_hostname);
-+ sub_query.exec();
-+ }
-+ }
-+ }
-+
-+
-+
-+
-+
-+
-+}
-+
-+bool MythDB::settings_check(QString src_hostname,
-+ QString saved_settingsgroupname)
-+{
-+ int tempItem;
-+ bool returncode = FALSE ;
-+ QString table="settings";
-+
-+ QString tablename = find_group_table_name(table, saved_settingsgroupname);
-+ QString hostname_clause;
-+ if ( src_hostname == "GLOBAL" )
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ hostname_clause ="hostname = :HOSTNAME";
-+
-+ if (does_table_exist (tablename))
-+ {
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ QString query_string = QString("SELECT COUNT(data) from %1 "
-+ "WHERE %2")
-+ .arg(tablename)
-+ .arg(hostname_clause);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" , src_hostname );
-+
-+ if (query.exec() && query.isActive() && query.size() > 0 )
-+ {
-+ while (query.next())
-+ {
-+ tempItem = query.value(0).toInt();
-+ if ( tempItem >= 1 )
-+ returncode = TRUE;
-+ else
-+ {
-+ LOG(VB_GENERAL, LOG_NOTICE,
-+ QString("Group %1 does not contain"
-+ " valid settings")
-+ .arg(saved_settingsgroupname));
-+ }
-+ }
-+ }
-+ }
-+ else
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Couldn't find table: %1")
-+ .arg(tablename));
-+ return returncode;
-+}; // end settings_check
-+
-+void MythDB::import_settings(QMap<QString,QString> vp_map,
-+ QString table)
-+{
-+ MSqlQuery query(MSqlQuery::InitCon());
-+
-+ //IMPORT SETTINGS TABLE
-+ if (table.startsWith("settings"))
-+ {
-+ if ( table != "settings" )
-+ create_new_table(table,"settings");
-+ QString hostname = vp_map.value("hostname");
-+ QString value = vp_map.value("value");
-+ QString data = vp_map.value("data");
-+
-+ QString hostname_clause;
-+ QVariant import_hostname = QVariant(QVariant::String);
-+
-+ if ( hostname.isEmpty())
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ {
-+ hostname_clause ="hostname = :HOSTNAME";
-+ import_hostname = hostname;
-+ }
-+
-+ QString query_string=QString("SELECT value, data, hostname "
-+ "FROM %1 "
-+ "WHERE %2 AND value = :VALUE "
-+ "ORDER BY value")
-+ .arg(table)
-+ .arg(hostname_clause);
-+
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME", hostname);
-+ query.bindValue(":VALUE", value);
-+
-+ // if already exisiting records then update, otherwise insert
-+ if (query.exec() && query.isActive())
-+ {
-+ MSqlQuery sub_query(MSqlQuery::InitCon());
-+ if ( query.size() > 0 )
-+ {
-+ query_string = QString("UPDATE "
-+ "%1 "
-+ "set data = :DATA "
-+ "WHERE %2 AND "
-+ "value = :VALUE ")
-+ .arg(table)
-+ .arg(hostname_clause);
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", import_hostname);
-+ sub_query.bindValue(":VALUE", value);
-+ sub_query.bindValue(":DATA", data);
-+ sub_query.exec();
-+ }
-+ else
-+ {
-+ query_string = QString("INSERT INTO "
-+ " %1 "
-+ "(value,data,hostname) "
-+ "VALUES ( :VALUE , :DATA , :HOSTNAME)").arg(table);
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", import_hostname);
-+ sub_query.bindValue(":VALUE", value);
-+ sub_query.bindValue(":DATA", data);
-+ sub_query.exec();
-+ }
-+ }
-+ }
-+ //KEYBINDINGS TABLE
-+ else if (table.startsWith("keybindings"))
-+ {
-+ if ( table != "keybindings" )
-+ create_new_table(table,"keybindings");
-+ QString hostname = vp_map.value("hostname");
-+ QString context = vp_map.value("context");
-+ QString action = vp_map.value("action");
-+ QString description = vp_map.value("description");
-+ QString keylist = vp_map.value("keylist");
-+
-+ QString query_string=QString("SELECT context,action,hostname "
-+ "FROM %1 "
-+ "WHERE hostname = :HOSTNAME AND "
-+ "context = :CONTEXT "
-+ "AND action = :ACTION ").arg(table);
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME", hostname);
-+ query.bindValue(":CONTEXT", context);
-+ query.bindValue(":ACTION", action);
-+
-+ if (query.exec() && query.isActive())
-+ {
-+ MSqlQuery sub_query(MSqlQuery::InitCon());
-+ if ( query.size() > 0 )
-+ {
-+ query_string = QString("UPDATE "
-+ " %1 "
-+ "set keylist = :KEYLIST "
-+ "WHERE hostname = :HOSTNAME AND "
-+ "context = :CONTEXT "
-+ "AND action = :ACTION ").arg(table);
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", hostname);
-+ sub_query.bindValue(":KEYLIST", keylist);
-+ sub_query.bindValue(":CONTEXT", context);
-+ sub_query.bindValue(":ACTION", action);
-+ sub_query.exec();
-+ }
-+ else
-+ {
-+ query_string = QString("INSERT INTO "
-+ " %1 "
-+ " (context , action , description , keylist , hostname) "
-+ " VALUES( "
-+ " :CONTEXT ,"
-+ " :ACTION , "
-+ " :DESCRIPTION , "
-+ " :KEYLIST , "
-+ " :HOSTNAME)").arg(table) ;
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", hostname);
-+ sub_query.bindValue(":KEYLIST", keylist);
-+ sub_query.bindValue(":CONTEXT", context);
-+ sub_query.bindValue(":ACTION", action);
-+ sub_query.bindValue(":DESCRIPTION", description);
-+ sub_query.exec();
-+ }
-+ }
-+ }
-+ //JUMP POINTS
-+ else if (table.startsWith("jumppoints"))
-+ {
-+ if ( table != "jumppoints" )
-+ create_new_table(table,"jumppoints");
-+ QString hostname = vp_map.value("hostname");
-+ QString description = vp_map.value("description");
-+ QString destination = vp_map.value("destination");
-+ QString keylist = vp_map.value("keylist");
-+
-+ QString query_string=QString("SELECT destination, keylist "
-+ "FROM %1 "
-+ "WHERE hostname = :HOSTNAME AND "
-+ "destination = :DESTINATION "
-+ "AND keylist = :KEYLIST ").arg(table);
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME", hostname);
-+ query.bindValue(":DESTINATION", destination);
-+ query.bindValue(":KEYLIST", keylist);
-+
-+ if (query.exec() && query.isActive())
-+ {
-+ MSqlQuery sub_query(MSqlQuery::InitCon());
-+ if ( query.size() > 0 )
-+ {
-+ query_string = QString("UPDATE "
-+ " %1 "
-+ "set keylist = :KEYLIST "
-+ "WHERE hostname = :HOSTNAME AND "
-+ "destination = :DESTINATION ").arg(table);
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", hostname);
-+ sub_query.bindValue(":KEYLIST", keylist);
-+ sub_query.bindValue(":DESTINATION", destination);
-+ sub_query.exec();
-+ }
-+ else
-+ {
-+ query_string = QString("INSERT INTO "
-+ " %1 "
-+ " (description , destination, keylist , hostname) "
-+ " VALUES( "
-+ " :DESCRIPTION ,"
-+ " :DESTINATION , "
-+ " :KEYLIST , "
-+ " :HOSTNAME)").arg(table) ;
-+
-+ sub_query.prepare(query_string);
-+ sub_query.bindValue(":HOSTNAME", hostname);
-+ sub_query.bindValue(":KEYLIST", keylist);
-+ sub_query.bindValue(":DESTINATION", destination);
-+ sub_query.bindValue(":DESCRIPTION", description);
-+ sub_query.exec();
-+ }
-+ }
-+ }
-+}; //end import_settings
-+
-+QMap<QString, QMap<QString,QString> >
-+ MythDB::export_settings(QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list, bool skip_host )
-+{
-+ QMap<QString, QMap<QString,QString> > result_set;
-+ QStringList::Iterator it;
-+ QString current_table;
-+ int record_count = 0;
-+
-+ if ( table_list.isEmpty() )
-+ {
-+ table_list.append("settings");
-+ table_list.append("keybindings");
-+ table_list.append("jumppoints");
-+ }
-+
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ QString query_string;
-+
-+ //loop over tablelist
-+ for ( it = table_list.begin(); it != table_list.end(); ++it )
-+ {
-+ current_table = *it ;
-+ QString sub_sql;
-+ QStringList fields;
-+ QString field_query;
-+
-+ QString table_name = find_group_table_name(current_table,
-+ saved_settingsgroupname);
-+
-+ QString hostname_clause;
-+ if ( src_hostname == "GLOBAL" )
-+ hostname_clause = "hostname IS NULL";
-+ else
-+ hostname_clause ="hostname = :HOSTNAME";
-+
-+ // find field names
-+ query_string = QString("SHOW COLUMNS from %1").arg(table_name);
-+ query.prepare(query_string);
-+
-+ //build up field name vars
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ if (! field_query.isEmpty())
-+ field_query +=',';
-+ QString tempItem = query.value(0).toString();
-+ fields.append(tempItem);
-+ field_query += tempItem;
-+ }
-+ }
-+ // when working with settings table skip HOST if skip_host is true
-+ if ( current_table == "settings" && skip_host == TRUE )
-+ {
-+ QString skip_host_clause;
-+ skip_host_clause = " VALUE not like 'HOST%' AND DATA not like 'HardwareProfile%UUID'" ;
-+ query_string = QString("SELECT %1 FROM %2 WHERE %3 AND %4")
-+ .arg(field_query)
-+ .arg(table_name)
-+ .arg(hostname_clause)
-+ .arg(skip_host_clause);
-+
-+ }
-+ else
-+ {
-+ query_string = QString("SELECT %1 FROM %2 WHERE %3")
-+ .arg(field_query)
-+ .arg(table_name)
-+ .arg(hostname_clause);
-+ }
-+ query.prepare(query_string);
-+ query.bindValue(":HOSTNAME" , src_hostname);
-+
-+ //looping over each record in the table query
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ //construct qmap of elements
-+ //add table name
-+ QMap<QString,QString> value_pair;
-+ value_pair["table"]=table_name;
-+
-+ for ( int i=0 ; i < fields.size();i++ )
-+ {
-+ QString tempvalue = fields[i];
-+ QString tempItem = query.value(i).toString();
-+ value_pair[tempvalue]=tempItem;
-+ }
-+ result_set[QString(record_count)] = value_pair;
-+ record_count++;
-+ }
-+ }
-+
-+ } // end table loop
-+ return result_set;
-+}; //end export_settings
-+
-+
-+void MythDB::create_new_table (QString create_table_name,QString like_name)
-+{
-+ if ( ! does_table_exist(create_table_name))
-+ {
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ QString query_string = QString("CREATE TABLE %1 like %2")
-+ .arg(create_table_name)
-+ .arg(like_name);
-+
-+ query.prepare(query_string);
-+ query.exec();
-+ }
-+ else
-+ LOG(VB_GENERAL, LOG_NOTICE, QString("Table is already present,"
-+ "will not create it: %1")
-+ .arg(create_table_name));
-+};
-+
-+
-+void MythDB::drop_temp_table (QString table_name)
-+{
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ if (table_name == "settings" | table_name == "keybindings" | table_name == "jumppoints")
-+ return;
-+ QString query_string = QString("DROP TABLE %1").arg(table_name);
-+ query.prepare(query_string);
-+ query.exec();
-+ return;
-+}
-+
-+void MythDB::create_temp_table (QString create_table_name,QString like_name)
-+{
-+ MSqlQuery query(MSqlQuery::InitCon());
-+ create_new_table(create_table_name,like_name);
-+ QString query_string;
-+ if ( like_name == "settings")
-+ {
-+ query_string = QString ("ALTER TABLE %1 ADD UNIQUE( value)")
-+ .arg(create_table_name);
-+ query.prepare(query_string);
-+ query.exec();
-+ }
-+
-+ query_string = QString("TRUNCATE %1").arg(create_table_name);
-+ query.prepare(query_string);
-+ query.exec();
-+ return;
-+}
-+
-+bool MythDB::does_table_exist(QString table_name)
-+{
-+ bool table_exist = FALSE;
-+ QString full_table_name;
-+ MSqlQuery query(MSqlQuery::InitCon());
-+
-+ query.prepare( "SHOW TABLES" );
-+ if (query.exec() && query.isActive() && query.size() > 0)
-+ {
-+ while (query.next())
-+ {
-+ full_table_name = query.value(0).toString();
-+ if (table_name == full_table_name)
-+ {
-+ table_exist = TRUE;
-+ break;
-+ }
-+ }
-+ }
-+ return table_exist;
-+};
-+
-+
-+QString MythDB::find_group_table_name(QString current_table,
-+ QString saved_settingsgroupname)
-+{
-+ QString table_name;
-+ if ( saved_settingsgroupname.toLower() == "current" )
-+ table_name = current_table ;
-+ else
-+ table_name = current_table + "_" + saved_settingsgroupname ;
-+
-+ return table_name;
-+};
-+//END JM ADDED
-+
- /**
- * \brief Set a flag indicating we have successfully connected to the database
- */
-diff --git a/mythtv/libs/libmythbase/mythdb.h b/mythtv/libs/libmythbase/mythdb.h
-index 79abe56..fd6044e 100644
---- a/mythtv/libs/libmythbase/mythdb.h
-+++ b/mythtv/libs/libmythbase/mythdb.h
-@@ -75,6 +75,49 @@ class MBASE_PUBLIC MythDB
-
- void WriteDelayedSettings(void);
-
-+ //JM ADDED
-+ void savesettings_togroup(QString src_hostname,
-+ QString saved_settingsgroupname );
-+ void deletesettings(QString delete_hostname,
-+ QString saved_settingsgroupname);
-+
-+ QMap<QString,QStringList> list_settingsgroupname();
-+
-+ QMap<QString,QStringList> diff_settingsgroupname(QString diff_hostname1,
-+ QString diff_hostname2,
-+ QStringList table_list);
-+
-+ void clonesettings(QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool is_full_clone=TRUE,
-+ QString dest_hostname="");
-+
-+ void restoresettings (QString dest_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list);
-+
-+ void change_hostname (QString old_hostname, QString new_hostname);
-+ bool settings_check (QString src_hostname, QString saved_settingsgroupname);
-+ void import_settings(QMap<QString,QString> vp_map, QString table);
-+
-+
-+ QMap<QString,QMap <QString,QString> > export_settings(
-+ QString src_hostname,
-+ QString saved_settingsgroupname,
-+ QStringList table_list,
-+ bool skip_host = FALSE);
-+
-+ void create_new_table (QString create_table_name,QString like_name);
-+ void drop_temp_table (QString table_name);
-+ void create_temp_table (QString create_table_name,QString like_name);
-+ bool does_table_exist(QString table_name);
-+ QString find_group_table_name(QString current_table,
-+ QString saved_settingsgroupname);
-+ //END JM ADDED
-+
-+
-+
- void SetHaveDBConnection(bool connected);
- void SetHaveSchema(bool schema);
- bool HaveSchema(void) const;
-diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp
-index f4a6035..fdeeb8e 100644
---- a/mythtv/programs/mythutil/commandlineparser.cpp
-+++ b/mythtv/programs/mythutil/commandlineparser.cpp
-@@ -118,6 +118,37 @@ void MythUtilCommandLineParser::LoadArguments(void)
- << add("--print-template", "printtemplate", false,
- "Print the template to be sent to the frontend", "")
- ->SetGroup("Messaging")
-+
-+ //settingsutil.cpp
-+ << add("--save-settings", "savesettings", false,
-+ "Save current settings", "")
-+ ->SetGroup("Settings")
-+ << add("--delete-settings", "deletesettings", false,
-+ "Delete current settings", "")
-+ ->SetGroup("Settings")
-+ << add("--restore-settings", "restoresettings", false,
-+ "Restore settings from previous backup", "")
-+ ->SetGroup("Settings")
-+ << add("--list-groups", "listgroups", false,
-+ "List hosts and groups of settings", "")
-+ ->SetGroup("Settings")
-+ << add("--copy-settings", "copysettings", false,
-+ "Copy or Clone settings from one host to another", "")
-+ ->SetGroup("Settings")
-+ << add("--diff-settings", "diffsettings", false,
-+ "Show settings that are different between two hosts", "")
-+ ->SetGroup("Settings")
-+ << add("--change-hostname", "changehostname", false,
-+ "Change the hostname", "")
-+ ->SetGroup("Settings")
-+ << add("--import-settings", "importsettings", false,
-+ "import settings", "")
-+ ->SetRequiredChild("infile")
-+
-+ << add("--export-settings", "exportsettings", false,
-+ "export settings", "")
-+ ->SetRequiredChild("outfile")
-+
- );
-
- // mpegutils.cpp
-@@ -140,6 +171,59 @@ void MythUtilCommandLineParser::LoadArguments(void)
- add("--bcastaddr", "bcastaddr", "127.0.0.1", "(optional) IP address to send to", "")
- ->SetChildOf("message");
-
-+ //settingsutils.cpp
-+ add("--groupname", "groupname", "", "Group of settings name", "")
-+ ->SetRequiredChildOf("savesettings")
-+ ->SetRequiredChildOf("restoresettings")
-+ ->SetRequiredChildOf("deletesettings")
-+ ->SetChildOf("copysettings");
-+
-+ add("--hostname", "hostname", "", "System name to save/restore settings", "")
-+ ->SetChildOf("savesettings")
-+ ->SetChildOf("restoresettings")
-+ ->SetChildOf("copysettings")
-+ ->SetChildOf("deletesettings")
-+ ->SetChildOf("exportsettings")
-+ ->SetChildOf("importsettings");
-+
-+ add("--host_1", "host_1", "", "First host in compare list", "")
-+ ->SetRequiredChildOf("diffsettings");
-+
-+ add("--host_2", "host_2", "", "Second host in compare list", "")
-+ ->SetRequiredChildOf("diffsettings");
-+
-+
-+ add("--tablelist", "table_list", "", "List of tables to operate on "
-+ "[keybindings,settings]", "")
-+ ->SetChildOf("diffsettings")
-+ ->SetChildOf("restoresettings")
-+ ->SetChildOf("copysettings")
-+ ->SetChildOf("exportsettings");
-+
-+ add("--clone", "fullclone", false, "Enable copy of all settings, "
-+ "including those that are unique to each system.", "")
-+ ->SetChildOf("copysettings");
-+
-+
-+ add("--old-host", "oldhost", "", "Hostname to change", "")
-+ ->SetRequiredChildOf("changehostname");
-+
-+ add("--new-host", "newhost", "", "New hostname", "")
-+ ->SetRequiredChildOf("changehostname")
-+ ->SetRequiredChildOf("copysettings");
-+
-+ add("--format", "format", false, "Format output of differences", "")
-+ ->SetChildOf("diffsettings");
-+ add("--distro-default", "distro-default", false, "Export settings for"
-+ "import into the default table", "")
-+ ->SetChildOf("exportsettings");
-+ add("--generic", "generic", false, "export settings without saving "
-+ "the hostname", "")
-+ ->SetChildOf("exportsettings");
-+
-+
-+
-+
- // Generic Options used by more than one utility
- addRecording();
- addInFile(true);
-diff --git a/mythtv/programs/mythutil/main.cpp b/mythtv/programs/mythutil/main.cpp
-index 418ea01..bd4a1f4 100644
---- a/mythtv/programs/mythutil/main.cpp
-+++ b/mythtv/programs/mythutil/main.cpp
-@@ -20,7 +20,7 @@
- #include "jobutils.h"
- #include "markuputils.h"
- #include "messageutils.h"
--
-+#include "settingsutils.h"
-
- int main(int argc, char *argv[])
- {
-@@ -92,6 +92,7 @@ int main(int argc, char *argv[])
- registerJobUtils(utilMap);
- registerMarkupUtils(utilMap);
- registerMessageUtils(utilMap);
-+ registerSettingsUtils(utilMap);
-
- bool cmdFound = false;
- int cmdResult = GENERIC_EXIT_OK;
-diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro
-index 066e618..87d7952 100644
---- a/mythtv/programs/mythutil/mythutil.pro
-+++ b/mythtv/programs/mythutil/mythutil.pro
-@@ -10,7 +10,7 @@ TARGET = mythutil
- target.path = $${PREFIX}/bin
- INSTALLS = target
-
--LIBS += $$EXTRA_LIBS
-+LIBS += $$EXTRA_LIBS
- INCLUDEPATH += ../../libs/libmythbase
-
- QMAKE_CLEAN += $(TARGET)
-@@ -19,8 +19,10 @@ QMAKE_CLEAN += $(TARGET)
- HEADERS += mythutil.h commandlineparser.h
- HEADERS += backendutils.h fileutils.h jobutils.h markuputils.h
- HEADERS += messageutils.h mpegutils.h
-+HEADERS += settingsutils.h
-+
- SOURCES += main.cpp mythutil.cpp commandlineparser.cpp
- SOURCES += backendutils.cpp fileutils.cpp jobutils.cpp markuputils.cpp
- SOURCES += messageutils.cpp mpegutils.cpp
--
-+SOURCES += settingsutils.cpp
- mingw: LIBS += -lwinmm -lws2_32
-diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp
-new file mode 100644
-index 0000000..8fc7b0e
---- /dev/null
-+++ b/mythtv/programs/mythutil/settingsutils.cpp
-@@ -0,0 +1,586 @@
-+// C++ includes
-+#include <iostream>
-+
-+//QT includes
-+#include <qdom.h>
-+#include <QFile>
-+#include <QDomElement>
-+
-+// libmyth* includes
-+#include "compat.h"
-+#include "exitcodes.h"
-+#include "mythlogging.h"
-+#include "mythcontext.h"
-+
-+
-+#include "settingsutils.h"
-+
-+
-+static int SaveSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+ QString src_hostname;
-+ QString groupname;
-+
-+ if (cmdline.toBool("groupname"))
-+ groupname = cmdline.toString("groupname");
-+
-+ if (cmdline.toBool("hostname"))
-+ src_hostname = cmdline.toString("hostname");
-+ else
-+ src_hostname = gCoreContext->GetHostName();
-+
-+ gCoreContext->savesettings_togroup(src_hostname,groupname);
-+ return GENERIC_EXIT_OK;
-+}
-+
-+static int DeleteSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+
-+ QString delete_hostname;
-+ QString groupname;
-+
-+ if (cmdline.toBool("groupname"))
-+ groupname = cmdline.toString("groupname");
-+
-+ if (cmdline.toBool("hostname"))
-+ delete_hostname = cmdline.toString("hostname");
-+ else
-+ delete_hostname = gCoreContext->GetHostName();
-+
-+
-+ gCoreContext->deletesettings(delete_hostname,groupname);
-+
-+ return GENERIC_EXIT_OK;
-+}
-+
-+
-+static int RestoreSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+ QString dest_hostname;
-+ QString groupname;
-+ QString tablestring;
-+ QStringList table_list;
-+
-+ if (cmdline.toBool("groupname"))
-+ groupname = cmdline.toString("groupname");
-+
-+
-+ if (cmdline.toBool("hostname"))
-+ dest_hostname = cmdline.toString("hostname");
-+ else
-+ dest_hostname = gCoreContext->GetHostName();
-+
-+ if (cmdline.toBool("table_list"))
-+ {
-+ tablestring = QString(cmdline.toString("table_list"));
-+ table_list = tablestring.split(",", QString::SkipEmptyParts);
-+ }
-+
-+ gCoreContext->restoresettings(dest_hostname,
-+ groupname,
-+ table_list);
-+
-+ return GENERIC_EXIT_OK;
-+}
-+
-+
-+static int CopySettings(const MythUtilCommandLineParser &cmdline)
-+{
-+ QString src_hostname;
-+ QString groupname;
-+ QString tablestring;
-+ QStringList table_list;
-+ bool is_full_clone;
-+ QString dest_hostname;
-+
-+ if (cmdline.toBool("groupname"))
-+ groupname = cmdline.toString("groupname");
-+ else
-+ groupname = "Current";
-+
-+ if (cmdline.toBool("hostname"))
-+ src_hostname = cmdline.toString("hostname");
-+ else
-+ src_hostname = gCoreContext->GetHostName();
-+
-+ if (cmdline.toBool("newhost"))
-+ dest_hostname = cmdline.toString("newhost");
-+
-+ if (cmdline.toBool("table_list"))
-+ {
-+ tablestring = QString(cmdline.toString("table_list"));
-+ table_list = tablestring.split(",", QString::SkipEmptyParts);
-+ }
-+
-+ if (cmdline.toBool("fullclone"))
-+ is_full_clone = TRUE;
-+ else
-+ is_full_clone = FALSE;
-+
-+ gCoreContext->clonesettings(src_hostname,
-+ groupname,
-+ table_list,
-+ is_full_clone,
-+ dest_hostname);
-+
-+ return GENERIC_EXIT_OK;
-+}
-+
-+void print_out_diff_formated(QMap<QString, QStringList> resultset)
-+{
-+ QString settings_header;
-+ QString keybindings_header;
-+ QString tempString;
-+ QString tempItem;
-+ QString dashline_settings;
-+ QString dashline_key;
-+ QStringList tempList;
-+
-+ QString host_1;
-+ QString host_2;
-+ QString data_1;
-+ QString data_2;
-+ QString value;
-+ QString context;
-+ QString action;
-+
-+ int value_width = 35;
-+ int data_width = 40;
-+
-+ int context_width = 22;
-+ int action_width = 22;
-+ int key_width = 35;
-+
-+ dashline_key = (tempString.fill('-', 133));
-+ dashline_settings = (tempString.fill('-', 130));
-+
-+ QMap<QString, QStringList>::iterator i;
-+
-+
-+ for (i = resultset.begin(); i != resultset.end(); ++i)
-+ {
-+ cout << endl<<i.key().toLocal8Bit().constData() << ": \t" << endl;;
-+ //construct the headers
-+ if (i.key() == "Settings")
-+ {
-+ //settings header
-+ tempList = (i.value().at(0)).split("|", QString::SkipEmptyParts);
-+ host_1 = tempList.at(1);
-+ host_2 = tempList.at(3);
-+ tempString="|";
-+ tempItem = "Value";
-+ tempString.append(tempItem.leftJustified(value_width));
-+ tempString.append("|");
-+ tempItem = host_1; //hostname 1
-+ tempString.append(tempItem.leftJustified(data_width));
-+ tempString.append("|");
-+ tempItem = host_2; //hostname 2
-+ tempString.append(tempItem.leftJustified(data_width));
-+ tempString.append("|");
-+ settings_header = tempString;
-+
-+ cout << settings_header.toLocal8Bit().constData() << endl;;
-+ cout << dashline_settings.toLocal8Bit().constData() << endl;
-+ }
-+
-+ if (i.key() == "Keybindings")
-+ {
-+ //keybindings_header
-+ tempList = (i.value().at(0)).split("|", QString::SkipEmptyParts);
-+ host_1 = tempList.at(2);
-+ host_2 = tempList.at(4);
-+ tempString="|";
-+ tempItem = "Context";
-+ tempString.append(tempItem.leftJustified(context_width));
-+ tempString.append("|");
-+ tempItem = "Action";
-+ tempString.append(tempItem.leftJustified(action_width));
-+ tempString.append("|");
-+ tempItem = host_1;
-+ tempString.append(tempItem.leftJustified(key_width));
-+ tempString.append("|");
-+ tempItem = host_2;
-+ tempString.append(tempItem.leftJustified(key_width));
-+ tempString.append("|");
-+ keybindings_header = tempString;
-+
-+ cout << keybindings_header.toLocal8Bit().constData() << endl;;
-+ cout << dashline_key.toLocal8Bit().constData() << endl;
-+
-+ }
-+ // format each line
-+ for (int y = 0; y < i.value().size(); ++y)
-+ {
-+ if (i.key() == "Settings")
-+ {
-+ tempList = (i.value().at(y)).split("|",
-+ QString::SkipEmptyParts);
-+ data_1 = tempList.at(2);
-+ data_2 = tempList.at(4);
-+ value = tempList.at(0);
-+ tempString="|";
-+ tempItem = value;
-+ tempString.append(tempItem.leftJustified(value_width));
-+ tempString.append("|");
-+ tempItem = data_1;
-+ tempString.append(tempItem.leftJustified(data_width));
-+ tempString.append("|");
-+ tempItem = data_2;
-+ tempString.append(tempItem.leftJustified(data_width));
-+ tempString.append("|");
-+ }
-+ if (i.key() == "Keybindings")
-+ {
-+ tempList = (i.value().at(y)).split("|",
-+ QString::SkipEmptyParts);
-+ data_1 = tempList.at(3);
-+ data_2 = tempList.at(5);
-+ context = tempList.at(0);
-+ action = tempList.at(1);
-+
-+ tempString="|";
-+ tempItem = context;
-+ tempString.append(tempItem.leftJustified(context_width));
-+ tempString.append("|");
-+ tempItem = action;
-+ tempString.append(tempItem.leftJustified(action_width));
-+ tempString.append("|");
-+ tempItem = data_1;
-+ tempString.append(tempItem.leftJustified(key_width));
-+ tempString.append("|");
-+ tempItem = data_2;
-+ tempString.append(tempItem.leftJustified(key_width));
-+ tempString.append("|");
-+ }
-+
-+ cout << tempString.toLocal8Bit().constData()<<endl;
-+ }
-+ }
-+};
-+
-+static int DiffSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+ QMap<QString, QStringList> resultset;
-+ QString diff_hostname1;
-+ QString diff_hostname2;
-+ QStringList table_list;
-+ bool format_results = FALSE;
-+ QMap<QString, QStringList>::iterator i;
-+
-+ if (cmdline.toBool("host_1"))
-+ diff_hostname1 = cmdline.toString("host_1");
-+ if (cmdline.toBool("host_2"))
-+ diff_hostname2 = cmdline.toString("host_2");
-+
-+ if (cmdline.toBool("table_list"))
-+ {
-+ QString tablestring = QString(cmdline.toString("table_list"));
-+ table_list = tablestring.split(",", QString::SkipEmptyParts);
-+ }
-+
-+ if (cmdline.toBool("format"))
-+ format_results = TRUE;
-+
-+ resultset = gCoreContext->diff_settingsgroupname(diff_hostname1,
-+ diff_hostname2,
-+ table_list);
-+ if (resultset.isEmpty())
-+ cout << "No differences found" << endl;
-+ else
-+ {
-+ if (format_results)
-+ print_out_diff_formated(resultset);
-+ else
-+ {
-+ for (i = resultset.begin(); i != resultset.end(); ++i)
-+ {
-+ cout << i.key().toLocal8Bit().constData() << " : \t" << endl;;
-+ for (int y = 0; y < i.value().size(); ++y)
-+ cout << i.value().at(y).toLocal8Bit().constData()<<endl;
-+ cout << endl;
-+ }
-+ }
-+ }
-+ return GENERIC_EXIT_OK;
-+};// DiffSettings
-+
-+static int ListGroups(const MythUtilCommandLineParser &cmdline)
-+{
-+ QMap<QString, QStringList> resultset;
-+ resultset = gCoreContext->list_settingsgroupname();
-+ QMap<QString, QStringList>::iterator i;
-+ cout << endl;
-+ for (i = resultset.begin(); i != resultset.end(); ++i)
-+ {
-+ cout << i.key().toLocal8Bit().constData() << " : \t";
-+ for (int y = 0; y < i.value().size(); ++y)
-+ cout << i.value().at(y).toLocal8Bit().constData()<<" " ;
-+ cout << endl;
-+ }
-+ return GENERIC_EXIT_OK;
-+};
-+
-+static int ImportSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+
-+ if (cmdline.toString("infile").isEmpty())
-+ {
-+ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing --infile option\n");
-+ return GENERIC_EXIT_INVALID_CMDLINE;
-+ }
-+ QString import_hostname;
-+ bool change_name = FALSE;
-+ if (cmdline.toBool("hostname"))
-+ {
-+ change_name = TRUE;
-+ import_hostname = cmdline.toString("hostname");
-+ }
-+ QString import_filename = cmdline.toString("infile");
-+ QFile myFile(import_filename);
-+
-+ QDomDocument doc( "exported_xml" );
-+ doc.setContent( &myFile );
-+
-+ QDomElement docElement = doc.documentElement();
-+ QDomElement record_element;
-+
-+ if ( docElement.nodeName() != "exported_xml" )
-+ {
-+ cout << "not a valid exported xml file" << endl;
-+ return 1;
-+ }
-+
-+ QString out_string = "Importing records, please be patient";
-+ cout << out_string.toLocal8Bit().constData() << endl;
-+ //Gives list of records in the file + count
-+ QDomNodeList nodeList = docElement.childNodes();
-+ int total_records = nodeList.count();
-+ out_string = QString("\nFound %1 records \n").arg(total_records);
-+ cout << out_string.toLocal8Bit().constData() << endl;
-+ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, out_string);
-+
-+ for(QDomNode n = docElement.firstChild(); !n.isNull(); n = n.nextSibling())
-+ {
-+ QString table_name=QString();
-+ QMap<QString,QString> value_pair_map ;
-+
-+ //find table name for this record
-+ QDomNode tablenode=n.namedItem("table");
-+ record_element = tablenode.toElement();
-+ table_name = record_element.text();
-+
-+ //loop over childern of n and convert to element
-+ for(QDomNode subn = n.firstChild();
-+ !subn.isNull();
-+ subn = subn.nextSibling())
-+ {
-+ record_element = subn.toElement();
-+ if ( record_element.nodeName() == "table" )
-+ continue;
-+ if ( change_name && record_element.nodeName() == "hostname" )
-+ value_pair_map[record_element.nodeName()] = import_hostname;
-+ else
-+ value_pair_map[record_element.nodeName()] = record_element.text();
-+ }
-+ if (import_filename.endsWith("syssettings.xml"))
-+ {
-+ if ( value_pair_map["value"] == "BackendServerIP")
-+ {
-+ out_string = "sysettings, ignoring backendserver ip record";
-+ cout << out_string.toLocal8Bit().constData() << endl;
-+ }
-+ else
-+ gCoreContext->import_settings(value_pair_map,table_name);
-+ }
-+ else
-+ //perform insert
-+ gCoreContext->import_settings(value_pair_map,table_name);
-+ }
-+ return GENERIC_EXIT_OK;
-+}; //end ImportSettings
-+
-+
-+static int ExportSettings(const MythUtilCommandLineParser &cmdline)
-+{
-+ QMap<QString, QMap<QString,QString> > records;
-+ QString src_hostname;
-+ QString groupname;
-+ QStringList table_list;
-+ QString tablestring;
-+ bool distro_default = FALSE;
-+ bool generic = FALSE;
-+ bool skip_host = FALSE;
-+
-+
-+
-+ QDomDocument doc("mythutils_exported_settings");
-+
-+ if (cmdline.toBool("groupname"))
-+ groupname = cmdline.toString("groupname");
-+ else
-+ groupname = "current";
-+
-+ if (cmdline.toBool("hostname"))
-+ src_hostname = cmdline.toString("hostname");
-+ else
-+ src_hostname = gCoreContext->GetHostName();
-+
-+ if (cmdline.toBool("distro-default"))
-+ {
-+ distro_default = TRUE;
-+ skip_host = TRUE;
-+ }
-+ if (cmdline.toBool("generic"))
-+ {
-+ generic = TRUE;
-+ //skip_host = TRUE;
-+ }
-+ if (cmdline.toBool("table_list"))
-+ {
-+ tablestring = QString(cmdline.toString("table_list"));
-+ table_list = tablestring.split(",", QString::SkipEmptyParts);
-+ }
-+ else
-+ table_list << "settings" <<"keybindings" <<"jumppoints" ;
-+
-+ if (cmdline.toString("outfile").isEmpty())
-+ {
-+ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing --outfile option\n");
-+ return GENERIC_EXIT_INVALID_CMDLINE;
-+ }
-+
-+ QString export_filename = cmdline.toString("outfile");
-+
-+ records = gCoreContext->export_settings(src_hostname,groupname,
-+ table_list, skip_host);
-+
-+ QDomElement exported_xml = doc.createElement("exported_xml");
-+ doc.appendChild(exported_xml);
-+
-+ QMap<QString,int> record_count;
-+ QMap<QString,QMap<QString,QString> >::iterator i;
-+ for (i = records.begin(); i != records.end(); ++i )
-+ {
-+ QDomElement record = doc.createElement("record");
-+ exported_xml.appendChild(record);
-+
-+ //loop over all values in the record
-+ QMap<QString,QString> value_pair = i.value();
-+ QMap<QString, QString>::iterator y;
-+ //because we don't know the name of the key, we loop over it
-+ for (y = value_pair.begin(); y != value_pair.end(); ++y)
-+ {
-+ //add key/pair to xml document
-+ QDomElement tag = doc.createElement(y.key());
-+ record.appendChild(tag);
-+ QDomText t;
-+ if ( distro_default == TRUE )
-+ { // If exporting distro_default then change hostname + table
-+ if ( y.key() == "hostname" )
-+ { //check for global values here, empty value means global
-+ if ( y.value().isEmpty() )
-+ t = doc.createTextNode(y.value());
-+ else
-+ t = doc.createTextNode("distro_default");
-+ }
-+ else if ( y.key() == "table")
-+ t = doc.createTextNode(y.value()+"_distro_default");
-+ else
-+ t = doc.createTextNode(y.value());
-+ }
-+
-+ else if ( generic == TRUE )
-+ { // If exporting generic then change hostname
-+ if ( y.key() == "hostname" )
-+ { //check for global values here, empty value means global
-+ if ( y.value().isEmpty() )
-+ t = doc.createTextNode(y.value());
-+ else
-+ t = doc.createTextNode("REPLACE_ME");
-+ }
-+ else
-+ t = doc.createTextNode(y.value());
-+ }
-+ else
-+ t = doc.createTextNode(y.value());
-+
-+ tag.appendChild(t);
-+ //create record counts
-+ if ( y.key() == "table" )
-+ {
-+ if ( record_count.contains( y.value()) )
-+ {
-+ int record_num = record_count[y.value()];
-+ record_count[y.value()] = ++record_num;
-+ }
-+ else
-+ record_count[y.value()] = 1;
-+ }
-+ }
-+ }
-+ QFile file( export_filename );
-+
-+ if( !file.open(QIODevice::WriteOnly) )
-+ return -1;
-+
-+ QTextStream ts( &file );
-+ ts << doc.toString();
-+ file.close();
-+ QMap<QString, int >::iterator rc_it;
-+ for ( rc_it = record_count.begin(); rc_it != record_count.end(); ++rc_it)
-+ {
-+ QString table = rc_it.key();
-+ int rc_count = rc_it.value();
-+ QString out_string = QString ("Exported table %1: %2 records")
-+ .arg(table)
-+ .arg(rc_count);
-+ cout << out_string.toLocal8Bit().constData() << endl;
-+ }
-+ return GENERIC_EXIT_OK;
-+}; // end export_settings
-+
-+
-+static int ChangeHostname(const MythUtilCommandLineParser &cmdline)
-+{
-+
-+ QString old_hostname;
-+ QString new_hostname;
-+
-+
-+ if (cmdline.toBool("oldhost"))
-+ old_hostname = cmdline.toString("oldhost");
-+
-+ if (cmdline.toBool("newhost"))
-+ new_hostname = cmdline.toString("newhost");
-+
-+ if (old_hostname.isEmpty())
-+ {
-+ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing or empty --old-host option\n");
-+ return GENERIC_EXIT_INVALID_CMDLINE;
-+ }
-+
-+ if (new_hostname.isEmpty())
-+ {
-+ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing or empty --new-host option\n");
-+ return GENERIC_EXIT_INVALID_CMDLINE;
-+ }
-+
-+ gCoreContext->change_hostname(old_hostname, new_hostname);
-+
-+ return GENERIC_EXIT_OK;
-+}; //end ChangeHostname
-+
-+void registerSettingsUtils(UtilMap &utilMap)
-+{
-+ utilMap["savesettings"] = &SaveSettings;
-+ utilMap["deletesettings"] = &DeleteSettings;
-+ utilMap["restoresettings"] = &RestoreSettings;
-+ utilMap["copysettings"] = &CopySettings;
-+ utilMap["diffsettings"] = &DiffSettings;
-+ utilMap["listgroups"] = &ListGroups;
-+ utilMap["importsettings"] = &ImportSettings;
-+ utilMap["exportsettings"] = &ExportSettings;
-+ utilMap["changehostname"] = &ChangeHostname;
-+}
-+
-+/* vim: set expandtab tabstop=4 shiftwidth=4: */
-\ No newline at end of file
-diff --git a/mythtv/programs/mythutil/settingsutils.h b/mythtv/programs/mythutil/settingsutils.h
-new file mode 100644
-index 0000000..413496c
---- /dev/null
-+++ b/mythtv/programs/mythutil/settingsutils.h
-@@ -0,0 +1,3 @@
-+#include "mythutil.h"
-+
-+void registerSettingsUtils(UtilMap &utilMap);
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythbackend b/abs/core/mythtv/stable-0.25/mythtv/mythbackend
deleted file mode 100644
index 93773a2..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/mythbackend
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mythbackend`
-case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
- [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
- [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/mythbackend.pid
- add_daemon mythbackend
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping MythTV Backend"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mythbackend
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1s
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythbackend.lr b/abs/core/mythtv/stable-0.25/mythtv/mythbackend.lr
deleted file mode 100644
index 4f218bc..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/mythbackend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythbackend.log {
- copytruncate
- daily
- size 10M
- missingok
- rotate 7
- compress
- notifempty
-}
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythbackend.sh b/abs/core/mythtv/stable-0.25/mythtv/mythbackend.sh
deleted file mode 100644
index e7a7b70..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/mythbackend.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.d/init.d/mythbackend
-#
-# Starts the mythbackend as a daemon
-#
-# chkconfig: 345 90 10
-# description: Starts the mythbackend process as a daemon after the XWindows \
-# system is started, in runlevel 5. This allows scheduled \
-# recordings to occur without manual intervention.
-# processname: mythbackend
-
-# Copyright (c) by Michael Thomson <linux at m-thomson dot net>
-# With thanks to Stu Tomlinson <stu at nosnilmot dot com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# Default values to use if none are supplied in the config file.
-# User who should start the mythbackend processes
-MBE_USER="root"
-# Directory holding the mythbackend binary
-MBE_LOCATION="/usr/local/bin/"
-# Name of mythbackend binary
-MBE_PROG="mythbackend"
-# Full path to mythbackend log file
-MBE_LOGFILE="/var/log/mythtv/mythbackend.log"
-
-# Source function library.
-. /etc/init.d/functions
-
-# Source config file if available
-if [ -f "/etc/sysconfig/mythbackend" ]; then
- . /etc/sysconfig/mythbackend
-fi
-
-test -x ${MBE_LOCATION}${MBE_PROG} || exit 0
-
-RETVAL=0
-
-#
-# See how we were called.
-#
-
-start() {
- # Check if mythbackend is already running
- if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then
- echo -n "Starting ${MBE_PROG}: "
- # /usr/local/bin/mythbackend -d -l /some/log/file
- #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
- ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG}
- echo
- fi
- return $RETVAL
-}
-
-stop() {
- echo -n "Stopping ${MBE_PROG}: "
- killproc ${MBE_LOCATION}${MBE_PROG}
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG}
- echo
- return $RETVAL
-}
-
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-status_at() {
- status ${MBE_LOCATION}${MBE_PROG}
-}
-
-case "$1" in
-start)
- start
- ;;
-stop)
- stop
- ;;
-reload|restart)
- restart
- ;;
-condrestart)
- if [ -f /var/lock/subsys/${MBE_PROG} ]; then
- restart
- fi
- ;;
-status)
- status_at
- ;;
-*)
- echo "Usage: $0 {start|stop|restart|condrestart|status}"
- exit 1
-esac
-
-exit $?
-exit $RETVAL
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythfrontend.lr b/abs/core/mythtv/stable-0.25/mythtv/mythfrontend.lr
deleted file mode 100644
index 1580533..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/mythfrontend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythfrontend.log {
- copytruncate
- daily
- size 10M
- missingok
- rotate 7
- compress
- notifempty
-}
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
deleted file mode 100644
index 5d4614d..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
+++ /dev/null
@@ -1,25 +0,0 @@
-# arg 1: the new package version
-post_install() {
- gen_is_xml.py
- gen_lib_xml.py
-}
-
-pre_upgrade() {
- /bin/true
-}
-
-post_upgrade() {
- post_install
- /usr/share/mythtv/metadata/Movie/tmdb3_db_update.py
-}
-
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core/mythtv/stable-0.25/mythtv/pretty b/abs/core/mythtv/stable-0.25/mythtv/pretty
deleted file mode 100644
index 7e0ab21..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ]
-then
- su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty"
-elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ]
-then
- su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty"
-fi
-
diff --git a/abs/core/mythtv/stable-0.25/mythtv/smolt_jump.patch b/abs/core/mythtv/stable-0.25/mythtv/smolt_jump.patch
deleted file mode 100644
index 76f884c..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/smolt_jump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig 2010-11-08 23:07:04.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp 2010-11-08 23:08:06.000000000 +0000
-@@ -88,6 +88,7 @@
- jumpMap["zoneminderliveview"] = "ZoneMinder Live View";
- jumpMap["zoneminderevents"] = "ZoneMinder Events";
- jumpMap["snapshot"] = "ScreenShot";
-+ jumpMap["mythsmolt"] = "MythSmolt";
-
- jumpMap["channelrecpriority"] = "Channel Recording Priorities";
- jumpMap["viewscheduled"] = "Manage Recordings / Fix Conflicts";
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
deleted file mode 100755
index 829f744..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-# ----------------------
-# Name: tmdb3.py
-# Python Script
-# Author: Raymond Wagner
-# Purpose: This python script is intended to translate lookups between the
-# TheMovieDB.org V3 API and MythTV's internal metadata format.
-# http://www.mythtv.org/wiki/MythVideo_Grabber_Script_Format
-# http://help.themoviedb.org/kb/api/about-3
-#-----------------------
-__title__ = "TheMovieDB.org V3"
-__author__ = "Raymond Wagner"
-__version__ = "0.3.6"
-# 0.1.0 Initial version
-# 0.2.0 Add language support, move cache to home directory
-# 0.3.0 Enable version detection to allow use in MythTV
-# 0.3.1 Add --test parameter for proper compatibility with mythmetadatalookup
-# 0.3.2 Add --area parameter to allow country selection for release date and
-# parental ratings
-# 0.3.3 Use translated title if available
-# 0.3.4 Add support for finding by IMDB under -D (simulate previous version)
-# 0.3.5 Add debugging mode
-# 0.3.6 Add handling for TMDB site and library returning null results in
-# search. This should only need to be a temporary fix, and should be
-# resolved upstream.
-
-from optparse import OptionParser
-import sys
-
-def buildSingle(inetref, opts):
- from MythTV.tmdb3 import Movie
- from MythTV import VideoMetadata
- from lxml import etree
-
- import re
- if re.match('^0[0-9]{6}$', inetref):
- movie = Movie.fromIMDB(inetref)
- else:
- movie = Movie(inetref)
-
- tree = etree.XML(u'<metadata></metadata>')
- mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
- ['releasedate', 'releasedate'], ['tagline', 'tagline'],
- ['description', 'overview'], ['homepage', 'homepage'],
- ['userrating', 'userrating'], ['popularity', 'popularity'],
- ['budget', 'budget'], ['revenue', 'revenue']]
- m = VideoMetadata()
- for i,j in mapping:
- if getattr(movie, j):
- setattr(m, i, getattr(movie, j))
-
- if movie.title:
- m.title = movie.title
-
- releases = movie.releases.items()
-
- if opts.country:
- try:
- # resort releases with selected country at top to ensure it
- # is selected by the metadata libraries
- index = zip(*releases)[0].index(opts.country)
- releases.insert(0, releases.pop(index))
- except ValueError:
- pass
- else:
- m.releasedate = releases[0][1].releasedate
-
- m.inetref = str(movie.id)
- if movie.collection:
- m.collectionref = str(movie.collection.id)
- if movie.releasedate:
- m.year = movie.releasedate.year
- for country, release in releases:
- if release.certification:
- m.certifications[country] = release.certification
- for genre in movie.genres:
- m.categories.append(genre.name)
- for studio in movie.studios:
- m.studios.append(studio.name)
- for country in movie.countries:
- m.countries.append(country.name)
- for cast in movie.cast:
- d = {'name':cast.name, 'character':cast.character, 'department':'Actors',
- 'job':'Actor', 'url':'http://www.themoviedb.org/people/{0}'.format(cast.id)}
- if cast.profile: d['thumb'] = cast.profile.geturl()
- m.people.append(d)
- for crew in movie.crew:
- d = {'name':crew.name, 'job':crew.job, 'department':crew.department,
- 'url':'http://www.themoviedb.org/people/{0}'.format(crew.id)}
- if crew.profile: d['thumb'] = crew.profile.geturl()
- m.people.append(d)
- for backdrop in movie.backdrops:
- m.images.append({'type':'fanart', 'url':backdrop.geturl(),
- 'thumb':backdrop.geturl(backdrop.sizes()[0])})
- for poster in movie.posters:
- m.images.append({'type':'coverart', 'url':poster.geturl(),
- 'thumb':poster.geturl(poster.sizes()[0])})
- tree.append(m.toXML())
- sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
- xml_declaration=True))
- sys.exit()
-
-def buildList(query, opts):
- # TEMPORARY FIX:
- # replace all dashes from queries to work around search behavior
- # as negative to all text that comes afterwards
- query = query.replace('-',' ')
-
- from MythTV.tmdb3 import searchMovie
- from MythTV import VideoMetadata
- from lxml import etree
- results = searchMovie(query)
- tree = etree.XML(u'<metadata></metadata>')
- mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
- ['releasedate', 'releasedate'], ['tagline', 'tagline'],
- ['description', 'overview'], ['homepage', 'homepage'],
- ['userrating', 'userrating'], ['popularity', 'popularity']]
-
- count = 0
- for res in results:
- if res is None:
- continue
-
- m = VideoMetadata()
- for i,j in mapping:
- if getattr(res, j):
- setattr(m, i, getattr(res, j))
- m.inetref = str(res.id)
-
- if res.title:
- m.title = res.title
-
- #TODO:
- # should releasedate and year be pulled from the country-specific data
- # or should it be left to the default information to cut down on
- # traffic from searches
- if res.releasedate:
- m.year = res.releasedate.year
- if res.backdrop:
- b = res.backdrop
- m.images.append({'type':'fanart', 'url':b.geturl(),
- 'thumb':b.geturl(b.sizes()[0])})
- if res.poster:
- p = res.poster
- m.images.append({'type':'coverart', 'url':p.geturl(),
- 'thumb':p.geturl(p.sizes()[0])})
- tree.append(m.toXML())
- count += 1
- if count >= 60:
- # page limiter, dont want to overload the server
- break
-
- sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
- xml_declaration=True))
- sys.exit(0)
-
-def buildCollection(inetref, opts):
- from MythTV.tmdb3 import Collection
- from MythTV import VideoMetadata
- from lxml import etree
- collection = Collection(inetref)
- tree = etree.XML(u'<metadata></metadata>')
- m = VideoMetadata()
- m.collectionref = str(collection.id)
- m.title = collection.name
- if collection.backdrop:
- b = collection.backdrop
- m.images.append({'type':'fanart', 'url':b.geturl(),
- 'thumb':b.geturl(b.sizes()[0])})
- if collection.poster:
- p = collection.poster
- m.images.append({'type':'coverart', 'url':p.geturl(),
- 'thumb':p.geturl(p.sizes()[0])})
- tree.append(m.toXML())
- sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
- xml_declaration=True))
- sys.exit()
-
-def buildVersion():
- from lxml import etree
- version = etree.XML(u'<grabber></grabber>')
- etree.SubElement(version, "name").text = __title__
- etree.SubElement(version, "author").text = __author__
- etree.SubElement(version, "thumbnail").text = 'tmdb.png'
- etree.SubElement(version, "command").text = 'tmdb3.py'
- etree.SubElement(version, "type").text = 'movie'
- etree.SubElement(version, "description").text = \
- 'Search and metadata downloads for themoviedb.org'
- etree.SubElement(version, "version").text = __version__
- sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True,
- xml_declaration=True))
- sys.exit(0)
-
-def performSelfTest():
- err = 0
- try:
- import MythTV
- except:
- err = 1
- print ("Failed to import MythTV bindings. Check your `configure` output "
- "to make sure installation was not disabled due to external "
- "dependencies")
- try:
- import MythTV.tmdb3
- except:
- err = 1
- print ("Failed to import PyTMDB3 library. This should have been included "
- "with the python MythTV bindings.")
- try:
- import lxml
- except:
- err = 1
- print "Failed to import python lxml library."
-
- if not err:
- print "Everything appears in order."
- sys.exit(err)
-
-def main():
- parser = OptionParser()
-
- parser.add_option('-v', "--version", action="store_true", default=False,
- dest="version", help="Display version and author")
- parser.add_option('-t', "--test", action="store_true", default=False,
- dest="test", help="Perform self-test for dependencies.")
- parser.add_option('-M', "--movielist", action="store_true", default=False,
- dest="movielist", help="Get Movies matching search.")
- parser.add_option('-D', "--moviedata", action="store_true", default=False,
- dest="moviedata", help="Get Movie data.")
- parser.add_option('-C', "--collection", action="store_true", default=False,
- dest="collectiondata", help="Get Collection data.")
- parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
- dest="language", help="Specify language for filtering.")
- parser.add_option('-a', "--area", metavar="COUNTRY", default=u'US',
- dest="country", help="Specify country for custom data.")
- parser.add_option('--debug', action="store_true", default=False,
- dest="debug", help=("Disable caching and enable raw "
- "data output."))
-
- opts, args = parser.parse_args()
-
- if opts.version:
- buildVersion()
-
- if opts.test:
- performSelfTest()
-
- from MythTV.tmdb3 import set_key, set_cache, set_locale
- set_key('c27cb71cff5bd76e1a7a009380562c62')
-
- if opts.debug:
- import MythTV.tmdb3
- MythTV.tmdb3.request.DEBUG = True
- set_cache(engine='null')
- else:
- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
-
- if opts.language:
- set_locale(language=opts.language, fallthrough=True)
- if opts.country:
- set_locale(country=opts.country, fallthrough=True)
-
- if (len(args) != 1) or (args[0] == ''):
- sys.stdout.write('ERROR: tmdb3.py requires exactly one non-empty argument')
- sys.exit(1)
-
- if opts.movielist:
- buildList(args[0], opts)
-
- if opts.moviedata:
- buildSingle(args[0], opts)
-
- if opts.collectiondata:
- buildCollection(args[0], opts)
-
-if __name__ == '__main__':
- main()
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
deleted file mode 100755
index 22fc635..0000000
--- a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python2
-
-# This script will configure the myth db to use tmdb3.py
-
-from socket import gethostname
-from MythTV import MythDB
-mythdb = MythDB()
-localhostname = gethostname()
-import sys, os
-
-# Function to set db setting. This setting is set in mythtv-setup.
-def dbSettingChange():
- if mythdb.settings.NULL.MovieGrabber == u'metadata/Movie/tmdb3.py':
- print 'The MythTV database setting MovieGrabber is already set to tmdb3.py.'
- else:
- mythdb.settings.NULL.MovieGrabber = u'metadata/Movie/tmdb3.py'
- print 'The MythTV database setting MovieGrabber has been updated to tmdb3.py'
- try:
- os.remove("/home/mythtv/.mythtv/pytmdb3.cache")
- print 'tmdb3 cache at /home/mythtv/.mythtv/pytmdb3.cache removed.'
- except OSError:
- print "tmdb3 cache at /home/mythtv/.mythtv/pytmdb3.cache doesn't exist."
- pass
- return
-
-#taken from systemconfig.py
-#this is how you populate the dict
-systemconfig = {}
-file_name = "/etc/systemconfig"
-try:
- config_file = open(file_name)
-except:
- print file_name + ' could not be opened'
- sys.exit(1)
-
-for line in config_file:
- line = line.strip()
- if line and line[0] is not "#" and line[-1] is not "=":
- var, val = line.rsplit("=", 1)
- val = val.strip('"')
- systemconfig[var.strip()] = val.strip()
-
-#this is how you reference a value from mv_hostype.py
-if (systemconfig.get("SystemType") == "Standalone"):
- dbSettingChange()
-elif systemconfig.get("SystemType") == "Master_backend":
- dbSettingChange()
diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
deleted file mode 100644
index 9882ad8..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-pkgname=mythweb
-pkgver=0.25
-pkgrel=9
-
-commit_hash=`cat ../git_src/git_hash_web`
-
-pkgdesc="Web interface for MythTV's backend, $commit_hash"
-url="http://www.mythtv.org"
-license="GPL"
-arch=('i686' 'x86_64')
-
-depends=('mythtv>=0.25' 'lighttpd' 'php' 'supplemental-web')
-groups=('mythtv-extras')
-install=mythweb.install
-#http://code.mythtv.org/trac/ticket/10504
-#patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch)
-patches=(schedules.php.patch tv-schedules.php.patch)
-source=(`echo ${patches[@]:0}` mythweb.include mythweb_gen_light.conf)
-
-build() {
-
- if [ -e ${srcdir}/mythweb ]
- then
- rm -rf ${srcdir}/mythweb
- fi
-
- cd ${startdir}
- msg "copy in myth web src"
- cp -rp ../git_src/mythweb $srcdir
- cd ${srcdir}/${pkgbase}
-
-
-
- msg "The local files are updated."
-
-
- cd $srcdir/mythweb
-
-
-
- echo "--------------------------applying patches----------------------------------------------------"
- for i in `echo ${patches[@]:0} `
- do
- echo applying $i
- echo "-----------------------------"
- patch -Np0 -i ${srcdir}/$i || return 1
- done
- echo "--------------------------done applying patches-----------------------------------------------"
-
- [ "$CARCH" = "i686" ] && ARCH="i686"
- [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-}
-
-package() {
- DOCROOT=/data/srv/httpd/mythweb
- mkdir -p $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
- rsync -arp --exclude .git --delete-excluded $srcdir/mythweb/* $pkgdir/$DOCROOT
- rm $pkgdir/$DOCROOT/README
- chown -R http:http $pkgdir/$DOCROOT
- chmod g+rw $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
-
- # mythweb modules_path fix for 0.24
- # http://code.mythtv.org/trac/ticket/9255
- cd ${pkgdir}/${DOCROOT}
- ln -s modules modules_path
-
- #install conf files for lighttpd
- mkdir -p $pkgdir/etc/lighttpd
- install -D -m 644 $srcdir/mythweb.include $pkgdir/etc/lighttpd/
- #gen_light_conf
- install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf
-
-}
-md5sums=('392e570594859c026ac12194920246d8'
- '515e29fda503c199888a91553e1815a0'
- '7645a6399434cbba35639713ac5d88e0'
- 'df190116b3aba35720fb6631885f973f')
diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb.include b/abs/core/mythtv/stable-0.25/mythweb/mythweb.include
deleted file mode 100644
index 18e9be1..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/mythweb.include
+++ /dev/null
@@ -1,8 +0,0 @@
-alias.url += ( "/mythweb" => "/data/srv/httpd/mythweb/")
-
-url.rewrite-once = (
-"^/{1,2}mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0",
-"^/{1,2}mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1",
-"^/{1,2}mythweb/(.+)$" => "/mythweb/mythweb.php/$1",
-"^/{1,2}mythweb/(.*)$" => "/mythweb/mythweb.php"
-)
\ No newline at end of file
diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb.install b/abs/core/mythtv/stable-0.25/mythweb/mythweb.install
deleted file mode 100644
index 0073499..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/mythweb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- gen_light_include.py
- /sbin/sv hup /service/lighttpd
-}
-post_upgrade() {
- post_install
-
-}
-
-post_remove() {
- gen_light_include.py
- echo
- echo "==> Forcing a re-read of lighttpd's configuration file."
- echo ""
- /sbin/sv hup /service/lighttpd
-#--
-
-}
diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf b/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf
deleted file mode 100644
index ddf0d2f..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf
+++ /dev/null
@@ -1 +0,0 @@
-include "/etc/lighttpd/mythweb.include"
diff --git a/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch b/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch
deleted file mode 100644
index 1d41711..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-*** modules/tv/tmpl/default/schedules.php.old 2011-04-03 06:05:31.000000000 -0500
---- modules/tv/tmpl/default/schedules.php 2012-03-27 05:37:40.000000000 -0500
-***************
-*** 90,95 ****
---- 90,100 ----
- </tr>
- </thead>
- <?php
-+ // Hack: Disable warnings about "Creating default
-+ // object from empty value" from below line
-+ // "$schedule->channel->name = '[ '.t('Any').' ]';"
-+ ini_set('error_reporting', E_ERROR);
-+
- $prev_group = '';
- $cur_group = '';
- foreach ($the_schedules as $schedule) {
diff --git a/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch b/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch
deleted file mode 100644
index 2f76216..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** includes/sorting.php.old 2011-04-03 06:05:31.000000000 -0500
---- includes/sorting.php 2012-03-27 05:05:51.000000000 -0500
-***************
-*** 123,129 ****
- function by_user_choice(&$a, &$b) {
- foreach ($GLOBALS['user_sort_choice'] as $sort) {
- $function = 'by_'.$sort['field'];
-! $response = $function(&$a, &$b);
- // Identical response, go on to the next sort choice
- if (!$response)
- continue;
---- 123,129 ----
- function by_user_choice(&$a, &$b) {
- foreach ($GLOBALS['user_sort_choice'] as $sort) {
- $function = 'by_'.$sort['field'];
-! $response = $function($a, $b);
- // Identical response, go on to the next sort choice
- if (!$response)
- continue;
diff --git a/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch b/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch
deleted file mode 100644
index 29e4ccb..0000000
--- a/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-*** modules/tv/schedules.php.orig 2012-06-05 09:05:32.935946957 +0200
---- modules/tv/schedules.php 2012-06-05 09:05:36.633022229 +0200
-***************
-*** 47,52 ****
---- 47,56 ----
- if (count($the_schedules))
- sort_programs($the_schedules, 'schedules_sortby');
-
-+ // Hack: Disable warnings about "Creating default
-+ // object from empty value" from below line
-+ // "$schedule->channel->name = '[ '.t('Any').' ]';"
-+ ini_set('error_reporting', E_ERROR);
- // Load the class for this page
- require_once tmpl_dir.'schedules.php';
-
--
cgit v0.12
From dcb4367bee1cee9b2b881c993ef56bb9560a0796 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Oct 2014 19:41:44 +0000
Subject: supplemental-web: fe_status: add a loading screen
move to main menu and a few other tweaks
---
abs/core/supplemental-web/PKGBUILD | 4 +--
.../supplemental-web/contents/ajaxloader.min.js | 1 +
abs/core/supplemental-web/contents/fe_status.py | 12 ++++++--
abs/core/supplemental-web/contents/fe_status.shtml | 8 ++++--
.../supplemental-web/contents/fe_status_load.shtml | 33 ++++++++++++++++++++++
abs/core/supplemental-web/contents/frame.css | 2 +-
abs/core/supplemental-web/contents/header.html | 3 +-
7 files changed, 53 insertions(+), 10 deletions(-)
create mode 100755 abs/core/supplemental-web/contents/ajaxloader.min.js
create mode 100755 abs/core/supplemental-web/contents/fe_status_load.shtml
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 3f9e8ef..a5bf2f6 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
-pkgver=8.0
-pkgrel=18
+pkgver=8.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/ajaxloader.min.js b/abs/core/supplemental-web/contents/ajaxloader.min.js
new file mode 100755
index 0000000..11c14ba
--- /dev/null
+++ b/abs/core/supplemental-web/contents/ajaxloader.min.js
@@ -0,0 +1 @@
+function AjaxLoader(e,t){function n(e){var t=/^#?([a-f\d])([a-f\d])([a-f\d])$/i;e=e.replace(t,function(e,t,n,r){return t+t+n+n+r+r});var n=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return n?{r:parseInt(n[1],16),g:parseInt(n[2],16),b:parseInt(n[3],16)}:null}function r(e,t,n){return"#"+((1<<24)+(e<<16)+(t<<8)+n).toString(16).slice(1)}function b(){p=s>=32?s>=128?72:36:18,d=.5*s*o,v=2*Math.PI/p;h=a/m;if(f){h=-h}g.width=s;g.height=s}function w(e){var t=2*Math.PI*e;var n=Math.cos(t),r=Math.sin(t),i=.5*s*(1+n),o=.5*s*(1-r),a=i-d*n,l=o+d*r;y.clearRect(0,0,s,s);for(var c=0;c<p;c++){y.beginPath();if(f){y.fillStyle="rgba("+u.r+","+u.g+","+u.b+","+(p-1-c)/(p-1)+")"}else{y.fillStyle="rgba("+u.r+","+u.g+","+u.b+","+c/(p-1)+")"}y.moveTo(i,o);y.lineTo(a,l);t+=v,n=Math.cos(t);r=Math.sin(t);i=.5*s*(1+n);o=.5*s*(1-r);a=i-d*n;l=o+d*r;y.lineTo(a,l);y.lineTo(i,o);y.closePath();y.fill()}}var i={size:32,factor:.25,speed:1,color:"#000",clockwise:true};var s,o,u,a,f,l,c=0,h,p,d,v,m=30;if(t!=null){s="size"in t?t.size:i.size;o="factor"in t?t.factor:i.factor;u=n("color"in t?t.color:i.color);a="speed"in t?t.speed:i.speed;f="clockwise"in t?t.clockwise:i.clockwise}else{s=i.size;o=i.factor;u=n(i.color);a=i.speed;f=i.clockwise}var g=document.getElementById(e);if(g==null){console.log("AjaxLoader Error! Cannot find canvas element by id '"+e+"'");return null}var y=g.getContext("2d");b();this.show=function(){g.removeAttribute("style");clearInterval(l);l=setInterval(function(){w(c);c+=h;c=c-Math.floor(c)},1e3/m)};this.hide=function(){clearInterval(l);g.style.display="none"};this.getSize=function(){return s};this.setSize=function(e){s=e;b()};this.getFactor=function(){return o};this.setFactor=function(e){o=e;b()};this.getSpeed=function(){return a};this.setSpeed=function(e){a=e;b()};this.getColor=function(){return r(u.r,u.g,u.b)};this.setColor=function(e){u=n(e)};this.getClockwise=function(){return f};this.setClockwise=function(e){f=e;b()}}
\ No newline at end of file
diff --git a/abs/core/supplemental-web/contents/fe_status.py b/abs/core/supplemental-web/contents/fe_status.py
index 49bbf95..993ef72 100644
--- a/abs/core/supplemental-web/contents/fe_status.py
+++ b/abs/core/supplemental-web/contents/fe_status.py
@@ -16,6 +16,7 @@ def msg(msg):
def parse_xml(frontend):
temp_dict = {'state':" --- ",
'title':" --- ",
+ 'subtitle':" --- ",
'location':" --- "}
url = "http://%s:6547/Frontend/GetStatus" %frontend
try:
@@ -40,6 +41,9 @@ def parse_xml(frontend):
elif keyitem == "title":
temp_dict['title'] = valueitem
+ elif keyitem == "subtitle":
+ temp_dict['subtitle'] = valueitem
+
elif keyitem == "currentlocation":
temp_dict['location'] = valueitem
@@ -82,15 +86,17 @@ def print_html(status_dict):
<td> %s </td>
<td> %s </td>
<td> %s </td>
- <td> %s </td>
+ <td> %s </td>
+ <td> %s </td>
</tr>
'''
- print row %(" Frontend "," State "," Title "," MythTV Location")
+ print row %(" MythFrontend Host "," State "," Title "," Subtitle "," MythFrontend Location ")
for fe in status_dict.keys():
temp_dict = status_dict[fe]
print row %(fe,
temp_dict['state'],
temp_dict['title'],
+ temp_dict['subtitle'],
temp_dict['location'])
print "</table>"
@@ -99,7 +105,7 @@ def print_html(status_dict):
print '''
<div id="footer">
</br>
- <p>Offline systems will not be listed</p>
+ <p>Offline systems are not listed</p>
</div>
'''
diff --git a/abs/core/supplemental-web/contents/fe_status.shtml b/abs/core/supplemental-web/contents/fe_status.shtml
index d821600..845a931 100644
--- a/abs/core/supplemental-web/contents/fe_status.shtml
+++ b/abs/core/supplemental-web/contents/fe_status.shtml
@@ -1,12 +1,14 @@
<html>
<head>
<style type="text/css">@import "/frame.css";</style>
+ <meta http-equiv="pragma" content="no-cache" />
</head>
+
<body>
<div id="header">
- <h1>LinHES Frontend Status </h1>
-
+ <h1>MythFrontend Status</h1>
</div>
- <!--#exec cmd="/root/fe_status.py" -->
+ <!--#exec cmd="MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/fe_status.py" -->
</body>
</html>
+
diff --git a/abs/core/supplemental-web/contents/fe_status_load.shtml b/abs/core/supplemental-web/contents/fe_status_load.shtml
new file mode 100755
index 0000000..ee058ad
--- /dev/null
+++ b/abs/core/supplemental-web/contents/fe_status_load.shtml
@@ -0,0 +1,33 @@
+<html>
+ <head>
+ <style type="text/css">@import "/frame.css";</style>
+ <script src="../ajaxloader.min.js"></script>
+ <meta http-equiv="pragma" content="no-cache" />
+ <meta http-equiv="refresh" content="0; url=../fe_status.shtml" />
+ </head>
+
+ <body>
+ <div id="header">
+ <h1>MythFrontend Status</h1>
+ </div>
+ </br> </br>
+ <h3>Querying MythFrontends...</h3>
+ </br>
+ <div id="container">
+ <div>
+ <canvas id="spinner"></canvas>
+ </div>
+ </div>
+ <script type="text/javascript">
+ var opts = {
+ size: 72, // Width and height of the spinner
+ factor: 0.25, // Factor of thickness, density, etc.
+ color: "#ebb81c", // Color #rgb or #rrggbb
+ speed: 1.0, // Number of turns per second
+ clockwise: true // Direction of rotation
+ };
+ var ajaxLoader = new AjaxLoader("spinner", opts);
+ ajaxLoader.show();
+ </script>
+ </body>
+</html>
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index 63a6121..0008aec 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -154,7 +154,7 @@ table.calllog {
border-style: outset;
border-color: #808080;
border-collapse: separate;
- width:500px;
+ width:85%;
margin-left:auto;
margin-right:auto;
body {text-align:center;}
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index 772cb52..c50cfee 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -41,6 +41,8 @@ function beStatus()
<li><a href="mythweb/">MythWeb</a></li>
+<li><a href="fe_status_load.shtml">MythFrontend Status</a></li>
+
<li><a id="modify-me">MythBackend Status</a></li>
<li><a href="xymon/">Health & Maintenance</a></li>
@@ -59,7 +61,6 @@ function beStatus()
<ul>
<!-- <li><a onClick=r() >MythBackend Status</a></li> -->
<li><a href="calllog.shtml">Call Log</a></li>
- <li><a href="fe_status.shtml">Frontend status</a></li>
<li><a href="mythexport/setup.cgi">MythExport</a></li>
<li><a href="mythexpress.html">MythExpress</a></li>
<!-- <li><a href="remyth.html" >ReMyth</a></li> -->
--
cgit v0.12
From 2705bb4450b02596183fc000996e0b348face96d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 3 Oct 2014 20:54:40 +0000
Subject: lighttpd: update to 1.4.35
---
abs/core/lighttpd/PKGBUILD | 12 ++++++------
abs/core/lighttpd/__changelog | 3 +++
abs/core/lighttpd/openssl-0.9.8m.patch | 11 -----------
3 files changed, 9 insertions(+), 17 deletions(-)
delete mode 100644 abs/core/lighttpd/openssl-0.9.8m.patch
diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index a29db8e..a2c3b7d 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=lighttpd
-pkgver=1.4.32
-pkgrel=3
+pkgver=1.4.35
+pkgrel=1
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('libxml2: mod_webdav' \
'libmysqlclient: mod_mysql_vhost' \
'sqlite3: mod_webdav' \
'gdbm: mod_trigger_b4_dl')
-backup=(etc/lighttpd/lighttpd.conf etc/logrotate.d/lighttpd etc/lighttpd/auth-inc.conf etc/lighttpd/conf.include etc/lighttpd/html.include)
+backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd' 'etc/lighttpd/auth-inc.conf' 'etc/lighttpd/conf.include' 'etc/lighttpd/html.include')
options=('!libtool' 'emptydirs')
source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \
'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf')
@@ -24,7 +24,7 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr \
- --sbindir=/usr/bin \
+ --sbindir=/usr/bin \
--libexecdir=/usr/lib/lighttpd/modules \
--sysconfdir=/etc/lighttpd \
--sharedstatedir=/usr/var \
@@ -46,7 +46,7 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
install -D -m755 ../lighttpd.rc.d ${pkgdir}/etc/rc.d/lighttpd
@@ -77,7 +77,7 @@ package() {
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
-md5sums=('8e2d4ae8e918d4de1aeb9842584d170b'
+md5sums=('f7a88130ee9984b421ad8aa80629750a'
'bd690eee0d9e51857448770a151023b0'
'e17a29ebcdac82a853389c3df468c980'
'7945bd60801295010e9e2cac1dba78b7'
diff --git a/abs/core/lighttpd/__changelog b/abs/core/lighttpd/__changelog
index 84a588c..e87d620 100644
--- a/abs/core/lighttpd/__changelog
+++ b/abs/core/lighttpd/__changelog
@@ -34,3 +34,6 @@ add proxy for shellinaboxd
# 8/14/2013
move proxy to shellinabox pkg
+
+# 10/3/2014
+didn't pull pkgbuild from arch just upgrade to 1.4.35
diff --git a/abs/core/lighttpd/openssl-0.9.8m.patch b/abs/core/lighttpd/openssl-0.9.8m.patch
deleted file mode 100644
index 321e10b..0000000
--- a/abs/core/lighttpd/openssl-0.9.8m.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lighttpd-1.4.26/src/network.c.orig 2010-03-12 01:19:34.000000000 +0000
-+++ src/lighttpd-1.4.26/src/network.c 2010-03-12 01:20:45.000000000 +0000
-@@ -525,7 +525,7 @@
-
- if (!s->ssl_use_sslv2) {
- /* disable SSLv2 */
-- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
- ERR_error_string(ERR_get_error(), NULL));
- return -1;
--
cgit v0.12
From 068c62ad9519b2001c068e2cbd76a277ab8f04b1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 3 Oct 2014 21:37:21 +0000
Subject: supplemental-web: fe_status: add some more disable cache lines and
set 60 refresh.
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/fe_status.shtml | 6 +++++-
abs/core/supplemental-web/contents/fe_status_load.shtml | 14 +++++++++-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index a5bf2f6..2a25f72 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/fe_status.shtml b/abs/core/supplemental-web/contents/fe_status.shtml
index 845a931..41ad117 100644
--- a/abs/core/supplemental-web/contents/fe_status.shtml
+++ b/abs/core/supplemental-web/contents/fe_status.shtml
@@ -1,7 +1,12 @@
<html>
<head>
<style type="text/css">@import "/frame.css";</style>
+ <meta http-equiv="cache-control" content="max-age=0" />
+ <meta http-equiv="cache-control" content="no-cache" />
+ <meta http-equiv="expires" content="0" />
+ <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
<meta http-equiv="pragma" content="no-cache" />
+ <meta http-equiv="refresh" content="60">
</head>
<body>
@@ -11,4 +16,3 @@
<!--#exec cmd="MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/fe_status.py" -->
</body>
</html>
-
diff --git a/abs/core/supplemental-web/contents/fe_status_load.shtml b/abs/core/supplemental-web/contents/fe_status_load.shtml
index ee058ad..4476cd1 100755
--- a/abs/core/supplemental-web/contents/fe_status_load.shtml
+++ b/abs/core/supplemental-web/contents/fe_status_load.shtml
@@ -1,18 +1,22 @@
<html>
<head>
<style type="text/css">@import "/frame.css";</style>
- <script src="../ajaxloader.min.js"></script>
- <meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="refresh" content="0; url=../fe_status.shtml" />
+ <script src="/ajaxloader.min.js"></script>
+ <meta http-equiv="cache-control" content="max-age=0">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="refresh" content="0; url=/fe_status.shtml">
</head>
<body>
<div id="header">
<h1>MythFrontend Status</h1>
</div>
- </br> </br>
+ <br> <br>
<h3>Querying MythFrontends...</h3>
- </br>
+ <br>
<div id="container">
<div>
<canvas id="spinner"></canvas>
--
cgit v0.12
From 3cdab7d28cc3c8e66074c167c7ac6c7625ba49d8 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 3 Oct 2014 16:59:49 -0500
Subject: dhcpcd: moved lib dir to /usr/lib because /lib conflicts with the
filesystem pkg.
---
abs/core/dhcpcd/PKGBUILD | 7 +++++--
abs/core/dhcpcd/__changelog | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD
index 82a42e8..34525d8 100644
--- a/abs/core/dhcpcd/PKGBUILD
+++ b/abs/core/dhcpcd/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=dhcpcd
pkgver=6.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
@@ -24,12 +24,15 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver}
# configure variables
- ./configure \
+ ./configure \
--sbindir=/usr/bin \
--libexecdir=/usr/lib/dhcpcd \
+ --libdir=/usr/lib \
--dbdir=/var/lib/dhcpcd \
--rundir=/run
+
+
# Build
make
}
diff --git a/abs/core/dhcpcd/__changelog b/abs/core/dhcpcd/__changelog
index 3f0d400..0004c0c 100644
--- a/abs/core/dhcpcd/__changelog
+++ b/abs/core/dhcpcd/__changelog
@@ -1,2 +1,4 @@
Added to dhcpcd.conf.d
DHCPCD_ARGS="-t 30 -h $HOSTNAME"
+
+Added libdir=/usr/lib because /lib conflicts with filesystem pkg
--
cgit v0.12
From 02f331eed155a769f1e5b387cbf9321a963a7e61 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 4 Oct 2014 00:07:12 +0000
Subject: hal & hal-info: rebuild for R8. refs #970
---
abs/core/hal-info/PKGBUILD | 25 +
abs/core/hal/PKGBUILD | 101 +
abs/core/hal/badvok-compile-fix.patch | 12 +
abs/core/hal/hal-glib-2.3-compile-fix.patch | 156 +
abs/core/hal/hal-libudev-events.patch | 346 +
abs/core/hal/hal.install | 24 +
abs/core/hal/hal.patch | 24335 +++++++++++++++++++
abs/core/hal/hal.service | 14 +
abs/core/hal/hald | 54 +
abs/core/hal/udev-update.patch | 55 +
abs/not_built/core/hal-info/PKGBUILD | 25 -
abs/not_built/core/hal/PKGBUILD | 83 -
abs/not_built/core/hal/cryptsetup_location.patch | 36 -
abs/not_built/core/hal/dbus-error-init.patch | 231 -
abs/not_built/core/hal/fix-libusb-detection.patch | 66 -
.../core/hal/fix-udev-compatibility.patch | 31 -
abs/not_built/core/hal/hal | 54 -
.../core/hal/hal-0.5.9-hide-diagnostic.patch | 14 -
abs/not_built/core/hal/hal-HDAPS-blacklist.patch | 30 -
abs/not_built/core/hal/hal-KVM-evdev.patch | 36 -
abs/not_built/core/hal/hal-policy.patch | 32 -
.../core/hal/hal-remove-dell-killswitch.patch | 201 -
abs/not_built/core/hal/hal-use-at-console.patch | 45 -
abs/not_built/core/hal/hal-xen-unignore-axes.patch | 39 -
abs/not_built/core/hal/hal.install | 24 -
abs/not_built/core/hal/handle-input-touchpad.patch | 101 -
abs/not_built/core/hal/macbook-fix-ioperm.patch | 41 -
abs/not_built/core/hal/ntfs-mount-fix.patch | 18 -
abs/not_built/core/hal/ntfs3g-valid-options.patch | 11 -
abs/not_built/core/hal/path-max.patch | 31 -
30 files changed, 25122 insertions(+), 1149 deletions(-)
create mode 100644 abs/core/hal-info/PKGBUILD
create mode 100644 abs/core/hal/PKGBUILD
create mode 100644 abs/core/hal/badvok-compile-fix.patch
create mode 100644 abs/core/hal/hal-glib-2.3-compile-fix.patch
create mode 100644 abs/core/hal/hal-libudev-events.patch
create mode 100644 abs/core/hal/hal.install
create mode 100644 abs/core/hal/hal.patch
create mode 100644 abs/core/hal/hal.service
create mode 100644 abs/core/hal/hald
create mode 100644 abs/core/hal/udev-update.patch
delete mode 100644 abs/not_built/core/hal-info/PKGBUILD
delete mode 100644 abs/not_built/core/hal/PKGBUILD
delete mode 100644 abs/not_built/core/hal/cryptsetup_location.patch
delete mode 100644 abs/not_built/core/hal/dbus-error-init.patch
delete mode 100644 abs/not_built/core/hal/fix-libusb-detection.patch
delete mode 100644 abs/not_built/core/hal/fix-udev-compatibility.patch
delete mode 100644 abs/not_built/core/hal/hal
delete mode 100644 abs/not_built/core/hal/hal-0.5.9-hide-diagnostic.patch
delete mode 100644 abs/not_built/core/hal/hal-HDAPS-blacklist.patch
delete mode 100644 abs/not_built/core/hal/hal-KVM-evdev.patch
delete mode 100644 abs/not_built/core/hal/hal-policy.patch
delete mode 100644 abs/not_built/core/hal/hal-remove-dell-killswitch.patch
delete mode 100644 abs/not_built/core/hal/hal-use-at-console.patch
delete mode 100644 abs/not_built/core/hal/hal-xen-unignore-axes.patch
delete mode 100644 abs/not_built/core/hal/hal.install
delete mode 100644 abs/not_built/core/hal/handle-input-touchpad.patch
delete mode 100644 abs/not_built/core/hal/macbook-fix-ioperm.patch
delete mode 100644 abs/not_built/core/hal/ntfs-mount-fix.patch
delete mode 100644 abs/not_built/core/hal/ntfs3g-valid-options.patch
delete mode 100644 abs/not_built/core/hal/path-max.patch
diff --git a/abs/core/hal-info/PKGBUILD b/abs/core/hal-info/PKGBUILD
new file mode 100644
index 0000000..2eb17b1
--- /dev/null
+++ b/abs/core/hal-info/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 61556 2009-12-19 19:16:58Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=hal-info
+_date=20091130
+pkgver=0.${_date}
+pkgrel=2
+pkgdesc="Hardware Abstraction Layer information files"
+arch=(any)
+options=('!emptydirs')
+license=('GPL' 'custom')
+url="http://www.freedesktop.org/wiki/Software/hal"
+source=(http://hal.freedesktop.org/releases/hal-info-${_date}.tar.gz)
+md5sums=('34375489a02a00b250fdc0b280be11b8')
+
+build() {
+ cd "${srcdir}/${pkgname}-${_date}"
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no --enable-killswitch-dell-wwan=no
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${_date}"
+ make DESTDIR=${pkgdir} install
+}
diff --git a/abs/core/hal/PKGBUILD b/abs/core/hal/PKGBUILD
new file mode 100644
index 0000000..fab08c5
--- /dev/null
+++ b/abs/core/hal/PKGBUILD
@@ -0,0 +1,101 @@
+# Maintainer: Rohit Manokaran <rohit000@live.com>
+# Contributor: James An <james@jamesan.ca>
+# Contributor: Rohit Manokaran <rohitmanokaran@yahoo.com>
+# Contributor: Pawel "l0ner" Soltys <pwslts@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Link Dupont <link@subpop.net>
+# Contributor: Calvin Morisson <mutantturkey@gmail.com>
+# Contributor: deusstultus <deusstultus@gmail.com>
+
+pkgname=hal
+pkgver=0.5.14
+pkgrel=21
+pkgdesc="Hardware Abstraction Layer"
+arch=(i686 x86_64)
+license=('GPL' 'custom')
+url="http://www.freedesktop.org/wiki/Software/hal"
+depends=('dbus-glib>=0.82' 'libusb-compat' 'hal-info>=0.20090716' 'dmidecode' 'v4l-utils')
+optdepends=('acpid>=2.0' 'pm-utils>=1.2.5')
+makedepends=('gperf')
+options=('!libtool' '!makeflags')
+install=hal.install
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+ hald
+ hal.service
+ hal.patch
+ udev-update.patch
+ hal-glib-2.3-compile-fix.patch
+ hal-libudev-events.patch
+ badvok-compile-fix.patch)
+
+md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
+ '4cdfc673ad65ddb51919f5a757f62145'
+ 'ca4a7932fe7e8acbfa17245b62cc3b9b'
+ '185dd5d6ffc703ec8395b4eb3a1ae498'
+ '68209ba62b2a19537bfa459fdef70ed3'
+ 'c126a66766118f83a171511832d1b619'
+ 'd115a2f1793121b08dd58527c1530d0b'
+ '7acfdd590c98272930ddfd37f1c7f5a3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -d ${srcdir} -i ${srcdir}/hal.patch
+
+ patch -Np1 -i ${srcdir}/hal-libudev-events.patch
+ patch -Np1 -i ${srcdir}/hal-glib-2.3-compile-fix.patch
+ patch -Np1 -i ${srcdir}/udev-update.patch
+ patch -Np1 -i ${srcdir}/badvok-compile-fix.patch
+
+ # fix trialing space
+ sed -i 's/failed; [\] /failed; \\/' policy/Makefile.am
+
+ # fix subdir-objects mess in automake 1.14
+ sed -i 's/AM_INIT_AUTOMAKE[(]\[gnu 1.9\][)]/AM_INIT_AUTOMAKE([subdir-objects])/' configure.in
+
+ libtoolize --force
+ aclocal
+ autoupdate # required to fix obsolete macros
+ autoconf
+ automake --add-missing --warnings=all
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
+ --enable-static=no --disable-acpi-ibm \
+ --disable-docbook-docs --disable-console-kit \
+ --disable-policy-kit --disable-acl-management \
+ --enable-umount-helper --disable-smbios \
+ --with-hal-user=hal --with-hal-group=hal \
+ --with-pid-file=/var/run/hald.pid \
+ --sbindir=/usr/bin --disable-gtk-doc
+ make
+
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+ # These empty directories are required by hal to successfuly create its fdi-cache
+ install -m755 -d "${pkgdir}/etc/hal/fdi/"{policy,preprobe,information}
+
+ # udev-sockets support has been removed from udev. hal-libudev-events.patch fixes hal to get events from libudev
+ rm -r "${pkgdir}/etc/udev"
+
+ # move umount.hal from non-standard /sbin to /usr/bin
+ if test -e "${pkgdir}/sbin/umount.hal"; then
+ install -m755 -d "${pkgdir}/usr/bin"
+ mv "${pkgdir}/sbin/umount.hal" "${pkgdir}/usr/bin/umount.hal"
+ rmdir "${pkgdir}/sbin"
+ fi
+
+ # create systemd service files
+ install -Dm644 ../hal.service "${pkgdir}/usr/lib/systemd/system/hal.service"
+
+ # These dirs dont appear to be used. If they are needed we need to add systemd tmpfile to create them
+ rm -r "${pkgdir}/var/run"
+
+ # Change ownership from hal:hal to root [namcap error]
+ chown root:root "${pkgdir}/var/cache/hald"
+}
diff --git a/abs/core/hal/badvok-compile-fix.patch b/abs/core/hal/badvok-compile-fix.patch
new file mode 100644
index 0000000..83ed2de
--- /dev/null
+++ b/abs/core/hal/badvok-compile-fix.patch
@@ -0,0 +1,12 @@
+diff -ru hal-0.5.14-original/hald/linux/addons/addon-storage.c hal-0.5.14/hald/linux/addons/addon-storage.c
+--- hal-0.5.14-original/hald/linux/addons/addon-storage.c 2013-01-06 01:15:17.195955506 -0800
++++ hal-0.5.14/hald/linux/addons/addon-storage.c 2013-01-06 01:16:43.835764036 -0800
+@@ -32,6 +32,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/fs.h>
+ #include <mntent.h>
++#include <sys/types.h>
+ #include <scsi/sg.h>
+ #include <stdint.h>
+ #include <stdio.h>
+
diff --git a/abs/core/hal/hal-glib-2.3-compile-fix.patch b/abs/core/hal/hal-glib-2.3-compile-fix.patch
new file mode 100644
index 0000000..461144f
--- /dev/null
+++ b/abs/core/hal/hal-glib-2.3-compile-fix.patch
@@ -0,0 +1,156 @@
+diff -ru hal-0.5.14/hald/linux/addons/addon-acpi-buttons-toshiba.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-acpi-buttons-toshiba.c
+--- hal-0.5.14/hald/linux/addons/addon-acpi-buttons-toshiba.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-acpi-buttons-toshiba.c 2012-05-26 18:17:41.516400197 -0700
+@@ -40,7 +40,7 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
+diff -ru hal-0.5.14/hald/linux/addons/addon-cpufreq.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-cpufreq.c
+--- hal-0.5.14/hald/linux/addons/addon-cpufreq.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-cpufreq.c 2012-05-26 18:16:04.626395657 -0700
+@@ -32,7 +32,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <glib/gprintf.h>
+
+ #include "addon-cpufreq.h"
+ #include "addon-cpufreq-userspace.h"
+diff -ru hal-0.5.14/hald/linux/addons/addon-dell-backlight.cpp hal-glib-2.3-compile-fix/hald/linux/addons/addon-dell-backlight.cpp
+--- hal-0.5.14/hald/linux/addons/addon-dell-backlight.cpp 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-dell-backlight.cpp 2012-05-26 18:17:16.816399038 -0700
+@@ -29,7 +29,7 @@
+
+ #include <string.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-generic-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-generic-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-generic-backlight.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-generic-backlight.c 2012-05-26 18:16:51.779731200 -0700
+@@ -35,7 +35,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-imac-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-imac-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-imac-backlight.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-imac-backlight.c 2012-05-26 18:16:58.686398190 -0700
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-input.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-input.c
+--- hal-0.5.14/hald/linux/addons/addon-input.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-input.c 2012-05-26 18:17:10.783065423 -0700
+@@ -41,8 +41,7 @@
+ #else
+ #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+ #include "libhal/libhal.h"
+diff -ru hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-ipw-killswitch.c
+--- hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-ipw-killswitch.c 2012-05-26 18:16:44.186397511 -0700
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-leds.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-leds.c
+--- hal-0.5.14/hald/linux/addons/addon-leds.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-leds.c 2012-05-26 18:17:59.099734354 -0700
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-macbookpro-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-macbookpro-backlight.c 2012-05-26 18:18:05.539734654 -0700
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-omap-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-omap-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-omap-backlight.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-omap-backlight.c 2012-05-26 18:17:34.836399884 -0700
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-rfkill-killswitch.c
+--- hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-rfkill-killswitch.c 2012-05-26 18:16:36.813063830 -0700
+@@ -36,8 +36,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-storage.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-storage.c
+--- hal-0.5.14/hald/linux/addons/addon-storage.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-storage.c 2012-05-26 18:16:25.149729952 -0700
+@@ -39,7 +39,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+diff -ru hal-0.5.14/hald/linux/addons/addon-usb-csr.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-usb-csr.c
+--- hal-0.5.14/hald/linux/addons/addon-usb-csr.c 2009-08-24 05:42:30.000000000 -0700
++++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-usb-csr.c 2012-05-26 18:17:22.746399317 -0700
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
diff --git a/abs/core/hal/hal-libudev-events.patch b/abs/core/hal/hal-libudev-events.patch
new file mode 100644
index 0000000..abd13db
--- /dev/null
+++ b/abs/core/hal/hal-libudev-events.patch
@@ -0,0 +1,346 @@
+diff -ru hal-0.5.14/configure.in hal-libudev-events/configure.in
+--- hal-0.5.14/configure.in 2012-06-17 17:05:38.346983427 -0700
++++ hal-libudev-events/configure.in 2012-06-17 12:30:53.406613390 -0700
+@@ -14,6 +14,7 @@
+
+ glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
+ dbus_module="dbus-1 >= 0.61"
++udev_module="libudev >= 185"
+ blkid_module="blkid >= 2.15"
+ volume_id_module="libvolume_id >= 0.77"
+ polkit_module="polkit >= 0.5"
+@@ -693,6 +694,11 @@
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+
++# D-Bus libs
++PKG_CHECK_MODULES(UDEV, [$udev_module])
++AC_SUBST(UDEV_CFLAGS)
++AC_SUBST(UDEV_LIBS)
++
+ # glib libs
+ PKG_CHECK_MODULES(GLIB, [$glib_module])
+ AC_SUBST(GLIB_CFLAGS)
+Only in hal-libudev-events: .configure.in.swp
+diff -ru hal-0.5.14/hald/linux/osspec.c hal-libudev-events/hald/linux/osspec.c
+--- hal-0.5.14/hald/linux/osspec.c 2012-06-17 17:05:38.343650094 -0700
++++ hal-libudev-events/hald/linux/osspec.c 2012-06-17 16:57:08.250305305 -0700
+@@ -44,6 +44,7 @@
+ #include <sys/un.h>
+ #include <sys/utsname.h>
+ #include <unistd.h>
++#include <libudev.h>
+
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib.h>
+@@ -69,158 +70,97 @@
+
+ static gboolean hald_done_synthesizing_coldplug = FALSE;
+
+-static gboolean
+-hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
++static long long get_ll_dev_prop(struct udev_device *device, const char *property)
+ {
+- int fd;
+- int retval;
+- struct msghdr smsg;
+- struct cmsghdr *cmsg;
+- struct iovec iov;
+- struct ucred *cred;
+- char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
++ long long result = 0;
++ const char * propVal = udev_device_get_property_value(device, property);
+
+- char buf[4096];
+- size_t bufpos = 0;
+- const char *action = NULL;
+- HotplugEvent *hotplug_event;
++ if(propVal != NULL) {
++ result = strtoull(propVal, NULL, 10);
++ HAL_INFO(("Property: %s Value: %lli", property, result));
++ }
++ return result;
++}
+
+- memset(buf, 0x00, sizeof (buf));
++static void copy_dev_prop(struct udev_device *device, char * dst, size_t dst_size, const char *property)
++{
++ const char * propVal = udev_device_get_property_value(device, property);
+
+- fd = g_io_channel_unix_get_fd (source);
++ if(propVal != NULL) {
++ g_strlcpy (dst, propVal, dst_size);
++ HAL_INFO(("Property: %s Value: %s", property, dst));
++ }
++}
+
+- iov.iov_base = &buf;
+- iov.iov_len = sizeof (buf);
++static void copy_dev_prop_formatted(struct udev_device *device, char * format, char * dst, size_t dst_size, const char *property)
++{
++ const char * propVal = udev_device_get_property_value(device, property);
+
+- memset(&smsg, 0x00, sizeof (struct msghdr));
+- smsg.msg_iov = &iov;
+- smsg.msg_iovlen = 1;
+- smsg.msg_control = cred_msg;
+- smsg.msg_controllen = sizeof (cred_msg);
+-
+- retval = recvmsg (fd, &smsg, 0);
+- if (retval < 0) {
+- if (errno != EINTR)
+- HAL_INFO (("Unable to receive message, errno=%d", errno));
+- goto out;
++ if(propVal != NULL) {
++ g_snprintf (dst, dst_size, format, propVal);
++ HAL_INFO(("Property: %s Value: %s", property, dst));
+ }
+- cmsg = CMSG_FIRSTHDR (&smsg);
+- cred = (struct ucred *) CMSG_DATA (cmsg);
++}
+
+- if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
+- HAL_INFO (("No sender credentials received, message ignored"));
+- goto out;
+- }
++static gboolean
++hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data)
++{
++ struct udev_monitor *udev_monitor = (struct udev_monitor *) user_data;
++ struct udev_device *device;
+
+- if (cred->uid != 0) {
+- HAL_INFO (("Sender uid=%i, message ignored", cred->uid));
+- goto out;
+- }
++ char *tmp, *tmp1;
++
++ const char *action = NULL;
++ HotplugEvent *hotplug_event;
+
+- if (!strstr(buf, "@/")) {
+- HAL_INFO (("invalid message format"));
++ device = udev_monitor_receive_device(udev_monitor);
++
++ if (!device) {
++ HAL_ERROR (("Unable to receive message from udev device"));
+ goto out;
+ }
+
+ hotplug_event = g_slice_new0 (HotplugEvent);
+ hotplug_event->type = HOTPLUG_EVENT_SYSFS;
+
+- while (bufpos < sizeof (buf)) {
+- size_t keylen;
+- char *key;
+- char *str, *dstr;
+-
+- key = &buf[bufpos];
+- keylen = strlen(key);
+- if (keylen == 0)
+- break;
+- bufpos += keylen + 1;
+-
+- if (strncmp(key, "ACTION=", 7) == 0)
+- action = &key[7];
+- else if (strncmp(key, "DEVPATH=", 8) == 0) {
+-
+- /* md devices are handled via looking at /proc/mdstat */
+- if (g_str_has_prefix (key + 8, "/block/md")) {
+- HAL_INFO (("skipping md event for %s", key + 8));
+- goto invalid;
+- }
+-
+- g_snprintf (hotplug_event->sysfs.sysfs_path, sizeof (hotplug_event->sysfs.sysfs_path),
+- "/sys%s", &key[8]);
+- } else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) {
+-
+- /* md devices are handled via looking at /proc/mdstat */
+- if (g_str_has_prefix (key + 12, "/block/md")) {
+- HAL_INFO (("skipping md event for %s", key + 8));
+- goto invalid;
+- }
+-
+- g_snprintf (hotplug_event->sysfs.sysfs_path_old, sizeof (hotplug_event->sysfs.sysfs_path_old),
+- "/sys%s", &key[12]);
+- } else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
+- g_strlcpy (hotplug_event->sysfs.subsystem, &key[10], sizeof (hotplug_event->sysfs.subsystem));
+- else if (strncmp(key, "DEVNAME=", 8) == 0)
+- g_strlcpy (hotplug_event->sysfs.device_file, &key[8], sizeof (hotplug_event->sysfs.device_file));
+- else if (strncmp(key, "SEQNUM=", 7) == 0)
+- hotplug_event->sysfs.seqnum = strtoull(&key[7], NULL, 10);
+- else if (strncmp(key, "IFINDEX=", 8) == 0)
+- hotplug_event->sysfs.net_ifindex = strtoul(&key[8], NULL, 10);
+- else if (strncmp(key, "ID_VENDOR=", 10) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.vendor, str, sizeof(hotplug_event->sysfs.vendor));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_MODEL=", 9) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[9])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.model, str, sizeof(hotplug_event->sysfs.model));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_REVISION=", 12) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.revision, str, sizeof(hotplug_event->sysfs.revision));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_SERIAL=", 10) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[10])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.serial, str, sizeof(hotplug_event->sysfs.serial));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_FS_USAGE=", 12) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[12])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.fsusage, str, sizeof(hotplug_event->sysfs.fsusage));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_FS_TYPE=", 11) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.fstype, str, sizeof(hotplug_event->sysfs.fstype));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_FS_VERSION=", 14) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[14])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.fsversion, str, sizeof(hotplug_event->sysfs.fsversion));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_FS_UUID=", 11) == 0) {
+- if ((str = hal_util_strdup_valid_utf8(&key[11])) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.fsuuid, str, sizeof(hotplug_event->sysfs.fsuuid));
+- g_free (str);
+- }
+- } else if (strncmp(key, "ID_FS_LABEL_ENC=", 16) == 0) {
+- dstr = g_malloc0 (keylen - 15);
+- hal_util_decode_escape (&key[16], dstr, sizeof(hotplug_event->sysfs.fslabel));
+-
+- if ((str = hal_util_strdup_valid_utf8(dstr)) != NULL ) {
+- g_strlcpy (hotplug_event->sysfs.fslabel, str, sizeof(hotplug_event->sysfs.fslabel));
+- g_free (str);
+- }
+- g_free (dstr);
+- } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
+- if (strtoul(&key[33], NULL, 10) == 1) {
+- HAL_INFO (("ignoring device requested by DM udev rules"));
+- goto invalid;
+- }
++ action = udev_device_get_action(device);
++
++ copy_dev_prop_formatted(device, "/sys%s", hotplug_event->sysfs.sysfs_path, sizeof(hotplug_event->sysfs.sysfs_path), "DEVPATH");
++ copy_dev_prop(device, hotplug_event->sysfs.subsystem, sizeof(hotplug_event->sysfs.subsystem), "SUBSYSTEM");
++ copy_dev_prop(device, hotplug_event->sysfs.device_file, sizeof(hotplug_event->sysfs.device_file), "DEVNAME");
++
++ hotplug_event->sysfs.seqnum = get_ll_dev_prop(device, "SEQNUM");
++ hotplug_event->sysfs.net_ifindex = get_ll_dev_prop(device, "IFINDEX");
++
++ copy_dev_prop_formatted(device, "/sys%s", hotplug_event->sysfs.sysfs_path_old, sizeof(hotplug_event->sysfs.sysfs_path_old), "DEVPATH_OLD");
++ copy_dev_prop(device, hotplug_event->sysfs.vendor, sizeof(hotplug_event->sysfs.vendor), "ID_VENDOR");
++ copy_dev_prop(device, hotplug_event->sysfs.model, sizeof(hotplug_event->sysfs.model), "ID_MODEL");
++ copy_dev_prop(device, hotplug_event->sysfs.revision, sizeof(hotplug_event->sysfs.revision), "ID_REVISION");
++ copy_dev_prop(device, hotplug_event->sysfs.serial, sizeof(hotplug_event->sysfs.serial), "ID_SERIAL");
++ copy_dev_prop(device, hotplug_event->sysfs.fsusage, sizeof(hotplug_event->sysfs.fsusage), "ID_FS_USAGE");
++ copy_dev_prop(device, hotplug_event->sysfs.fstype, sizeof(hotplug_event->sysfs.fstype), "ID_FS_TYPE");
++ copy_dev_prop(device, hotplug_event->sysfs.fsversion, sizeof(hotplug_event->sysfs.fsversion), "ID_FS_VERSION");
++ copy_dev_prop(device, hotplug_event->sysfs.fsuuid, sizeof(hotplug_event->sysfs.fsuuid), "ID_FS_UUID");
++ copy_dev_prop(device, hotplug_event->sysfs.fslabel, sizeof(hotplug_event->sysfs.fslabel), "ID_FS_LABEL_ENC");
++
++ /* md devices are handled via looking at /proc/mdstat */
++ if (g_str_has_prefix (hotplug_event->sysfs.sysfs_path, "/sys/block/md")) {
++ HAL_INFO (("skipping md event for %s", hotplug_event->sysfs.sysfs_path));
++ goto invalid;
++ }
++ if (g_str_has_prefix (hotplug_event->sysfs.sysfs_path_old, "/sys/block/md")) {
++ HAL_INFO (("skipping md event for %s", hotplug_event->sysfs.sysfs_path_old));
++ goto invalid;
++ }
++
++ if(hotplug_event->sysfs.fslabel != NULL) {
++ tmp = g_malloc(sizeof(hotplug_event->sysfs.fslabel));
++ hal_util_decode_escape (hotplug_event->sysfs.fslabel, tmp, sizeof(hotplug_event->sysfs.fslabel));
++ if ((tmp1 = hal_util_strdup_valid_utf8(tmp)) != NULL ) {
++ g_strlcpy (hotplug_event->sysfs.fslabel, tmp1, sizeof(hotplug_event->sysfs.fslabel));
++ g_free (tmp1);
+ }
++ g_free(tmp);
+ }
+
+ if (!action) {
+@@ -291,6 +231,7 @@
+ g_slice_free (HotplugEvent, hotplug_event);
+
+ out:
++ udev_device_unref(device);
+ return TRUE;
+ }
+
+@@ -406,9 +347,9 @@
+ void
+ osspec_init (void)
+ {
++ struct udev * udev;
++ struct udev_monitor * udev_monitor;
+ int udev_socket;
+- struct sockaddr_un saddr;
+- socklen_t addrlen;
+ const int on = 1;
+ GIOChannel *udev_channel;
+ GIOChannel *mounts_channel;
+@@ -419,28 +360,35 @@
+
+ hal_device_store_index_property (hald_get_gdl (), "linux.sysfs_path");
+
+- memset(&saddr, 0x00, sizeof(saddr));
+- saddr.sun_family = AF_LOCAL;
+- /* use abstract namespace for socket path */
+- strcpy(&saddr.sun_path[1], "/org/freedesktop/hal/udev_event");
+- addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
++ udev = udev_new();
++
++ if(!udev) {
++ DIE (("Could not create udev"));
++ }
++
++ udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
++
++ if(!udev_monitor || udev_monitor_enable_receiving(udev_monitor)) {
++ DIE (("Could not create udev monitor"));
++ }
++
++ udev_socket = udev_monitor_get_fd(udev_monitor);
+
+- udev_socket = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (udev_socket == -1) {
+ DIE (("Couldn't open socket"));
+ }
+
+- if (bind(udev_socket, (struct sockaddr *) &saddr, addrlen) < 0) {
+- fprintf (stderr, "Error binding udev_event socket: %s\n", strerror(errno));
+- exit (1);
+- }
+ /* enable receiving of the sender credentials */
+ setsockopt(udev_socket, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on));
+
+ udev_channel = g_io_channel_unix_new (udev_socket);
+- g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, NULL);
++ g_io_add_watch (udev_channel, G_IO_IN, hald_udev_data, udev_monitor);
+ g_io_channel_unref (udev_channel);
+
++ /*udev_monitor_unref(udev_monitor);
++ udev_unref(udev);*/
++
++
+ /* watch /proc/mounts for mount tree changes
+ * kernel 2.6.15 vfs throws a POLLERR event for every change
+ */diff -ru hal-0.5.14/hald/Makefile.am hal-libudev-events/hald/Makefile.am
+--- hal-0.5.14/hald/Makefile.am 2012-06-17 17:05:38.346983427 -0700
++++ hal-libudev-events/hald/Makefile.am 2012-06-17 12:41:57.566628300 -0700
+@@ -74,7 +74,7 @@
+ hald_SOURCES += ck-tracker.h ck-tracker.c
+ endif
+
+-hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la
++hald_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @POLKIT_LIBS@ -lm @HALD_OS_LIBS@ $(top_builddir)/hald/$(HALD_BACKEND)/libhald_$(HALD_BACKEND).la @UDEV_LIBS@
+
+ #### Init scripts fun
+ SCRIPT_IN_FILES=haldaemon.in
diff --git a/abs/core/hal/hal.install b/abs/core/hal/hal.install
new file mode 100644
index 0000000..d6afee3
--- /dev/null
+++ b/abs/core/hal/hal.install
@@ -0,0 +1,24 @@
+post_install() {
+ getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
+ getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
+ getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
+ getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
+ getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
+ usr/bin/passwd -l hal &>/dev/null
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install $1
+}
+
+# arg 1: the old package version
+post_remove() {
+ if getent passwd hal &>/dev/null; then
+ usr/sbin/userdel hal
+ fi
+ if getent group hal &>/dev/null; then
+ usr/sbin/groupdel hal
+ fi
+}
diff --git a/abs/core/hal/hal.patch b/abs/core/hal/hal.patch
new file mode 100644
index 0000000..d5e2709
--- /dev/null
+++ b/abs/core/hal/hal.patch
@@ -0,0 +1,24335 @@
+diff -u -r hal-0.5.14/aclocal.m4 src/hal-0.5.14/aclocal.m4
+--- hal-0.5.14/aclocal.m4 2009-11-30 23:22:30.000000000 +0100
++++ src/hal-0.5.14/aclocal.m4 2011-12-19 20:40:08.000000000 +0100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+-[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -22,7 +22,8 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is free software; the Free Software Foundation gives
+@@ -31,7 +32,8 @@
+
+ m4_define([_LT_COPYING], [dnl
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -58,7 +60,7 @@
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ])
+
+-# serial 56 LT_INIT
++# serial 57 LT_INIT
+
+
+ # LT_PREREQ(VERSION)
+@@ -87,6 +89,7 @@
+ # ------------------
+ AC_DEFUN([LT_INIT],
+ [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ AC_BEFORE([$0], [LT_LANG])dnl
+ AC_BEFORE([$0], [LT_OUTPUT])dnl
+ AC_BEFORE([$0], [LTDL_INIT])dnl
+@@ -103,6 +106,8 @@
+ AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+ m4_require([_LT_PROG_LTMAIN])dnl
+
++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
++
+ dnl Parse OPTIONS
+ _LT_SET_OPTIONS([$0], [$1])
+
+@@ -139,7 +144,7 @@
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ ])
+
+
+@@ -159,6 +164,11 @@
+ m4_defun([_LT_SETUP],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
++
++_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
++dnl
+ _LT_DECL([], [host_alias], [0], [The host system])dnl
+ _LT_DECL([], [host], [0])dnl
+ _LT_DECL([], [host_os], [0])dnl
+@@ -181,10 +191,13 @@
+ dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+ m4_require([_LT_CMD_RELOAD])dnl
+ m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_WITH_SYSROOT])dnl
+
+ _LT_CONFIG_LIBTOOL_INIT([
+ # See if we are running on zsh, and set the options which allow our
+@@ -200,7 +213,6 @@
+ _LT_CHECK_OBJDIR
+
+ m4_require([_LT_TAG_COMPILER])dnl
+-_LT_PROG_ECHO_BACKSLASH
+
+ case $host_os in
+ aix3*)
+@@ -214,23 +226,6 @@
+ ;;
+ esac
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -271,6 +266,28 @@
+ ])# _LT_SETUP
+
+
++# _LT_PREPARE_SED_QUOTE_VARS
++# --------------------------
++# Define a few sed substitution that help us do robust quoting.
++m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
++[# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++])
++
+ # _LT_PROG_LTMAIN
+ # ---------------
+ # Note that this code is called both from `configure', and `config.status'
+@@ -423,7 +440,7 @@
+ # declaration there will have the same value as in `configure'. VARNAME
+ # must have a single quote delimited value for this to work.
+ m4_define([_LT_CONFIG_STATUS_DECLARE],
+-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
++[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+ # _LT_CONFIG_STATUS_DECLARATIONS
+@@ -433,7 +450,7 @@
+ # embedded single quotes properly. In configure, this macro expands
+ # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+ #
+-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
++# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+ [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+@@ -532,12 +549,20 @@
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++ eval 'cat <<_LTECHO_EOF
++\$[]1
++_LTECHO_EOF'
++}
++
+ # Quote evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_quote_varnames); do
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -548,9 +573,9 @@
+ # Double-quote double-evaled strings.
+ for var in lt_decl_all_varnames([[ \
+ ]], lt_decl_dquote_varnames); do
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -558,16 +583,38 @@
+ esac
+ done
+
+-# Fix-up fallback echo if it was mangled by the above quoting rules.
+-case \$lt_ECHO in
+-*'\\\[$]0 --fallback-echo"')dnl "
+- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+- ;;
+-esac
+-
+ _LT_OUTPUT_LIBTOOL_INIT
+ ])
+
++# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
++# ------------------------------------
++# Generate a child script FILE with all initialization necessary to
++# reuse the environment learned by the parent script, and make the
++# file executable. If COMMENT is supplied, it is inserted after the
++# `#!' sequence but before initialization text begins. After this
++# macro, additional text can be appended to FILE to form the body of
++# the child script. The macro ends with non-zero status if the
++# file could not be fully written (such as if the disk is full).
++m4_ifdef([AS_INIT_GENERATED],
++[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
++[m4_defun([_LT_GENERATED_FILE_INIT],
++[m4_require([AS_PREPARE])]dnl
++[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
++[lt_write_fail=0
++cat >$1 <<_ASEOF || lt_write_fail=1
++#! $SHELL
++# Generated by $as_me.
++$2
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$1 <<\_ASEOF || lt_write_fail=1
++AS_SHELL_SANITIZE
++_AS_PREPARE
++exec AS_MESSAGE_FD>&1
++_ASEOF
++test $lt_write_fail = 0 && chmod +x $1[]dnl
++m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+ # LT_OUTPUT
+ # ---------
+@@ -577,20 +624,11 @@
+ AC_DEFUN([LT_OUTPUT],
+ [: ${CONFIG_LT=./config.lt}
+ AC_MSG_NOTICE([creating $CONFIG_LT])
+-cat >"$CONFIG_LT" <<_LTEOF
+-#! $SHELL
+-# Generated by $as_me.
+-# Run this file to recreate a libtool stub with the current configuration.
+-
+-lt_cl_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_LTEOF
++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
++[# Run this file to recreate a libtool stub with the current configuration.])
+
+ cat >>"$CONFIG_LT" <<\_LTEOF
+-AS_SHELL_SANITIZE
+-_AS_PREPARE
+-
+-exec AS_MESSAGE_FD>&1
++lt_cl_silent=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ {
+ echo
+@@ -616,7 +654,7 @@
+ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+ configured by $[0], generated by m4_PACKAGE_STRING.
+
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2011 Free Software Foundation, Inc.
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+
+@@ -661,15 +699,13 @@
+ # appending to config.log, which fails on DOS, as config.log is still kept
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+-if test "$no_create" != yes; then
+- lt_cl_success=:
+- test "$silent" = yes &&
+- lt_config_lt_args="$lt_config_lt_args --quiet"
+- exec AS_MESSAGE_LOG_FD>/dev/null
+- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+- exec AS_MESSAGE_LOG_FD>>config.log
+- $lt_cl_success || AS_EXIT(1)
+-fi
++lt_cl_success=:
++test "$silent" = yes &&
++ lt_config_lt_args="$lt_config_lt_args --quiet"
++exec AS_MESSAGE_LOG_FD>/dev/null
++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++exec AS_MESSAGE_LOG_FD>>config.log
++$lt_cl_success || AS_EXIT(1)
+ ])# LT_OUTPUT
+
+
+@@ -732,15 +768,12 @@
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
+-
+- _LT_PROG_XSI_SHELLFNS
++ sed '$q' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
+
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
++ _LT_PROG_REPLACE_SHELLFNS
+
+- mv -f "$cfgfile" "$ofile" ||
++ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+ ],
+@@ -785,6 +818,7 @@
+ m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
++ [Go], [_LT_LANG(GO)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+@@ -806,6 +840,29 @@
+ ])# _LT_LANG
+
+
++m4_ifndef([AC_PROG_GO], [
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_GO. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
++m4_defun([AC_PROG_GO],
++[AC_LANG_PUSH(Go)dnl
++AC_ARG_VAR([GOC], [Go compiler command])dnl
++AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
++_AC_ARG_VAR_LDFLAGS()dnl
++AC_CHECK_TOOL(GOC, gccgo)
++if test -z "$GOC"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
++ fi
++fi
++if test -z "$GOC"; then
++ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
++fi
++])#m4_defun
++])#m4_ifndef
++
++
+ # _LT_LANG_DEFAULT_CONFIG
+ # -----------------------
+ m4_defun([_LT_LANG_DEFAULT_CONFIG],
+@@ -836,6 +893,10 @@
+ m4_ifdef([LT_PROG_GCJ],
+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
++AC_PROVIDE_IFELSE([AC_PROG_GO],
++ [LT_LANG(GO)],
++ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
++
+ AC_PROVIDE_IFELSE([LT_PROG_RC],
+ [LT_LANG(RC)],
+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+@@ -846,11 +907,13 @@
+ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+ AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+ AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
++AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+ dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+ dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+ dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
++dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+ # _LT_TAG_COMPILER
+@@ -936,7 +999,13 @@
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -944,6 +1013,7 @@
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi])
++
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+@@ -955,6 +1025,34 @@
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
++
++ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
++ [lt_cv_ld_force_load=no
++ cat > conftest.c << _LT_EOF
++int forced_loaded() { return 2;}
++_LT_EOF
++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
++ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
++ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
++ cat > conftest.c << _LT_EOF
++int main() { return 0;}
++_LT_EOF
++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
++ _lt_result=$?
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++ lt_cv_ld_force_load=yes
++ else
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ fi
++ rm -f conftest.err libconftest.a conftest conftest.c
++ rm -rf conftest.dSYM
++ ])
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -982,7 +1080,7 @@
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test "$DSYMUTIL" != ":"; then
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -992,8 +1090,8 @@
+ ])
+
+
+-# _LT_DARWIN_LINKER_FEATURES
+-# --------------------------
++# _LT_DARWIN_LINKER_FEATURES([TAG])
++# ---------------------------------
+ # Checks for linker and compiler features on darwin
+ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ [
+@@ -1002,7 +1100,13 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
++ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
++ else
++ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -1010,7 +1114,7 @@
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=echo
++ output_verbose_link_cmd=func_echo_all
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -1026,203 +1130,142 @@
+ fi
+ ])
+
+-# _LT_SYS_MODULE_PATH_AIX
+-# -----------------------
++# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
++# ----------------------------------
+ # Links a minimal program and checks the executable
+ # for the system default hardcoded library path. In most cases,
+ # this is /usr/lib:/lib, but when the MPI compilers are used
+ # the location of the communication and MPI libs are included too.
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
++# Store the results from the different compilers for each TAGNAME.
++# Allow to override them for all tags through lt_cv_aix_libpath.
+ m4_defun([_LT_SYS_MODULE_PATH_AIX],
+ [m4_require([_LT_DECL_SED])dnl
+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++if test "${lt_cv_aix_libpath+set}" = set; then
++ aix_libpath=$lt_cv_aix_libpath
++else
++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
++ lt_aix_libpath_sed='[
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\([^ ]*\) *$/\1/
++ p
++ }
++ }]'
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ # Check for a 64-bit object if we didn't find anything.
++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ fi],[])
++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++ fi
++ ])
++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
++fi
+ ])# _LT_SYS_MODULE_PATH_AIX
+
+
+ # _LT_SHELL_INIT(ARG)
+ # -------------------
+ m4_define([_LT_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+- [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_SHELL_INIT
++[m4_divert_text([M4SH-INIT], [$1
++])])# _LT_SHELL_INIT
++
+
+
+ # _LT_PROG_ECHO_BACKSLASH
+ # -----------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
++# Find how we can fake an echo command that does not interpret backslash.
++# In particular, with Autoconf 2.60 or later we add some code to the start
++# of the generated configure script which will find a shell with a builtin
++# printf (which we can use as an echo command).
+ m4_defun([_LT_PROG_ECHO_BACKSLASH],
+-[_LT_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-case X$lt_ECHO in
+-X*--fallback-echo)
+- # Remove one level of quotation (which was required for Make).
+- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+- ;;
+-esac
+-
+-ECHO=${lt_ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+-elif test "X[$]1" = X--fallback-echo; then
+- # Avoid inline document here, it may be left over
+- :
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+- # Yippee, $ECHO works!
+- :
++[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++AC_MSG_CHECKING([how to print strings])
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='printf %s\n'
+ else
+- # Restart under the correct shell.
+- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
+-
+-if test "X[$]1" = X--fallback-echo; then
+- # used as fallback echo
+- shift
+- cat <<_LT_EOF
+-[$]*
+-_LT_EOF
+- exit 0
++ # Use this function as a fallback that always works.
++ func_fallback_echo ()
++ {
++ eval 'cat <<_LTECHO_EOF
++$[]1
++_LTECHO_EOF'
++ }
++ ECHO='func_fallback_echo'
+ fi
+
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-if test -z "$lt_ECHO"; then
+- if test "X${echo_test_string+set}" != Xset; then
+- # find a string as large as possible, as long as the shell can cope with it
+- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+- then
+- break
+- fi
+- done
+- fi
+-
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- :
+- else
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
+- # backslashes. This makes it impossible to quote backslashes using
+- # echo "$something" | sed 's/\\/\\\\/g'
+- #
+- # So, first we look for a working echo in the user's PATH.
+-
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for dir in $PATH /usr/ucb; do
+- IFS="$lt_save_ifs"
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- ECHO="$dir/echo"
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
+-
+- if test "X$ECHO" = Xecho; then
+- # We didn't find a better echo, so look for alternatives.
+- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # This shell has a builtin print -r that does the trick.
+- ECHO='print -r'
+- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
+- # If we have ksh, try running configure again with it.
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+- export ORIGINAL_CONFIG_SHELL
+- CONFIG_SHELL=/bin/ksh
+- export CONFIG_SHELL
+- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+- else
+- # Try using printf.
+- ECHO='printf %s\n'
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # Cool, printf works
+- :
+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+- export CONFIG_SHELL
+- SHELL="$CONFIG_SHELL"
+- export SHELL
+- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+- else
+- # maybe with a smaller string...
+- prev=:
+-
+- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+- then
+- break
+- fi
+- prev="$cmd"
+- done
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++ $ECHO "$*"
++}
+
+- if test "$prev" != 'sed 50q "[$]0"'; then
+- echo_test_string=`eval $prev`
+- export echo_test_string
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+- else
+- # Oops. We lost completely, so just stick with echo.
+- ECHO=echo
+- fi
+- fi
+- fi
+- fi
+- fi
+-fi
++case "$ECHO" in
++ printf*) AC_MSG_RESULT([printf]) ;;
++ print*) AC_MSG_RESULT([print -r]) ;;
++ *) AC_MSG_RESULT([cat]) ;;
++esac
+
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-lt_ECHO=$ECHO
+-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
++m4_ifdef([_AS_DETECT_SUGGESTED],
++[_AS_DETECT_SUGGESTED([
++ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++ PATH=/empty FPATH=/empty; export PATH FPATH
++ test "X`printf %s $ECHO`" = "X$ECHO" \
++ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+-AC_SUBST(lt_ECHO)
+-])
+ _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+-_LT_DECL([], [ECHO], [1],
+- [An echo program that does not interpret backslashes])
++_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+ ])# _LT_PROG_ECHO_BACKSLASH
+
+
++# _LT_WITH_SYSROOT
++# ----------------
++AC_DEFUN([_LT_WITH_SYSROOT],
++[AC_MSG_CHECKING([for sysroot])
++AC_ARG_WITH([sysroot],
++[ --with-sysroot[=DIR] Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).],
++[], [with_sysroot=no])
++
++dnl lt_sysroot will always be passed unquoted. We quote it here
++dnl in case the user passed a directory name.
++lt_sysroot=
++case ${with_sysroot} in #(
++ yes)
++ if test "$GCC" = yes; then
++ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
++ fi
++ ;; #(
++ /*)
++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
++ ;; #(
++ no|'')
++ ;; #(
++ *)
++ AC_MSG_RESULT([${with_sysroot}])
++ AC_MSG_ERROR([The sysroot must be an absolute path.])
++ ;;
++esac
++
++ AC_MSG_RESULT([${lt_sysroot:-no}])
++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
++[dependent libraries, and in which our libraries should be installed.])])
++
+ # _LT_ENABLE_LOCK
+ # ---------------
+ m4_defun([_LT_ENABLE_LOCK],
+@@ -1251,7 +1294,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+@@ -1344,14 +1387,27 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -1369,14 +1425,47 @@
+ ])# _LT_ENABLE_LOCK
+
+
++# _LT_PROG_AR
++# -----------
++m4_defun([_LT_PROG_AR],
++[AC_CHECK_TOOLS(AR, [ar], false)
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
++
++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
++ [lt_cv_ar_at_file=no
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
++ [echo conftest.$ac_objext > conftest.lst
++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
++ AC_TRY_EVAL([lt_ar_try])
++ if test "$ac_status" -eq 0; then
++ # Ensure the archiver fails upon bogus file names.
++ rm -f conftest.$ac_objext libconftest.a
++ AC_TRY_EVAL([lt_ar_try])
++ if test "$ac_status" -ne 0; then
++ lt_cv_ar_at_file=@
++ fi
++ fi
++ rm -f conftest.* libconftest.a
++ ])
++ ])
++
++if test "x$lt_cv_ar_at_file" = xno; then
++ archiver_list_spec=
++else
++ archiver_list_spec=$lt_cv_ar_at_file
++fi
++_LT_DECL([], [archiver_list_spec], [1],
++ [How to feed a file listing to the archiver])
++])# _LT_PROG_AR
++
++
+ # _LT_CMD_OLD_ARCHIVE
+ # -------------------
+ m4_defun([_LT_CMD_OLD_ARCHIVE],
+-[AC_CHECK_TOOL(AR, ar, false)
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-_LT_DECL([], [AR], [1], [The archiver])
+-_LT_DECL([], [AR_FLAGS], [1])
++[_LT_PROG_AR
+
+ AC_CHECK_TOOL(STRIP, strip, :)
+ test -z "$STRIP" && STRIP=:
+@@ -1395,18 +1484,27 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+ fi
++
++case $host_os in
++ darwin*)
++ lock_old_archive_extraction=yes ;;
++ *)
++ lock_old_archive_extraction=no ;;
++esac
+ _LT_DECL([], [old_postinstall_cmds], [2])
+ _LT_DECL([], [old_postuninstall_cmds], [2])
+ _LT_TAGDECL([], [old_archive_cmds], [2],
+ [Commands used to build an old-style archive])
++_LT_DECL([], [lock_old_archive_extraction], [0],
++ [Whether to use a lock for old archive extraction])
+ ])# _LT_CMD_OLD_ARCHIVE
+
+
+@@ -1431,15 +1529,15 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+@@ -1479,7 +1577,7 @@
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+@@ -1542,6 +1640,11 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
++ mint*)
++ # On MiNT this can take a long time and run out of memory.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+@@ -1567,6 +1670,11 @@
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -1606,8 +1714,8 @@
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
++ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+@@ -1658,7 +1766,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-[#line __oline__ "configure"
++[#line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -1699,7 +1807,13 @@
+ # endif
+ #endif
+
+-void fnord() { int i=42;}
++/* When -fvisbility=hidden is used, assume the code has been annotated
++ correspondingly for the symbols needed. */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
++
++int fnord () { return 42; }
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -1708,7 +1822,11 @@
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else
++ {
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else puts (dlerror ());
++ }
+ /* dlclose (self); */
+ }
+ else
+@@ -1884,16 +2002,16 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+@@ -2052,6 +2170,7 @@
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_OBJDUMP])dnl
+ m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ m4_if([$1],
+ [], [
+@@ -2060,16 +2179,23 @@
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++ case $host_os in
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
++ case $lt_search_path_spec in
++ *\;*)
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
++ ;;
++ *)
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
++ ;;
++ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+@@ -2082,7 +2208,7 @@
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+@@ -2102,7 +2228,13 @@
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+ }'`
+- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
++ # AWK program above erroneously prepends '/' to C:/dos/paths
++ # for these hosts.
++ case $host_os in
++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
++ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
++ esac
++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi])
+@@ -2128,7 +2260,7 @@
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -2137,7 +2269,7 @@
+ ;;
+
+ aix[[4-9]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -2190,7 +2322,7 @@
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+@@ -2202,7 +2334,7 @@
+ ;;
+
+ bsdi[[45]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -2221,8 +2353,9 @@
+ need_version=no
+ need_lib_prefix=no
+
+- case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ case $GCC,$cc_basename in
++ yes,*)
++ # gcc
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -2243,36 +2376,83 @@
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
++ dynamic_linker='Win32 ld.exe'
++ ;;
++
++ *,cl*)
++ # Native MSVC
++ libname_spec='$name'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
++
++ case $build_os in
++ mingw*)
++ sys_lib_search_path_spec=
++ lt_save_ifs=$IFS
++ IFS=';'
++ for lt_path in $LIB
++ do
++ IFS=$lt_save_ifs
++ # Let DOS variable expansion print the short 8.3 style file name.
++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++ done
++ IFS=$lt_save_ifs
++ # Convert to MSYS style.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
++ ;;
++ cygwin*)
++ # Convert to unix form, then to dos form, then back to unix form
++ # but this time dos style (no spaces!) so that the unix form looks
++ # like /cygdrive/c/PROGRA~1:/cygdr...
++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ ;;
++ *)
++ sys_lib_search_path_spec="$LIB"
++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++ # It is most probably a Windows format PATH.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # FIXME: find the short name or the path components, as spaces are
++ # common. (e.g. "Program Files" -> "PROGRA~1")
++ ;;
++ esac
++
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
++ postinstall_cmds='base_file=`basename \${file}`~
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++ dldir=$destdir/`dirname \$dlpath`~
++ test -d \$dldir || mkdir -p \$dldir~
++ $install_prog $dir/$dlname \$dldir/$dlname'
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++ dlpath=$dir/\$dldll~
++ $RM \$dlpath'
++ shlibpath_overrides_runpath=yes
++ dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
++ # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+- dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+@@ -2293,7 +2473,7 @@
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -2301,10 +2481,6 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -2312,7 +2488,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
++ freebsd[[23]].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -2330,7 +2506,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+@@ -2350,12 +2526,26 @@
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
++haiku*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ dynamic_linker="$host_os runtime_loader"
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
+@@ -2401,12 +2591,14 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ postinstall_cmds='chmod 555 $lib'
++ # or fails outright, so override atomically:
++ install_override_mode=555
+ ;;
+
+ interix[[3-9]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -2422,7 +2614,7 @@
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -2459,9 +2651,9 @@
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+- version_type=linux
++# This must be glibc/ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2469,16 +2661,21 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
++
+ # Some binutils ld are patched to set DT_RUNPATH
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+- [shlibpath_overrides_runpath=yes])])
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
++ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
++ [lt_cv_shlibpath_overrides_runpath=no
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
++ [lt_cv_shlibpath_overrides_runpath=yes])])
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
++ ])
++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+@@ -2487,7 +2684,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -2500,18 +2697,6 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -2531,7 +2716,7 @@
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -2600,7 +2785,7 @@
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2625,7 +2810,7 @@
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2649,7 +2834,7 @@
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2680,7 +2865,7 @@
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2690,7 +2875,7 @@
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2732,6 +2917,8 @@
+ The last name is the one that the linker finds with -lNAME]])
+ _LT_DECL([], [soname_spec], [1],
+ [[The coded name of the library, if different from the real name]])
++_LT_DECL([], [install_override_mode], [1],
++ [Permission mode override for installation of shared libraries])
+ _LT_DECL([], [postinstall_cmds], [2],
+ [Command to use after installation of a shared archive])
+ _LT_DECL([], [postuninstall_cmds], [2],
+@@ -2844,6 +3031,7 @@
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ m4_require([_LT_DECL_SED])dnl
+ m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+ AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+@@ -2965,6 +3153,11 @@
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
++ cygwin* | mingw* | pw32* | cegcc*)
++ if test "$GCC" != yes; then
++ reload_cmds=false
++ fi
++ ;;
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -2973,8 +3166,8 @@
+ fi
+ ;;
+ esac
+-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+-_LT_DECL([], [reload_cmds], [2])dnl
++_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
++_LT_TAGDECL([], [reload_cmds], [2])dnl
+ ])# _LT_CMD_RELOAD
+
+
+@@ -3026,16 +3219,18 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ # Keep this pattern in sync with the one in func_win32_libid.
++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+-cegcc)
++cegcc*)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -3065,6 +3260,10 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++haiku*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+@@ -3073,11 +3272,11 @@
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+@@ -3098,12 +3297,12 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++# This must be glibc/ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd* | netbsdelf*-gnu)
++netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -3177,6 +3376,21 @@
+ ;;
+ esac
+ ])
++
++file_magic_glob=
++want_nocaseglob=no
++if test "$build" = "$host"; then
++ case $host_os in
++ mingw* | pw32*)
++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
++ want_nocaseglob=yes
++ else
++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
++ fi
++ ;;
++ esac
++fi
++
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -3184,7 +3398,11 @@
+ _LT_DECL([], [deplibs_check_method], [1],
+ [Method to check whether dependent libraries are shared objects])
+ _LT_DECL([], [file_magic_cmd], [1],
+- [Command to use when deplibs_check_method == "file_magic"])
++ [Command to use when deplibs_check_method = "file_magic"])
++_LT_DECL([], [file_magic_glob], [1],
++ [How to find potential files when deplibs_check_method = "file_magic"])
++_LT_DECL([], [want_nocaseglob], [1],
++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+ ])# _LT_CHECK_MAGIC_METHOD
+
+
+@@ -3241,9 +3459,21 @@
+ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+- AC_SUBST([DUMPBIN])
+- if test "$DUMPBIN" != ":"; then
++ if test -n "$DUMPBIN"; then :
++ # Let the user override the test.
++ else
++ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++ *COFF*)
++ DUMPBIN="$DUMPBIN -symbols"
++ ;;
++ *)
++ DUMPBIN=:
++ ;;
++ esac
++ fi
++ AC_SUBST([DUMPBIN])
++ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+ fi
+ fi
+@@ -3254,13 +3484,13 @@
+ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+ [lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
++ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+ cat conftest.out >&AS_MESSAGE_LOG_FD
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -3275,6 +3505,67 @@
+ dnl AC_DEFUN([AM_PROG_NM], [])
+ dnl AC_DEFUN([AC_PROG_NM], [])
+
++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++# --------------------------------
++# how to determine the name of the shared library
++# associated with a specific link library.
++# -- PORTME fill in with the dynamic library characteristics
++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
++[m4_require([_LT_DECL_EGREP])
++m4_require([_LT_DECL_OBJDUMP])
++m4_require([_LT_DECL_DLLTOOL])
++AC_CACHE_CHECK([how to associate runtime and link libraries],
++lt_cv_sharedlib_from_linklib_cmd,
++[lt_cv_sharedlib_from_linklib_cmd='unknown'
++
++case $host_os in
++cygwin* | mingw* | pw32* | cegcc*)
++ # two different shell functions defined in ltmain.sh
++ # decide which to use based on capabilities of $DLLTOOL
++ case `$DLLTOOL --help 2>&1` in
++ *--identify-strict*)
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
++ ;;
++ *)
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
++ ;;
++ esac
++ ;;
++*)
++ # fallback: assume linklib IS sharedlib
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++ ;;
++esac
++])
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
++_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
++ [Command to associate shared and link libraries])
++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
++
++
++# _LT_PATH_MANIFEST_TOOL
++# ----------------------
++# locate the manifest tool
++m4_defun([_LT_PATH_MANIFEST_TOOL],
++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
++ [lt_cv_path_mainfest_tool=no
++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++ lt_cv_path_mainfest_tool=yes
++ fi
++ rm -f conftest*])
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++ MANIFEST_TOOL=:
++fi
++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
++])# _LT_PATH_MANIFEST_TOOL
++
+
+ # LT_LIB_M
+ # --------
+@@ -3283,7 +3574,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+ *-ncr-sysv4.3*)
+@@ -3311,7 +3602,12 @@
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+ if test "$GCC" = yes; then
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++ case $cc_basename in
++ nvcc*)
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
++ *)
++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
++ esac
+
+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+ lt_cv_prog_compiler_rtti_exceptions,
+@@ -3328,6 +3624,7 @@
+ m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
+ AC_REQUIRE([LT_PATH_LD])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -3395,8 +3692,8 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+@@ -3420,6 +3717,7 @@
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -3432,6 +3730,7 @@
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -3453,7 +3752,7 @@
+ if AC_TRY_EVAL(ac_compile); then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+@@ -3465,6 +3764,18 @@
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
++# define LT@&t@_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data. */
++# define LT@&t@_DLSYM_CONST
++#else
++# define LT@&t@_DLSYM_CONST const
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -3476,7 +3787,7 @@
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+ /* The mapping between symbol names and symbols. */
+-const struct {
++LT@&t@_DLSYM_CONST struct {
+ const char *name;
+ void *address;
+ }
+@@ -3502,15 +3813,15 @@
+ _LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+- lt_save_LIBS="$LIBS"
+- lt_save_CFLAGS="$CFLAGS"
++ lt_globsym_save_LIBS=$LIBS
++ lt_globsym_save_CFLAGS=$CFLAGS
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+- LIBS="$lt_save_LIBS"
+- CFLAGS="$lt_save_CFLAGS"
++ LIBS=$lt_globsym_save_LIBS
++ CFLAGS=$lt_globsym_save_CFLAGS
+ else
+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+@@ -3543,6 +3854,13 @@
+ AC_MSG_RESULT(ok)
+ fi
+
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
++ nm_file_list_spec='@'
++fi
++
+ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+ [Take the output of nm and produce a listing of raw symbols and C names])
+ _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+@@ -3553,6 +3871,8 @@
+ _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+ [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([], [nm_file_list_spec], [1],
++ [Specify filename containing input files for $NM])
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+@@ -3564,7 +3884,6 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+ m4_if([$1], [CXX], [
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -3615,6 +3934,11 @@
+ # DJGPP does not support shared libraries at all
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
++ haiku*)
++ # PIC is the default for Haiku.
++ # The "-static" flag exists, but is broken.
++ _LT_TAGVAR(lt_prog_compiler_static, $1)=
++ ;;
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+@@ -3664,6 +3988,12 @@
+ ;;
+ esac
+ ;;
++ mingw* | cygwin* | os2* | pw32* | cegcc*)
++ # This hack is so that the source file can tell whether it is being
++ # built for inclusion in a dll (and should export symbols for example).
++ m4_if([$1], [GCJ], [],
++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++ ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+@@ -3720,7 +4050,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -3753,8 +4083,8 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+- xlc* | xlC*)
+- # IBM XL 8.0 on PPC
++ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
++ # IBM XL 8.0, 9.0 on PPC and BlueGene
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+@@ -3784,7 +4114,7 @@
+ ;;
+ esac
+ ;;
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3816,7 +4146,7 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -3920,6 +4250,12 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ haiku*)
++ # PIC is the default for Haiku.
++ # The "-static" flag exists, but is broken.
++ _LT_TAGVAR(lt_prog_compiler_static, $1)=
++ ;;
++
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -3962,6 +4298,15 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
++
++ case $cc_basename in
++ nvcc*) # Cuda Compiler Driver 2.2
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
++ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
++ fi
++ ;;
++ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+@@ -4004,7 +4349,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -4025,7 +4370,13 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+ ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
++ nagfor*)
++ # NAG Fortran compiler
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -4037,25 +4388,40 @@
+ # All Alpha code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+- xl*)
+- # IBM XL C 8.0/Fortran 10.1 on PPC
++ xl* | bgxl* | bgf* | mpixl*)
++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+- *Sun\ F*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ *Intel*\ [[CF]]*Compiler*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ *Portland\ Group*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
+@@ -4087,7 +4453,7 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ case $cc_basename in
+- f77* | f90* | f95*)
++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+@@ -4144,9 +4510,11 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
+-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+- [How to pass a linker flag through the compiler])
++
++AC_CACHE_CHECK([for $compiler option to produce PIC],
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -4165,6 +4533,8 @@
+ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+ [Additional compiler flags for building library objects])
+
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++ [How to pass a linker flag through the compiler])
+ #
+ # Check to make sure the static flag actually works.
+ #
+@@ -4185,6 +4555,7 @@
+ m4_defun([_LT_LINKER_SHLIBS],
+ [AC_REQUIRE([LT_PATH_LD])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -4193,30 +4564,37 @@
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ m4_if([$1], [CXX], [
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global defined
++ # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+- ;;
++ ;;
+ cygwin* | mingw* | cegcc*)
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+- ;;
+- linux* | k*bsd*-gnu)
+- _LT_TAGVAR(link_all_deplibs, $1)=no
+- ;;
++ case $cc_basename in
++ cl*)
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ ;;
++ *)
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
++ ;;
++ esac
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- ;;
++ ;;
+ esac
+- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ], [
+ runpath_var=
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -4231,7 +4609,6 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -4276,13 +4653,36 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+- linux* | k*bsd*-gnu)
+- _LT_TAGVAR(link_all_deplibs, $1)=no
+- ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
++
++ # On some targets, GNU ld is compatible enough with the native linker
++ # that we're better off using the native interface for both.
++ lt_use_gnu_ld_interface=no
+ if test "$with_gnu_ld" = yes; then
++ case $host_os in
++ aix*)
++ # The AIX port of GNU ld has always aspired to compatibility
++ # with the native linker. However, as the warning in the GNU ld
++ # block says, versions before 2.19.5* couldn't really create working
++ # shared libraries, regardless of the interface used.
++ case `$LD -v 2>&1` in
++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
++ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
++ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
++ *)
++ lt_use_gnu_ld_interface=yes
++ ;;
++ esac
++ ;;
++ *)
++ lt_use_gnu_ld_interface=yes
++ ;;
++ esac
++ fi
++
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+@@ -4300,6 +4700,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4315,11 +4716,12 @@
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** Warning: the GNU linker, at least up to release 2.19, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++*** really care for shared libraries, you may want to install binutils
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
++*** You will then need to restart the configuration process.
+
+ _LT_EOF
+ fi
+@@ -4355,10 +4757,12 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -4376,6 +4780,11 @@
+ fi
+ ;;
+
++ haiku*)
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(link_all_deplibs, $1)=yes
++ ;;
++
+ interix[[3-9]]*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4391,7 +4800,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -4401,15 +4810,16 @@
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+- tmp_addflag=
++ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ pgf77* | pgf90* | pgf95* | pgfortran*)
++ # Portland Group f77 and f90 compilers
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -4420,13 +4830,17 @@
+ lf95*) # Lahey Fortran 8.1
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ tmp_sharedflag='--shared' ;;
+- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
++ nvcc*) # Cuda Compiler Driver 2.2
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(compiler_needs_object, $1)=yes
++ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+@@ -4442,17 +4856,16 @@
+ fi
+
+ case $cc_basename in
+- xlf*)
++ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -4461,13 +4874,13 @@
+ fi
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -4485,8 +4898,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -4532,8 +4945,8 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -4573,8 +4986,10 @@
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -4636,7 +5051,6 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -4662,9 +5076,9 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- _LT_SYS_MODULE_PATH_AIX
++ _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -4673,14 +5087,19 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- _LT_SYS_MODULE_PATH_AIX
++ _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ if test "$with_gnu_ld" = yes; then
++ # We only use this code for GNU lds that support --whole-archive.
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++ else
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -4712,20 +5131,64 @@
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+- # FIXME: Should let the user specify the lib program.
+- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ case $cc_basename in
++ cl*)
++ # Native MSVC
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_TAGVAR(always_export_symbols, $1)=yes
++ _LT_TAGVAR(file_list_spec, $1)='@'
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++ else
++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++ fi~
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++ linknames='
++ # The linker will not automatically build a static lib if we build a DLL.
++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++ # Don't use ranlib
++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
++ case $lt_outputfile in
++ *.exe|*.EXE) ;;
++ *)
++ lt_outputfile="$lt_outputfile.exe"
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
++ ;;
++ esac~
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++ $RM "$lt_outputfile.manifest";
++ fi'
++ ;;
++ *)
++ # Assume MSVC wrapper
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ # The linker will automatically build a .lib file if we build a DLL.
++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++ # FIXME: Should let the user specify the lib program.
++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ ;;
++ esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4738,10 +5201,6 @@
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- freebsd1*)
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -4754,7 +5213,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+@@ -4763,7 +5222,7 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4771,7 +5230,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -4786,14 +5245,13 @@
+ ;;
+
+ hpux10*)
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+@@ -4805,16 +5263,16 @@
+ ;;
+
+ hpux11*)
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+@@ -4826,7 +5284,14 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ m4_if($1, [], [
++ # Older versions of the 11.00 compiler do not understand -b yet
++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
++ _LT_LINKER_OPTION([if $CC understands -b],
++ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ ;;
+ esac
+ fi
+@@ -4854,19 +5319,34 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+- AC_LINK_IFELSE(int foo(void) {},
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- )
+- LDFLAGS="$save_LDFLAGS"
++ # This should be the same for all languages, so no per-tag cache variable.
++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
++ [lt_cv_irix_exported_symbol],
++ [save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++ AC_LINK_IFELSE(
++ [AC_LANG_SOURCE(
++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
++ [C++], [[int foo (void) { return 0; }]],
++ [Fortran 77], [[
++ subroutine foo
++ end]],
++ [Fortran], [[
++ subroutine foo
++ end]])])],
++ [lt_cv_irix_exported_symbol=yes],
++ [lt_cv_irix_exported_symbol=no])
++ LDFLAGS="$save_LDFLAGS"])
++ if test "$lt_cv_irix_exported_symbol" = yes; then
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++ fi
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -4875,7 +5355,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -4928,17 +5408,17 @@
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+@@ -4948,13 +5428,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -4967,9 +5447,9 @@
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+@@ -5145,36 +5625,38 @@
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+- _LT_TAGVAR(allow_undefined_flag, $1)=
+- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+- then
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+- else
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- fi
+- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
++ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
++ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
++ [$RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
++ _LT_TAGVAR(allow_undefined_flag, $1)=
++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
++ then
++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++ else
++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++ fi
++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ ])
++ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+ ;;
+ esac
+ fi
+@@ -5211,9 +5693,6 @@
+ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+ [Flag to hardcode $libdir into a binary during linking.
+ This must work even if $libdir does not exist])
+-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+- [[If ld is used when linking, flag to hardcode $libdir into a binary
+- during linking. This must work even if $libdir does not exist]])
+ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+ _LT_TAGDECL([], [hardcode_direct], [0],
+@@ -5239,8 +5718,6 @@
+ to runtime path list])
+ _LT_TAGDECL([], [link_all_deplibs], [0],
+ [Whether libtool must link a program against all its dependency libraries])
+-_LT_TAGDECL([], [fix_srcfile_path], [1],
+- [Fix the shell variable $srcfile for the compiler])
+ _LT_TAGDECL([], [always_export_symbols], [0],
+ [Set to "yes" if exported symbols are required])
+ _LT_TAGDECL([], [export_symbols_cmds], [2],
+@@ -5251,6 +5728,8 @@
+ [Symbols that must always be exported])
+ _LT_TAGDECL([], [prelink_cmds], [2],
+ [Commands necessary for linking programs (against libraries) with templates])
++_LT_TAGDECL([], [postlink_cmds], [2],
++ [Commands necessary for finishing linking programs])
+ _LT_TAGDECL([], [file_list_spec], [1],
+ [Specify filename containing input files])
+ dnl FIXME: Not yet implemented
+@@ -5340,37 +5819,22 @@
+ ])# _LT_LANG_C_CONFIG
+
+
+-# _LT_PROG_CXX
+-# ------------
+-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+-# compiler, we have our own version here.
+-m4_defun([_LT_PROG_CXX],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+-AC_PROG_CXX
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_PROG_CXXCPP
+-else
+- _lt_caught_CXX_error=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_CXX
+-
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_CXX], [])
+-
+-
+ # _LT_LANG_CXX_CONFIG([TAG])
+ # --------------------------
+ # Ensure that the configuration variables for a C++ compiler are suitably
+ # defined. These variables are subsequently used by _LT_CONFIG to write
+ # the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_CXX_CONFIG],
+-[AC_REQUIRE([_LT_PROG_CXX])dnl
+-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_PATH_MANIFEST_TOOL])dnl
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++else
++ _lt_caught_CXX_error=yes
++fi
+
+ AC_LANG_PUSH(C++)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+@@ -5382,7 +5846,6 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -5392,6 +5855,8 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -5423,6 +5888,7 @@
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
++ lt_save_CFLAGS=$CFLAGS
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+@@ -5440,6 +5906,7 @@
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
++ CFLAGS=$CXXFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -5461,8 +5928,8 @@
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -5494,7 +5961,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+ else
+ GXX=no
+@@ -5603,10 +6070,10 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+- _LT_SYS_MODULE_PATH_AIX
++ _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+@@ -5615,14 +6082,19 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- _LT_SYS_MODULE_PATH_AIX
++ _LT_SYS_MODULE_PATH_AIX([$1])
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ if test "$with_gnu_ld" = yes; then
++ # We only use this code for GNU lds that support --whole-archive.
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++ else
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+@@ -5652,28 +6124,75 @@
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+- # as there is no search path for DLLs.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(always_export_symbols, $1)=no
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is; otherwise, prepend...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname.def;
+- else
+- echo EXPORTS > $output_objdir/$soname.def;
+- cat $export_symbols >> $output_objdir/$soname.def;
+- fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- else
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ case $GXX,$cc_basename in
++ ,cl* | no,cl*)
++ # Native MSVC
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
++ # no search path for DLLs.
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_TAGVAR(always_export_symbols, $1)=yes
++ _LT_TAGVAR(file_list_spec, $1)='@'
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++ else
++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++ fi~
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++ linknames='
++ # The linker will not automatically build a static lib if we build a DLL.
++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ # Don't use ranlib
++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
++ case $lt_outputfile in
++ *.exe|*.EXE) ;;
++ *)
++ lt_outputfile="$lt_outputfile.exe"
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
++ ;;
++ esac~
++ func_to_tool_file "$lt_outputfile"~
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++ $RM "$lt_outputfile.manifest";
++ fi'
++ ;;
++ *)
++ # g++
++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++ # as there is no search path for DLLs.
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_TAGVAR(always_export_symbols, $1)=no
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ cp $export_symbols $output_objdir/$soname.def;
++ else
++ echo EXPORTS > $output_objdir/$soname.def;
++ cat $export_symbols >> $output_objdir/$soname.def;
++ fi~
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ else
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+@@ -5696,7 +6215,7 @@
+ esac
+ ;;
+
+- freebsd[[12]]*)
++ freebsd2.*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5715,6 +6234,11 @@
+ gnu*)
+ ;;
+
++ haiku*)
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(link_all_deplibs, $1)=yes
++ ;;
++
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -5739,11 +6263,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5804,7 +6328,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -5814,10 +6338,10 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -5847,7 +6371,7 @@
+ case $cc_basename in
+ CC*)
+ # SGI C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -5858,9 +6382,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ fi
+ fi
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -5871,7 +6395,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -5889,7 +6413,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -5926,26 +6450,26 @@
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
++ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+- *) # Version 6 will use weak symbols
++ *) # Version 6 and above use weak symbols
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+@@ -5953,7 +6477,7 @@
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+@@ -5972,9 +6496,9 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ ;;
+- xl*)
++ xl* | mpixl* | bgxl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -5994,13 +6518,13 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+- output_verbose_link_cmd='echo'
++ output_verbose_link_cmd='func_echo_all'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -6069,7 +6593,7 @@
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+- output_verbose_link_cmd=echo
++ output_verbose_link_cmd=func_echo_all
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -6104,15 +6628,15 @@
+ case $host in
+ osf3*)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ ;;
+@@ -6128,17 +6652,17 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -6148,7 +6672,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+@@ -6184,7 +6708,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+@@ -6205,7 +6729,7 @@
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+- output_verbose_link_cmd='echo'
++ output_verbose_link_cmd='func_echo_all'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -6225,14 +6749,14 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+@@ -6243,7 +6767,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ fi
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+@@ -6297,6 +6821,10 @@
+ CC*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
++ '"$_LT_TAGVAR(old_archive_cmds, $1)"
++ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
++ '"$_LT_TAGVAR(reload_cmds, $1)"
+ ;;
+ *)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -6352,6 +6880,7 @@
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
++ CFLAGS=$lt_save_CFLAGS
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+@@ -6366,6 +6895,29 @@
+ ])# _LT_LANG_CXX_CONFIG
+
+
++# _LT_FUNC_STRIPNAME_CNF
++# ----------------------
++# func_stripname_cnf prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++#
++# This function is identical to the (non-XSI) version of func_stripname,
++# except this one can be used by m4 code that may be executed by configure,
++# rather than the libtool script.
++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
++AC_REQUIRE([_LT_DECL_SED])
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
++func_stripname_cnf ()
++{
++ case ${2} in
++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ esac
++} # func_stripname_cnf
++])# _LT_FUNC_STRIPNAME_CNF
++
+ # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+ # ---------------------------------
+ # Figure out "hidden" library dependencies from verbose
+@@ -6374,6 +6926,7 @@
+ # objects, libraries and library flags.
+ m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+ [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+ # Dependencies to place before and after the object being linked:
+ _LT_TAGVAR(predep_objects, $1)=
+ _LT_TAGVAR(postdep_objects, $1)=
+@@ -6423,7 +6976,20 @@
+ }
+ };
+ _LT_EOF
++], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
++package foo
++func foo() {
++}
++_LT_EOF
+ ])
++
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
++esac
++
+ dnl Parse the compiler output and extract the necessary
+ dnl objects, libraries and library flags.
+ if AC_TRY_EVAL(ac_compile); then
+@@ -6435,7 +7001,7 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case $p in
++ case ${prev}${p} in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+@@ -6444,13 +7010,22 @@
+ test $p = "-R"; then
+ prev=$p
+ continue
+- else
+- prev=
+ fi
+
++ # Expand the sysroot to ease extracting the directories later.
++ if test -z "$prev"; then
++ case $p in
++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++ esac
++ fi
++ case $p in
++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++ esac
+ if test "$pre_test_object_deps_done" = no; then
+- case $p in
+- -L* | -R*)
++ case ${prev} in
++ -L | -R)
+ # Internal compiler library paths should come after those
+ # provided the user. The postdeps already come after the
+ # user supplied libs so there is no need to process them.
+@@ -6470,8 +7045,10 @@
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ fi
+ fi
++ prev=
+ ;;
+
++ *.lto.$objext) ;; # Ignore GCC LTO objects
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+@@ -6507,6 +7084,7 @@
+ fi
+
+ $RM -f confest.$objext
++CFLAGS=$_lt_libdeps_save_CFLAGS
+
+ # PORTME: override above test on systems where it is broken
+ m4_if([$1], [CXX],
+@@ -6543,7 +7121,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -6587,32 +7165,16 @@
+ ])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+-# _LT_PROG_F77
+-# ------------
+-# Since AC_PROG_F77 is broken, in that it returns the empty string
+-# if there is no fortran compiler, we have our own version here.
+-m4_defun([_LT_PROG_F77],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+-AC_PROG_F77
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+- _lt_disable_F77=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_F77
+-
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_F77], [])
+-
+-
+ # _LT_LANG_F77_CONFIG([TAG])
+ # --------------------------
+ # Ensure that the configuration variables for a Fortran 77 compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_F77_CONFIG],
+-[AC_REQUIRE([_LT_PROG_F77])dnl
+-AC_LANG_PUSH(Fortran 77)
++[AC_LANG_PUSH(Fortran 77)
++if test -z "$F77" || test "X$F77" = "Xno"; then
++ _lt_disable_F77=yes
++fi
+
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -6622,7 +7184,6 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6631,6 +7192,8 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -6670,7 +7233,9 @@
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
++ lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
++ CFLAGS=$FFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -6724,38 +7289,24 @@
+
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
++ CFLAGS="$lt_save_CFLAGS"
+ fi # test "$_lt_disable_F77" != yes
+
+ AC_LANG_POP
+ ])# _LT_LANG_F77_CONFIG
+
+
+-# _LT_PROG_FC
+-# -----------
+-# Since AC_PROG_FC is broken, in that it returns the empty string
+-# if there is no fortran compiler, we have our own version here.
+-m4_defun([_LT_PROG_FC],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+-AC_PROG_FC
+-if test -z "$FC" || test "X$FC" = "Xno"; then
+- _lt_disable_FC=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_FC
+-
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_FC], [])
+-
+-
+ # _LT_LANG_FC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for a Fortran compiler are
+ # suitably defined. These variables are subsequently used by _LT_CONFIG
+ # to write the compiler configuration to `libtool'.
+ m4_defun([_LT_LANG_FC_CONFIG],
+-[AC_REQUIRE([_LT_PROG_FC])dnl
+-AC_LANG_PUSH(Fortran)
++[AC_LANG_PUSH(Fortran)
++
++if test -z "$FC" || test "X$FC" = "Xno"; then
++ _lt_disable_FC=yes
++fi
+
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -6765,7 +7316,6 @@
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6774,6 +7324,8 @@
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+@@ -6813,7 +7365,9 @@
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
++ lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
++ CFLAGS=$FCFLAGS
+ compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
+@@ -6869,7 +7423,8 @@
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+- CC="$lt_save_CC"
++ CC=$lt_save_CC
++ CFLAGS=$lt_save_CFLAGS
+ fi # test "$_lt_disable_FC" != yes
+
+ AC_LANG_POP
+@@ -6906,10 +7461,12 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
+ lt_save_GCC=$GCC
+ GCC=yes
+ CC=${GCJ-"gcj"}
++CFLAGS=$GCJFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_TAGVAR(LD, $1)="$LD"
+@@ -6919,6 +7476,8 @@
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+ if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+@@ -6934,10 +7493,78 @@
+ AC_LANG_RESTORE
+
+ GCC=$lt_save_GCC
+-CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
+ ])# _LT_LANG_GCJ_CONFIG
+
+
++# _LT_LANG_GO_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Go compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GO_CONFIG],
++[AC_REQUIRE([LT_PROG_GO])dnl
++AC_LANG_SAVE
++
++# Source file extension for Go test sources.
++ac_ext=go
++
++# Object file extension for compiled Go test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="package main; func main() { }"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='package main; func main() { }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GOC-"gccgo"}
++CFLAGS=$GOFLAGS
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
++
++# Go did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
++
++if test -n "$compiler"; then
++ _LT_COMPILER_NO_RTTI($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++fi
++
++AC_LANG_RESTORE
++
++GCC=$lt_save_GCC
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
++])# _LT_LANG_GO_CONFIG
++
++
+ # _LT_LANG_RC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for the Windows resource compiler
+@@ -6969,9 +7596,11 @@
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
++lt_save_CFLAGS=$CFLAGS
+ lt_save_GCC=$GCC
+ GCC=
+ CC=${RC-"windres"}
++CFLAGS=
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -6984,7 +7613,8 @@
+
+ GCC=$lt_save_GCC
+ AC_LANG_RESTORE
+-CC="$lt_save_CC"
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
+ ])# _LT_LANG_RC_CONFIG
+
+
+@@ -7004,6 +7634,13 @@
+ dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
++# LT_PROG_GO
++# ----------
++AC_DEFUN([LT_PROG_GO],
++[AC_CHECK_TOOL(GOC, gccgo,)
++])
++
++
+ # LT_PROG_RC
+ # ----------
+ AC_DEFUN([LT_PROG_RC],
+@@ -7043,6 +7680,15 @@
+ AC_SUBST([OBJDUMP])
+ ])
+
++# _LT_DECL_DLLTOOL
++# ----------------
++# Ensure DLLTOOL variable is set.
++m4_defun([_LT_DECL_DLLTOOL],
++[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
++AC_SUBST([DLLTOOL])
++])
+
+ # _LT_DECL_SED
+ # ------------
+@@ -7134,8 +7780,8 @@
+ # Try some XSI features
+ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+- = c,a/b,, \
++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,b/c, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+@@ -7174,222 +7820,177 @@
+ ])# _LT_CHECK_SHELL_FEATURES
+
+
+-# _LT_PROG_XSI_SHELLFNS
+-# ---------------------
+-# Bourne and XSI compatible variants of some useful shell functions.
+-m4_defun([_LT_PROG_XSI_SHELLFNS],
+-[case $xsi_shell in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+-}
+-
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result="${1##*/}"
+-}
+-
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-# dirname: Compute the dirname of FILE. If nonempty,
+-# add APPEND to the result, otherwise set result
+-# to NONDIR_REPLACEMENT.
+-# value returned in "$func_dirname_result"
+-# basename: Compute filename of FILE.
+-# value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+- func_basename_result="${1##*/}"
+-}
+-
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-func_stripname ()
+-{
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary parameter first.
+- func_stripname_result=${3}
+- func_stripname_result=${func_stripname_result#"${1}"}
+- func_stripname_result=${func_stripname_result%"${2}"}
+-}
+-
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=${1%%=*}
+- func_opt_split_arg=${1#*=}
+-}
+-
+-# func_lo2o object
+-func_lo2o ()
+-{
+- case ${1} in
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+- *) func_lo2o_result=${1} ;;
+- esac
+-}
+-
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=${1%.*}.lo
+-}
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $[*] ))
+-}
++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
++# ------------------------------------------------------
++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
++m4_defun([_LT_PROG_FUNCTION_REPLACE],
++[dnl {
++sed -e '/^$1 ()$/,/^} # $1 /c\
++$1 ()\
++{\
++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++])
+
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=${#1}
+-}
+
+-_LT_EOF
+- ;;
+- *) # Bourne compatible functions.
+- cat << \_LT_EOF >> "$cfgfile"
++# _LT_PROG_REPLACE_SHELLFNS
++# -------------------------
++# Replace existing portable implementations of several shell functions with
++# equivalent extended shell implementations where those features are available..
++m4_defun([_LT_PROG_REPLACE_SHELLFNS],
++[if test x"$xsi_shell" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac])
++
++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
++ func_basename_result="${1##*/}"])
++
++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++ func_basename_result="${1##*/}"])
+
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}])
+
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
++ func_split_long_opt_name=${1%%=*}
++ func_split_long_opt_arg=${1#*=}])
+
+-dnl func_dirname_and_basename
+-dnl A portable version of this function is already defined in general.m4sh
+-dnl so there is no need for it here.
++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
++ func_split_short_opt_arg=${1#??}
++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-# func_strip_suffix prefix name
+-func_stripname ()
+-{
+- case ${2} in
+- .*) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+- esac
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac])
+
+-# sed scripts:
+-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+-my_sed_long_arg='1s/^-[[^=]]*=//'
++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
+
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
+
+-# func_lo2o object
+-func_lo2o ()
+-{
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
+
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+-}
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
+
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=`expr "$[@]"`
+-}
++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++ func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
++ # Save a `func_append' function call where possible by direct use of '+='
++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++ test 0 -eq $? || _lt_function_replace_fail=:
++else
++ # Save a `func_append' function call even when '+=' is not available
++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++ test 0 -eq $? || _lt_function_replace_fail=:
++fi
+
+-_LT_EOF
+-esac
++if test x"$_lt_function_replace_fail" = x":"; then
++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
++fi
++])
+
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]+=\$[2]"
+-}
+-_LT_EOF
++# _LT_PATH_CONVERSION_FUNCTIONS
++# -----------------------------
++# Determine which file name conversion functions should be used by
++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
++# for certain cross-compile configurations and native mingw.
++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_MSG_CHECKING([how to convert $build file names to $host format])
++AC_CACHE_VAL(lt_cv_to_host_file_cmd,
++[case $host in
++ *-*-mingw* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
++ ;;
++ *-*-cygwin* )
++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
++ ;;
++ * ) # otherwise, assume *nix
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
++ ;;
++ esac
+ ;;
+- *)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$[1]=\$$[1]\$[2]"
+-}
+-
+-_LT_EOF
++ *-*-cygwin* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
++ ;;
++ *-*-cygwin* )
++ lt_cv_to_host_file_cmd=func_convert_file_noop
++ ;;
++ * ) # otherwise, assume *nix
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
++ ;;
++ esac
+ ;;
+- esac
++ * ) # unhandled hosts (and "normal" native builds)
++ lt_cv_to_host_file_cmd=func_convert_file_noop
++ ;;
++esac
+ ])
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
++ [0], [convert $build file names to $host format])dnl
++
++AC_MSG_CHECKING([how to convert $build file names to toolchain format])
++AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
++[#assume ordinary cross tools, or native build.
++lt_cv_to_tool_file_cmd=func_convert_file_noop
++case $host in
++ *-*-mingw* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
++ ;;
++ esac
++ ;;
++esac
++])
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
++ [0], [convert $build files to toolchain format])dnl
++])# _LT_PATH_CONVERSION_FUNCTIONS
+
+ # Helper functions for option handling. -*- Autoconf -*-
+ #
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # Written by Gary V. Vaughan, 2004
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# serial 6 ltoptions.m4
++# serial 7 ltoptions.m4
+
+ # This is to help aclocal find these macros, as it can't see m4_define.
+ AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+@@ -7504,7 +8105,7 @@
+ [enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -7512,13 +8113,13 @@
+ esac
+
+ test -z "$AS" && AS=as
+-_LT_DECL([], [AS], [0], [Assembler program])dnl
++_LT_DECL([], [AS], [1], [Assembler program])dnl
+
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+ ])# win32-dll
+
+ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+@@ -7704,9 +8305,24 @@
+ # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+ m4_define([_LT_WITH_PIC],
+ [AC_ARG_WITH([pic],
+- [AS_HELP_STRING([--with-pic],
++ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
++ [lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
+ [pic_mode=default])
+
+ test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+@@ -7876,31 +8492,31 @@
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# Generated from ltversion.in.
++# @configure_input@
+
+-# serial 3012 ltversion.m4
++# serial 3337 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.4.2])
++m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.4.2'
++macro_revision='1.3337'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+
+ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+ #
+-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+ # Written by Scott James Remnant, 2004.
+ #
+ # This file is free software; the Free Software Foundation gives
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# serial 4 lt~obsolete.m4
++# serial 5 lt~obsolete.m4
+
+ # These exist entirely to fool aclocal when bootstrapping libtool.
+ #
+@@ -7970,7 +8586,6 @@
+ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
+ m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
+ m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
+-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
+ m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+ m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+@@ -7983,8 +8598,16 @@
+ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
++m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
++m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
++m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
++m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
++m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
++m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
++m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ #
+ # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+ #
+@@ -8011,8 +8634,12 @@
+ # ----------------------------------
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -8025,7 +8652,6 @@
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+@@ -8034,34 +8660,32 @@
+ # Check to see whether a particular set of modules exists. Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
++ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+ $3])dnl
+ fi])
+
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+- if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- else
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- fi
+-else
+- pkg_failed=untried
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes ],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+
+@@ -8103,16 +8727,17 @@
+ See the pkg-config man page for more details.])
+
+ if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- ifelse([$4], , [AC_MSG_ERROR(dnl
++ m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+
+ $$1_PKG_ERRORS
+@@ -8120,25 +8745,24 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
++_PKG_TEXT])[]dnl
++ ])
+ elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
++ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
++ $3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+@@ -8157,7 +8781,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -8173,7 +8797,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+Only in src/hal-0.5.14: autom4te.cache
+Only in src/hal-0.5.14: config.h
+Only in src/hal-0.5.14: config.log
+Only in src/hal-0.5.14: config.status
+diff -u -r hal-0.5.14/configure src/hal-0.5.14/configure
+--- hal-0.5.14/configure 2009-11-30 23:22:33.000000000 +0100
++++ src/hal-0.5.14/configure 2011-12-19 20:40:11.000000000 +0100
+@@ -1,13 +1,15 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for hal 0.5.14.
++# Generated by GNU Autoconf 2.68 for hal 0.5.14.
+ #
+ # Report bugs to <david@fubar.dk>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+ # Foundation, Inc.
+ #
++#
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## -------------------- ##
+@@ -89,6 +91,7 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -171,7 +174,15 @@
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-test \$(( 1 + 1 )) = 2 || exit 1"
++test \$(( 1 + 1 )) = 2 || exit 1
++
++ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
++ PATH=/empty FPATH=/empty; export PATH FPATH
++ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
++ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+ else
+@@ -214,11 +225,18 @@
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
++ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++ case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++ esac
++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+
+ if test x$as_have_required = xno; then :
+@@ -317,7 +335,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -357,19 +375,19 @@
+ fi # as_fn_arith
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -526,160 +544,14 @@
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+-
+-
+-# Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+-case X$lt_ECHO in
+-X*--fallback-echo)
+- # Remove one level of quotation (which was required for Make).
+- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+- ;;
+-esac
+-
+-ECHO=${lt_ECHO-echo}
+-if test "X$1" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+-elif test "X$1" = X--fallback-echo; then
+- # Avoid inline document here, it may be left over
+- :
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+- # Yippee, $ECHO works!
+- :
+-else
+- # Restart under the correct shell.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-
+-if test "X$1" = X--fallback-echo; then
+- # used as fallback echo
+- shift
+- cat <<_LT_EOF
+-$*
+-_LT_EOF
+- exit 0
+-fi
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-
+-if test -z "$lt_ECHO"; then
+- if test "X${echo_test_string+set}" != Xset; then
+- # find a string as large as possible, as long as the shell can cope with it
+- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+- then
+- break
+- fi
+- done
+- fi
+-
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- :
+- else
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
+- # backslashes. This makes it impossible to quote backslashes using
+- # echo "$something" | sed 's/\\/\\\\/g'
+- #
+- # So, first we look for a working echo in the user's PATH.
+-
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for dir in $PATH /usr/ucb; do
+- IFS="$lt_save_ifs"
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- ECHO="$dir/echo"
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
+-
+- if test "X$ECHO" = Xecho; then
+- # We didn't find a better echo, so look for alternatives.
+- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # This shell has a builtin print -r that does the trick.
+- ECHO='print -r'
+- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+- test "X$CONFIG_SHELL" != X/bin/ksh; then
+- # If we have ksh, try running configure again with it.
+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+- export ORIGINAL_CONFIG_SHELL
+- CONFIG_SHELL=/bin/ksh
+- export CONFIG_SHELL
+- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+- else
+- # Try using printf.
+- ECHO='printf %s\n'
+- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- # Cool, printf works
+- :
+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+- export CONFIG_SHELL
+- SHELL="$CONFIG_SHELL"
+- export SHELL
+- ECHO="$CONFIG_SHELL $0 --fallback-echo"
+- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+- test "X$echo_testing_string" = 'X\t' &&
+- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- ECHO="$CONFIG_SHELL $0 --fallback-echo"
+- else
+- # maybe with a smaller string...
+- prev=:
+-
+- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+- then
+- break
+- fi
+- prev="$cmd"
+- done
+-
+- if test "$prev" != 'sed 50q "$0"'; then
+- echo_test_string=`eval $prev`
+- export echo_test_string
+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+- else
+- # Oops. We lost completely, so just stick with echo.
+- ECHO=echo
+- fi
+- fi
+- fi
+- fi
+- fi
+-fi
+-
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-lt_ECHO=$ECHO
+-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+-fi
+-
+-
+-
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -860,6 +732,8 @@
+ USB_IDS_DIR
+ PCI_IDS_DIR
+ udev_prefix
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ CXXCPP
+ OTOOL64
+@@ -867,9 +741,11 @@
+ LIPO
+ NMEDIT
+ DSYMUTIL
+-lt_ECHO
++MANIFEST_TOOL
+ RANLIB
++ac_ct_AR
+ AR
++DLLTOOL
+ OBJDUMP
+ LN_S
+ NM
+@@ -992,6 +868,7 @@
+ with_pic
+ enable_fast_install
+ with_gnu_ld
++with_sysroot
+ enable_libtool_lock
+ enable_largefile
+ with_os_type
+@@ -1058,6 +935,8 @@
+ CPP
+ CXXCPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ PARTED_CFLAGS
+ PARTED_LIBS
+ POLKIT_CFLAGS
+@@ -1132,8 +1011,9 @@
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1178,7 +1058,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1204,7 +1084,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1408,7 +1288,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1424,7 +1304,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1454,8 +1334,8 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+@@ -1463,7 +1343,7 @@
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -1473,7 +1353,7 @@
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+@@ -1481,13 +1361,13 @@
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -1510,7 +1390,7 @@
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1524,8 +1404,8 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1540,9 +1420,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -1581,11 +1461,11 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1625,7 +1505,7 @@
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1708,7 +1588,7 @@
+ --enable-verbose-mode support verbose debug mode
+ --enable-docbook-docs build documentation (requires xmlto)
+ --enable-man-pages build manual pages
+- --enable-gtk-doc use gtk-doc to build documentation default=yes
++ --enable-gtk-doc use gtk-doc to build documentation [default=yes]
+ --disable-acpi-acpid Do not use ACPI daemon event source
+ --disable-acpi-proc Do not use ACPI kernel-interface directly
+ --enable-acpi-ibm Forward IBM ACPI events
+@@ -1729,9 +1609,11 @@
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-pic try to use only PIC/non-PIC objects [default=use
++ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
+ both]
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
++ --with-sysroot=DIR Search for dependent libraries within DIR
++ (or the compiler's sysroot if not specified).
+ --with-os-type=<os> Distribution or OS (redhat)
+ --with-pid-file=<file> PID file for HAL daemon
+ --with-hwdata=<dir> Where PCI and USB IDs are found
+@@ -1766,13 +1648,17 @@
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CPP C preprocessor
+ CXXCPP C++ preprocessor
+ PKG_CONFIG path to pkg-config utility
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ PARTED_CFLAGS
+ C compiler flags for PARTED, overriding pkg-config
+ PARTED_LIBS linker flags for PARTED, overriding pkg-config
+@@ -1858,9 +1744,9 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ hal configure 0.5.14
+-generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.68
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1904,8 +1790,8 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+
+@@ -1950,8 +1836,8 @@
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+
+@@ -1988,8 +1874,8 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_compile
+
+@@ -2014,7 +1900,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2025,8 +1911,8 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+
+@@ -2067,8 +1953,8 @@
+ ac_retval=$ac_status
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+
+@@ -2081,7 +1967,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2099,7 +1985,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_compile
+
+@@ -2111,7 +1997,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2166,7 +2052,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_func
+
+@@ -2191,7 +2077,7 @@
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2202,8 +2088,8 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_cpp
+
+@@ -2248,8 +2134,8 @@
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_link
+
+@@ -2261,10 +2147,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2300,7 +2186,7 @@
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2323,17 +2209,15 @@
+ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-( cat <<\_ASBOX
+-## ----------------------------- ##
++( $as_echo "## ----------------------------- ##
+ ## Report this to david@fubar.dk ##
+-## ----------------------------- ##
+-_ASBOX
++## ----------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2342,7 +2226,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_mongrel
+
+@@ -2355,7 +2239,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+@@ -2396,7 +2280,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_type
+ cat >config.log <<_ACEOF
+@@ -2404,7 +2288,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by hal $as_me 0.5.14, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.68. Invocation command line was
+
+ $ $0 $@
+
+@@ -2514,11 +2398,9 @@
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2552,11 +2434,9 @@
+ )
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2569,11 +2449,9 @@
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
++ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2587,11 +2465,9 @@
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -2646,7 +2522,12 @@
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2657,18 +2538,22 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+ test "x$ac_site_file" = xNONE && continue
+- if test -r "$ac_site_file"; then
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+@@ -2737,7 +2622,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2754,16 +2639,22 @@
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
++ if test -f "$ac_dir/install-sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f "$ac_dir/install.sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ elif test -f "$ac_dir/shtool"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/shtool install -c"
++ break
++ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+
+ # These three variables are undocumented and unsupported,
+@@ -2792,7 +2683,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2879,11 +2770,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2905,7 +2796,7 @@
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- as_fn_error "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -2915,7 +2806,7 @@
+ # Ok.
+ :
+ else
+- as_fn_error "newly created file is older than distributed files!
++ as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -2969,7 +2860,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -3009,7 +2900,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -3062,7 +2953,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+- if test "${ac_cv_path_mkdir+set}" = set; then :
++ if ${ac_cv_path_mkdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3087,6 +2978,7 @@
+
+ fi
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -3094,7 +2986,6 @@
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+ fi
+@@ -3113,7 +3004,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AWK"; then
+@@ -3153,7 +3044,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -3161,7 +3052,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -3195,7 +3086,7 @@
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+ fi
+
+@@ -3376,7 +3267,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3416,7 +3307,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3469,7 +3360,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3509,7 +3400,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3568,7 +3459,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3612,7 +3503,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3666,8 +3557,8 @@
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3688,32 +3579,30 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <stdio.h>
++
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -3775,62 +3664,28 @@
+ else
+ ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3860,19 +3715,78 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
++rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details" "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3912,8 +3826,8 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3923,7 +3837,7 @@
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3960,7 +3874,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -4038,7 +3952,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -4137,7 +4051,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4263,7 +4177,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+ $as_echo_n "checking for library containing strerror... " >&6; }
+-if test "${ac_cv_search_strerror+set}" = set; then :
++if ${ac_cv_search_strerror+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -4297,11 +4211,11 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if test "${ac_cv_search_strerror+set}" = set; then :
++ if ${ac_cv_search_strerror+:} false; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_strerror+set}" = set; then :
++if ${ac_cv_search_strerror+:} false; then :
+
+ else
+ ac_cv_search_strerror=no
+@@ -4327,7 +4241,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4367,7 +4281,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4420,7 +4334,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4460,7 +4374,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4519,7 +4433,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4563,7 +4477,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4617,8 +4531,8 @@
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -4639,15 +4553,15 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4684,7 +4598,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -4762,7 +4676,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -4861,7 +4775,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5000,7 +4914,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then :
++if ${ac_cv_prog_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CXX"; then
+@@ -5044,7 +4958,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CXX"; then
+@@ -5114,15 +5028,15 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++if ${ac_cv_cxx_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5159,7 +5073,7 @@
+ ac_save_CXXFLAGS=$CXXFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then :
++if ${ac_cv_prog_cxx_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+@@ -5245,7 +5159,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5377,7 +5291,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5506,7 +5420,7 @@
+ CPP=
+ fi
+ if test -z "$CPP"; then
+- if test "${ac_cv_prog_CPP+set}" = set; then :
++ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # Double quotes because CPP needs to be expanded
+@@ -5536,7 +5450,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5552,11 +5466,11 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -5595,7 +5509,7 @@
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -5611,18 +5525,18 @@
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -5634,7 +5548,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$GREP"; then
+@@ -5683,7 +5597,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -5697,7 +5611,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -5749,7 +5663,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -5764,7 +5678,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5882,8 +5796,8 @@
+
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.4.2'
++macro_revision='1.3337'
+
+
+
+@@ -5901,27 +5815,27 @@
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5939,14 +5853,14 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -5954,7 +5868,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5970,9 +5884,78 @@
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
++# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
++$as_echo_n "checking how to print strings... " >&6; }
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++ ECHO='printf %s\n'
++else
++ # Use this function as a fallback that always works.
++ func_fallback_echo ()
++ {
++ eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++ }
++ ECHO='func_fallback_echo'
++fi
++
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++ $ECHO ""
++}
++
++case "$ECHO" in
++ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
++$as_echo "printf" >&6; } ;;
++ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
++$as_echo "print -r" >&6; } ;;
++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
++$as_echo "cat" >&6; } ;;
++esac
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
++if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -6027,7 +6010,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_SED=$SED
+@@ -6054,7 +6037,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then :
++if ${ac_cv_path_FGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -6106,7 +6089,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_FGREP=$FGREP
+@@ -6185,7 +6168,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+@@ -6222,10 +6205,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -6252,7 +6235,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then :
++if ${lt_cv_path_NM+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NM"; then
+@@ -6305,14 +6288,17 @@
+ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++ if test -n "$DUMPBIN"; then :
++ # Let the user override the test.
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in dumpbin "link -dump"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DUMPBIN"; then
+@@ -6350,13 +6336,13 @@
+ fi
+ if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
++ for ac_prog in dumpbin "link -dump"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DUMPBIN"; then
+@@ -6405,6 +6391,15 @@
+ fi
+ fi
+
++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++ *COFF*)
++ DUMPBIN="$DUMPBIN -symbols"
++ ;;
++ *)
++ DUMPBIN=:
++ ;;
++ esac
++ fi
+
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+@@ -6419,18 +6414,18 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then :
++if ${lt_cv_nm_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6427: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6433: output\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6454,7 +6449,7 @@
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
++if ${lt_cv_sys_max_cmd_len+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ i=0
+@@ -6487,6 +6482,11 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
++ mint*)
++ # On MiNT this can take a long time and run out of memory.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+@@ -6512,6 +6512,11 @@
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -6551,8 +6556,8 @@
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
++ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+@@ -6594,8 +6599,8 @@
+ # Try some XSI features
+ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+- = c,a/b,, \
++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,b/c, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+@@ -6644,22 +6649,101 @@
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+-$as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
++$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
++if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- lt_cv_ld_reload_flag='-r'
++ case $host in
++ *-*-mingw* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
++ ;;
++ *-*-cygwin* )
++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
++ ;;
++ * ) # otherwise, assume *nix
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
++ ;;
++ esac
++ ;;
++ *-*-cygwin* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
++ ;;
++ *-*-cygwin* )
++ lt_cv_to_host_file_cmd=func_convert_file_noop
++ ;;
++ * ) # otherwise, assume *nix
++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
++ ;;
++ esac
++ ;;
++ * ) # unhandled hosts (and "normal" native builds)
++ lt_cv_to_host_file_cmd=func_convert_file_noop
++ ;;
++esac
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+-reload_flag=$lt_cv_ld_reload_flag
++
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
++$as_echo "$lt_cv_to_host_file_cmd" >&6; }
++
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
++if ${lt_cv_to_tool_file_cmd+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ #assume ordinary cross tools, or native build.
++lt_cv_to_tool_file_cmd=func_convert_file_noop
++case $host in
++ *-*-mingw* )
++ case $build in
++ *-*-mingw* ) # actually msys
++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
++ ;;
++ esac
++ ;;
++esac
++
++fi
++
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
++$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
++
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
++if ${lt_cv_ld_reload_flag+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_ld_reload_flag='-r'
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
++$as_echo "$lt_cv_ld_reload_flag" >&6; }
++reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
++ cygwin* | mingw* | pw32* | cegcc*)
++ if test "$GCC" != yes; then
++ reload_cmds=false
++ fi
++ ;;
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -6682,7 +6766,7 @@
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OBJDUMP"; then
+@@ -6722,7 +6806,7 @@
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OBJDUMP"; then
+@@ -6781,7 +6865,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
++if ${lt_cv_deplibs_check_method+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -6823,16 +6907,18 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- if ( file / ) >/dev/null 2>&1; then
++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ # Keep this pattern in sync with the one in func_win32_libid.
++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+-cegcc)
++cegcc*)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -6862,6 +6948,10 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++haiku*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+@@ -6870,11 +6960,11 @@
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+@@ -6895,12 +6985,12 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++# This must be glibc/ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd* | netbsdelf*-gnu)
++netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -6977,6 +7067,21 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
++
++file_magic_glob=
++want_nocaseglob=no
++if test "$build" = "$host"; then
++ case $host_os in
++ mingw* | pw32*)
++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
++ want_nocaseglob=yes
++ else
++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
++ fi
++ ;;
++ esac
++fi
++
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -6992,12 +7097,165 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_DLLTOOL+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$DLLTOOL"; then
++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++DLLTOOL=$ac_cv_prog_DLLTOOL
++if test -n "$DLLTOOL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
++$as_echo "$DLLTOOL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DLLTOOL"; then
++ ac_ct_DLLTOOL=$DLLTOOL
++ # Extract the first word of "dlltool", so it can be a program name with args.
++set dummy dlltool; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_DLLTOOL"; then
++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
++if test -n "$ac_ct_DLLTOOL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
++$as_echo "$ac_ct_DLLTOOL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_DLLTOOL" = x; then
++ DLLTOOL="false"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ DLLTOOL=$ac_ct_DLLTOOL
++ fi
++else
++ DLLTOOL="$ac_cv_prog_DLLTOOL"
++fi
++
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++
++
++
++
++
++
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
++$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_sharedlib_from_linklib_cmd='unknown'
++
++case $host_os in
++cygwin* | mingw* | pw32* | cegcc*)
++ # two different shell functions defined in ltmain.sh
++ # decide which to use based on capabilities of $DLLTOOL
++ case `$DLLTOOL --help 2>&1` in
++ *--identify-strict*)
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
++ ;;
++ *)
++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
++ ;;
++ esac
++ ;;
++*)
++ # fallback: assume linklib IS sharedlib
++ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
++ ;;
++esac
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
++
++
++
++
++
++
++
+ if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
++ for ac_prog in ar
++ do
++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AR"; then
+@@ -7010,7 +7268,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_AR="${ac_tool_prefix}ar"
++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -7030,14 +7288,18 @@
+ fi
+
+
++ test -n "$AR" && break
++ done
+ fi
+-if test -z "$ac_cv_prog_AR"; then
++if test -z "$AR"; then
+ ac_ct_AR=$AR
+- # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
++ for ac_prog in ar
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_AR"; then
+@@ -7050,7 +7312,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_AR="ar"
++ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -7069,6 +7331,10 @@
+ $as_echo "no" >&6; }
+ fi
+
++
++ test -n "$ac_ct_AR" && break
++done
++
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+@@ -7080,16 +7346,72 @@
+ esac
+ AR=$ac_ct_AR
+ fi
+-else
+- AR="$ac_cv_prog_AR"
+ fi
+
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++
++
++
++
++
++
++
++
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
++$as_echo_n "checking for archiver @FILE support... " >&6; }
++if ${lt_cv_ar_at_file+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_ar_at_file=no
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ echo conftest.$ac_objext > conftest.lst
++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
++ (eval $lt_ar_try) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if test "$ac_status" -eq 0; then
++ # Ensure the archiver fails upon bogus file names.
++ rm -f conftest.$ac_objext libconftest.a
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
++ (eval $lt_ar_try) 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if test "$ac_status" -ne 0; then
++ lt_cv_ar_at_file=@
++ fi
++ fi
++ rm -f conftest.* libconftest.a
+
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
++$as_echo "$lt_cv_ar_at_file" >&6; }
+
++if test "x$lt_cv_ar_at_file" = xno; then
++ archiver_list_spec=
++else
++ archiver_list_spec=$lt_cv_ar_at_file
++fi
+
+
+
+@@ -7102,7 +7424,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -7142,7 +7464,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -7201,7 +7523,7 @@
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$RANLIB"; then
+@@ -7241,7 +7563,7 @@
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+@@ -7303,15 +7625,27 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+ fi
+
++case $host_os in
++ darwin*)
++ lock_old_archive_extraction=yes ;;
++ *)
++ lock_old_archive_extraction=no ;;
++esac
++
++
++
++
++
++
+
+
+
+@@ -7358,7 +7692,7 @@
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -7419,8 +7753,8 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+@@ -7444,6 +7778,7 @@
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -7456,6 +7791,7 @@
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -7481,8 +7817,8 @@
+ test $ac_status = 0; }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
++ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
+@@ -7497,6 +7833,18 @@
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data. */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -7508,7 +7856,7 @@
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+ /* The mapping between symbol names and symbols. */
+-const struct {
++LT_DLSYM_CONST struct {
+ const char *name;
+ void *address;
+ }
+@@ -7534,8 +7882,8 @@
+ _LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+- lt_save_LIBS="$LIBS"
+- lt_save_CFLAGS="$CFLAGS"
++ lt_globsym_save_LIBS=$LIBS
++ lt_globsym_save_CFLAGS=$CFLAGS
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+@@ -7545,8 +7893,8 @@
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+- LIBS="$lt_save_LIBS"
+- CFLAGS="$lt_save_CFLAGS"
++ LIBS=$lt_globsym_save_LIBS
++ CFLAGS=$lt_globsym_save_CFLAGS
+ else
+ echo "cannot find nm_test_func in $nlist" >&5
+ fi
+@@ -7583,6 +7931,20 @@
+ $as_echo "ok" >&6; }
+ fi
+
++# Response file support.
++if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++ nm_file_list_spec='@'
++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
++ nm_file_list_spec='@'
++fi
++
++
++
++
++
++
++
++
+
+
+
+@@ -7602,6 +7964,41 @@
+
+
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
++$as_echo_n "checking for sysroot... " >&6; }
++
++# Check whether --with-sysroot was given.
++if test "${with_sysroot+set}" = set; then :
++ withval=$with_sysroot;
++else
++ with_sysroot=no
++fi
++
++
++lt_sysroot=
++case ${with_sysroot} in #(
++ yes)
++ if test "$GCC" = yes; then
++ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
++ fi
++ ;; #(
++ /*)
++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
++ ;; #(
++ no|'')
++ ;; #(
++ *)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
++$as_echo "${with_sysroot}" >&6; }
++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
++ ;;
++esac
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
++$as_echo "${lt_sysroot:-no}" >&6; }
++
++
++
+
+
+ # Check whether --enable-libtool-lock was given.
+@@ -7635,7 +8032,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7638 "configure"' > conftest.$ac_ext
++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7729,7 +8126,7 @@
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
++if ${lt_cv_cc_needs_belf+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_ext=c
+@@ -7770,7 +8167,7 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -7781,7 +8178,20 @@
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -7797,19 +8207,16 @@
+
+ need_locks="$enable_libtool_lock"
+
+-
+- case $host_os in
+- rhapsody* | darwin*)
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
++set dummy ${ac_tool_prefix}mt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$DSYMUTIL"; then
+- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++ if test -n "$MANIFEST_TOOL"; then
++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -7818,7 +8225,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -7828,10 +8235,10 @@
+
+ fi
+ fi
+-DSYMUTIL=$ac_cv_prog_DSYMUTIL
+-if test -n "$DSYMUTIL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+-$as_echo "$DSYMUTIL" >&6; }
++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
++if test -n "$MANIFEST_TOOL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
++$as_echo "$MANIFEST_TOOL" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -7839,13 +8246,133 @@
+
+
+ fi
+-if test -z "$ac_cv_prog_DSYMUTIL"; then
+- ac_ct_DSYMUTIL=$DSYMUTIL
+- # Extract the first word of "dsymutil", so it can be a program name with args.
+-set dummy dsymutil; ac_word=$2
++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
++ # Extract the first word of "mt", so it can be a program name with args.
++set dummy mt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_MANIFEST_TOOL"; then
++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
++if test -n "$ac_ct_MANIFEST_TOOL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_MANIFEST_TOOL" = x; then
++ MANIFEST_TOOL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
++ fi
++else
++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
++fi
++
++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
++if ${lt_cv_path_mainfest_tool+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_path_mainfest_tool=no
++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
++ cat conftest.err >&5
++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
++ lt_cv_path_mainfest_tool=yes
++ fi
++ rm -f conftest*
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
++$as_echo "$lt_cv_path_mainfest_tool" >&6; }
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
++ MANIFEST_TOOL=:
++fi
++
++
++
++
++
++
++ case $host_os in
++ rhapsody* | darwin*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
++$as_echo "$DSYMUTIL" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ ac_ct_DSYMUTIL=$DSYMUTIL
++ # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DSYMUTIL"; then
+@@ -7897,7 +8424,7 @@
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NMEDIT"; then
+@@ -7937,7 +8464,7 @@
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_NMEDIT"; then
+@@ -7989,7 +8516,7 @@
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then :
++if ${ac_cv_prog_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$LIPO"; then
+@@ -8029,7 +8556,7 @@
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_LIPO"; then
+@@ -8081,7 +8608,7 @@
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then :
++if ${ac_cv_prog_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL"; then
+@@ -8121,7 +8648,7 @@
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL"; then
+@@ -8173,7 +8700,7 @@
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL64"; then
+@@ -8213,7 +8740,7 @@
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL64"; then
+@@ -8288,7 +8815,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++if ${lt_cv_apple_cc_single_mod+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+@@ -8304,7 +8831,13 @@
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&5
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+@@ -8315,9 +8848,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_exported_symbols_list=no
+@@ -8332,611 +8866,131 @@
+ {
+
+ ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- lt_cv_ld_exported_symbols_list=yes
+-else
+- lt_cv_ld_exported_symbols_list=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+- case $host_os in
+- rhapsody* | darwin1.[012])
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+- darwin1.*)
+- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+- darwin*) # darwin 5.x on
+- # if running on 10.5 or later, the deployment target defaults
+- # to the OS version, if on x86, and 10.4, the deployment
+- # target defaults to 10.4. Don't you love it?
+- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+- 10.[012]*)
+- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+- 10.*)
+- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+- esac
+- ;;
+- esac
+- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+- _lt_dar_single_mod='$single_module'
+- fi
+- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+- else
+- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- if test "$DSYMUTIL" != ":"; then
+- _lt_dsymutil='~$DSYMUTIL $lib || :'
+- else
+- _lt_dsymutil=
+- fi
+- ;;
+- esac
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+-"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-for ac_header in dlfcn.h
+-do :
+- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+-"
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_DLFCN_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+-ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -z "$CXX"; then
+- if test -n "$CCC"; then
+- CXX=$CCC
+- else
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$CXX"; then
+- ac_cv_prog_CXX="$CXX" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-CXX=$ac_cv_prog_CXX
+-if test -n "$CXX"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+-$as_echo "$CXX" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+- test -n "$CXX" && break
+- done
+-fi
+-if test -z "$CXX"; then
+- ac_ct_CXX=$CXX
+- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_CXX"; then
+- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_CXX="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+-if test -n "$ac_ct_CXX"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+-$as_echo "$ac_ct_CXX" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+- test -n "$ac_ct_CXX" && break
+-done
+-
+- if test "x$ac_ct_CXX" = x; then
+- CXX="g++"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- CXX=$ac_ct_CXX
+- fi
+-fi
+-
+- fi
+-fi
+-# Provide some information about the compiler.
+-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+-set X $ac_compile
+-ac_compiler=$2
+-for ac_option in --version -v -V -qversion; do
+- { { ac_try="$ac_compiler $ac_option >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+- ac_status=$?
+- if test -s conftest.err; then
+- sed '10a\
+-... rest of stderr output deleted ...
+- 10q' conftest.err >conftest.er1
+- cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+- fi
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }
+-done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+- choke me
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+- ac_compiler_gnu=yes
+-else
+- ac_compiler_gnu=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+-if test $ac_compiler_gnu = yes; then
+- GXX=yes
+-else
+- GXX=
+-fi
+-ac_test_CXXFLAGS=${CXXFLAGS+set}
+-ac_save_CXXFLAGS=$CXXFLAGS
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+- ac_cxx_werror_flag=yes
+- ac_cv_prog_cxx_g=no
+- CXXFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+- ac_cv_prog_cxx_g=yes
+-else
+- CXXFLAGS=""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-
+-else
+- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+- CXXFLAGS="-g"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+- ac_cv_prog_cxx_g=yes
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+-$as_echo "$ac_cv_prog_cxx_g" >&6; }
+-if test "$ac_test_CXXFLAGS" = set; then
+- CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+- if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+- else
+- CXXFLAGS="-g"
+- fi
+-else
+- if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
+- else
+- CXXFLAGS=
+- fi
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-depcc="$CXX" am_compiler_list=
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+-$as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_CXX_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+- fi
+- am__universal=false
+- case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac
+-
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+-
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+- case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
+- fi
+- ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+- none) break ;;
+- esac
+- if depmode=$depmode \
+- source=sub/conftest.c object=$am__obj \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CXX_dependencies_compiler_type=$depmode
+- break
+- fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_CXX_dependencies_compiler_type=none
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+-
+- if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+- am__fastdepCXX_TRUE=
+- am__fastdepCXX_FALSE='#'
+-else
+- am__fastdepCXX_TRUE='#'
+- am__fastdepCXX_FALSE=
+-fi
+-
+-
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+-if test -z "$CXXCPP"; then
+- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- # Double quotes because CXXCPP needs to be expanded
+- for CXXCPP in "$CXX -E" "/lib/cpp"
+- do
+- ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+-
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
++ return 0;
++}
+ _ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
++if ac_fn_c_try_link "$LINENO"; then :
++ lt_cv_ld_exported_symbols_list=yes
+ else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
++ lt_cv_ld_exported_symbols_list=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+- break
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+- done
+- ac_cv_prog_CXXCPP=$CXXCPP
+-
+-fi
+- CXXCPP=$ac_cv_prog_CXXCPP
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
++$as_echo_n "checking for -force_load linker flag... " >&6; }
++if ${lt_cv_ld_force_load+:} false; then :
++ $as_echo_n "(cached) " >&6
+ else
+- ac_cv_prog_CXXCPP=$CXXCPP
++ lt_cv_ld_force_load=no
++ cat > conftest.c << _LT_EOF
++int forced_loaded() { return 2;}
++_LT_EOF
++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
++ echo "$AR cru libconftest.a conftest.o" >&5
++ $AR cru libconftest.a conftest.o 2>&5
++ echo "$RANLIB libconftest.a" >&5
++ $RANLIB libconftest.a 2>&5
++ cat > conftest.c << _LT_EOF
++int main() { return 0;}
++_LT_EOF
++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
++ _lt_result=$?
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&5
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++ lt_cv_ld_force_load=yes
++ else
++ cat conftest.err >&5
++ fi
++ rm -f conftest.err libconftest.a conftest conftest.c
++ rm -rf conftest.dSYM
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+-$as_echo "$CXXCPP" >&6; }
+-ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
++$as_echo "$lt_cv_ld_force_load" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[012])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*) # darwin 5.x on
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++ _lt_dsymutil='~$DSYMUTIL $lib || :'
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++ inttypes.h stdint.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+-else
+- # Broken: fails on valid input.
+-continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
++done
++
++
++for ac_header in dlfcn.h
++do :
++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
+ _ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
++
+ fi
+-rm -f conftest.err conftest.$ac_ext
+
+ done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+
+-else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-_lt_caught_CXX_error=yes; }
+-fi
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-else
+- _lt_caught_CXX_error=yes
+-fi
++
++func_stripname_cnf ()
++{
++ case ${2} in
++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ esac
++} # func_stripname_cnf
+
+
+
+@@ -9017,7 +9071,22 @@
+
+ # Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then :
+- withval=$with_pic; pic_mode="$withval"
++ withval=$with_pic; lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
+ else
+ pic_mode=default
+ fi
+@@ -9094,6 +9163,11 @@
+
+
+
++
++
++
++
++
+ test -z "$LN_S" && LN_S="ln -s"
+
+
+@@ -9115,7 +9189,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then :
++if ${lt_cv_objdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ rm -f .libs 2>/dev/null
+@@ -9143,19 +9217,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ case $host_os in
+ aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+@@ -9168,23 +9229,6 @@
+ ;;
+ esac
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -9213,7 +9257,7 @@
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+ # Only perform the check for file, if the check method requires it
+@@ -9223,7 +9267,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -9289,7 +9333,7 @@
+ if test -n "$ac_tool_prefix"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -9418,11 +9462,16 @@
+ lt_prog_compiler_no_builtin_flag=
+
+ if test "$GCC" = yes; then
+- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++ case $cc_basename in
++ nvcc*)
++ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
++ *)
++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
++ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+@@ -9438,15 +9487,15 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9445: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+@@ -9475,8 +9524,6 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9524,6 +9571,12 @@
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
++ haiku*)
++ # PIC is the default for Haiku.
++ # The "-static" flag exists, but is broken.
++ lt_prog_compiler_static=
++ ;;
++
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -9566,6 +9619,15 @@
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
++
++ case $cc_basename in
++ nvcc*) # Cuda Compiler Driver 2.2
++ lt_prog_compiler_wl='-Xlinker '
++ if test -n "$lt_prog_compiler_pic"; then
++ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
++ fi
++ ;;
++ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+@@ -9607,7 +9669,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9628,7 +9690,13 @@
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
++ nagfor*)
++ # NAG Fortran compiler
++ lt_prog_compiler_wl='-Wl,-Wl,,'
++ lt_prog_compiler_pic='-PIC'
++ lt_prog_compiler_static='-Bstatic'
++ ;;
++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+@@ -9640,25 +9708,40 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+- xl*)
+- # IBM XL C 8.0/Fortran 10.1 on PPC
++ xl* | bgxl* | bgf* | mpixl*)
++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+- *Sun\ F*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- lt_prog_compiler_pic='-KPIC'
++ *Intel*\ [CF]*Compiler*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fPIC'
++ lt_prog_compiler_static='-static'
++ ;;
++ *Portland\ Group*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+- lt_prog_compiler_wl=''
+ ;;
+ esac
+ ;;
+@@ -9690,7 +9773,7 @@
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+- f77* | f90* | f95*)
++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+@@ -9747,13 +9830,17 @@
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+ esac
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+-$as_echo "$lt_prog_compiler_pic" >&6; }
+-
+-
+-
+-
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++if ${lt_cv_prog_compiler_pic+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
++$as_echo "$lt_cv_prog_compiler_pic" >&6; }
++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -9761,7 +9848,7 @@
+ if test -n "$lt_prog_compiler_pic"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_pic_works=no
+@@ -9777,15 +9864,15 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9780: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9784: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
+@@ -9814,13 +9901,18 @@
+
+
+
++
++
++
++
++
+ #
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+@@ -9833,7 +9925,7 @@
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+@@ -9863,7 +9955,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -9882,16 +9974,16 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9885: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9889: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -9918,7 +10010,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -9937,16 +10029,16 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9940: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9944: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -10012,7 +10104,6 @@
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+@@ -10056,13 +10147,36 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+- linux* | k*bsd*-gnu)
+- link_all_deplibs=no
+- ;;
+ esac
+
+ ld_shlibs=yes
++
++ # On some targets, GNU ld is compatible enough with the native linker
++ # that we're better off using the native interface for both.
++ lt_use_gnu_ld_interface=no
+ if test "$with_gnu_ld" = yes; then
++ case $host_os in
++ aix*)
++ # The AIX port of GNU ld has always aspired to compatibility
++ # with the native linker. However, as the warning in the GNU ld
++ # block says, versions before 2.19.5* couldn't really create working
++ # shared libraries, regardless of the interface used.
++ case `$LD -v 2>&1` in
++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
++ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
++ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
++ *)
++ lt_use_gnu_ld_interface=yes
++ ;;
++ esac
++ ;;
++ *)
++ lt_use_gnu_ld_interface=yes
++ ;;
++ esac
++ fi
++
++ if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+@@ -10080,6 +10194,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10095,11 +10210,12 @@
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** Warning: the GNU linker, at least up to release 2.19, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++*** really care for shared libraries, you may want to install binutils
++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
++*** You will then need to restart the configuration process.
+
+ _LT_EOF
+ fi
+@@ -10135,10 +10251,12 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
++ export_dynamic_flag_spec='${wl}--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -10156,6 +10274,11 @@
+ fi
+ ;;
+
++ haiku*)
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ link_all_deplibs=yes
++ ;;
++
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+@@ -10171,7 +10294,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -10181,15 +10304,16 @@
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+- tmp_addflag=
++ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ pgf77* | pgf90* | pgf95* | pgfortran*)
++ # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -10200,13 +10324,17 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
++ nvcc*) # Cuda Compiler Driver 2.2
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ compiler_needs_object=yes
++ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+@@ -10222,17 +10350,16 @@
+ fi
+
+ case $cc_basename in
+- xlf*)
++ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+- hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -10241,13 +10368,13 @@
+ fi
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -10265,8 +10392,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -10312,8 +10439,8 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -10353,8 +10480,10 @@
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global
++ # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -10416,7 +10545,6 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+- link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10442,7 +10570,13 @@
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "${lt_cv_aix_libpath+set}" = set; then
++ aix_libpath=$lt_cv_aix_libpath
++else
++ if ${lt_cv_aix_libpath_+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -10455,25 +10589,32 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++ lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\([^ ]*\) *$/\1/
++ p
++ }
++ }'
++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ # Check for a 64-bit object if we didn't find anything.
++ if test -z "$lt_cv_aix_libpath_"; then
++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++ if test -z "$lt_cv_aix_libpath_"; then
++ lt_cv_aix_libpath_="/usr/lib:/lib"
++ fi
++
++fi
++
++ aix_libpath=$lt_cv_aix_libpath_
++fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+@@ -10482,7 +10623,13 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "${lt_cv_aix_libpath+set}" = set; then
++ aix_libpath=$lt_cv_aix_libpath
++else
++ if ${lt_cv_aix_libpath_+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -10495,30 +10642,42 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++ lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\([^ ]*\) *$/\1/
++ p
++ }
++ }'
++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ # Check for a 64-bit object if we didn't find anything.
++ if test -z "$lt_cv_aix_libpath_"; then
++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++ if test -z "$lt_cv_aix_libpath_"; then
++ lt_cv_aix_libpath_="/usr/lib:/lib"
++ fi
++
++fi
++
++ aix_libpath=$lt_cv_aix_libpath_
++fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec='$convenience'
++ if test "$with_gnu_ld" = yes; then
++ # We only use this code for GNU lds that support --whole-archive.
++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++ else
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec='$convenience'
++ fi
+ archive_cmds_need_lc=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -10550,20 +10709,64 @@
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+- hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- old_archive_from_new_cmds='true'
+- # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
+- enable_shared_with_static_runtimes=yes
++ case $cc_basename in
++ cl*)
++ # Native MSVC
++ hardcode_libdir_flag_spec=' '
++ allow_undefined_flag=unsupported
++ always_export_symbols=yes
++ file_list_spec='@'
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++ else
++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++ fi~
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++ linknames='
++ # The linker will not automatically build a static lib if we build a DLL.
++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
++ enable_shared_with_static_runtimes=yes
++ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++ # Don't use ranlib
++ old_postinstall_cmds='chmod 644 $oldlib'
++ postlink_cmds='lt_outputfile="@OUTPUT@"~
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
++ case $lt_outputfile in
++ *.exe|*.EXE) ;;
++ *)
++ lt_outputfile="$lt_outputfile.exe"
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
++ ;;
++ esac~
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++ $RM "$lt_outputfile.manifest";
++ fi'
++ ;;
++ *)
++ # Assume MSVC wrapper
++ hardcode_libdir_flag_spec=' '
++ allow_undefined_flag=unsupported
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ # The linker will automatically build a .lib file if we build a DLL.
++ old_archive_from_new_cmds='true'
++ # FIXME: Should let the user specify the lib program.
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ enable_shared_with_static_runtimes=yes
++ ;;
++ esac
+ ;;
+
+ darwin* | rhapsody*)
+@@ -10573,7 +10776,12 @@
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- whole_archive_flag_spec=''
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
++ else
++ whole_archive_flag_spec=''
++ fi
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -10581,7 +10789,7 @@
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=echo
++ output_verbose_link_cmd=func_echo_all
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -10599,10 +10807,6 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
+- ld_shlibs=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -10615,7 +10819,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -10624,7 +10828,7 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+@@ -10632,7 +10836,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -10647,14 +10851,13 @@
+ ;;
+
+ hpux10*)
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+@@ -10666,16 +10869,16 @@
+ ;;
+
+ hpux11*)
+- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+@@ -10687,7 +10890,46 @@
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++
++ # Older versions of the 11.00 compiler do not understand -b yet
++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
++$as_echo_n "checking if $CC understands -b... " >&6; }
++if ${lt_cv_prog_compiler__b+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_prog_compiler__b=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -b"
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_cv_prog_compiler__b=yes
++ fi
++ else
++ lt_cv_prog_compiler__b=yes
++ fi
++ fi
++ $RM -r conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
++$as_echo "$lt_cv_prog_compiler__b" >&6; }
++
++if test x"$lt_cv_prog_compiler__b" = xyes; then
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++else
++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++fi
++
+ ;;
+ esac
+ fi
+@@ -10715,26 +10957,39 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ # This should be the same for all languages, so no per-tag cache variable.
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
++if ${lt_cv_irix_exported_symbol+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-int foo(void) {}
++int foo (void) { return 0; }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+-
++ lt_cv_irix_exported_symbol=yes
++else
++ lt_cv_irix_exported_symbol=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS="$save_LDFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
++$as_echo "$lt_cv_irix_exported_symbol" >&6; }
++ if test "$lt_cv_irix_exported_symbol" = yes; then
++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++ fi
+ else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10743,7 +10998,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10796,17 +11051,17 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10816,13 +11071,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10835,9 +11090,9 @@
+ no_undefined_flag=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+@@ -11025,44 +11280,50 @@
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++if ${lt_cv_archive_cmds_need_lc+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl
+- pic_flag=$lt_prog_compiler_pic
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag
+- allow_undefined_flag=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl
++ pic_flag=$lt_prog_compiler_pic
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag
++ allow_undefined_flag=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- archive_cmds_need_lc=no
+- else
+- archive_cmds_need_lc=yes
+- fi
+- allow_undefined_flag=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+-$as_echo "$archive_cmds_need_lc" >&6; }
++ then
++ lt_cv_archive_cmds_need_lc=no
++ else
++ lt_cv_archive_cmds_need_lc=yes
++ fi
++ allow_undefined_flag=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
++$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
++ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+ ;;
+ esac
+ fi
+@@ -11220,11 +11481,6 @@
+
+
+
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+@@ -11233,16 +11489,23 @@
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++ case $host_os in
++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
++ *) lt_sed_strip_eq="s,=/,/,g" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
++ case $lt_search_path_spec in
++ *\;*)
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
++ ;;
++ *)
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
++ ;;
++ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+@@ -11255,7 +11518,7 @@
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+ BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+@@ -11275,7 +11538,13 @@
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+ }'`
+- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
++ # AWK program above erroneously prepends '/' to C:/dos/paths
++ # for these hosts.
++ case $host_os in
++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
++ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
++ esac
++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -11301,7 +11570,7 @@
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -11310,7 +11579,7 @@
+ ;;
+
+ aix[4-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -11363,7 +11632,7 @@
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+@@ -11375,7 +11644,7 @@
+ ;;
+
+ bsdi[45]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -11394,8 +11663,9 @@
+ need_version=no
+ need_lib_prefix=no
+
+- case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ case $GCC,$cc_basename in
++ yes,*)
++ # gcc
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -11416,36 +11686,83 @@
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
++ dynamic_linker='Win32 ld.exe'
++ ;;
++
++ *,cl*)
++ # Native MSVC
++ libname_spec='$name'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
++
++ case $build_os in
++ mingw*)
++ sys_lib_search_path_spec=
++ lt_save_ifs=$IFS
++ IFS=';'
++ for lt_path in $LIB
++ do
++ IFS=$lt_save_ifs
++ # Let DOS variable expansion print the short 8.3 style file name.
++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++ done
++ IFS=$lt_save_ifs
++ # Convert to MSYS style.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
++ ;;
++ cygwin*)
++ # Convert to unix form, then to dos form, then back to unix form
++ # but this time dos style (no spaces!) so that the unix form looks
++ # like /cygdrive/c/PROGRA~1:/cygdr...
++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ ;;
++ *)
++ sys_lib_search_path_spec="$LIB"
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # FIXME: find the short name or the path components, as spaces are
++ # common. (e.g. "Program Files" -> "PROGRA~1")
++ ;;
++ esac
++
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
++ postinstall_cmds='base_file=`basename \${file}`~
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++ dldir=$destdir/`dirname \$dlpath`~
++ test -d \$dldir || mkdir -p \$dldir~
++ $install_prog $dir/$dlname \$dldir/$dlname'
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++ dlpath=$dir/\$dldll~
++ $RM \$dlpath'
++ shlibpath_overrides_runpath=yes
++ dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
++ # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+- dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+@@ -11466,7 +11783,7 @@
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -11474,10 +11791,6 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -11485,7 +11798,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -11503,7 +11816,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -11523,12 +11836,26 @@
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
++haiku*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ dynamic_linker="$host_os runtime_loader"
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
+@@ -11574,12 +11901,14 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ postinstall_cmds='chmod 555 $lib'
++ # or fails outright, so override atomically:
++ install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -11595,7 +11924,7 @@
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -11632,9 +11961,9 @@
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+- version_type=linux
++# This must be glibc/ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11642,12 +11971,17 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
++
+ # Some binutils ld are patched to set DT_RUNPATH
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_shlibpath_overrides_runpath=no
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -11660,13 +11994,17 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- shlibpath_overrides_runpath=yes
++ lt_cv_shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
++
++fi
++
++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+@@ -11675,7 +12013,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -11688,18 +12026,6 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11719,7 +12045,7 @@
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -11788,7 +12114,7 @@
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11813,7 +12139,7 @@
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11837,7 +12163,7 @@
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11868,7 +12194,7 @@
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11878,7 +12204,7 @@
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -11990,6 +12316,11 @@
+
+
+
++
++
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action=
+@@ -12062,7 +12393,7 @@
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12096,7 +12427,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -12110,12 +12441,12 @@
+
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = x""yes; then :
++if test "x$ac_cv_func_shl_load" = xyes; then :
+ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12149,16 +12480,16 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
++if test "x$ac_cv_func_dlopen" = xyes; then :
+ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12192,12 +12523,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
++if ${ac_cv_lib_svld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12231,12 +12562,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
++if ${ac_cv_lib_dld_dld_link+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12270,7 +12601,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+@@ -12311,7 +12642,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then :
++if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -12320,7 +12651,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12323 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12361,7 +12692,13 @@
+ # endif
+ #endif
+
+-void fnord() { int i=42;}
++/* When -fvisbility=hidden is used, assume the code has been annotated
++ correspondingly for the symbols needed. */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
++
++int fnord () { return 42; }
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -12370,7 +12707,11 @@
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else
++ {
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else puts (dlerror ());
++ }
+ /* dlclose (self); */
+ }
+ else
+@@ -12407,7 +12748,7 @@
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
++if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -12416,7 +12757,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 12419 "configure"
++#line $LINENO "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12457,7 +12798,13 @@
+ # endif
+ #endif
+
+-void fnord() { int i=42;}
++/* When -fvisbility=hidden is used, assume the code has been annotated
++ correspondingly for the symbols needed. */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
++
++int fnord () { return 42; }
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -12466,7 +12813,11 @@
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else
++ {
++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ else puts (dlerror ());
++ }
+ /* dlclose (self); */
+ }
+ else
+@@ -12584,45 +12935,184 @@
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+
+- # On AIX, shared libraries and static libraries use the same namespace, and
+- # are all built from PIC.
+- case $host_os in
+- aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
++ # On AIX, shared libraries and static libraries use the same namespace, and
++ # are all built from PIC.
++ case $host_os in
++ aix3*)
++ test "$enable_shared" = yes && enable_static=no
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
++ ;;
++
++ aix[4-9]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
++ esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
++
++
++
++
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++if test -z "$CXXCPP"; then
++ if ${ac_cv_prog_CXXCPP+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ # Double quotes because CXXCPP needs to be expanded
++ for CXXCPP in "$CXX -E" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++
++else
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++ break
++fi
+
+- aix[4-9]*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+- esac
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
++ done
++ ac_cv_prog_CXXCPP=$CXXCPP
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
++fi
++ CXXCPP=$ac_cv_prog_CXXCPP
++else
++ ac_cv_prog_CXXCPP=$CXXCPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
++$as_echo "$CXXCPP" >&6; }
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
+
++else
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
+
++else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-CC="$lt_save_CC"
+-
++else
++ _lt_caught_CXX_error=yes
++fi
+
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -12639,7 +13129,6 @@
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ hardcode_libdir_flag_spec_CXX=
+-hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
+ hardcode_shlibpath_var_CXX=unsupported
+@@ -12649,6 +13138,8 @@
+ module_expsym_cmds_CXX=
+ link_all_deplibs_CXX=unknown
+ old_archive_cmds_CXX=$old_archive_cmds
++reload_flag_CXX=$reload_flag
++reload_cmds_CXX=$reload_cmds
+ no_undefined_flag_CXX=
+ whole_archive_flag_spec_CXX=
+ enable_shared_with_static_runtimes_CXX=no
+@@ -12704,6 +13195,7 @@
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
++ lt_save_CFLAGS=$CFLAGS
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+@@ -12721,6 +13213,7 @@
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
++ CFLAGS=$CXXFLAGS
+ compiler=$CC
+ compiler_CXX=$CC
+ for cc_temp in $compiler""; do
+@@ -12731,7 +13224,7 @@
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+ if test -n "$compiler"; then
+@@ -12794,7 +13287,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+@@ -12831,10 +13324,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -12860,8 +13353,8 @@
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12893,7 +13386,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+ else
+ GXX=no
+@@ -13003,7 +13496,13 @@
+ allow_undefined_flag_CXX='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "${lt_cv_aix_libpath+set}" = set; then
++ aix_libpath=$lt_cv_aix_libpath
++else
++ if ${lt_cv_aix_libpath__CXX+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -13016,26 +13515,33 @@
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++ lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\([^ ]*\) *$/\1/
++ p
++ }
++ }'
++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ # Check for a 64-bit object if we didn't find anything.
++ if test -z "$lt_cv_aix_libpath__CXX"; then
++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++ if test -z "$lt_cv_aix_libpath__CXX"; then
++ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++ fi
++
++fi
++
++ aix_libpath=$lt_cv_aix_libpath__CXX
++fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+@@ -13044,7 +13550,13 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if test "${lt_cv_aix_libpath+set}" = set; then
++ aix_libpath=$lt_cv_aix_libpath
++else
++ if ${lt_cv_aix_libpath__CXX+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -13057,30 +13569,42 @@
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+
+-lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\(.*\)$/\1/
+- p
+- }
+- }'
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
++ lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\([^ ]*\) *$/\1/
++ p
++ }
++ }'
++ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ # Check for a 64-bit object if we didn't find anything.
++ if test -z "$lt_cv_aix_libpath__CXX"; then
++ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++ if test -z "$lt_cv_aix_libpath__CXX"; then
++ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
++ fi
++
++fi
++
++ aix_libpath=$lt_cv_aix_libpath__CXX
++fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec_CXX='$convenience'
++ if test "$with_gnu_ld" = yes; then
++ # We only use this code for GNU lds that support --whole-archive.
++ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++ else
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec_CXX='$convenience'
++ fi
+ archive_cmds_need_lc_CXX=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+@@ -13110,28 +13634,75 @@
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+- # as there is no search path for DLLs.
+- hardcode_libdir_flag_spec_CXX='-L$libdir'
+- allow_undefined_flag_CXX=unsupported
+- always_export_symbols_CXX=no
+- enable_shared_with_static_runtimes_CXX=yes
+-
+- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is; otherwise, prepend...
+- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname.def;
+- else
+- echo EXPORTS > $output_objdir/$soname.def;
+- cat $export_symbols >> $output_objdir/$soname.def;
+- fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- else
+- ld_shlibs_CXX=no
+- fi
+- ;;
++ case $GXX,$cc_basename in
++ ,cl* | no,cl*)
++ # Native MSVC
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
++ # no search path for DLLs.
++ hardcode_libdir_flag_spec_CXX=' '
++ allow_undefined_flag_CXX=unsupported
++ always_export_symbols_CXX=yes
++ file_list_spec_CXX='@'
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
++ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
++ else
++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
++ fi~
++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++ linknames='
++ # The linker will not automatically build a static lib if we build a DLL.
++ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
++ enable_shared_with_static_runtimes_CXX=yes
++ # Don't use ranlib
++ old_postinstall_cmds_CXX='chmod 644 $oldlib'
++ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
++ lt_tool_outputfile="@TOOL_OUTPUT@"~
++ case $lt_outputfile in
++ *.exe|*.EXE) ;;
++ *)
++ lt_outputfile="$lt_outputfile.exe"
++ lt_tool_outputfile="$lt_tool_outputfile.exe"
++ ;;
++ esac~
++ func_to_tool_file "$lt_outputfile"~
++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++ $RM "$lt_outputfile.manifest";
++ fi'
++ ;;
++ *)
++ # g++
++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++ # as there is no search path for DLLs.
++ hardcode_libdir_flag_spec_CXX='-L$libdir'
++ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
++ allow_undefined_flag_CXX=unsupported
++ always_export_symbols_CXX=no
++ enable_shared_with_static_runtimes_CXX=yes
++
++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ cp $export_symbols $output_objdir/$soname.def;
++ else
++ echo EXPORTS > $output_objdir/$soname.def;
++ cat $export_symbols >> $output_objdir/$soname.def;
++ fi~
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ else
++ ld_shlibs_CXX=no
++ fi
++ ;;
++ esac
++ ;;
+ darwin* | rhapsody*)
+
+
+@@ -13139,7 +13710,12 @@
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+- whole_archive_flag_spec_CXX=''
++ if test "$lt_cv_ld_force_load" = "yes"; then
++ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
++ else
++ whole_archive_flag_spec_CXX=''
++ fi
+ link_all_deplibs_CXX=yes
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -13147,7 +13723,7 @@
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=echo
++ output_verbose_link_cmd=func_echo_all
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -13181,7 +13757,7 @@
+ esac
+ ;;
+
+- freebsd[12]*)
++ freebsd2.*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ ld_shlibs_CXX=no
+@@ -13200,6 +13776,11 @@
+ gnu*)
+ ;;
+
++ haiku*)
++ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ link_all_deplibs_CXX=yes
++ ;;
++
+ hpux9*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -13224,11 +13805,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -13289,7 +13870,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -13299,10 +13880,10 @@
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -13332,7 +13913,7 @@
+ case $cc_basename in
+ CC*)
+ # SGI C++
+- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -13343,9 +13924,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ fi
+ fi
+ link_all_deplibs_CXX=yes
+@@ -13356,7 +13937,7 @@
+ inherit_rpath_CXX=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -13374,7 +13955,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -13411,26 +13992,26 @@
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+- *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
++ *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+ prelink_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ old_archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
+ archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+- *) # Version 6 will use weak symbols
++ *) # Version 6 and above use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+@@ -13438,7 +14019,7 @@
+
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+@@ -13457,9 +14038,9 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ ;;
+- xl*)
++ xl* | mpixl* | bgxl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -13479,13 +14060,13 @@
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_CXX=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+- output_verbose_link_cmd='echo'
++ output_verbose_link_cmd='func_echo_all'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13554,7 +14135,7 @@
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+- output_verbose_link_cmd=echo
++ output_verbose_link_cmd=func_echo_all
+ else
+ ld_shlibs_CXX=no
+ fi
+@@ -13589,15 +14170,15 @@
+ case $host in
+ osf3*)
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ allow_undefined_flag_CXX=' -expect_unresolved \*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ ;;
+@@ -13613,17 +14194,17 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -13633,7 +14214,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+@@ -13669,7 +14250,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
+ no_undefined_flag_CXX=' -zdefs'
+@@ -13690,7 +14271,7 @@
+ esac
+ link_all_deplibs_CXX=yes
+
+- output_verbose_link_cmd='echo'
++ output_verbose_link_cmd='func_echo_all'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13710,14 +14291,14 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+@@ -13728,7 +14309,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+@@ -13782,6 +14363,10 @@
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
++ '"$old_archive_cmds_CXX"
++ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
++ '"$reload_cmds_CXX"
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -13843,6 +14428,14 @@
+ };
+ _LT_EOF
+
++
++_lt_libdeps_save_CFLAGS=$CFLAGS
++case "$CC $CFLAGS " in #(
++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
++esac
++
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -13856,7 +14449,7 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case $p in
++ case ${prev}${p} in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+@@ -13865,13 +14458,22 @@
+ test $p = "-R"; then
+ prev=$p
+ continue
+- else
+- prev=
+ fi
+
++ # Expand the sysroot to ease extracting the directories later.
++ if test -z "$prev"; then
++ case $p in
++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
++ esac
++ fi
++ case $p in
++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
++ esac
+ if test "$pre_test_object_deps_done" = no; then
+- case $p in
+- -L* | -R*)
++ case ${prev} in
++ -L | -R)
+ # Internal compiler library paths should come after those
+ # provided the user. The postdeps already come after the
+ # user supplied libs so there is no need to process them.
+@@ -13891,8 +14493,10 @@
+ postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ fi
+ fi
++ prev=
+ ;;
+
++ *.lto.$objext) ;; # Ignore GCC LTO objects
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+@@ -13928,6 +14532,7 @@
+ fi
+
+ $RM -f confest.$objext
++CFLAGS=$_lt_libdeps_save_CFLAGS
+
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+@@ -13963,7 +14568,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -14028,8 +14633,6 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -14079,6 +14682,11 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
++ haiku*)
++ # PIC is the default for Haiku.
++ # The "-static" flag exists, but is broken.
++ lt_prog_compiler_static_CXX=
++ ;;
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+@@ -14128,6 +14736,11 @@
+ ;;
+ esac
+ ;;
++ mingw* | cygwin* | os2* | pw32* | cegcc*)
++ # This hack is so that the source file can tell whether it is being
++ # built for inclusion in a dll (and should export symbols for example).
++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++ ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+@@ -14184,7 +14797,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -14217,8 +14830,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX='-non_shared'
+ ;;
+- xlc* | xlC*)
+- # IBM XL 8.0 on PPC
++ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
++ # IBM XL 8.0, 9.0 on PPC and BlueGene
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-qpic'
+ lt_prog_compiler_static_CXX='-qstaticlink'
+@@ -14248,7 +14861,7 @@
+ ;;
+ esac
+ ;;
+- netbsd* | netbsdelf*-gnu)
++ netbsd*)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -14280,7 +14893,7 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC*)
++ CC* | sunCC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+@@ -14345,10 +14958,17 @@
+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+ ;;
+ esac
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+-
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
++if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
++$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
++lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -14356,7 +14976,7 @@
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_pic_works_CXX=no
+@@ -14372,15 +14992,15 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14379: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works_CXX=yes
+@@ -14406,13 +15026,15 @@
+
+
+
++
++
+ #
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works_CXX=no
+@@ -14425,7 +15047,7 @@
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works_CXX=yes
+@@ -14452,7 +15074,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o_CXX=no
+@@ -14471,16 +15093,16 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14478: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14504,7 +15126,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o_CXX=no
+@@ -14523,16 +15145,16 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14526: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14530: \$? = $ac_status" >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14583,30 +15205,37 @@
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ case $host_os in
+ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
++ # Also, AIX nm treats weak defined symbols like other global defined
++ # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+ export_symbols_cmds_CXX="$ltdll_cmds"
+- ;;
++ ;;
+ cygwin* | mingw* | cegcc*)
+- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+- ;;
+- linux* | k*bsd*-gnu)
+- link_all_deplibs_CXX=no
+- ;;
++ case $cc_basename in
++ cl*)
++ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ ;;
++ *)
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
++ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
++ ;;
++ esac
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- ;;
++ ;;
+ esac
+- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
+@@ -14638,44 +15267,50 @@
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl_CXX
+- pic_flag=$lt_prog_compiler_pic_CXX
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+- allow_undefined_flag_CXX=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++ allow_undefined_flag_CXX=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- archive_cmds_need_lc_CXX=no
+- else
+- archive_cmds_need_lc_CXX=yes
+- fi
+- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
++ then
++ lt_cv_archive_cmds_need_lc_CXX=no
++ else
++ lt_cv_archive_cmds_need_lc_CXX=yes
++ fi
++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
++$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
++ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+ ;;
+ esac
+ fi
+@@ -14743,8 +15378,6 @@
+
+
+
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+@@ -14770,7 +15403,7 @@
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -14779,7 +15412,7 @@
+ ;;
+
+ aix[4-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -14832,7 +15465,7 @@
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+@@ -14844,7 +15477,7 @@
+ ;;
+
+ bsdi[45]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -14863,8 +15496,9 @@
+ need_version=no
+ need_lib_prefix=no
+
+- case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++ case $GCC,$cc_basename in
++ yes,*)
++ # gcc
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -14885,36 +15519,82 @@
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
++ dynamic_linker='Win32 ld.exe'
++ ;;
++
++ *,cl*)
++ # Native MSVC
++ libname_spec='$name'
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='${libname}.dll.lib'
++
++ case $build_os in
++ mingw*)
++ sys_lib_search_path_spec=
++ lt_save_ifs=$IFS
++ IFS=';'
++ for lt_path in $LIB
++ do
++ IFS=$lt_save_ifs
++ # Let DOS variable expansion print the short 8.3 style file name.
++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++ done
++ IFS=$lt_save_ifs
++ # Convert to MSYS style.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
++ ;;
++ cygwin*)
++ # Convert to unix form, then to dos form, then back to unix form
++ # but this time dos style (no spaces!) so that the unix form looks
++ # like /cygdrive/c/PROGRA~1:/cygdr...
++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ ;;
++ *)
++ sys_lib_search_path_spec="$LIB"
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # FIXME: find the short name or the path components, as spaces are
++ # common. (e.g. "Program Files" -> "PROGRA~1")
++ ;;
++ esac
++
++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
++ postinstall_cmds='base_file=`basename \${file}`~
++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++ dldir=$destdir/`dirname \$dlpath`~
++ test -d \$dldir || mkdir -p \$dldir~
++ $install_prog $dir/$dlname \$dldir/$dlname'
++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++ dlpath=$dir/\$dldll~
++ $RM \$dlpath'
++ shlibpath_overrides_runpath=yes
++ dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
++ # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+- dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+@@ -14934,7 +15614,7 @@
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -14942,10 +15622,6 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -14953,7 +15629,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -14971,7 +15647,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14991,12 +15667,26 @@
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
++haiku*)
++ version_type=linux # correct to gnu/linux during the next big refactor
++ need_lib_prefix=no
++ need_version=no
++ dynamic_linker="$host_os runtime_loader"
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
+@@ -15042,12 +15732,14 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ postinstall_cmds='chmod 555 $lib'
++ # or fails outright, so override atomically:
++ install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -15063,7 +15755,7 @@
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -15100,9 +15792,9 @@
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+- version_type=linux
++# This must be glibc/ELF.
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15110,12 +15802,17 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
++
+ # Some binutils ld are patched to set DT_RUNPATH
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ lt_cv_shlibpath_overrides_runpath=no
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -15128,13 +15825,17 @@
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- shlibpath_overrides_runpath=yes
++ lt_cv_shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
++
++fi
++
++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+@@ -15143,7 +15844,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -15156,18 +15857,6 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+-netbsdelf*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='NetBSD ld.elf_so'
+- ;;
+-
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15187,7 +15876,7 @@
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -15256,7 +15945,7 @@
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15281,7 +15970,7 @@
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -15305,7 +15994,7 @@
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -15336,7 +16025,7 @@
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -15346,7 +16035,7 @@
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -15407,6 +16096,8 @@
+
+
+
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action_CXX=
+@@ -15454,6 +16145,7 @@
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
++ CFLAGS=$lt_save_CFLAGS
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+@@ -15482,6 +16174,8 @@
+
+
+
++
++
+ ac_config_commands="$ac_config_commands libtool"
+
+
+@@ -15494,7 +16188,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -15502,7 +16196,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -15541,7 +16235,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
++if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_sys_largefile_CC=no
+@@ -15592,7 +16286,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
++if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ while :; do
+@@ -15661,7 +16355,7 @@
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+-if test "${ac_cv_sys_large_files+set}" = set; then :
++if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ while :; do
+@@ -15732,13 +16426,18 @@
+
+
+
++
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -15781,7 +16480,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -15844,15 +16543,13 @@
+ $as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+-
+ fi
+
+ for ac_header in sys/ioccom.h sys/inotify.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15953,11 +16650,11 @@
+ as_ac_File=`$as_echo "ac_cv_file_$dir/pci.ids" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/pci.ids" >&5
+ $as_echo_n "checking for $dir/pci.ids... " >&6; }
+-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$as_ac_File+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
++ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "$dir/pci.ids"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -15967,14 +16664,13 @@
+ eval ac_res=\$$as_ac_File
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_File
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ PCI_IDS_DIR=$dir
+ fi
+
+ done
+ if test -z "$PCI_IDS_DIR"; then
+- as_fn_error "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5
++ as_fn_error $? "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&5
+ $as_echo "$as_me: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&2;}
+@@ -15994,11 +16690,11 @@
+ as_ac_File=`$as_echo "ac_cv_file_$dir/usb.ids" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/usb.ids" >&5
+ $as_echo_n "checking for $dir/usb.ids... " >&6; }
+-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$as_ac_File+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ test "$cross_compiling" = yes &&
+- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
++ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r "$dir/usb.ids"; then
+ eval "$as_ac_File=yes"
+ else
+@@ -16008,14 +16704,13 @@
+ eval ac_res=\$$as_ac_File
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_File
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+ USB_IDS_DIR=$dir
+ fi
+
+ done
+ if test -z "$USB_IDS_DIR"; then
+- as_fn_error "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5
++ as_fn_error $? "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&5
+ $as_echo "$as_me: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&2;}
+@@ -16165,7 +16860,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -16352,7 +17047,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+ $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
++if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16386,7 +17081,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+ $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
++if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBUUID 1
+ _ACEOF
+@@ -16394,12 +17089,12 @@
+ LIBS="-luuid $LIBS"
+
+ else
+- as_fn_error "*** uuid library (libuuid) not found" "$LINENO" 5
++ as_fn_error $? "*** uuid library (libuuid) not found" "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16433,7 +17128,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+@@ -16441,7 +17136,7 @@
+ LIBS="-ldl $LIBS"
+
+ else
+- as_fn_error "*** dl library (libdl) not found" "$LINENO" 5
++ as_fn_error $? "*** dl library (libdl) not found" "$LINENO" 5
+ fi
+
+
+@@ -16452,8 +17147,8 @@
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -16481,7 +17176,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+ else
+- as_fn_error "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5
++ as_fn_error $? "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+@@ -16496,46 +17191,46 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PARTED" >&5
+ $as_echo_n "checking for PARTED... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PARTED_CFLAGS"; then
+- pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PARTED_CFLAGS"; then
++ pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libparted") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PARTED_CFLAGS=`$PKG_CONFIG --cflags "libparted" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$PARTED_LIBS"; then
+- pkg_cv_PARTED_LIBS="$PARTED_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$PARTED_LIBS"; then
++ pkg_cv_PARTED_LIBS="$PARTED_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libparted") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PARTED_LIBS=`$PKG_CONFIG --libs "libparted" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -16543,14 +17238,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libparted"`
++ PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libparted" 2>&1`
+ else
+- PARTED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libparted"`
++ PARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libparted" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PARTED_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (libparted) were not met:
++ as_fn_error $? "Package requirements (libparted) were not met:
+
+ $PARTED_PKG_ERRORS
+
+@@ -16559,12 +17254,13 @@
+
+ Alternatively, you may set the environment variables PARTED_CFLAGS
+ and PARTED_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -16573,13 +17269,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ PARTED_CFLAGS=$pkg_cv_PARTED_CFLAGS
+ PARTED_LIBS=$pkg_cv_PARTED_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+ fi
+
+@@ -16677,7 +17373,7 @@
+ fi
+ else
+ if test x$enable_gcov = xyes; then
+- as_fn_error "--enable-gcov can only be used with gcc" "$LINENO" 5
++ as_fn_error $? "--enable-gcov can only be used with gcc" "$LINENO" 5
+ fi
+ fi
+
+@@ -16703,21 +17399,21 @@
+ for ac_header in expat.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
+-if test "x$ac_cv_header_expat_h" = x""yes; then :
++if test "x$ac_cv_header_expat_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_EXPAT_H 1
+ _ACEOF
+ $as_echo "#define HAVE_EXPAT_H 1" >>confdefs.h
+
+ else
+- as_fn_error "Can't find expat.h. Please install expat." "$LINENO" 5
++ as_fn_error $? "Can't find expat.h. Please install expat." "$LINENO" 5
+ fi
+
+ done
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
+ $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
++if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16751,10 +17447,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+ $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
++if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then :
+ EXPAT_LIB="-lexpat"
+ else
+- as_fn_error "Can't find expat library. Please install expat." "$LINENO" 5
++ as_fn_error $? "Can't find expat library. Please install expat." "$LINENO" 5
+ fi
+
+
+@@ -16770,7 +17466,7 @@
+ for ac_header in usb.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+-if test "x$ac_cv_header_usb_h" = x""yes; then :
++if test "x$ac_cv_header_usb_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_USB_H 1
+ _ACEOF
+@@ -16784,7 +17480,7 @@
+ if test "x$USE_LIBUSB" = "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_find_devices in -lusb" >&5
+ $as_echo_n "checking for usb_find_devices in -lusb... " >&6; }
+-if test "${ac_cv_lib_usb_usb_find_devices+set}" = set; then :
++if ${ac_cv_lib_usb_usb_find_devices+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16818,7 +17514,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_find_devices" >&5
+ $as_echo "$ac_cv_lib_usb_usb_find_devices" >&6; }
+-if test "x$ac_cv_lib_usb_usb_find_devices" = x""yes; then :
++if test "x$ac_cv_lib_usb_usb_find_devices" = xyes; then :
+ USE_LIBUSB=yes
+ else
+ USE_LIBUSB=no
+@@ -16853,7 +17549,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMBIOSFreeMemory in -lsmbios" >&5
+ $as_echo_n "checking for SMBIOSFreeMemory in -lsmbios... " >&6; }
+-if test "${ac_cv_lib_smbios_SMBIOSFreeMemory+set}" = set; then :
++if ${ac_cv_lib_smbios_SMBIOSFreeMemory+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16887,7 +17583,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbios_SMBIOSFreeMemory" >&5
+ $as_echo "$ac_cv_lib_smbios_SMBIOSFreeMemory" >&6; }
+-if test "x$ac_cv_lib_smbios_SMBIOSFreeMemory" = x""yes; then :
++if test "x$ac_cv_lib_smbios_SMBIOSFreeMemory" = xyes; then :
+ LIB_SMBIOS=yes
+ else
+ LIB_SMBIOS=no
+@@ -16906,8 +17602,8 @@
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -16972,8 +17668,8 @@
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -17036,13 +17732,13 @@
+ for ac_header in pci/pci.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "pci/pci.h" "ac_cv_header_pci_pci_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pci_pci_h" = x""yes; then :
++if test "x$ac_cv_header_pci_pci_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_PCI_PCI_H 1
+ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pci_init in -lpci" >&5
+ $as_echo_n "checking for pci_init in -lpci... " >&6; }
+-if test "${ac_cv_lib_pci_pci_init+set}" = set; then :
++if ${ac_cv_lib_pci_pci_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -17076,7 +17772,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pci_pci_init" >&5
+ $as_echo "$ac_cv_lib_pci_pci_init" >&6; }
+-if test "x$ac_cv_lib_pci_pci_init" = x""yes; then :
++if test "x$ac_cv_lib_pci_pci_init" = xyes; then :
+ USE_LIBPCI="yes"
+ fi
+
+@@ -17094,9 +17790,6 @@
+ fi
+
+
+-USE_LIBUSB20=no
+-USE_LIBUSB=no
+-LIBUSB20_LIBS=""
+
+ # Check whether --with-backend was given.
+ if test "${with_backend+set}" = set; then :
+@@ -17155,9 +17848,12 @@
+
+
+ if test "x$HALD_BACKEND" = "xfreebsd"; then
++ USE_BSDLIBUSB20=no
++ USE_BSDLIBUSB=no
++ LIBUSB20_LIBS=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb20" >&5
+ $as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; }
+-if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then :
++if ${ac_cv_lib_usb20_libusb20_dev_get_info+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -17191,17 +17887,16 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5
+ $as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }
+-if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then :
+- USE_LIBUSB20=yes
++if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = xyes; then :
++ USE_BSDLIBUSB20=yes
+ else
+- USE_LIBUSB20=no
++ USE_BSDLIBUSB20=no
+ fi
+
+-fi
+-if test "x$USE_LIBUSB20" = "xno"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5
++ if test "x$USE_BSDLIBUSB20" = "xno"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5
+ $as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; }
+-if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then :
++if ${ac_cv_lib_usb_libusb20_dev_get_info+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -17235,22 +17930,14 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5
+ $as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }
+-if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then :
+- USE_LIBUSB=yes
+-else
+- USE_LIBUSB=no
+-fi
+-
+-fi
+- if test "x$USE_LIBUSB20" = "xyes"; then
+- HAVE_LIBUSB20_TRUE=
+- HAVE_LIBUSB20_FALSE='#'
++if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = xyes; then :
++ USE_BSDLIBUSB=yes
+ else
+- HAVE_LIBUSB20_TRUE='#'
+- HAVE_LIBUSB20_FALSE=
++ USE_BSDLIBUSB=no
+ fi
+
+- if test "x$USE_LIBUSB" = "xyes"; then
++ fi
++ if test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"; then
+ HAVE_LIBUSB20_TRUE=
+ HAVE_LIBUSB20_FALSE='#'
+ else
+@@ -17258,18 +17945,28 @@
+ HAVE_LIBUSB20_FALSE=
+ fi
+
+-if test "x$USE_LIBUSB20" = "xyes"; then
++ if test "x$USE_BSDLIBUSB20" = "xyes"; then
+
+ $as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h
+
+- LIBUSB20_LIBS="-lusb20"
+-elif test "x$USE_LIBUSB" = "xyes"; then
++ LIBUSB20_LIBS="-lusb20"
++ elif test "x$USE_BSDLIBUSB" = "xyes"; then
+
+ $as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h
+
+- LIBUSB20_LIBS="-lusb"
++ LIBUSB20_LIBS="-lusb"
++ fi
++
++else
++ if false; then
++ HAVE_LIBUSB20_TRUE=
++ HAVE_LIBUSB20_FALSE='#'
++else
++ HAVE_LIBUSB20_TRUE='#'
++ HAVE_LIBUSB20_FALSE=
+ fi
+
++fi
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -17335,7 +18032,7 @@
+ set dummy gperf; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GPERF+set}" = set; then :
++if ${ac_cv_path_GPERF+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GPERF in
+@@ -17443,53 +18140,53 @@
+ msg_polkit=no
+ if test "x$enable_policy_kit" != "xno"; then
+ if test "x$enable_console_kit" = "xno"; then
+- as_fn_error "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5
++ as_fn_error $? "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5
+ fi
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
+ $as_echo_n "checking for POLKIT... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$POLKIT_CFLAGS"; then
+- pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$POLKIT_CFLAGS"; then
++ pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "$polkit_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$POLKIT_LIBS"; then
+- pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$POLKIT_LIBS"; then
++ pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "$polkit_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -17497,16 +18194,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$polkit_module"`
++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$polkit_module" 2>&1`
+ else
+- POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$polkit_module"`
++ POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$polkit_module" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$POLKIT_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- if false; then
++ if false; then
+ HAVE_POLKIT_TRUE=
+ HAVE_POLKIT_FALSE='#'
+ else
+@@ -17515,6 +18210,8 @@
+ fi
+
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ if false; then
+ HAVE_POLKIT_TRUE=
+ HAVE_POLKIT_FALSE='#'
+@@ -17544,14 +18241,14 @@
+
+
+ if test "x$msg_polkit" != "xyes"; then
+- as_fn_error "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5
++ as_fn_error $? "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5
+ fi
+
+ # Extract the first word of "polkit-policy-file-validate", so it can be a program name with args.
+ set dummy polkit-policy-file-validate; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE+set}" = set; then :
++if ${ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
+@@ -17585,7 +18282,7 @@
+
+
+ if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+- as_fn_error "polkit-policy-file-validate not found" "$LINENO" 5
++ as_fn_error $? "polkit-policy-file-validate not found" "$LINENO" 5
+ fi
+ fi
+
+@@ -17608,7 +18305,7 @@
+ msg_aclmgmt=no
+ if test "x$enable_acl_management" != "xno"; then
+ if test "x$enable_policy_kit" = "xno"; then
+- as_fn_error "ACL management support requires building with PolicyKit support" "$LINENO" 5
++ as_fn_error $? "ACL management support requires building with PolicyKit support" "$LINENO" 5
+ fi
+ if true; then
+ HAVE_ACLMGMT_TRUE=
+@@ -17758,46 +18455,46 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
+ $as_echo_n "checking for DBUS... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_CFLAGS"; then
+- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_CFLAGS"; then
++ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "$dbus_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$DBUS_LIBS"; then
+- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$DBUS_LIBS"; then
++ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "$dbus_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -17805,14 +18502,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$dbus_module"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$dbus_module" 2>&1`
+ else
+- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dbus_module"`
++ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$dbus_module" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements ($dbus_module) were not met:
++ as_fn_error $? "Package requirements ($dbus_module) were not met:
+
+ $DBUS_PKG_ERRORS
+
+@@ -17821,12 +18518,13 @@
+
+ Alternatively, you may set the environment variables DBUS_CFLAGS
+ and DBUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -17835,13 +18533,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+ DBUS_LIBS=$pkg_cv_DBUS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -17852,46 +18550,46 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+ $as_echo_n "checking for GLIB... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GLIB_CFLAGS"; then
+- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GLIB_CFLAGS"; then
++ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$glib_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GLIB_LIBS"; then
+- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$GLIB_LIBS"; then
++ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$glib_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -17899,14 +18597,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$glib_module"`
++ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$glib_module" 2>&1`
+ else
+- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$glib_module"`
++ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$glib_module" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements ($glib_module) were not met:
++ as_fn_error $? "Package requirements ($glib_module) were not met:
+
+ $GLIB_PKG_ERRORS
+
+@@ -17915,12 +18613,13 @@
+
+ Alternatively, you may set the environment variables GLIB_CFLAGS
+ and GLIB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -17929,13 +18628,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -17960,46 +18659,46 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_ID" >&5
+ $as_echo_n "checking for VOLUME_ID... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$VOLUME_ID_CFLAGS"; then
+- pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$VOLUME_ID_CFLAGS"; then
++ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$VOLUME_ID_LIBS"; then
+- pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$VOLUME_ID_LIBS"; then
++ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -18007,14 +18706,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"`
++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$volume_id_module" 2>&1`
+ else
+- VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"`
++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$volume_id_module" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VOLUME_ID_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements ($volume_id_module) were not met:
++ as_fn_error $? "Package requirements ($volume_id_module) were not met:
+
+ $VOLUME_ID_PKG_ERRORS
+
+@@ -18023,12 +18722,13 @@
+
+ Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
+ and VOLUME_ID_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -18037,13 +18737,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS
+ VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -18064,46 +18764,46 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
+ $as_echo_n "checking for BLKID... " >&6; }
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$BLKID_CFLAGS"; then
+- pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$BLKID_CFLAGS"; then
++ pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "$blkid_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$BLKID_LIBS"; then
+- pkg_cv_BLKID_LIBS="$BLKID_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
++if test -n "$BLKID_LIBS"; then
++ pkg_cv_BLKID_LIBS="$BLKID_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "$blkid_module" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+
+ if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+@@ -18111,14 +18811,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$blkid_module"`
++ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$blkid_module" 2>&1`
+ else
+- BLKID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$blkid_module"`
++ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$blkid_module" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BLKID_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements ($blkid_module) were not met:
++ as_fn_error $? "Package requirements ($blkid_module) were not met:
+
+ $BLKID_PKG_ERRORS
+
+@@ -18127,12 +18827,13 @@
+
+ Alternatively, you may set the environment variables BLKID_CFLAGS
+ and BLKID_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -18141,13 +18842,13 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
+ BLKID_LIBS=$pkg_cv_BLKID_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- :
++
+ fi
+
+
+@@ -18164,7 +18865,7 @@
+ # Check for BLKGETSIZE64
+ ac_fn_c_check_type "$LINENO" "pgoff_t" "ac_cv_type_pgoff_t" "/usr/include/sys/types.h
+ "
+-if test "x$ac_cv_type_pgoff_t" = x""yes; then :
++if test "x$ac_cv_type_pgoff_t" = xyes; then :
+
+ else
+
+@@ -18193,7 +18894,7 @@
+ if test x$have_size64 = xno; then
+ case "$host" in
+ *-*-linux*)
+- as_fn_error "BLKGETSIZE64 is not defined" "$LINENO" 5
++ as_fn_error $? "BLKGETSIZE64 is not defined" "$LINENO" 5
+ ;;
+ *)
+ ;;
+@@ -18203,7 +18904,7 @@
+ for ac_func in getgrouplist
+ do :
+ ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
+-if test "x$ac_cv_func_getgrouplist" = x""yes; then :
++if test "x$ac_cv_func_getgrouplist" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETGROUPLIST 1
+ _ACEOF
+@@ -18214,7 +18915,7 @@
+ for ac_func in asprintf
+ do :
+ ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+-if test "x$ac_cv_func_asprintf" = x""yes; then :
++if test "x$ac_cv_func_asprintf" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_ASPRINTF 1
+ _ACEOF
+@@ -18225,7 +18926,7 @@
+ for ac_func in mallopt
+ do :
+ ac_fn_c_check_func "$LINENO" "mallopt" "ac_cv_func_mallopt"
+-if test "x$ac_cv_func_mallopt" = x""yes; then :
++if test "x$ac_cv_func_mallopt" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_MALLOPT 1
+ _ACEOF
+@@ -18236,7 +18937,7 @@
+ for ac_func in strndup
+ do :
+ ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+-if test "x$ac_cv_func_strndup" = x""yes; then :
++if test "x$ac_cv_func_strndup" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRNDUP 1
+ _ACEOF
+@@ -18251,7 +18952,7 @@
+ set dummy xmlto; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XMLTO+set}" = set; then :
++if ${ac_cv_path_XMLTO+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XMLTO in
+@@ -18301,7 +19002,7 @@
+ set dummy xmllint; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XMLLINT+set}" = set; then :
++if ${ac_cv_path_XMLLINT+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XMLLINT in
+@@ -18355,10 +19056,10 @@
+
+ if test x$enable_docbook_docs = xyes; then
+ if test x$have_xmlto = xno; then
+- as_fn_error "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5
++ as_fn_error $? "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5
+ fi
+ if test x$ve_xmllint = xno; then
+- as_fn_error "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5
++ as_fn_error $? "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5
+ fi
+ fi
+
+@@ -18671,7 +19372,7 @@
+ enableval=$enable_sonypic; case "${enableval}" in
+ yes) ENABLE_SONYPIC=yes ;;
+ no) ENABLE_SONYPIC=no ;;
+- *) as_fn_error "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;
+ esac
+
+ else
+@@ -18699,7 +19400,7 @@
+ $as_echo "$have_sonypic" >&6; }
+
+ if test "x$ENABLE_SONYPIC" = "xyes" && test "x$have_sonypic" != "xyes" ; then
+- as_fn_error "Sony PIC support explicitly requested but no support found" "$LINENO" 5
++ as_fn_error $? "Sony PIC support explicitly requested but no support found" "$LINENO" 5
+ fi
+ fi
+ if test x"$have_sonypic" = "xyes" ; then
+@@ -18806,10 +19507,21 @@
+ :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+- test "x$cache_file" != "x/dev/null" &&
++ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+- cat confcache >$cache_file
++ if test ! -f "$cache_file" || test -h "$cache_file"; then
++ cat confcache >"$cache_file"
++ else
++ case $cache_file in #(
++ */* | ?:*)
++ mv -f confcache "$cache_file"$$ &&
++ mv -f "$cache_file"$$ "$cache_file" ;; #(
++ *)
++ mv -f confcache "$cache_file" ;;
++ esac
++ fi
++ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -18825,6 +19537,7 @@
+
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -18848,223 +19561,219 @@
+ fi
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- as_fn_error "conditional \"AMDEP\" was never defined.
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${MAN_PAGES_ENABLED_TRUE}" && test -z "${MAN_PAGES_ENABLED_FALSE}"; then
+- as_fn_error "conditional \"MAN_PAGES_ENABLED\" was never defined.
++ as_fn_error $? "conditional \"MAN_PAGES_ENABLED\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++ as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ACPI_ACPID_TRUE}" && test -z "${ACPI_ACPID_FALSE}"; then
+- as_fn_error "conditional \"ACPI_ACPID\" was never defined.
++ as_fn_error $? "conditional \"ACPI_ACPID\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ACPI_PROC_TRUE}" && test -z "${ACPI_PROC_FALSE}"; then
+- as_fn_error "conditional \"ACPI_PROC\" was never defined.
++ as_fn_error $? "conditional \"ACPI_PROC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_ACPI_IBM_TRUE}" && test -z "${BUILD_ACPI_IBM_FALSE}"; then
+- as_fn_error "conditional \"BUILD_ACPI_IBM\" was never defined.
++ as_fn_error $? "conditional \"BUILD_ACPI_IBM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_ACPI_TOSHIBA_TRUE}" && test -z "${BUILD_ACPI_TOSHIBA_FALSE}"; then
+- as_fn_error "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.
++ as_fn_error $? "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_PARTED_TRUE}" && test -z "${USE_PARTED_FALSE}"; then
+- as_fn_error "conditional \"USE_PARTED\" was never defined.
++ as_fn_error $? "conditional \"USE_PARTED\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCOV_TRUE}" && test -z "${GCOV_FALSE}"; then
+- as_fn_error "conditional \"GCOV\" was never defined.
++ as_fn_error $? "conditional \"GCOV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_LIBUSB_TRUE}" && test -z "${HAVE_LIBUSB_FALSE}"; then
+- as_fn_error "conditional \"HAVE_LIBUSB\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBUSB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
+- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
+- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
+- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then
+- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_LIBPCI_TRUE}" && test -z "${HAVE_LIBPCI_FALSE}"; then
+- as_fn_error "conditional \"HAVE_LIBPCI\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBPCI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HALD_COMPILE_DUMMY_TRUE}" && test -z "${HALD_COMPILE_DUMMY_FALSE}"; then
+- as_fn_error "conditional \"HALD_COMPILE_DUMMY\" was never defined.
++ as_fn_error $? "conditional \"HALD_COMPILE_DUMMY\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HALD_COMPILE_LINUX_TRUE}" && test -z "${HALD_COMPILE_LINUX_FALSE}"; then
+- as_fn_error "conditional \"HALD_COMPILE_LINUX\" was never defined.
++ as_fn_error $? "conditional \"HALD_COMPILE_LINUX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HALD_COMPILE_FREEBSD_TRUE}" && test -z "${HALD_COMPILE_FREEBSD_FALSE}"; then
+- as_fn_error "conditional \"HALD_COMPILE_FREEBSD\" was never defined.
++ as_fn_error $? "conditional \"HALD_COMPILE_FREEBSD\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HALD_COMPILE_SOLARIS_TRUE}" && test -z "${HALD_COMPILE_SOLARIS_FALSE}"; then
+- as_fn_error "conditional \"HALD_COMPILE_SOLARIS\" was never defined.
++ as_fn_error $? "conditional \"HALD_COMPILE_SOLARIS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
+- as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
+- as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_CONKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_CONKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GPERF_TRUE}" && test -z "${HAVE_GPERF_FALSE}"; then
+- as_fn_error "conditional \"HAVE_GPERF\" was never defined.
++ as_fn_error $? "conditional \"HAVE_GPERF\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_KEYMAPS_TRUE}" && test -z "${BUILD_KEYMAPS_FALSE}"; then
+- as_fn_error "conditional \"BUILD_KEYMAPS\" was never defined.
++ as_fn_error $? "conditional \"BUILD_KEYMAPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then
+- as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then
+- as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.
++ as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then
+- as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.
++ as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_ACPI_TRUE}" && test -z "${HAVE_ACPI_FALSE}"; then
+- as_fn_error "conditional \"HAVE_ACPI\" was never defined.
++ as_fn_error $? "conditional \"HAVE_ACPI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_APM_TRUE}" && test -z "${HAVE_APM_FALSE}"; then
+- as_fn_error "conditional \"HAVE_APM\" was never defined.
++ as_fn_error $? "conditional \"HAVE_APM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PMU_TRUE}" && test -z "${HAVE_PMU_FALSE}"; then
+- as_fn_error "conditional \"HAVE_PMU\" was never defined.
++ as_fn_error $? "conditional \"HAVE_PMU\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_DEPRECATED_KEYS_TRUE}" && test -z "${BUILD_DEPRECATED_KEYS_FALSE}"; then
+- as_fn_error "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.
++ as_fn_error $? "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then
+- as_fn_error "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
++ as_fn_error $? "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${OS_TYPE_UNKNOWN_TRUE}" && test -z "${OS_TYPE_UNKNOWN_FALSE}"; then
+- as_fn_error "conditional \"OS_TYPE_UNKNOWN\" was never defined.
++ as_fn_error $? "conditional \"OS_TYPE_UNKNOWN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${OS_TYPE_RED_HAT_TRUE}" && test -z "${OS_TYPE_RED_HAT_FALSE}"; then
+- as_fn_error "conditional \"OS_TYPE_RED_HAT\" was never defined.
++ as_fn_error $? "conditional \"OS_TYPE_RED_HAT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_MACBOOKPRO_TRUE}" && test -z "${BUILD_MACBOOKPRO_FALSE}"; then
+- as_fn_error "conditional \"BUILD_MACBOOKPRO\" was never defined.
++ as_fn_error $? "conditional \"BUILD_MACBOOKPRO\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_MACBOOK_TRUE}" && test -z "${BUILD_MACBOOK_FALSE}"; then
+- as_fn_error "conditional \"BUILD_MACBOOK\" was never defined.
++ as_fn_error $? "conditional \"BUILD_MACBOOK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_IMAC_TRUE}" && test -z "${BUILD_IMAC_FALSE}"; then
+- as_fn_error "conditional \"BUILD_IMAC\" was never defined.
++ as_fn_error $? "conditional \"BUILD_IMAC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_OMAP_TRUE}" && test -z "${BUILD_OMAP_FALSE}"; then
+- as_fn_error "conditional \"BUILD_OMAP\" was never defined.
++ as_fn_error $? "conditional \"BUILD_OMAP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_CPUFREQ_TRUE}" && test -z "${BUILD_CPUFREQ_FALSE}"; then
+- as_fn_error "conditional \"BUILD_CPUFREQ\" was never defined.
++ as_fn_error $? "conditional \"BUILD_CPUFREQ\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_USBCSR_TRUE}" && test -z "${BUILD_USBCSR_FALSE}"; then
+- as_fn_error "conditional \"BUILD_USBCSR\" was never defined.
++ as_fn_error $? "conditional \"BUILD_USBCSR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_DELL_TRUE}" && test -z "${BUILD_DELL_FALSE}"; then
+- as_fn_error "conditional \"BUILD_DELL\" was never defined.
++ as_fn_error $? "conditional \"BUILD_DELL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_SONYPIC_TRUE}" && test -z "${HAVE_SONYPIC_FALSE}"; then
+- as_fn_error "conditional \"HAVE_SONYPIC\" was never defined.
++ as_fn_error $? "conditional \"HAVE_SONYPIC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -19165,6 +19874,7 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -19210,19 +19920,19 @@
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -19418,7 +20128,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -19472,7 +20182,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by hal $as_me 0.5.14, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -19512,6 +20222,7 @@
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -19534,12 +20245,13 @@
+
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ hal config.status 0.5.14
+-configured by $0, generated by GNU Autoconf 2.64,
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.68,
++ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -19557,11 +20269,16 @@
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -19575,12 +20292,15 @@
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -19593,7 +20313,7 @@
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -19602,7 +20322,7 @@
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -19656,184 +20376,208 @@
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
++enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
++SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
++ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
++PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
++host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
++host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
++host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
++build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
++build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
++build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
++SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
++Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
++GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
++EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
++FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
++LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
++NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
++LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
++exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
++AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
++STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
++lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
++CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
++compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
++GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
++objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
++need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
++LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
++libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
++need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
++version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
++install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
++striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
++predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
++postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
++predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
++postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
++LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
++reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
++reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
++GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
++lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
++archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
++export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
++allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
++no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
++inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
++link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
++always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
++export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
++include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
++prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
++file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
++hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
++predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
++postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
++predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
++postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
++compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+ LTCC='$LTCC'
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++ eval 'cat <<_LTECHO_EOF
++\$1
++_LTECHO_EOF'
++}
++
+ # Quote evaled strings.
+-for var in SED \
++for var in SHELL \
++ECHO \
++PATH_SEPARATOR \
++SED \
+ GREP \
+ EGREP \
+ FGREP \
+@@ -19846,8 +20590,13 @@
+ OBJDUMP \
+ deplibs_check_method \
+ file_magic_cmd \
++file_magic_glob \
++want_nocaseglob \
++DLLTOOL \
++sharedlib_from_linklib_cmd \
+ AR \
+ AR_FLAGS \
++archiver_list_spec \
+ STRIP \
+ RANLIB \
+ CC \
+@@ -19857,14 +20606,14 @@
+ lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+-SHELL \
+-ECHO \
++nm_file_list_spec \
+ lt_prog_compiler_no_builtin_flag \
+-lt_prog_compiler_wl \
+ lt_prog_compiler_pic \
++lt_prog_compiler_wl \
+ lt_prog_compiler_static \
+ lt_cv_prog_compiler_c_o \
+ need_locks \
++MANIFEST_TOOL \
+ DSYMUTIL \
+ NMEDIT \
+ LIPO \
+@@ -19878,9 +20627,7 @@
+ allow_undefined_flag \
+ no_undefined_flag \
+ hardcode_libdir_flag_spec \
+-hardcode_libdir_flag_spec_ld \
+ hardcode_libdir_separator \
+-fix_srcfile_path \
+ exclude_expsyms \
+ include_expsyms \
+ file_list_spec \
+@@ -19888,6 +20635,7 @@
+ libname_spec \
+ library_names_spec \
+ soname_spec \
++install_override_mode \
+ finish_eval \
+ old_striplib \
+ striplib \
+@@ -19898,10 +20646,11 @@
+ postdeps \
+ compiler_lib_search_path \
+ LD_CXX \
++reload_flag_CXX \
+ compiler_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+-lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_pic_CXX \
++lt_prog_compiler_wl_CXX \
+ lt_prog_compiler_static_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
+ export_dynamic_flag_spec_CXX \
+@@ -19911,9 +20660,7 @@
+ allow_undefined_flag_CXX \
+ no_undefined_flag_CXX \
+ hardcode_libdir_flag_spec_CXX \
+-hardcode_libdir_flag_spec_ld_CXX \
+ hardcode_libdir_separator_CXX \
+-fix_srcfile_path_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX \
+ file_list_spec_CXX \
+@@ -19923,9 +20670,9 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX; do
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -19947,11 +20694,13 @@
+ module_expsym_cmds \
+ export_symbols_cmds \
+ prelink_cmds \
++postlink_cmds \
+ postinstall_cmds \
+ postuninstall_cmds \
+ finish_cmds \
+ sys_lib_search_path_spec \
+ sys_lib_dlsearch_path_spec \
++reload_cmds_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+@@ -19960,10 +20709,11 @@
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ export_symbols_cmds_CXX \
+-prelink_cmds_CXX; do
+- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++prelink_cmds_CXX \
++postlink_cmds_CXX; do
++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -19971,12 +20721,6 @@
+ esac
+ done
+
+-# Fix-up fallback echo if it was mangled by the above quoting rules.
+-case \$lt_ECHO in
+-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+- ;;
+-esac
+-
+ ac_aux_dir='$ac_aux_dir'
+ xsi_shell='$xsi_shell'
+ lt_shell_append='$lt_shell_append'
+@@ -20054,7 +20798,7 @@
+ "doc/spec/hal-spec.xml.in") CONFIG_FILES="$CONFIG_FILES doc/spec/hal-spec.xml.in" ;;
+ "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
+
+- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+ done
+
+@@ -20077,9 +20821,10 @@
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- tmp=
++ tmp= ac_tmp=
+ trap 'exit_status=$?
+- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++ : "${ac_tmp:=$tmp}"
++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -20087,12 +20832,13 @@
+
+ {
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+- test -n "$tmp" && test -d "$tmp"
++ test -d "$tmp"
+ } ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -20109,12 +20855,12 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\r'
++ ac_cs_awk_cr='\\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+
+
+@@ -20123,18 +20869,18 @@
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -20142,7 +20888,7 @@
+ rm -f conf$$subs.sh
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -20156,7 +20902,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -20170,7 +20916,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -20190,7 +20936,7 @@
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+@@ -20222,21 +20968,29 @@
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+ cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -20248,7 +21002,7 @@
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+@@ -20260,11 +21014,11 @@
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_t"; then
++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -20349,7 +21103,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -20362,7 +21116,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -20381,7 +21135,7 @@
+ for ac_f
+ do
+ case $ac_f in
+- -) ac_f="$tmp/stdin";;
++ -) ac_f="$ac_tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+@@ -20390,7 +21144,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -20416,8 +21170,8 @@
+ esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ *:-:* | *:-) cat >"$ac_tmp/stdin" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -20553,23 +21307,24 @@
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
++ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+- rm -f "$tmp/stdin"
++ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -20578,21 +21333,21 @@
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+- } >"$tmp/config.h" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
+- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++ } >"$ac_tmp/config.h" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+- mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ mv "$ac_tmp/config.h" "$ac_file" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error "could not create -" "$LINENO" 5
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -20753,7 +21508,8 @@
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -20801,6 +21557,15 @@
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# An echo program that protects backslashes.
++ECHO=$lt_ECHO
++
++# The PATH separator for the build system.
++PATH_SEPARATOR=$lt_PATH_SEPARATOR
++
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -20850,9 +21615,11 @@
+ # turn newlines into spaces.
+ NL2SP=$lt_lt_NL2SP
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
++# convert \$build file names to \$host format.
++to_host_file_cmd=$lt_cv_to_host_file_cmd
++
++# convert \$build files to toolchain format.
++to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+ # An object symbol dumper.
+ OBJDUMP=$lt_OBJDUMP
+@@ -20860,13 +21627,30 @@
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+
+-# Command to use when deplibs_check_method == "file_magic".
++# Command to use when deplibs_check_method = "file_magic".
+ file_magic_cmd=$lt_file_magic_cmd
+
++# How to find potential files when deplibs_check_method = "file_magic".
++file_magic_glob=$lt_file_magic_glob
++
++# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
++want_nocaseglob=$lt_want_nocaseglob
++
++# DLL creation program.
++DLLTOOL=$lt_DLLTOOL
++
++# Command to associate shared and link libraries.
++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
++
+ # The archiver.
+ AR=$lt_AR
++
++# Flags to create an archive.
+ AR_FLAGS=$lt_AR_FLAGS
+
++# How to feed a file listing to the archiver.
++archiver_list_spec=$lt_archiver_list_spec
++
+ # A symbol stripping program.
+ STRIP=$lt_STRIP
+
+@@ -20875,6 +21659,9 @@
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
++# Whether to use a lock for old archive extraction.
++lock_old_archive_extraction=$lock_old_archive_extraction
++
+ # A C compiler.
+ LTCC=$lt_CC
+
+@@ -20893,14 +21680,14 @@
+ # Transform the output of nm in a C name address pair when lib prefix is needed.
+ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++# Specify filename containing input files for \$NM.
++nm_file_list_spec=$lt_nm_file_list_spec
+
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++# The root where to search for dependent libraries,and in which our libraries should be installed.
++lt_sysroot=$lt_sysroot
+
+-# An echo program that does not interpret backslashes.
+-ECHO=$lt_ECHO
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+
+ # Used to examine libraries when file_magic_cmd begins with "file".
+ MAGIC_CMD=$MAGIC_CMD
+@@ -20908,6 +21695,9 @@
+ # Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
++# Manifest tool.
++MANIFEST_TOOL=$lt_MANIFEST_TOOL
++
+ # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+ DSYMUTIL=$lt_DSYMUTIL
+
+@@ -20964,6 +21754,9 @@
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+
++# Permission mode override for installation of shared libraries.
++install_override_mode=$lt_install_override_mode
++
+ # Command to use after installation of a shared archive.
+ postinstall_cmds=$lt_postinstall_cmds
+
+@@ -21003,6 +21796,10 @@
+ # The linker used to build libraries.
+ LD=$lt_LD
+
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds
+
+@@ -21015,12 +21812,12 @@
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl
+-
+ # Additional compiler flags for building library objects.
+ pic_flag=$lt_lt_prog_compiler_pic
+
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_lt_prog_compiler_static
+
+@@ -21070,10 +21867,6 @@
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking. This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+-
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+@@ -21107,9 +21900,6 @@
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$link_all_deplibs
+
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path=$lt_fix_srcfile_path
+-
+ # Set to "yes" if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+
+@@ -21125,6 +21915,9 @@
+ # Commands necessary for linking programs (against libraries) with templates.
+ prelink_cmds=$lt_prelink_cmds
+
++# Commands necessary for finishing linking programs.
++postlink_cmds=$lt_postlink_cmds
++
+ # Specify filename containing input files.
+ file_list_spec=$lt_file_list_spec
+
+@@ -21171,212 +21964,169 @@
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
+-
+- case $xsi_shell in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+-}
+-
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result="${1##*/}"
+-}
+-
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-# dirname: Compute the dirname of FILE. If nonempty,
+-# add APPEND to the result, otherwise set result
+-# to NONDIR_REPLACEMENT.
+-# value returned in "$func_dirname_result"
+-# basename: Compute filename of FILE.
+-# value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+- func_basename_result="${1##*/}"
+-}
+-
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-func_stripname ()
+-{
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary parameter first.
+- func_stripname_result=${3}
+- func_stripname_result=${func_stripname_result#"${1}"}
+- func_stripname_result=${func_stripname_result%"${2}"}
+-}
+-
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=${1%%=*}
+- func_opt_split_arg=${1#*=}
+-}
+-
+-# func_lo2o object
+-func_lo2o ()
+-{
+- case ${1} in
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+- *) func_lo2o_result=${1} ;;
+- esac
+-}
+-
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=${1%.*}.lo
+-}
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=$(( $* ))
+-}
+-
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=${#1}
+-}
+-
+-_LT_EOF
+- ;;
+- *) # Bourne compatible functions.
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+-}
+-
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+-}
+-
+-
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-# func_strip_suffix prefix name
+-func_stripname ()
+-{
+- case ${2} in
+- .*) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "X${3}" \
+- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+- esac
+-}
+-
+-# sed scripts:
+-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+-my_sed_long_arg='1s/^-[^=]*=//'
+-
+-# func_opt_split
+-func_opt_split ()
+-{
+- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+-}
+-
+-# func_lo2o object
+-func_lo2o ()
+-{
+- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+-}
+-
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+-}
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=`expr "$@"`
+-}
+-
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
+-
+-_LT_EOF
+-esac
+-
+-case $lt_shell_append in
+- yes)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$1+=\$2"
+-}
+-_LT_EOF
+- ;;
+- *)
+- cat << \_LT_EOF >> "$cfgfile"
+-
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "$1=\$$1\$2"
+-}
+-
+-_LT_EOF
+- ;;
+- esac
++ sed '$q' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
+
++ if test x"$xsi_shell" = xyes; then
++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
++func_dirname ()\
++{\
++\ case ${1} in\
++\ */*) func_dirname_result="${1%/*}${2}" ;;\
++\ * ) func_dirname_result="${3}" ;;\
++\ esac\
++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_basename ()$/,/^} # func_basename /c\
++func_basename ()\
++{\
++\ func_basename_result="${1##*/}"\
++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
++func_dirname_and_basename ()\
++{\
++\ case ${1} in\
++\ */*) func_dirname_result="${1%/*}${2}" ;;\
++\ * ) func_dirname_result="${3}" ;;\
++\ esac\
++\ func_basename_result="${1##*/}"\
++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
++func_stripname ()\
++{\
++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
++\ # positional parameters, so assign one to ordinary parameter first.\
++\ func_stripname_result=${3}\
++\ func_stripname_result=${func_stripname_result#"${1}"}\
++\ func_stripname_result=${func_stripname_result%"${2}"}\
++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
++func_split_long_opt ()\
++{\
++\ func_split_long_opt_name=${1%%=*}\
++\ func_split_long_opt_arg=${1#*=}\
++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
++func_split_short_opt ()\
++{\
++\ func_split_short_opt_arg=${1#??}\
++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
++func_lo2o ()\
++{\
++\ case ${1} in\
++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
++\ *) func_lo2o_result=${1} ;;\
++\ esac\
++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_xform ()$/,/^} # func_xform /c\
++func_xform ()\
++{\
++ func_xform_result=${1%.*}.lo\
++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_arith ()$/,/^} # func_arith /c\
++func_arith ()\
++{\
++ func_arith_result=$(( $* ))\
++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_len ()$/,/^} # func_len /c\
++func_len ()\
++{\
++ func_len_result=${#1}\
++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++fi
++
++if test x"$lt_shell_append" = xyes; then
++ sed -e '/^func_append ()$/,/^} # func_append /c\
++func_append ()\
++{\
++ eval "${1}+=\\${2}"\
++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
++func_append_quoted ()\
++{\
++\ func_quote_for_eval "${2}"\
++\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++test 0 -eq $? || _lt_function_replace_fail=:
++
++
++ # Save a `func_append' function call where possible by direct use of '+='
++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++ test 0 -eq $? || _lt_function_replace_fail=:
++else
++ # Save a `func_append' function call even when '+=' is not available
++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
++ && mv -f "$cfgfile.tmp" "$cfgfile" \
++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
++ test 0 -eq $? || _lt_function_replace_fail=:
++fi
++
++if test x"$_lt_function_replace_fail" = x":"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
++fi
+
+- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
+
+- mv -f "$cfgfile" "$ofile" ||
++ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+
+@@ -21388,6 +22138,10 @@
+ # The linker used to build libraries.
+ LD=$lt_LD_CXX
+
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag_CXX
++reload_cmds=$lt_reload_cmds_CXX
++
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds_CXX
+
+@@ -21400,12 +22154,12 @@
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+ # Additional compiler flags for building library objects.
+ pic_flag=$lt_lt_prog_compiler_pic_CXX
+
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+@@ -21455,10 +22209,6 @@
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking. This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+-
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+@@ -21492,9 +22242,6 @@
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$link_all_deplibs_CXX
+
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path=$lt_fix_srcfile_path_CXX
+-
+ # Set to "yes" if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+
+@@ -21510,6 +22257,9 @@
+ # Commands necessary for linking programs (against libraries) with templates.
+ prelink_cmds=$lt_prelink_cmds_CXX
+
++# Commands necessary for finishing linking programs.
++postlink_cmds=$lt_postlink_cmds_CXX
++
+ # Specify filename containing input files.
+ file_list_spec=$lt_file_list_spec_CXX
+
+@@ -21544,7 +22294,7 @@
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -21565,7 +22315,7 @@
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+diff -u -r hal-0.5.14/configure.in src/hal-0.5.14/configure.in
+--- hal-0.5.14/configure.in 2009-08-24 14:42:29.000000000 +0200
++++ src/hal-0.5.14/configure.in 2011-12-19 20:39:54.000000000 +0100
+@@ -479,9 +479,6 @@
+ fi
+ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
+
+-USE_LIBUSB20=no
+-USE_LIBUSB=no
+-LIBUSB20_LIBS=""
+ AC_ARG_WITH([backend],
+ AS_HELP_STRING([--with-backend=<name>],
+ [backend to use (linux/solaris/freebsd/dummy)]),
+@@ -510,21 +507,25 @@
+ AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
+ AC_SUBST(HALD_BACKEND)
+ if test "x$HALD_BACKEND" = "xfreebsd"; then
+- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
+-fi
+-if test "x$USE_LIBUSB20" = "xno"; then
+- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
+-fi
+-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
+-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
+-if test "x$USE_LIBUSB20" = "xyes"; then
+- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
+- LIBUSB20_LIBS="-lusb20"
+-elif test "x$USE_LIBUSB" = "xyes"; then
+- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
+- LIBUSB20_LIBS="-lusb"
++ USE_BSDLIBUSB20=no
++ USE_BSDLIBUSB=no
++ LIBUSB20_LIBS=""
++ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
++ if test "x$USE_BSDLIBUSB20" = "xno"; then
++ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
++ fi
++ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
++ if test "x$USE_BSDLIBUSB20" = "xyes"; then
++ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
++ LIBUSB20_LIBS="-lusb20"
++ elif test "x$USE_BSDLIBUSB" = "xyes"; then
++ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
++ LIBUSB20_LIBS="-lusb"
++ fi
++ AC_SUBST(LIBUSB20_LIBS)
++else
++ AM_CONDITIONAL([HAVE_LIBUSB20], [false])
+ fi
+-AC_SUBST(LIBUSB20_LIBS)
+
+ dnl DBUS API is subject to changes
+ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
+Only in src/hal-0.5.14/doc/api/libhal: Makefile
+diff -u -r hal-0.5.14/doc/api/libhal/Makefile.in src/hal-0.5.14/doc/api/libhal/Makefile.in
+--- hal-0.5.14/doc/api/libhal/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/doc/api/libhal/Makefile.in 2011-12-19 20:40:15.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -89,6 +89,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -131,6 +132,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -151,6 +153,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -173,6 +177,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -206,7 +211,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/doc/api/libhal-storage: Makefile
+diff -u -r hal-0.5.14/doc/api/libhal-storage/Makefile.in src/hal-0.5.14/doc/api/libhal-storage/Makefile.in
+--- hal-0.5.14/doc/api/libhal-storage/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/doc/api/libhal-storage/Makefile.in 2011-12-19 20:40:15.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -89,6 +89,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -131,6 +132,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -151,6 +153,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -173,6 +177,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -206,7 +211,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/doc/api: Makefile
+diff -u -r hal-0.5.14/doc/api/Makefile.in src/hal-0.5.14/doc/api/Makefile.in
+--- hal-0.5.14/doc/api/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/doc/api/Makefile.in 2011-12-19 20:40:15.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -122,6 +122,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -164,6 +165,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -184,6 +186,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -206,6 +210,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -239,7 +244,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -309,7 +313,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -334,7 +338,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/doc: Makefile
+diff -u -r hal-0.5.14/doc/Makefile.in src/hal-0.5.14/doc/Makefile.in
+--- hal-0.5.14/doc/Makefile.in 2009-11-30 23:22:35.000000000 +0100
++++ src/hal-0.5.14/doc/Makefile.in 2011-12-19 20:40:15.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -122,6 +122,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -164,6 +165,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -184,6 +186,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -206,6 +210,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -239,7 +244,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -309,7 +313,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -334,7 +338,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/doc/man: Makefile
+diff -u -r hal-0.5.14/doc/man/Makefile.in src/hal-0.5.14/doc/man/Makefile.in
+--- hal-0.5.14/doc/man/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/doc/man/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -109,6 +109,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -151,6 +152,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -171,6 +173,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -193,6 +197,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -226,7 +231,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/doc/spec: Makefile
+diff -u -r hal-0.5.14/doc/spec/Makefile.in src/hal-0.5.14/doc/spec/Makefile.in
+--- hal-0.5.14/doc/spec/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/doc/spec/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -107,6 +107,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -149,6 +150,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -169,6 +171,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -191,6 +195,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -224,7 +229,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/information/10freedesktop: Makefile
+diff -u -r hal-0.5.14/fdi/information/10freedesktop/Makefile.in src/hal-0.5.14/fdi/information/10freedesktop/Makefile.in
+--- hal-0.5.14/fdi/information/10freedesktop/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/fdi/information/10freedesktop/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -109,6 +109,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -151,6 +152,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -171,6 +173,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -193,6 +197,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -226,7 +231,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/information/20thirdparty: Makefile
+diff -u -r hal-0.5.14/fdi/information/20thirdparty/Makefile.in src/hal-0.5.14/fdi/information/20thirdparty/Makefile.in
+--- hal-0.5.14/fdi/information/20thirdparty/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/information/20thirdparty/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -107,6 +107,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -149,6 +150,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -169,6 +171,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -191,6 +195,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -224,7 +229,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/information: Makefile
+diff -u -r hal-0.5.14/fdi/information/Makefile.in src/hal-0.5.14/fdi/information/Makefile.in
+--- hal-0.5.14/fdi/information/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/information/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -147,6 +147,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -189,6 +190,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -209,6 +211,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -231,6 +235,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -264,7 +269,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -351,7 +355,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -376,7 +380,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/fdi: Makefile
+diff -u -r hal-0.5.14/fdi/Makefile.in src/hal-0.5.14/fdi/Makefile.in
+--- hal-0.5.14/fdi/Makefile.in 2009-11-30 23:22:36.000000000 +0100
++++ src/hal-0.5.14/fdi/Makefile.in 2011-12-19 20:40:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -147,6 +147,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -189,6 +190,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -209,6 +211,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -231,6 +235,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -264,7 +269,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -352,7 +356,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -377,7 +381,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -u -r hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi src/hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi
+--- hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi 2009-06-26 09:28:39.000000000 +0200
++++ src/hal-0.5.14/fdi/policy/10osvendor/10-x11-input.fdi 2011-12-19 20:39:54.000000000 +0100
+@@ -2,6 +2,12 @@
+ <deviceinfo version="0.2">
+ <device>
+
++ <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
++ set by hal and doesn't get picked up by default -->
++ <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
++ <merge key="input.x11_driver" type="string">evdev</merge>
++ </match>
++
+ <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
+ <match key="input.product" contains="QEMU USB Tablet">
+ <merge key="input.x11_driver" type="string">evdev</merge>
+@@ -16,6 +22,14 @@
+ </match>
+ </match>
+
++ <match key="info.capabilities" contains="input.touchpad">
++ <merge key="input.x11_driver" type="string">mouse</merge>
++ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
++ string="Linux">
++ <merge key="input.x11_driver" type="string">evdev</merge>
++ </match>
++ </match>
++
+ <match key="info.capabilities" contains="input.tablet">
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+ string="Linux">
+@@ -32,5 +46,18 @@
+ <merge key="input.x11_driver" type="string">evdev</merge>
+ </match>
+ </match>
++
++ <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442
++ Posts accel data through ABS_X/ABS_Y, makes X unusable -->
++ <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
++ <remove key="input.x11_driver" />
++ </match>
++
++ <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
++ Mouse does not move in PV Xen guest -->
++ <match key="info.product" contains="Xen Virtual Pointer">
++ <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
++ <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
++ </match>
+ </device>
+ </deviceinfo>
+Only in src/hal-0.5.14/fdi/policy/10osvendor: 10-x11-input.fdi.orig
+diff -u -r hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi src/hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi
+--- hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi 2009-11-05 15:09:01.000000000 +0100
++++ src/hal-0.5.14/fdi/policy/10osvendor/20-storage-methods.fdi 2011-12-19 20:39:54.000000000 +0100
+@@ -99,6 +99,11 @@
+ </match>
+ </match>
+
++ <!-- Hide partitions marked as Compaq Diagnostics -->
++ <match key="volume.partition.type" string="0x12">
++ <merge key="volume.ignore" type="bool">true</merge>
++ </match>
++
+ <!-- EFI firmware partitions -->
+ <match key="volume.fstype" string="vfat">
+ <match key="volume.label" string="EFI">
+Only in src/hal-0.5.14/fdi/policy/10osvendor: 20-storage-methods.fdi.orig
+Only in src/hal-0.5.14/fdi/policy/10osvendor: Makefile
+diff -u -r hal-0.5.14/fdi/policy/10osvendor/Makefile.in src/hal-0.5.14/fdi/policy/10osvendor/Makefile.in
+--- hal-0.5.14/fdi/policy/10osvendor/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/policy/10osvendor/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -127,6 +127,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -169,6 +170,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -189,6 +191,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -211,6 +215,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -244,7 +249,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/policy/20thirdparty: Makefile
+diff -u -r hal-0.5.14/fdi/policy/20thirdparty/Makefile.in src/hal-0.5.14/fdi/policy/20thirdparty/Makefile.in
+--- hal-0.5.14/fdi/policy/20thirdparty/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/policy/20thirdparty/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -107,6 +107,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -149,6 +150,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -169,6 +171,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -191,6 +195,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -224,7 +229,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/policy: Makefile
+diff -u -r hal-0.5.14/fdi/policy/Makefile.in src/hal-0.5.14/fdi/policy/Makefile.in
+--- hal-0.5.14/fdi/policy/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/policy/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -147,6 +147,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -189,6 +190,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -209,6 +211,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -231,6 +235,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -264,7 +269,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -351,7 +355,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -376,7 +380,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/fdi/preprobe/10freedesktop: Makefile
+diff -u -r hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in src/hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in
+--- hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/preprobe/10freedesktop/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -107,6 +107,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -149,6 +150,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -169,6 +171,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -191,6 +195,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -224,7 +229,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/preprobe/20thirdparty: Makefile
+diff -u -r hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in src/hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in
+--- hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in 2009-11-30 23:22:37.000000000 +0100
++++ src/hal-0.5.14/fdi/preprobe/20thirdparty/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -107,6 +107,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -149,6 +150,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -169,6 +171,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -191,6 +195,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -224,7 +229,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/fdi/preprobe: Makefile
+diff -u -r hal-0.5.14/fdi/preprobe/Makefile.in src/hal-0.5.14/fdi/preprobe/Makefile.in
+--- hal-0.5.14/fdi/preprobe/Makefile.in 2009-11-30 23:22:38.000000000 +0100
++++ src/hal-0.5.14/fdi/preprobe/Makefile.in 2011-12-19 20:40:17.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -147,6 +147,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -189,6 +190,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -209,6 +211,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -231,6 +235,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -264,7 +269,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -351,7 +355,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -376,7 +380,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -u -r hal-0.5.14/hal.conf src/hal-0.5.14/hal.conf
+--- hal-0.5.14/hal.conf 2009-11-30 23:24:16.000000000 +0100
++++ src/hal-0.5.14/hal.conf 2011-12-19 20:41:06.000000000 +0100
+@@ -6,8 +6,8 @@
+ <!-- This configuration file specifies the required security policies
+ for the HAL to work. -->
+
+- <!-- Only root or user haldaemon can own the HAL service -->
+- <policy user="haldaemon">
++ <!-- Only root or user hal can own the HAL service -->
++ <policy user="hal">
+ <allow own="org.freedesktop.Hal"/>
+ </policy>
+ <policy user="root">
+@@ -25,7 +25,41 @@
+ send_interface="org.freedesktop.Hal.Device"/>
+ <allow send_destination="org.freedesktop.Hal"
+ send_interface="org.freedesktop.Hal.Manager"/>
++ </policy>
+
++ <!-- Only allow users at the local console to manipulate devices -->
++ <policy at_console="true">
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.DockStation"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Leds"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.LightSensor"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Storage"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Volume"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
++
++ </policy>
++
++ <!-- well,...and root too -->
++ <policy user="root">
+ <allow send_destination="org.freedesktop.Hal"
+ send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
+ <allow send_destination="org.freedesktop.Hal"
+diff -u -r hal-0.5.14/hal.conf.in src/hal-0.5.14/hal.conf.in
+--- hal-0.5.14/hal.conf.in 2009-02-04 23:07:23.000000000 +0100
++++ src/hal-0.5.14/hal.conf.in 2011-12-19 20:39:54.000000000 +0100
+@@ -25,7 +25,41 @@
+ send_interface="org.freedesktop.Hal.Device"/>
+ <allow send_destination="org.freedesktop.Hal"
+ send_interface="org.freedesktop.Hal.Manager"/>
++ </policy>
+
++ <!-- Only allow users at the local console to manipulate devices -->
++ <policy at_console="true">
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.DockStation"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Leds"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.LightSensor"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Storage"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Volume"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++ <allow send_destination="org.freedesktop.Hal"
++ send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
++
++ </policy>
++
++ <!-- well,...and root too -->
++ <policy user="root">
+ <allow send_destination="org.freedesktop.Hal"
+ send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
+ <allow send_destination="org.freedesktop.Hal"
+Only in src/hal-0.5.14/hald: .deps
+Only in src/hal-0.5.14/hald/dummy: .deps
+Only in src/hal-0.5.14/hald/dummy: libhald_dummy.la
+Only in src/hal-0.5.14/hald/dummy: .libs
+Only in src/hal-0.5.14/hald/dummy: Makefile
+diff -u -r hal-0.5.14/hald/dummy/Makefile.in src/hal-0.5.14/hald/dummy/Makefile.in
+--- hal-0.5.14/hald/dummy/Makefile.in 2009-11-30 23:22:38.000000000 +0100
++++ src/hal-0.5.14/hald/dummy/Makefile.in 2011-12-19 20:40:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -112,6 +112,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -154,6 +155,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -174,6 +176,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -196,6 +200,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -229,7 +234,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/hald/dummy: osspec.lo
+Only in src/hal-0.5.14/hald/freebsd/addons: .deps
+Only in src/hal-0.5.14/hald/freebsd/addons: Makefile
+diff -u -r hal-0.5.14/hald/freebsd/addons/Makefile.in src/hal-0.5.14/hald/freebsd/addons/Makefile.in
+--- hal-0.5.14/hald/freebsd/addons/Makefile.in 2009-11-30 23:22:39.000000000 +0100
++++ src/hal-0.5.14/hald/freebsd/addons/Makefile.in 2011-12-19 20:40:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -127,6 +127,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -169,6 +170,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -189,6 +191,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -211,6 +215,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -244,7 +249,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/hald/freebsd: .deps
+Only in src/hal-0.5.14/hald/freebsd/libprobe: .deps
+Only in src/hal-0.5.14/hald/freebsd/libprobe: Makefile
+diff -u -r hal-0.5.14/hald/freebsd/libprobe/Makefile.in src/hal-0.5.14/hald/freebsd/libprobe/Makefile.in
+--- hal-0.5.14/hald/freebsd/libprobe/Makefile.in 2009-11-30 23:22:39.000000000 +0100
++++ src/hal-0.5.14/hald/freebsd/libprobe/Makefile.in 2011-12-19 20:40:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -118,6 +118,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -160,6 +161,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -180,6 +182,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -202,6 +206,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -235,7 +240,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/hald/freebsd: Makefile
+diff -u -r hal-0.5.14/hald/freebsd/Makefile.in src/hal-0.5.14/hald/freebsd/Makefile.in
+--- hal-0.5.14/hald/freebsd/Makefile.in 2009-11-30 23:22:38.000000000 +0100
++++ src/hal-0.5.14/hald/freebsd/Makefile.in 2011-12-19 20:40:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -173,6 +173,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -215,6 +216,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -235,6 +237,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -257,6 +261,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -290,7 +295,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -438,7 +442,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -463,7 +467,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/hald/freebsd/probing: .deps
+Only in src/hal-0.5.14/hald/freebsd/probing: Makefile
+diff -u -r hal-0.5.14/hald/freebsd/probing/Makefile.in src/hal-0.5.14/hald/freebsd/probing/Makefile.in
+--- hal-0.5.14/hald/freebsd/probing/Makefile.in 2009-11-30 23:22:39.000000000 +0100
++++ src/hal-0.5.14/hald/freebsd/probing/Makefile.in 2011-12-19 20:40:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -167,6 +167,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -209,6 +210,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -229,6 +231,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -251,6 +255,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -284,7 +289,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+diff -u -r hal-0.5.14/hald/linux/addons/addon-imac-backlight.c src/hal-0.5.14/hald/linux/addons/addon-imac-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-imac-backlight.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/addons/addon-imac-backlight.c 2011-12-19 20:39:54.000000000 +0100
+@@ -158,7 +158,8 @@
+ goto out;
+ }
+
+- if (ioperm(0xB2, 0xB3, 1) < 0)
++ /* Allow access to ports 0xB2 and 0xB3 */
++ if (ioperm(0xB2, 2, 1) < 0)
+ {
+ HAL_ERROR (("ioperm failed (you should be root)."));
+ exit(1);
+diff -u -r hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c src/hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c
+--- hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c 2011-12-19 20:39:54.000000000 +0100
+@@ -507,7 +507,8 @@
+ state = INREG(0x7ae4);
+ OUTREG(0x7ae4, state);
+
+- if (ioperm (0x300, 0x304, 1) < 0) {
++ /* Allow access to porta 0x300 through 0x304 */
++ if (ioperm (0x300, 5, 1) < 0) {
+ HAL_ERROR (("ioperm failed (you should be root)."));
+ exit(1);
+ }
+Only in src/hal-0.5.14/hald/linux/addons: .deps
+Only in src/hal-0.5.14/hald/linux/addons: Makefile
+diff -u -r hal-0.5.14/hald/linux/addons/Makefile.in src/hal-0.5.14/hald/linux/addons/Makefile.in
+--- hal-0.5.14/hald/linux/addons/Makefile.in 2009-11-30 23:22:39.000000000 +0100
++++ src/hal-0.5.14/hald/linux/addons/Makefile.in 2011-12-19 20:40:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -311,6 +311,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -353,6 +354,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -373,6 +375,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -395,6 +399,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -428,7 +433,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/hald/linux: .deps
+Only in src/hal-0.5.14/hald/linux: Makefile
+diff -u -r hal-0.5.14/hald/linux/Makefile.in src/hal-0.5.14/hald/linux/Makefile.in
+--- hal-0.5.14/hald/linux/Makefile.in 2009-11-30 23:22:39.000000000 +0100
++++ src/hal-0.5.14/hald/linux/Makefile.in 2011-12-19 20:40:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -169,6 +169,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -211,6 +212,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -231,6 +233,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -253,6 +257,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -286,7 +291,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -418,7 +422,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -443,7 +447,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -u -r hal-0.5.14/hald/linux/osspec.c src/hal-0.5.14/hald/linux/osspec.c
+--- hal-0.5.14/hald/linux/osspec.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/osspec.c 2011-12-19 20:39:54.000000000 +0100
+@@ -215,6 +215,11 @@
+ g_free (str);
+ }
+ g_free (dstr);
++ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) {
++ if (strtoul(&key[33], NULL, 10) == 1) {
++ HAL_INFO (("ignoring device requested by DM udev rules"));
++ goto invalid;
++ }
+ }
+ }
+
+Only in src/hal-0.5.14/hald/linux/probing: .deps
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-hiddev
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-ieee1394-unit
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-input
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-net-bluetooth
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-pc-floppy
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-printer
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-serial
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-smbios
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-storage
+Only in src/hal-0.5.14/hald/linux/probing: hald-probe-volume
+Only in src/hal-0.5.14/hald/linux/probing: .libs
+Only in src/hal-0.5.14/hald/linux/probing: linux_dvd_rw_utils.o
+Only in src/hal-0.5.14/hald/linux/probing: logger.o
+Only in src/hal-0.5.14/hald/linux/probing: Makefile
+diff -u -r hal-0.5.14/hald/linux/probing/Makefile.in src/hal-0.5.14/hald/linux/probing/Makefile.in
+--- hal-0.5.14/hald/linux/probing/Makefile.in 2009-11-30 23:22:40.000000000 +0100
++++ src/hal-0.5.14/hald/linux/probing/Makefile.in 2011-12-19 20:40:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -183,6 +183,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -225,6 +226,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -245,6 +247,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -267,6 +271,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -300,7 +305,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+diff -u -r hal-0.5.14/hald/linux/probing/probe-hiddev.c src/hal-0.5.14/hald/linux/probing/probe-hiddev.c
+--- hal-0.5.14/hald/linux/probing/probe-hiddev.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-hiddev.c 2011-12-19 20:39:54.000000000 +0100
+@@ -57,11 +57,12 @@
+ /* assume failure */
+ ret = 1;
+
++ dbus_error_init (&error);
++
+ udi = getenv ("UDI");
+ if (udi == NULL)
+ goto out;
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-hiddev.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c src/hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c
+--- hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-ieee1394-unit.c 2011-12-19 20:39:54.000000000 +0100
+@@ -388,6 +388,8 @@
+
+ setup_logger ();
+
++ dbus_error_init (&error);
++
+ udi = getenv ("UDI");
+ if (udi == NULL)
+ goto out;
+@@ -396,7 +398,6 @@
+ if (ieee1394_udi == NULL)
+ goto out;
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-ieee1394-unit.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-input.c src/hal-0.5.14/hald/linux/probing/probe-input.c
+--- hal-0.5.14/hald/linux/probing/probe-input.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-input.c 2011-12-19 20:39:54.000000000 +0100
+@@ -70,6 +70,7 @@
+ fd = -1;
+
+ setup_logger ();
++ dbus_error_init (&error);
+
+ button_type = getenv ("HAL_PROP_BUTTON_TYPE");
+ if (button_type == NULL)
+@@ -96,7 +97,6 @@
+ if (udi == NULL)
+ goto out;
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-input.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c src/hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c
+--- hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-net-bluetooth.c 2011-12-19 20:39:54.000000000 +0100
+@@ -141,6 +141,8 @@
+ DBusMessage *reply = NULL;
+ DBusError error;
+
++ dbus_error_init (&error);
++
+ udi = getenv ("UDI");
+ if (udi == NULL)
+ goto out;
+@@ -151,8 +153,6 @@
+
+ HAL_INFO (("Investigating '%s'", iface));
+
+- dbus_error_init (&error);
+-
+ if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-net-bluetooth.o
+Only in src/hal-0.5.14/hald/linux/probing: probe-pc-floppy.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-printer.c src/hal-0.5.14/hald/linux/probing/probe-printer.c
+--- hal-0.5.14/hald/linux/probing/probe-printer.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-printer.c 2011-12-19 20:39:54.000000000 +0100
+@@ -66,6 +66,8 @@
+ ret = 1;
+
+ setup_logger ();
++
++ dbus_error_init (&error);
+
+ udi = getenv ("UDI");
+ if (udi == NULL) {
+@@ -73,7 +75,6 @@
+ goto out;
+ }
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ HAL_ERROR (("ctx init failed"));
+ goto out;
+Only in src/hal-0.5.14/hald/linux/probing: probe-printer.o
+Only in src/hal-0.5.14/hald/linux/probing: probe-serial.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-smbios.c src/hal-0.5.14/hald/linux/probing/probe-smbios.c
+--- hal-0.5.14/hald/linux/probing/probe-smbios.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-smbios.c 2011-12-19 20:39:54.000000000 +0100
+@@ -129,6 +129,8 @@
+ ret = 1;
+
+ setup_logger ();
++
++ dbus_error_init (&error);
+
+ udi = getenv ("UDI");
+ if (udi == NULL) {
+@@ -136,7 +138,6 @@
+ goto out;
+ }
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ HAL_ERROR (("ctx init failed"));
+ goto out;
+Only in src/hal-0.5.14/hald/linux/probing: probe-smbios.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-storage.c src/hal-0.5.14/hald/linux/probing/probe-storage.c
+--- hal-0.5.14/hald/linux/probing/probe-storage.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-storage.c 2011-12-19 20:39:54.000000000 +0100
+@@ -109,6 +109,8 @@
+ /* assume failure */
+ ret = 1;
+
++ dbus_error_init (&error);
++
+ if ((udi = getenv ("UDI")) == NULL)
+ goto out;
+ if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
+@@ -127,7 +129,6 @@
+ else
+ only_check_for_fs = FALSE;
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-storage.o
+diff -u -r hal-0.5.14/hald/linux/probing/probe-video4linux.c src/hal-0.5.14/hald/linux/probing/probe-video4linux.c
+--- hal-0.5.14/hald/linux/probing/probe-video4linux.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-video4linux.c 2011-12-19 20:44:20.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/videodev2.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -58,6 +58,8 @@
+
+ setup_logger ();
+
++ dbus_error_init (&error);
++
+ device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
+ if (device_file == NULL)
+ goto out;
+@@ -66,7 +68,6 @@
+ if (udi == NULL)
+ goto out;
+
+- dbus_error_init (&error);
+ ctx = libhal_ctx_init_direct (&error);
+ if (ctx == NULL)
+ goto out;
+diff -u -r hal-0.5.14/hald/linux/probing/probe-volume.c src/hal-0.5.14/hald/linux/probing/probe-volume.c
+--- hal-0.5.14/hald/linux/probing/probe-volume.c 2009-08-24 14:42:30.000000000 +0200
++++ src/hal-0.5.14/hald/linux/probing/probe-volume.c 2011-12-19 20:39:54.000000000 +0100
+@@ -318,6 +318,8 @@
+ /* assume failure */
+ ret = 1;
+
++ dbus_error_init (&error);
++
+ if ((udi = getenv ("UDI")) == NULL)
+ goto out;
+ if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
+@@ -346,7 +348,6 @@
+
+ fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
+
+- dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
+ goto out;
+
+Only in src/hal-0.5.14/hald/linux/probing: probe-volume.o
+Only in src/hal-0.5.14/hald/linux/probing: util_helper.o
+Only in src/hal-0.5.14/hald: Makefile
+diff -u -r hal-0.5.14/hald/Makefile.in src/hal-0.5.14/hald/Makefile.in
+--- hal-0.5.14/hald/Makefile.in 2009-11-30 23:22:38.000000000 +0100
++++ src/hal-0.5.14/hald/Makefile.in 2011-12-19 20:40:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -205,6 +205,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -247,6 +248,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -267,6 +269,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -289,6 +293,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -322,7 +327,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -642,7 +646,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -667,7 +671,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/hald/solaris/addons: .deps
+Only in src/hal-0.5.14/hald/solaris/addons: Makefile
+diff -u -r hal-0.5.14/hald/solaris/addons/Makefile.in src/hal-0.5.14/hald/solaris/addons/Makefile.in
+--- hal-0.5.14/hald/solaris/addons/Makefile.in 2009-11-30 23:22:40.000000000 +0100
++++ src/hal-0.5.14/hald/solaris/addons/Makefile.in 2011-12-19 20:40:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -116,6 +116,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -158,6 +159,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -178,6 +180,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -200,6 +204,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -233,7 +238,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/hald/solaris: .deps
+Only in src/hal-0.5.14/hald/solaris: Makefile
+diff -u -r hal-0.5.14/hald/solaris/Makefile.in src/hal-0.5.14/hald/solaris/Makefile.in
+--- hal-0.5.14/hald/solaris/Makefile.in 2009-11-30 23:22:40.000000000 +0100
++++ src/hal-0.5.14/hald/solaris/Makefile.in 2011-12-19 20:40:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -153,6 +153,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -195,6 +196,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -215,6 +217,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -237,6 +241,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -270,7 +275,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -401,7 +405,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -426,7 +430,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in src/hal-0.5.14/hald/solaris/probing: .deps
+Only in src/hal-0.5.14/hald/solaris/probing: Makefile
+diff -u -r hal-0.5.14/hald/solaris/probing/Makefile.in src/hal-0.5.14/hald/solaris/probing/Makefile.in
+--- hal-0.5.14/hald/solaris/probing/Makefile.in 2009-11-30 23:22:40.000000000 +0100
++++ src/hal-0.5.14/hald/solaris/probing/Makefile.in 2011-12-19 20:40:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -136,6 +136,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -178,6 +179,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -198,6 +200,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -220,6 +224,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -253,7 +258,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+diff -u -r hal-0.5.14/hald/util.h src/hal-0.5.14/hald/util.h
+--- hal-0.5.14/hald/util.h 2009-04-03 16:31:34.000000000 +0200
++++ src/hal-0.5.14/hald/util.h 2011-12-19 20:39:54.000000000 +0100
+@@ -38,7 +38,7 @@
+ #endif
+
+ #define HAL_NAME_MAX 256
+-#define HAL_PATH_MAX 512
++#define HAL_PATH_MAX 4096
+
+ gboolean hal_util_remove_trailing_slash (gchar *path);
+
+Only in src/hal-0.5.14/hald-runner: .deps
+Only in src/hal-0.5.14/hald-runner: Makefile
+diff -u -r hal-0.5.14/hald-runner/Makefile.in src/hal-0.5.14/hald-runner/Makefile.in
+--- hal-0.5.14/hald-runner/Makefile.in 2009-11-30 23:22:38.000000000 +0100
++++ src/hal-0.5.14/hald-runner/Makefile.in 2011-12-19 20:40:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -115,6 +115,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -177,6 +179,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -199,6 +203,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -232,7 +237,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14: hal.pc
+Only in src/hal-0.5.14: hal-storage.pc
+Only in src/hal-0.5.14/libhal: .deps
+Only in src/hal-0.5.14/libhal: libhal.la
+Only in src/hal-0.5.14/libhal: libhal.lo
+Only in src/hal-0.5.14/libhal: .libs
+Only in src/hal-0.5.14/libhal: Makefile
+diff -u -r hal-0.5.14/libhal/Makefile.in src/hal-0.5.14/libhal/Makefile.in
+--- hal-0.5.14/libhal/Makefile.in 2009-11-30 23:22:41.000000000 +0100
++++ src/hal-0.5.14/libhal/Makefile.in 2011-12-19 20:40:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -142,6 +142,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -184,6 +185,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -204,6 +206,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -226,6 +230,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -259,7 +264,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/libhal-storage: .deps
+Only in src/hal-0.5.14/libhal-storage: libhal-storage.la
+Only in src/hal-0.5.14/libhal-storage: libhal-storage.lo
+Only in src/hal-0.5.14/libhal-storage: .libs
+Only in src/hal-0.5.14/libhal-storage: Makefile
+diff -u -r hal-0.5.14/libhal-storage/Makefile.in src/hal-0.5.14/libhal-storage/Makefile.in
+--- hal-0.5.14/libhal-storage/Makefile.in 2009-11-30 23:22:41.000000000 +0100
++++ src/hal-0.5.14/libhal-storage/Makefile.in 2011-12-19 20:40:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -142,6 +142,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -184,6 +185,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -204,6 +206,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -226,6 +230,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -259,7 +264,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14: libtool
+diff -u -r hal-0.5.14/ltmain.sh src/hal-0.5.14/ltmain.sh
+--- hal-0.5.14/ltmain.sh 2009-11-30 23:22:27.000000000 +0100
++++ src/hal-0.5.14/ltmain.sh 2011-10-28 03:25:54.000000000 +0200
+@@ -1,9 +1,9 @@
+-# Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# libtool (GNU libtool) 2.4.2
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ # This is free software; see the source for copying conditions. There is NO
+ # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+@@ -32,50 +32,57 @@
+ #
+ # Provide generalized library-building support services.
+ #
+-# --config show all configuration variables
+-# --debug enable verbose shell tracing
+-# -n, --dry-run display commands without modifying any files
+-# --features display basic configuration information and exit
+-# --mode=MODE use operation mode MODE
+-# --preserve-dup-deps don't remove duplicate dependency libraries
+-# --quiet, --silent don't print informational messages
+-# --tag=TAG use configuration variables from tag TAG
+-# -v, --verbose print informational messages (default)
+-# --version print version information
+-# -h, --help print short or long help message
++# --config show all configuration variables
++# --debug enable verbose shell tracing
++# -n, --dry-run display commands without modifying any files
++# --features display basic configuration information and exit
++# --mode=MODE use operation mode MODE
++# --preserve-dup-deps don't remove duplicate dependency libraries
++# --quiet, --silent don't print informational messages
++# --no-quiet, --no-silent
++# print informational messages (default)
++# --no-warn don't display warning messages
++# --tag=TAG use configuration variables from tag TAG
++# -v, --verbose print more informational messages than default
++# --no-verbose don't print the extra informational messages
++# --version print version information
++# -h, --help, --help-all print short, long, or detailed help message
+ #
+ # MODE must be one of the following:
+ #
+-# clean remove files from the build directory
+-# compile compile a source file into a libtool object
+-# execute automatically set library path, then run a program
+-# finish complete the installation of libtool libraries
+-# install install libraries or executables
+-# link create a library or an executable
+-# uninstall remove libraries from an installed directory
++# clean remove files from the build directory
++# compile compile a source file into a libtool object
++# execute automatically set library path, then run a program
++# finish complete the installation of libtool libraries
++# install install libraries or executables
++# link create a library or an executable
++# uninstall remove libraries from an installed directory
+ #
+-# MODE-ARGS vary depending on the MODE.
++# MODE-ARGS vary depending on the MODE. When passed as first option,
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+ # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+ #
+ # When reporting a bug, please describe a test case to reproduce it and
+ # include the following information:
+ #
+-# host-triplet: $host
+-# shell: $SHELL
+-# compiler: $LTCC
+-# compiler flags: $LTCFLAGS
+-# linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+-# automake: $automake_version
+-# autoconf: $autoconf_version
++# host-triplet: $host
++# shell: $SHELL
++# compiler: $LTCC
++# compiler flags: $LTCFLAGS
++# linker: $LD (gnu? $with_gnu_ld)
++# $progname: (GNU libtool) 2.4.2
++# automake: $automake_version
++# autoconf: $autoconf_version
+ #
+ # Report bugs to <bug-libtool@gnu.org>.
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+-PROGRAM=ltmain.sh
++PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION=2.4.2
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3337
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -91,10 +98,15 @@
+ BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++ eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
++}
++
+ # NLS nuisances: We save the old values to restore during execute mode.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+ lt_user_locale=
+ lt_safe_locale=
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+@@ -107,24 +119,28 @@
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ fi"
+ done
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
+
+ $lt_unset CDPATH
+
+
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
+
+
+
+ : ${CP="cp -f"}
+-: ${ECHO="echo"}
+-: ${EGREP="/bin/grep -E"}
+-: ${FGREP="/bin/grep -F"}
+-: ${GREP="/bin/grep"}
+-: ${LN_S="ln -s"}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+
+@@ -144,6 +160,27 @@
+ dirname="s,/[^/]*$,,"
+ basename="s,^.*/,,"
+
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++} # func_dirname may be replaced by extended shell implementation
++
++
++# func_basename file
++func_basename ()
++{
++ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
++
++
+ # func_dirname_and_basename file append nondir_replacement
+ # perform func_basename and func_dirname in a single function
+ # call:
+@@ -158,33 +195,183 @@
+ # those functions but instead duplicate the functionality here.
+ func_dirname_and_basename ()
+ {
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
++ # Extract subdirectory from the argument.
++ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
++} # func_dirname_and_basename may be replaced by extended shell implementation
++
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++ case ${2} in
++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ esac
++} # func_stripname may be replaced by extended shell implementation
++
++
++# These SED scripts presuppose an absolute path with a trailing slash.
++pathcar='s,^/\([^/]*\).*$,\1,'
++pathcdr='s,^/[^/]*,,'
++removedotparts=':dotsl
++ s@/\./@/@g
++ t dotsl
++ s,/\.$,/,'
++collapseslashes='s@/\{1,\}@/@g'
++finalslash='s,/*$,/,'
++
++# func_normal_abspath PATH
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++# value returned in "$func_normal_abspath_result"
++func_normal_abspath ()
++{
++ # Start from root dir and reassemble the path.
++ func_normal_abspath_result=
++ func_normal_abspath_tpath=$1
++ func_normal_abspath_altnamespace=
++ case $func_normal_abspath_tpath in
++ "")
++ # Empty path, that just means $cwd.
++ func_stripname '' '/' "`pwd`"
++ func_normal_abspath_result=$func_stripname_result
++ return
++ ;;
++ # The next three entries are used to spot a run of precisely
++ # two leading slashes without using negated character classes;
++ # we take advantage of case's first-match behaviour.
++ ///*)
++ # Unusual form of absolute path, do nothing.
++ ;;
++ //*)
++ # Not necessarily an ordinary path; POSIX reserves leading '//'
++ # and for example Cygwin uses it to access remote file shares
++ # over CIFS/SMB, so we conserve a leading double slash if found.
++ func_normal_abspath_altnamespace=/
++ ;;
++ /*)
++ # Absolute path, do nothing.
++ ;;
++ *)
++ # Relative path, prepend $cwd.
++ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++ ;;
++ esac
++ # Cancel out all the simple stuff to save iterations. We also want
++ # the path to end with a slash for ease of parsing, so make sure
++ # there is one (and only one) here.
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
++ while :; do
++ # Processed it all yet?
++ if test "$func_normal_abspath_tpath" = / ; then
++ # If we ascended to the root using ".." the result may be empty now.
++ if test -z "$func_normal_abspath_result" ; then
++ func_normal_abspath_result=/
++ fi
++ break
++ fi
++ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcar"`
++ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++ -e "$pathcdr"`
++ # Figure out what to do with it
++ case $func_normal_abspath_tcomponent in
++ "")
++ # Trailing empty path component, ignore it.
++ ;;
++ ..)
++ # Parent dir; strip last assembled component from result.
++ func_dirname "$func_normal_abspath_result"
++ func_normal_abspath_result=$func_dirname_result
++ ;;
++ *)
++ # Actual path component, append it.
++ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
++ ;;
++ esac
++ done
++ # Restore leading double-slash if one was found on entry.
++ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+ }
+
+-# Generated shell functions inserted here.
++# func_relative_path SRCDIR DSTDIR
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
++# slash if non-empty, suitable for immediately appending a filename
++# without needing to append a separator.
++# value returned in "$func_relative_path_result"
++func_relative_path ()
++{
++ func_relative_path_result=
++ func_normal_abspath "$1"
++ func_relative_path_tlibdir=$func_normal_abspath_result
++ func_normal_abspath "$2"
++ func_relative_path_tbindir=$func_normal_abspath_result
++
++ # Ascend the tree starting from libdir
++ while :; do
++ # check if we have found a prefix of bindir
++ case $func_relative_path_tbindir in
++ $func_relative_path_tlibdir)
++ # found an exact match
++ func_relative_path_tcancelled=
++ break
++ ;;
++ $func_relative_path_tlibdir*)
++ # found a matching prefix
++ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++ func_relative_path_tcancelled=$func_stripname_result
++ if test -z "$func_relative_path_result"; then
++ func_relative_path_result=.
++ fi
++ break
++ ;;
++ *)
++ func_dirname $func_relative_path_tlibdir
++ func_relative_path_tlibdir=${func_dirname_result}
++ if test "x$func_relative_path_tlibdir" = x ; then
++ # Have to descend all the way to the root!
++ func_relative_path_result=../$func_relative_path_result
++ func_relative_path_tcancelled=$func_relative_path_tbindir
++ break
++ fi
++ func_relative_path_result=../$func_relative_path_result
++ ;;
++ esac
++ done
++
++ # Now calculate path; take care to avoid doubling-up slashes.
++ func_stripname '' '/' "$func_relative_path_result"
++ func_relative_path_result=$func_stripname_result
++ func_stripname '/' '/' "$func_relative_path_tcancelled"
++ if test "x$func_stripname_result" != x ; then
++ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
++ fi
+
+-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+-# is ksh but when the shell is invoked as "sh" and the current value of
+-# the _XPG environment variable is not equal to 1 (one), the special
+-# positional parameter $0, within a function call, is the name of the
+-# function.
+-progpath="$0"
++ # Normalisation. If bindir is libdir, return empty string,
++ # else relative path ending with a slash; either way, target
++ # file name can be directly appended.
++ if test ! -z "$func_relative_path_result"; then
++ func_stripname './' '' "$func_relative_path_result/"
++ func_relative_path_result=$func_stripname_result
++ fi
++}
+
+ # The name of this program:
+-# In the unlikely event $progname began with a '-', it would play havoc with
+-# func_echo (imagine progname=-n), so we prepend ./ in that case:
+ func_dirname_and_basename "$progpath"
+ progname=$func_basename_result
+-case $progname in
+- -*) progname=./$progname ;;
+-esac
+
+ # Make sure we have an absolute path for reexecution:
+ case $progpath in
+@@ -196,7 +383,7 @@
+ ;;
+ *)
+ save_IFS="$IFS"
+- IFS=:
++ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+@@ -215,6 +402,15 @@
+ # Same as above, but do not quote variable references.
+ double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
++# Sed substitution that turns a string into a regex matching for the
++# string literally.
++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
++
++# Sed substitution that converts a w32 file name or path
++# which contains forward slashes, into one that contains
++# (escaped) backslashes. A very naive implementation.
++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++
+ # Re-`\' parameter expansions in output of double_quote_subst that were
+ # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+ # in input to double_quote_subst, that '$' was protected from expansion.
+@@ -243,7 +439,7 @@
+ # name if it has been set yet.
+ func_echo ()
+ {
+- $ECHO "$progname${mode+: }$mode: $*"
++ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+ }
+
+ # func_verbose arg...
+@@ -258,18 +454,25 @@
+ :
+ }
+
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++ $ECHO "$*"
++}
++
+ # func_error arg...
+ # Echo program name prefixed message to standard error.
+ func_error ()
+ {
+- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
++ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+ }
+
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
++ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+@@ -326,9 +529,9 @@
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
++ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ done
+- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
++ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+@@ -378,7 +581,7 @@
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ fi
+
+- $ECHO "X$my_tmpdir" | $Xsed
++ $ECHO "$my_tmpdir"
+ }
+
+
+@@ -392,7 +595,7 @@
+ {
+ case $1 in
+ *[\\\`\"\$]*)
+- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
++ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
+ esac
+@@ -419,7 +622,7 @@
+ {
+ case $1 in
+ *[\\\`\"]*)
+- my_arg=`$ECHO "X$1" | $Xsed \
++ my_arg=`$ECHO "$1" | $SED \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ my_arg="$1" ;;
+@@ -488,15 +691,39 @@
+ fi
+ }
+
+-
+-
++# func_tr_sh
++# Turn $1 into a string suitable for a shell variable name.
++# Result is stored in $func_tr_sh_result. All characters
++# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
++# if $1 begins with a digit, a '_' is prepended as well.
++func_tr_sh ()
++{
++ case $1 in
++ [0-9]* | *[!a-zA-Z0-9_]*)
++ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
++ ;;
++ * )
++ func_tr_sh_result=$1
++ ;;
++ esac
++}
+
+
+ # func_version
+ # Echo version message to standard output and exit.
+ func_version ()
+ {
+- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
++ $opt_debug
++
++ $SED -n '/(C)/!b go
++ :more
++ /\./!{
++ N
++ s/\n# / /
++ b more
++ }
++ :go
++ /^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+@@ -509,22 +736,28 @@
+ # Echo short help message to standard output and exit.
+ func_usage ()
+ {
+- $SED -n '/^# Usage:/,/# -h/ {
++ $opt_debug
++
++ $SED -n '/^# Usage:/,/^# *.*--help/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+- $ECHO
++ echo
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+ }
+
+-# func_help
+-# Echo long help message to standard output and exit.
++# func_help [NOEXIT]
++# Echo long help message to standard output and exit,
++# unless 'noexit' is passed as argument.
+ func_help ()
+ {
++ $opt_debug
++
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
++ :print
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+@@ -534,11 +767,18 @@
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
++ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+ p
+- }' < "$progpath"
+- exit $?
++ d
++ }
++ /^# .* home page:/b print
++ /^# General help using/b print
++ ' < "$progpath"
++ ret=$?
++ if test -z "$1"; then
++ exit $ret
++ fi
+ }
+
+ # func_missing_arg argname
+@@ -546,63 +786,106 @@
+ # exit_cmd.
+ func_missing_arg ()
+ {
+- func_error "missing argument for $1"
++ $opt_debug
++
++ func_error "missing argument for $1."
+ exit_cmd=exit
+ }
+
+-exit_cmd=:
+
++# func_split_short_opt shortopt
++# Set func_split_short_opt_name and func_split_short_opt_arg shell
++# variables after splitting SHORTOPT after the 2nd character.
++func_split_short_opt ()
++{
++ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
++
++ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
++ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
++} # func_split_short_opt may be replaced by extended shell implementation
++
++
++# func_split_long_opt longopt
++# Set func_split_long_opt_name and func_split_long_opt_arg shell
++# variables after splitting LONGOPT at the `=' sign.
++func_split_long_opt ()
++{
++ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++ my_sed_long_arg='1s/^--[^=]*=//'
++
++ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
++ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
++} # func_split_long_opt may be replaced by extended shell implementation
+
++exit_cmd=:
+
+
+
+-# Check that we have a working $ECHO.
+-if test "X$1" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+-elif test "X$1" = X--fallback-echo; then
+- # Avoid inline document here, it may be left over
+- :
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+- # Yippee, $ECHO works!
+- :
+-else
+- # Restart under the correct shell, and then maybe $ECHO will work.
+- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+-fi
+
+-if test "X$1" = X--fallback-echo; then
+- # used as fallback echo
+- shift
+- cat <<EOF
+-$*
+-EOF
+- exit $EXIT_SUCCESS
+-fi
+
+ magic="%%%MAGIC variable%%%"
+ magic_exe="%%%MAGIC EXE variable%%%"
+
+ # Global variables.
+-# $mode is unset
+ nonopt=
+-execute_dlfiles=
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ extracted_archives=
+ extracted_serial=0
+
+-opt_dry_run=false
+-opt_duplicate_deps=false
+-opt_silent=false
+-opt_debug=:
+-
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end. This prevents here-documents from being
+ # left over by shells.
+ exec_cmd=
+
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
++
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
++{
++ func_quote_for_eval "${2}"
++ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
++
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
++
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
++} # func_len may be replaced by extended shell implementation
++
++
++# func_lo2o object
++func_lo2o ()
++{
++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++} # func_lo2o may be replaced by extended shell implementation
++
++
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++} # func_xform may be replaced by extended shell implementation
++
++
+ # func_fatal_configuration arg...
+ # Echo program name prefixed message to standard error, followed by
+ # a configuration failure hint, and exit.
+@@ -636,16 +919,16 @@
+ # Display the features supported by this script.
+ func_features ()
+ {
+- $ECHO "host: $host"
++ echo "host: $host"
+ if test "$build_libtool_libs" = yes; then
+- $ECHO "enable shared libraries"
++ echo "enable shared libraries"
+ else
+- $ECHO "disable shared libraries"
++ echo "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+- $ECHO "enable static libraries"
++ echo "enable static libraries"
+ else
+- $ECHO "disable static libraries"
++ echo "disable static libraries"
+ fi
+
+ exit $?
+@@ -692,117 +975,209 @@
+ esac
+ }
+
+-# Parse options once, thoroughly. This comes as soon as possible in
+-# the script to make things like `libtool --version' happen quickly.
++# func_check_version_match
++# Ensure that we are using m4 macros, and libtool script from the same
++# release of libtool.
++func_check_version_match ()
+ {
++ if test "$package_revision" != "$macro_revision"; then
++ if test "$VERSION" != "$macro_version"; then
++ if test -z "$macro_version"; then
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from an older release.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ fi
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
++$progname: but the definition of this LT_INIT comes from revision $macro_revision.
++$progname: You should recreate aclocal.m4 with macros from revision $package_revision
++$progname: of $PACKAGE $VERSION and run autoconf again.
++_LT_EOF
++ fi
++
++ exit $EXIT_MISMATCH
++ fi
++}
++
++
++# Shorthand for --mode=foo, only valid as the first argument
++case $1 in
++clean|clea|cle|cl)
++ shift; set dummy --mode clean ${1+"$@"}; shift
++ ;;
++compile|compil|compi|comp|com|co|c)
++ shift; set dummy --mode compile ${1+"$@"}; shift
++ ;;
++execute|execut|execu|exec|exe|ex|e)
++ shift; set dummy --mode execute ${1+"$@"}; shift
++ ;;
++finish|finis|fini|fin|fi|f)
++ shift; set dummy --mode finish ${1+"$@"}; shift
++ ;;
++install|instal|insta|inst|ins|in|i)
++ shift; set dummy --mode install ${1+"$@"}; shift
++ ;;
++link|lin|li|l)
++ shift; set dummy --mode link ${1+"$@"}; shift
++ ;;
++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++ shift; set dummy --mode uninstall ${1+"$@"}; shift
++ ;;
++esac
+
+- # Shorthand for --mode=foo, only valid as the first argument
+- case $1 in
+- clean|clea|cle|cl)
+- shift; set dummy --mode clean ${1+"$@"}; shift
+- ;;
+- compile|compil|compi|comp|com|co|c)
+- shift; set dummy --mode compile ${1+"$@"}; shift
+- ;;
+- execute|execut|execu|exec|exe|ex|e)
+- shift; set dummy --mode execute ${1+"$@"}; shift
+- ;;
+- finish|finis|fini|fin|fi|f)
+- shift; set dummy --mode finish ${1+"$@"}; shift
+- ;;
+- install|instal|insta|inst|ins|in|i)
+- shift; set dummy --mode install ${1+"$@"}; shift
+- ;;
+- link|lin|li|l)
+- shift; set dummy --mode link ${1+"$@"}; shift
+- ;;
+- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+- shift; set dummy --mode uninstall ${1+"$@"}; shift
+- ;;
+- esac
+
+- # Parse non-mode specific arguments:
+- while test "$#" -gt 0; do
++
++# Option defaults:
++opt_debug=:
++opt_dry_run=false
++opt_config=false
++opt_preserve_dup_deps=false
++opt_features=false
++opt_finish=false
++opt_help=false
++opt_help_all=false
++opt_silent=:
++opt_warning=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
++
++
++# Parse options once, thoroughly. This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
++{
++ # this just eases exit handling
++ while test $# -gt 0; do
+ opt="$1"
+ shift
+-
+ case $opt in
+- --config) func_config ;;
+-
+- --debug) preserve_args="$preserve_args $opt"
++ --debug|-x) opt_debug='set -x'
+ func_echo "enabling shell trace mode"
+- opt_debug='set -x'
+ $opt_debug
+ ;;
+-
+- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+- execute_dlfiles="$execute_dlfiles $1"
+- shift
++ --dry-run|--dryrun|-n)
++ opt_dry_run=:
+ ;;
+-
+- --dry-run | -n) opt_dry_run=: ;;
+- --features) func_features ;;
+- --finish) mode="finish" ;;
+-
+- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+- case $1 in
+- # Valid mode arguments:
+- clean) ;;
+- compile) ;;
+- execute) ;;
+- finish) ;;
+- install) ;;
+- link) ;;
+- relink) ;;
+- uninstall) ;;
+-
+- # Catch anything else as an error
+- *) func_error "invalid argument for $opt"
+- exit_cmd=exit
+- break
+- ;;
+- esac
+-
+- mode="$1"
++ --config)
++ opt_config=:
++func_config
++ ;;
++ --dlopen|-dlopen)
++ optarg="$1"
++ opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
+ shift
+ ;;
+-
+ --preserve-dup-deps)
+- opt_duplicate_deps=: ;;
+-
+- --quiet|--silent) preserve_args="$preserve_args $opt"
+- opt_silent=:
++ opt_preserve_dup_deps=:
+ ;;
+-
+- --verbose| -v) preserve_args="$preserve_args $opt"
++ --features)
++ opt_features=:
++func_features
++ ;;
++ --finish)
++ opt_finish=:
++set dummy --mode finish ${1+"$@"}; shift
++ ;;
++ --help)
++ opt_help=:
++ ;;
++ --help-all)
++ opt_help_all=:
++opt_help=': help-all'
++ ;;
++ --mode)
++ test $# = 0 && func_missing_arg $opt && break
++ optarg="$1"
++ opt_mode="$optarg"
++case $optarg in
++ # Valid mode arguments:
++ clean|compile|execute|finish|install|link|relink|uninstall) ;;
++
++ # Catch anything else as an error
++ *) func_error "invalid argument for $opt"
++ exit_cmd=exit
++ break
++ ;;
++esac
++ shift
++ ;;
++ --no-silent|--no-quiet)
+ opt_silent=false
++func_append preserve_args " $opt"
+ ;;
+-
+- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+- preserve_args="$preserve_args $opt $1"
+- func_enable_tag "$1" # tagname is set here
++ --no-warning|--no-warn)
++ opt_warning=false
++func_append preserve_args " $opt"
++ ;;
++ --no-verbose)
++ opt_verbose=false
++func_append preserve_args " $opt"
++ ;;
++ --silent|--quiet)
++ opt_silent=:
++func_append preserve_args " $opt"
++ opt_verbose=false
++ ;;
++ --verbose|-v)
++ opt_verbose=:
++func_append preserve_args " $opt"
++opt_silent=false
++ ;;
++ --tag)
++ test $# = 0 && func_missing_arg $opt && break
++ optarg="$1"
++ opt_tag="$optarg"
++func_append preserve_args " $opt $optarg"
++func_enable_tag "$optarg"
+ shift
+ ;;
+
++ -\?|-h) func_usage ;;
++ --help) func_help ;;
++ --version) func_version ;;
++
+ # Separate optargs to long options:
+- -dlopen=*|--mode=*|--tag=*)
+- func_opt_split "$opt"
+- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
++ --*=*)
++ func_split_long_opt "$opt"
++ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+- -\?|-h) func_usage ;;
+- --help) opt_help=: ;;
+- --version) func_version ;;
+-
+- -*) func_fatal_help "unrecognized option \`$opt'" ;;
+-
+- *) nonopt="$opt"
+- break
++ # Separate non-argument short options:
++ -\?*|-h*|-n*|-v*)
++ func_split_short_opt "$opt"
++ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
++ shift
+ ;;
++
++ --) break ;;
++ -*) func_fatal_help "unrecognized option \`$opt'" ;;
++ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
++ # Validate options:
++
++ # save first non-option argument
++ if test "$#" -gt 0; then
++ nonopt="$opt"
++ shift
++ fi
++
++ # preserve --debug
++ test "$opt_debug" = : || func_append preserve_args " --debug"
+
+ case $host in
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
+@@ -810,82 +1185,44 @@
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
++ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
+
+- # Having warned about all mis-specified options, bail out if
+- # anything was wrong.
+- $exit_cmd $EXIT_FAILURE
+-}
++ $opt_help || {
++ # Sanity checks first:
++ func_check_version_match
+
+-# func_check_version_match
+-# Ensure that we are using m4 macros, and libtool script from the same
+-# release of libtool.
+-func_check_version_match ()
+-{
+- if test "$package_revision" != "$macro_revision"; then
+- if test "$VERSION" != "$macro_version"; then
+- if test -z "$macro_version"; then
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from an older release.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+- else
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+- fi
+- else
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+-$progname: of $PACKAGE $VERSION and run autoconf again.
+-_LT_EOF
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+- exit $EXIT_MISMATCH
+- fi
+-}
+-
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
+
+-## ----------- ##
+-## Main. ##
+-## ----------- ##
+-
+-$opt_help || {
+- # Sanity checks first:
+- func_check_version_match
+-
+- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+- func_fatal_configuration "not configured to build any kind of library"
+- fi
++ # Only execute mode is allowed to have -dlopen flags.
++ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
++ func_error "unrecognized option \`-dlopen'"
++ $ECHO "$help" 1>&2
++ exit $EXIT_FAILURE
++ fi
+
+- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
++ # Change the help message to a mode-specific one.
++ generic_help="$help"
++ help="Try \`$progname --help --mode=$opt_mode' for more information."
++ }
+
+
+- # Darwin sucks
+- eval std_shrext=\"$shrext_cmds\"
++ # Bail if the options were screwed
++ $exit_cmd $EXIT_FAILURE
++}
+
+
+- # Only execute mode is allowed to have -dlopen flags.
+- if test -n "$execute_dlfiles" && test "$mode" != execute; then
+- func_error "unrecognized option \`-dlopen'"
+- $ECHO "$help" 1>&2
+- exit $EXIT_FAILURE
+- fi
+
+- # Change the help message to a mode-specific one.
+- generic_help="$help"
+- help="Try \`$progname --help --mode=$mode' for more information."
+-}
+
++## ----------- ##
++## Main. ##
++## ----------- ##
+
+ # func_lalib_p file
+ # True iff FILE is a libtool `.la' library or `.lo' object file.
+@@ -950,12 +1287,9 @@
+ # temporary ltwrapper_script.
+ func_ltwrapper_scriptname ()
+ {
+- func_ltwrapper_scriptname_result=""
+- if func_ltwrapper_executable_p "$1"; then
+- func_dirname_and_basename "$1" "" "."
+- func_stripname '' '.exe' "$func_basename_result"
+- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+- fi
++ func_dirname_and_basename "$1" "" "."
++ func_stripname '' '.exe' "$func_basename_result"
++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ }
+
+ # func_ltwrapper_p file
+@@ -1001,6 +1335,37 @@
+ }
+
+
++# func_resolve_sysroot PATH
++# Replace a leading = in PATH with a sysroot. Store the result into
++# func_resolve_sysroot_result
++func_resolve_sysroot ()
++{
++ func_resolve_sysroot_result=$1
++ case $func_resolve_sysroot_result in
++ =*)
++ func_stripname '=' '' "$func_resolve_sysroot_result"
++ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
++ ;;
++ esac
++}
++
++# func_replace_sysroot PATH
++# If PATH begins with the sysroot, replace it with = and
++# store the result into func_replace_sysroot_result.
++func_replace_sysroot ()
++{
++ case "$lt_sysroot:$1" in
++ ?*:"$lt_sysroot"*)
++ func_stripname "$lt_sysroot" '' "$1"
++ func_replace_sysroot_result="=$func_stripname_result"
++ ;;
++ *)
++ # Including no sysroot.
++ func_replace_sysroot_result=$1
++ ;;
++ esac
++}
++
+ # func_infer_tag arg
+ # Infer tagged configuration to use if any are available and
+ # if one wasn't chosen via the "--tag" command line option.
+@@ -1013,13 +1378,15 @@
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+- func_quote_for_eval "$arg"
+- CC_quoted="$CC_quoted $func_quote_for_eval_result"
++ func_append_quoted CC_quoted "$arg"
+ done
++ CC_expanded=`func_echo_all $CC`
++ CC_quoted_expanded=`func_echo_all $CC_quoted`
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
++ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
++ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+@@ -1030,11 +1397,13 @@
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+- func_quote_for_eval "$arg"
+- CC_quoted="$CC_quoted $func_quote_for_eval_result"
++ func_append_quoted CC_quoted "$arg"
+ done
++ CC_expanded=`func_echo_all $CC`
++ CC_quoted_expanded=`func_echo_all $CC_quoted`
+ case "$@ " in
+- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
++ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
++ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+@@ -1097,6 +1466,486 @@
+ }
+ }
+
++
++##################################################
++# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
++##################################################
++
++# func_convert_core_file_wine_to_w32 ARG
++# Helper function used by file name conversion functions when $build is *nix,
++# and $host is mingw, cygwin, or some other w32 environment. Relies on a
++# correctly configured wine environment available, with the winepath program
++# in $build's $PATH.
++#
++# ARG is the $build file name to be converted to w32 format.
++# Result is available in $func_convert_core_file_wine_to_w32_result, and will
++# be empty on error (or when ARG is empty)
++func_convert_core_file_wine_to_w32 ()
++{
++ $opt_debug
++ func_convert_core_file_wine_to_w32_result="$1"
++ if test -n "$1"; then
++ # Unfortunately, winepath does not exit with a non-zero error code, so we
++ # are forced to check the contents of stdout. On the other hand, if the
++ # command is not found, the shell will set an exit code of 127 and print
++ # *an error message* to stdout. So we must check for both error code of
++ # zero AND non-empty stdout, which explains the odd construction:
++ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
++ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
++ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
++ $SED -e "$lt_sed_naive_backslashify"`
++ else
++ func_convert_core_file_wine_to_w32_result=
++ fi
++ fi
++}
++# end: func_convert_core_file_wine_to_w32
++
++
++# func_convert_core_path_wine_to_w32 ARG
++# Helper function used by path conversion functions when $build is *nix, and
++# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
++# configured wine environment available, with the winepath program in $build's
++# $PATH. Assumes ARG has no leading or trailing path separator characters.
++#
++# ARG is path to be converted from $build format to win32.
++# Result is available in $func_convert_core_path_wine_to_w32_result.
++# Unconvertible file (directory) names in ARG are skipped; if no directory names
++# are convertible, then the result may be empty.
++func_convert_core_path_wine_to_w32 ()
++{
++ $opt_debug
++ # unfortunately, winepath doesn't convert paths, only file names
++ func_convert_core_path_wine_to_w32_result=""
++ if test -n "$1"; then
++ oldIFS=$IFS
++ IFS=:
++ for func_convert_core_path_wine_to_w32_f in $1; do
++ IFS=$oldIFS
++ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
++ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
++ if test -z "$func_convert_core_path_wine_to_w32_result"; then
++ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
++ else
++ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
++ fi
++ fi
++ done
++ IFS=$oldIFS
++ fi
++}
++# end: func_convert_core_path_wine_to_w32
++
++
++# func_cygpath ARGS...
++# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
++# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
++# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
++# (2), returns the Cygwin file name or path in func_cygpath_result (input
++# file name or path is assumed to be in w32 format, as previously converted
++# from $build's *nix or MSYS format). In case (3), returns the w32 file name
++# or path in func_cygpath_result (input file name or path is assumed to be in
++# Cygwin format). Returns an empty string on error.
++#
++# ARGS are passed to cygpath, with the last one being the file name or path to
++# be converted.
++#
++# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
++# environment variable; do not put it in $PATH.
++func_cygpath ()
++{
++ $opt_debug
++ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
++ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
++ if test "$?" -ne 0; then
++ # on failure, ensure result is empty
++ func_cygpath_result=
++ fi
++ else
++ func_cygpath_result=
++ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
++ fi
++}
++#end: func_cygpath
++
++
++# func_convert_core_msys_to_w32 ARG
++# Convert file name or path ARG from MSYS format to w32 format. Return
++# result in func_convert_core_msys_to_w32_result.
++func_convert_core_msys_to_w32 ()
++{
++ $opt_debug
++ # awkward: cmd appends spaces to result
++ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
++ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++}
++#end: func_convert_core_msys_to_w32
++
++
++# func_convert_file_check ARG1 ARG2
++# Verify that ARG1 (a file name in $build format) was converted to $host
++# format in ARG2. Otherwise, emit an error message, but continue (resetting
++# func_to_host_file_result to ARG1).
++func_convert_file_check ()
++{
++ $opt_debug
++ if test -z "$2" && test -n "$1" ; then
++ func_error "Could not determine host file name corresponding to"
++ func_error " \`$1'"
++ func_error "Continuing, but uninstalled executables may not work."
++ # Fallback:
++ func_to_host_file_result="$1"
++ fi
++}
++# end func_convert_file_check
++
++
++# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
++# Verify that FROM_PATH (a path in $build format) was converted to $host
++# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
++# func_to_host_file_result to a simplistic fallback value (see below).
++func_convert_path_check ()
++{
++ $opt_debug
++ if test -z "$4" && test -n "$3"; then
++ func_error "Could not determine the host path corresponding to"
++ func_error " \`$3'"
++ func_error "Continuing, but uninstalled executables may not work."
++ # Fallback. This is a deliberately simplistic "conversion" and
++ # should not be "improved". See libtool.info.
++ if test "x$1" != "x$2"; then
++ lt_replace_pathsep_chars="s|$1|$2|g"
++ func_to_host_path_result=`echo "$3" |
++ $SED -e "$lt_replace_pathsep_chars"`
++ else
++ func_to_host_path_result="$3"
++ fi
++ fi
++}
++# end func_convert_path_check
++
++
++# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
++# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
++# and appending REPL if ORIG matches BACKPAT.
++func_convert_path_front_back_pathsep ()
++{
++ $opt_debug
++ case $4 in
++ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
++ ;;
++ esac
++ case $4 in
++ $2 ) func_append func_to_host_path_result "$3"
++ ;;
++ esac
++}
++# end func_convert_path_front_back_pathsep
++
++
++##################################################
++# $build to $host FILE NAME CONVERSION FUNCTIONS #
++##################################################
++# invoked via `$to_host_file_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# Result will be available in $func_to_host_file_result.
++
++
++# func_to_host_file ARG
++# Converts the file name ARG from $build format to $host format. Return result
++# in func_to_host_file_result.
++func_to_host_file ()
++{
++ $opt_debug
++ $to_host_file_cmd "$1"
++}
++# end func_to_host_file
++
++
++# func_to_tool_file ARG LAZY
++# converts the file name ARG from $build format to toolchain format. Return
++# result in func_to_tool_file_result. If the conversion in use is listed
++# in (the comma separated) LAZY, no conversion takes place.
++func_to_tool_file ()
++{
++ $opt_debug
++ case ,$2, in
++ *,"$to_tool_file_cmd",*)
++ func_to_tool_file_result=$1
++ ;;
++ *)
++ $to_tool_file_cmd "$1"
++ func_to_tool_file_result=$func_to_host_file_result
++ ;;
++ esac
++}
++# end func_to_tool_file
++
++
++# func_convert_file_noop ARG
++# Copy ARG to func_to_host_file_result.
++func_convert_file_noop ()
++{
++ func_to_host_file_result="$1"
++}
++# end func_convert_file_noop
++
++
++# func_convert_file_msys_to_w32 ARG
++# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper. Returns result in
++# func_to_host_file_result.
++func_convert_file_msys_to_w32 ()
++{
++ $opt_debug
++ func_to_host_file_result="$1"
++ if test -n "$1"; then
++ func_convert_core_msys_to_w32 "$1"
++ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
++ fi
++ func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_w32
++
++
++# func_convert_file_cygwin_to_w32 ARG
++# Convert file name ARG from Cygwin to w32 format. Returns result in
++# func_to_host_file_result.
++func_convert_file_cygwin_to_w32 ()
++{
++ $opt_debug
++ func_to_host_file_result="$1"
++ if test -n "$1"; then
++ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
++ # LT_CYGPATH in this case.
++ func_to_host_file_result=`cygpath -m "$1"`
++ fi
++ func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_cygwin_to_w32
++
++
++# func_convert_file_nix_to_w32 ARG
++# Convert file name ARG from *nix to w32 format. Requires a wine environment
++# and a working winepath. Returns result in func_to_host_file_result.
++func_convert_file_nix_to_w32 ()
++{
++ $opt_debug
++ func_to_host_file_result="$1"
++ if test -n "$1"; then
++ func_convert_core_file_wine_to_w32 "$1"
++ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
++ fi
++ func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_w32
++
++
++# func_convert_file_msys_to_cygwin ARG
++# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_file_msys_to_cygwin ()
++{
++ $opt_debug
++ func_to_host_file_result="$1"
++ if test -n "$1"; then
++ func_convert_core_msys_to_w32 "$1"
++ func_cygpath -u "$func_convert_core_msys_to_w32_result"
++ func_to_host_file_result="$func_cygpath_result"
++ fi
++ func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_msys_to_cygwin
++
++
++# func_convert_file_nix_to_cygwin ARG
++# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
++# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
++# in func_to_host_file_result.
++func_convert_file_nix_to_cygwin ()
++{
++ $opt_debug
++ func_to_host_file_result="$1"
++ if test -n "$1"; then
++ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
++ func_convert_core_file_wine_to_w32 "$1"
++ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
++ func_to_host_file_result="$func_cygpath_result"
++ fi
++ func_convert_file_check "$1" "$func_to_host_file_result"
++}
++# end func_convert_file_nix_to_cygwin
++
++
++#############################################
++# $build to $host PATH CONVERSION FUNCTIONS #
++#############################################
++# invoked via `$to_host_path_cmd ARG'
++#
++# In each case, ARG is the path to be converted from $build to $host format.
++# The result will be available in $func_to_host_path_result.
++#
++# Path separators are also converted from $build format to $host format. If
++# ARG begins or ends with a path separator character, it is preserved (but
++# converted to $host format) on output.
++#
++# All path conversion functions are named using the following convention:
++# file name conversion function : func_convert_file_X_to_Y ()
++# path conversion function : func_convert_path_X_to_Y ()
++# where, for any given $build/$host combination the 'X_to_Y' value is the
++# same. If conversion functions are added for new $build/$host combinations,
++# the two new functions must follow this pattern, or func_init_to_host_path_cmd
++# will break.
++
++
++# func_init_to_host_path_cmd
++# Ensures that function "pointer" variable $to_host_path_cmd is set to the
++# appropriate value, based on the value of $to_host_file_cmd.
++to_host_path_cmd=
++func_init_to_host_path_cmd ()
++{
++ $opt_debug
++ if test -z "$to_host_path_cmd"; then
++ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
++ to_host_path_cmd="func_convert_path_${func_stripname_result}"
++ fi
++}
++
++
++# func_to_host_path ARG
++# Converts the path ARG from $build format to $host format. Return result
++# in func_to_host_path_result.
++func_to_host_path ()
++{
++ $opt_debug
++ func_init_to_host_path_cmd
++ $to_host_path_cmd "$1"
++}
++# end func_to_host_path
++
++
++# func_convert_path_noop ARG
++# Copy ARG to func_to_host_path_result.
++func_convert_path_noop ()
++{
++ func_to_host_path_result="$1"
++}
++# end func_convert_path_noop
++
++
++# func_convert_path_msys_to_w32 ARG
++# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
++# conversion to w32 is not available inside the cwrapper. Returns result in
++# func_to_host_path_result.
++func_convert_path_msys_to_w32 ()
++{
++ $opt_debug
++ func_to_host_path_result="$1"
++ if test -n "$1"; then
++ # Remove leading and trailing path separator characters from ARG. MSYS
++ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
++ # and winepath ignores them completely.
++ func_stripname : : "$1"
++ func_to_host_path_tmp1=$func_stripname_result
++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
++ func_convert_path_check : ";" \
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++ fi
++}
++# end func_convert_path_msys_to_w32
++
++
++# func_convert_path_cygwin_to_w32 ARG
++# Convert path ARG from Cygwin to w32 format. Returns result in
++# func_to_host_file_result.
++func_convert_path_cygwin_to_w32 ()
++{
++ $opt_debug
++ func_to_host_path_result="$1"
++ if test -n "$1"; then
++ # See func_convert_path_msys_to_w32:
++ func_stripname : : "$1"
++ func_to_host_path_tmp1=$func_stripname_result
++ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
++ func_convert_path_check : ";" \
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++ fi
++}
++# end func_convert_path_cygwin_to_w32
++
++
++# func_convert_path_nix_to_w32 ARG
++# Convert path ARG from *nix to w32 format. Requires a wine environment and
++# a working winepath. Returns result in func_to_host_file_result.
++func_convert_path_nix_to_w32 ()
++{
++ $opt_debug
++ func_to_host_path_result="$1"
++ if test -n "$1"; then
++ # See func_convert_path_msys_to_w32:
++ func_stripname : : "$1"
++ func_to_host_path_tmp1=$func_stripname_result
++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
++ func_convert_path_check : ";" \
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
++ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
++ fi
++}
++# end func_convert_path_nix_to_w32
++
++
++# func_convert_path_msys_to_cygwin ARG
++# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
++# Returns result in func_to_host_file_result.
++func_convert_path_msys_to_cygwin ()
++{
++ $opt_debug
++ func_to_host_path_result="$1"
++ if test -n "$1"; then
++ # See func_convert_path_msys_to_w32:
++ func_stripname : : "$1"
++ func_to_host_path_tmp1=$func_stripname_result
++ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
++ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
++ func_to_host_path_result="$func_cygpath_result"
++ func_convert_path_check : : \
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
++ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++ fi
++}
++# end func_convert_path_msys_to_cygwin
++
++
++# func_convert_path_nix_to_cygwin ARG
++# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
++# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
++# func_to_host_file_result.
++func_convert_path_nix_to_cygwin ()
++{
++ $opt_debug
++ func_to_host_path_result="$1"
++ if test -n "$1"; then
++ # Remove leading and trailing path separator characters from
++ # ARG. msys behavior is inconsistent here, cygpath turns them
++ # into '.;' and ';.', and winepath ignores them completely.
++ func_stripname : : "$1"
++ func_to_host_path_tmp1=$func_stripname_result
++ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
++ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
++ func_to_host_path_result="$func_cygpath_result"
++ func_convert_path_check : : \
++ "$func_to_host_path_tmp1" "$func_to_host_path_result"
++ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
++ fi
++}
++# end func_convert_path_nix_to_cygwin
++
++
+ # func_mode_compile arg...
+ func_mode_compile ()
+ {
+@@ -1137,12 +1986,12 @@
+ ;;
+
+ -pie | -fpie | -fPIE)
+- pie_flag="$pie_flag $arg"
++ func_append pie_flag " $arg"
+ continue
+ ;;
+
+ -shared | -static | -prefer-pic | -prefer-non-pic)
+- later="$later $arg"
++ func_append later " $arg"
+ continue
+ ;;
+
+@@ -1163,15 +2012,14 @@
+ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+ IFS="$save_ifs"
+- func_quote_for_eval "$arg"
+- lastarg="$lastarg $func_quote_for_eval_result"
++ func_append_quoted lastarg "$arg"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
+
+ # Add the arguments to base_compile.
+- base_compile="$base_compile $lastarg"
++ func_append base_compile " $lastarg"
+ continue
+ ;;
+
+@@ -1187,8 +2035,7 @@
+ esac # case $arg_mode
+
+ # Aesthetically quote the previous argument.
+- func_quote_for_eval "$lastarg"
+- base_compile="$base_compile $func_quote_for_eval_result"
++ func_append_quoted base_compile "$lastarg"
+ done # for arg
+
+ case $arg_mode in
+@@ -1213,7 +2060,7 @@
+ *.[cCFSifmso] | \
+ *.ada | *.adb | *.ads | *.asm | \
+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
++ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+ func_xform "$libobj"
+ libobj=$func_xform_result
+ ;;
+@@ -1288,7 +2135,7 @@
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+ if test "$compiler_c_o" = no; then
+- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
++ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ else
+ output_obj=
+@@ -1319,17 +2166,16 @@
+ $opt_dry_run || $RM $removelist
+ exit $EXIT_FAILURE
+ fi
+- removelist="$removelist $output_obj"
++ func_append removelist " $output_obj"
+ $ECHO "$srcfile" > "$lockfile"
+ fi
+
+ $opt_dry_run || $RM $removelist
+- removelist="$removelist $lockfile"
++ func_append removelist " $lockfile"
+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+- if test -n "$fix_srcfile_path"; then
+- eval srcfile=\"$fix_srcfile_path\"
+- fi
++ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
++ srcfile=$func_to_tool_file_result
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
+
+@@ -1349,7 +2195,7 @@
+
+ if test -z "$output_obj"; then
+ # Place PIC objects in $objdir
+- command="$command -o $lobj"
++ func_append command " -o $lobj"
+ fi
+
+ func_show_eval_locale "$command" \
+@@ -1396,11 +2242,11 @@
+ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+- command="$command -o $obj"
++ func_append command " -o $obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+- command="$command$suppress_output"
++ func_append command "$suppress_output"
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+@@ -1445,13 +2291,13 @@
+ }
+
+ $opt_help || {
+-test "$mode" = compile && func_mode_compile ${1+"$@"}
++ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ }
+
+ func_mode_help ()
+ {
+ # We need to display help for each of the modes.
+- case $mode in
++ case $opt_mode in
+ "")
+ # Generic help is extracted from the usage comments
+ # at the start of this file.
+@@ -1482,10 +2328,11 @@
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -no-suppress do not suppress compiler output for multiple passes
+- -prefer-pic try to building PIC objects only
+- -prefer-non-pic try to building non-PIC objects only
++ -prefer-pic try to build PIC objects only
++ -prefer-non-pic try to build non-PIC objects only
+ -shared do not build a \`.o' file suitable for static linking
+ -static only build a \`.o' file suitable for static linking
++ -Wc,FLAG pass FLAG directly to the compiler
+
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+@@ -1538,7 +2385,7 @@
+
+ The following components of INSTALL-COMMAND are treated specially:
+
+- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
++ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+
+ The rest of the components are interpreted as arguments to that command (only
+ BSD-compatible install options are recognized)."
+@@ -1558,6 +2405,8 @@
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
++ -bindir BINDIR specify path to binaries directory (for systems where
++ libraries must be found in the PATH setting at runtime)
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+@@ -1586,6 +2435,11 @@
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+ -weak LIBNAME declare that the target provides the LIBNAME interface
++ -Wc,FLAG
++ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
++ -Wl,FLAG
++ -Xlinker FLAG pass linker-specific FLAG directly to the linker
++ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -1619,18 +2473,44 @@
+ ;;
+
+ *)
+- func_fatal_help "invalid operation mode \`$mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+ ;;
+ esac
+
+- $ECHO
++ echo
+ $ECHO "Try \`$progname --help' for more information about other modes."
+-
+- exit $?
+ }
+
+- # Now that we've collected a possible --mode arg, show help if necessary
+- $opt_help && func_mode_help
++# Now that we've collected a possible --mode arg, show help if necessary
++if $opt_help; then
++ if test "$opt_help" = :; then
++ func_mode_help
++ else
++ {
++ func_help noexit
++ for opt_mode in compile link execute install finish uninstall clean; do
++ func_mode_help
++ done
++ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
++ {
++ func_help noexit
++ for opt_mode in compile link execute install finish uninstall clean; do
++ echo
++ func_mode_help
++ done
++ } |
++ sed '1d
++ /^When reporting/,/^Report/{
++ H
++ d
++ }
++ $x
++ /information about other modes/d
++ /more detailed .*MODE/d
++ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
++ fi
++ exit $?
++fi
+
+
+ # func_mode_execute arg...
+@@ -1643,13 +2523,16 @@
+ func_fatal_help "you must specify a COMMAND"
+
+ # Handle -dlopen flags immediately.
+- for file in $execute_dlfiles; do
++ for file in $opt_dlopen; do
+ test -f "$file" \
+ || func_fatal_help "\`$file' is not a file"
+
+ dir=
+ case $file in
+ *.la)
++ func_resolve_sysroot "$file"
++ file=$func_resolve_sysroot_result
++
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$lib' is not a valid libtool archive"
+@@ -1671,7 +2554,7 @@
+ dir="$func_dirname_result"
+
+ if test -f "$dir/$objdir/$dlname"; then
+- dir="$dir/$objdir"
++ func_append dir "/$objdir"
+ else
+ if test ! -f "$dir/$dlname"; then
+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+@@ -1712,7 +2595,7 @@
+ for file
+ do
+ case $file in
+- -*) ;;
++ -* | *.la | *.lo ) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if func_ltwrapper_script_p "$file"; then
+@@ -1728,8 +2611,7 @@
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+- func_quote_for_eval "$file"
+- args="$args $func_quote_for_eval_result"
++ func_append_quoted args "$file"
+ done
+
+ if test "X$opt_dry_run" = Xfalse; then
+@@ -1754,29 +2636,66 @@
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+- $ECHO "export $shlibpath_var"
++ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ fi
+ }
+
+-test "$mode" = execute && func_mode_execute ${1+"$@"}
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+ $opt_debug
+- libdirs="$nonopt"
++ libs=
++ libdirs=
+ admincmds=
+
+- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+- for dir
+- do
+- libdirs="$libdirs $dir"
+- done
++ for opt in "$nonopt" ${1+"$@"}
++ do
++ if test -d "$opt"; then
++ func_append libdirs " $opt"
+
++ elif test -f "$opt"; then
++ if func_lalib_unsafe_p "$opt"; then
++ func_append libs " $opt"
++ else
++ func_warning "\`$opt' is not a valid libtool archive"
++ fi
++
++ else
++ func_fatal_error "invalid argument \`$opt'"
++ fi
++ done
++
++ if test -n "$libs"; then
++ if test -n "$lt_sysroot"; then
++ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
++ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
++ else
++ sysroot_cmd=
++ fi
++
++ # Remove sysroot references
++ if $opt_dry_run; then
++ for lib in $libs; do
++ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
++ done
++ else
++ tmpdir=`func_mktempdir`
++ for lib in $libs; do
++ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
++ > $tmpdir/tmp-la
++ mv -f $tmpdir/tmp-la $lib
++ done
++ ${RM}r "$tmpdir"
++ fi
++ fi
++
++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+@@ -1786,7 +2705,7 @@
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
++ $opt_dry_run || eval "$cmds" || func_append admincmds "
+ $cmds"
+ fi
+ done
+@@ -1795,53 +2714,55 @@
+ # Exit here if they wanted silent mode.
+ $opt_silent && exit $EXIT_SUCCESS
+
+- $ECHO "X----------------------------------------------------------------------" | $Xsed
+- $ECHO "Libraries have been installed in:"
+- for libdir in $libdirs; do
+- $ECHO " $libdir"
+- done
+- $ECHO
+- $ECHO "If you ever happen to want to link against installed libraries"
+- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+- $ECHO "flag during linking and do at least one of the following:"
+- if test -n "$shlibpath_var"; then
+- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+- $ECHO " during execution"
+- fi
+- if test -n "$runpath_var"; then
+- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+- $ECHO " during linking"
+- fi
+- if test -n "$hardcode_libdir_flag_spec"; then
+- libdir=LIBDIR
+- eval flag=\"$hardcode_libdir_flag_spec\"
++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++ echo "----------------------------------------------------------------------"
++ echo "Libraries have been installed in:"
++ for libdir in $libdirs; do
++ $ECHO " $libdir"
++ done
++ echo
++ echo "If you ever happen to want to link against installed libraries"
++ echo "in a given directory, LIBDIR, you must either use libtool, and"
++ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++ echo "flag during linking and do at least one of the following:"
++ if test -n "$shlibpath_var"; then
++ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
++ echo " during execution"
++ fi
++ if test -n "$runpath_var"; then
++ echo " - add LIBDIR to the \`$runpath_var' environment variable"
++ echo " during linking"
++ fi
++ if test -n "$hardcode_libdir_flag_spec"; then
++ libdir=LIBDIR
++ eval flag=\"$hardcode_libdir_flag_spec\"
+
+- $ECHO " - use the \`$flag' linker flag"
+- fi
+- if test -n "$admincmds"; then
+- $ECHO " - have your system administrator run these commands:$admincmds"
+- fi
+- if test -f /etc/ld.so.conf; then
+- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+- fi
+- $ECHO
++ $ECHO " - use the \`$flag' linker flag"
++ fi
++ if test -n "$admincmds"; then
++ $ECHO " - have your system administrator run these commands:$admincmds"
++ fi
++ if test -f /etc/ld.so.conf; then
++ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++ fi
++ echo
+
+- $ECHO "See any operating system documentation about shared libraries for"
+- case $host in
+- solaris2.[6789]|solaris2.1[0-9])
+- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+- $ECHO "pages."
+- ;;
+- *)
+- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+- ;;
+- esac
+- $ECHO "X----------------------------------------------------------------------" | $Xsed
++ echo "See any operating system documentation about shared libraries for"
++ case $host in
++ solaris2.[6789]|solaris2.1[0-9])
++ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
++ echo "pages."
++ ;;
++ *)
++ echo "more information, such as the ld(1) and ld.so(8) manual pages."
++ ;;
++ esac
++ echo "----------------------------------------------------------------------"
++ fi
+ exit $EXIT_SUCCESS
+ }
+
+-test "$mode" = finish && func_mode_finish ${1+"$@"}
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+ # func_mode_install arg...
+@@ -1852,7 +2773,7 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
++ case $nonopt in *shtool*) :;; *) false;; esac; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+@@ -1866,7 +2787,12 @@
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ func_quote_for_eval "$arg"
+- install_prog="$install_prog$func_quote_for_eval_result"
++ func_append install_prog "$func_quote_for_eval_result"
++ install_shared_prog=$install_prog
++ case " $install_prog " in
++ *[\\\ /]cp\ *) install_cp=: ;;
++ *) install_cp=false ;;
++ esac
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+@@ -1876,10 +2802,12 @@
+ install_type=
+ isdir=no
+ stripme=
++ no_mode=:
+ for arg
+ do
++ arg2=
+ if test -n "$dest"; then
+- files="$files $dest"
++ func_append files " $dest"
+ dest=$arg
+ continue
+ fi
+@@ -1887,10 +2815,9 @@
+ case $arg in
+ -d) isdir=yes ;;
+ -f)
+- case " $install_prog " in
+- *[\\\ /]cp\ *) ;;
+- *) prev=$arg ;;
+- esac
++ if $install_cp; then :; else
++ prev=$arg
++ fi
+ ;;
+ -g | -m | -o)
+ prev=$arg
+@@ -1904,6 +2831,10 @@
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
++ if test "x$prev" = x-m && test -n "$install_override_mode"; then
++ arg2=$install_override_mode
++ no_mode=false
++ fi
+ prev=
+ else
+ dest=$arg
+@@ -1914,7 +2845,11 @@
+
+ # Aesthetically quote the argument.
+ func_quote_for_eval "$arg"
+- install_prog="$install_prog $func_quote_for_eval_result"
++ func_append install_prog " $func_quote_for_eval_result"
++ if test -n "$arg2"; then
++ func_quote_for_eval "$arg2"
++ fi
++ func_append install_shared_prog " $func_quote_for_eval_result"
+ done
+
+ test -z "$install_prog" && \
+@@ -1923,6 +2858,13 @@
+ test -n "$prev" && \
+ func_fatal_help "the \`$prev' option requires an argument"
+
++ if test -n "$install_override_mode" && $no_mode; then
++ if $install_cp; then :; else
++ func_quote_for_eval "$install_override_mode"
++ func_append install_shared_prog " -m $func_quote_for_eval_result"
++ fi
++ fi
++
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ func_fatal_help "no file or destination specified"
+@@ -1977,10 +2919,13 @@
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+- staticlibs="$staticlibs $file"
++ func_append staticlibs " $file"
+ ;;
+
+ *.la)
++ func_resolve_sysroot "$file"
++ file=$func_resolve_sysroot_result
++
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$file' is not a valid libtool archive"
+@@ -1994,23 +2939,23 @@
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+- *) current_libdirs="$current_libdirs $libdir" ;;
++ *) func_append current_libdirs " $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+- *) future_libdirs="$future_libdirs $libdir" ;;
++ *) func_append future_libdirs " $libdir" ;;
+ esac
+ fi
+
+ func_dirname "$file" "/" ""
+ dir="$func_dirname_result"
+- dir="$dir$objdir"
++ func_append dir "$objdir"
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
++ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+@@ -2023,9 +2968,9 @@
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
++ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ fi
+
+ func_warning "relinking \`$file'"
+@@ -2043,7 +2988,7 @@
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
++ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+@@ -2083,7 +3028,7 @@
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+ # Maybe install the static library, too.
+- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+ ;;
+
+ *.lo)
+@@ -2183,7 +3128,7 @@
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
++ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ func_warning "\`$lib' has not been installed in \`$libdir'"
+ finalize=no
+@@ -2202,7 +3147,7 @@
+ file="$func_basename_result"
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+@@ -2221,7 +3166,7 @@
+ }
+ else
+ # Install the binary that we compiled earlier.
+- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+@@ -2257,11 +3202,13 @@
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+
+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+- func_show_eval "$old_striplib $oldlib" 'exit $?'
++ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+ fi
+
+ # Do each command in the postinstall commands.
+@@ -2280,7 +3227,7 @@
+ fi
+ }
+
+-test "$mode" = install && func_mode_install ${1+"$@"}
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+ # func_generate_dlsyms outputname originator pic_p
+@@ -2323,6 +3270,22 @@
+ extern \"C\" {
+ #endif
+
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
++#endif
++
++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
++ relocations are performed -- see ld's documentation on pseudo-relocs. */
++# define LT_DLSYM_CONST
++#elif defined(__osf__)
++/* This system does not cope well with relocations in const data. */
++# define LT_DLSYM_CONST
++#else
++# define LT_DLSYM_CONST const
++#endif
++
+ /* External symbol declarations for the compiler. */\
+ "
+
+@@ -2332,10 +3295,11 @@
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+- func_verbose "extracting global C symbols from \`$progfile'"
+- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
++ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
++ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
++ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+@@ -2371,7 +3335,7 @@
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+- *cygwin | *mingw* | *cegcc* )
++ *cygwin* | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -2384,10 +3348,52 @@
+ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+ name="$func_basename_result"
+- $opt_dry_run || {
+- eval '$ECHO ": $name " >> "$nlist"'
+- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+- }
++ case $host in
++ *cygwin* | *mingw* | *cegcc* )
++ # if an import library, we need to obtain dlname
++ if func_win32_import_lib_p "$dlprefile"; then
++ func_tr_sh "$dlprefile"
++ eval "curr_lafile=\$libfile_$func_tr_sh_result"
++ dlprefile_dlbasename=""
++ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
++ # Use subshell, to avoid clobbering current variable values
++ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
++ if test -n "$dlprefile_dlname" ; then
++ func_basename "$dlprefile_dlname"
++ dlprefile_dlbasename="$func_basename_result"
++ else
++ # no lafile. user explicitly requested -dlpreopen <import library>.
++ $sharedlib_from_linklib_cmd "$dlprefile"
++ dlprefile_dlbasename=$sharedlib_from_linklib_result
++ fi
++ fi
++ $opt_dry_run || {
++ if test -n "$dlprefile_dlbasename" ; then
++ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
++ else
++ func_warning "Could not compute DLL name from $name"
++ eval '$ECHO ": $name " >> "$nlist"'
++ fi
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
++ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
++ }
++ else # not an import lib
++ $opt_dry_run || {
++ eval '$ECHO ": $name " >> "$nlist"'
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++ }
++ fi
++ ;;
++ *)
++ $opt_dry_run || {
++ eval '$ECHO ": $name " >> "$nlist"'
++ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
++ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++ }
++ ;;
++ esac
+ done
+
+ $opt_dry_run || {
+@@ -2415,36 +3421,19 @@
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+ else
+- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
++ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ fi
+
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
++ echo >> "$output_objdir/$my_dlsyms" "\
+
+ /* The mapping between symbol names and symbols. */
+ typedef struct {
+ const char *name;
+ void *address;
+ } lt_dlsymlist;
+-"
+- case $host in
+- *cygwin* | *mingw* | *cegcc* )
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
+-/* DATA imports from DLLs on WIN32 con't be const, because
+- runtime relocations are performed -- see ld's documentation
+- on pseudo-relocs. */"
+- lt_dlsym_const= ;;
+- *osf5*)
+- echo >> "$output_objdir/$my_dlsyms" "\
+-/* This system does not cope well with relocations in const data */"
+- lt_dlsym_const= ;;
+- *)
+- lt_dlsym_const=const ;;
+- esac
+-
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
+-extern $lt_dlsym_const lt_dlsymlist
++extern LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[];
+-$lt_dlsym_const lt_dlsymlist
++LT_DLSYM_CONST lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
+ {\
+ { \"$my_originator\", (void *) 0 },"
+@@ -2457,7 +3446,7 @@
+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ esac
+- $ECHO >> "$output_objdir/$my_dlsyms" "\
++ echo >> "$output_objdir/$my_dlsyms" "\
+ {0, (void *) 0}
+ };
+
+@@ -2484,7 +3473,7 @@
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+@@ -2500,7 +3489,7 @@
+ for arg in $LTCFLAGS; do
+ case $arg in
+ -pie | -fpie | -fPIE) ;;
+- *) symtab_cflags="$symtab_cflags $arg" ;;
++ *) func_append symtab_cflags " $arg" ;;
+ esac
+ done
+
+@@ -2515,16 +3504,16 @@
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ else
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ fi
+ ;;
+ *)
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ ;;
+ esac
+ ;;
+@@ -2538,8 +3527,8 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
++ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+ fi
+ }
+
+@@ -2549,6 +3538,7 @@
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
++# Despite the name, also deal with 64 bit binaries.
+ func_win32_libid ()
+ {
+ $opt_debug
+@@ -2559,9 +3549,11 @@
+ win32_libid_type="x86 archive import"
+ ;;
+ *ar\ archive*) # could be an import, or static
++ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+- win32_nmres=`eval $NM -f posix -A $1 |
++ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
++ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
+ 1,100{
+ / I /{
+@@ -2590,6 +3582,131 @@
+ $ECHO "$win32_libid_type"
+ }
+
++# func_cygming_dll_for_implib ARG
++#
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++# Invoked by eval'ing the libtool variable
++# $sharedlib_from_linklib_cmd
++# Result is available in the variable
++# $sharedlib_from_linklib_result
++func_cygming_dll_for_implib ()
++{
++ $opt_debug
++ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
++}
++
++# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
++#
++# The is the core of a fallback implementation of a
++# platform-specific function to extract the name of the
++# DLL associated with the specified import library LIBNAME.
++#
++# SECTION_NAME is either .idata$6 or .idata$7, depending
++# on the platform and compiler that created the implib.
++#
++# Echos the name of the DLL associated with the
++# specified import library.
++func_cygming_dll_for_implib_fallback_core ()
++{
++ $opt_debug
++ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
++ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
++ $SED '/^Contents of section '"$match_literal"':/{
++ # Place marker at beginning of archive member dllname section
++ s/.*/====MARK====/
++ p
++ d
++ }
++ # These lines can sometimes be longer than 43 characters, but
++ # are always uninteresting
++ /:[ ]*file format pe[i]\{,1\}-/d
++ /^In archive [^:]*:/d
++ # Ensure marker is printed
++ /^====MARK====/p
++ # Remove all lines with less than 43 characters
++ /^.\{43\}/!d
++ # From remaining lines, remove first 43 characters
++ s/^.\{43\}//' |
++ $SED -n '
++ # Join marker and all lines until next marker into a single line
++ /^====MARK====/ b para
++ H
++ $ b para
++ b
++ :para
++ x
++ s/\n//g
++ # Remove the marker
++ s/^====MARK====//
++ # Remove trailing dots and whitespace
++ s/[\. \t]*$//
++ # Print
++ /./p' |
++ # we now have a list, one entry per line, of the stringified
++ # contents of the appropriate section of all members of the
++ # archive which possess that section. Heuristic: eliminate
++ # all those which have a first or second character that is
++ # a '.' (that is, objdump's representation of an unprintable
++ # character.) This should work for all archives with less than
++ # 0x302f exports -- but will fail for DLLs whose name actually
++ # begins with a literal '.' or a single character followed by
++ # a '.'.
++ #
++ # Of those that remain, print the first one.
++ $SED -e '/^\./d;/^.\./d;q'
++}
++
++# func_cygming_gnu_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is a GNU/binutils-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_gnu_implib_p ()
++{
++ $opt_debug
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
++ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
++ test -n "$func_cygming_gnu_implib_tmp"
++}
++
++# func_cygming_ms_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is an MS-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_ms_implib_p ()
++{
++ $opt_debug
++ func_to_tool_file "$1" func_convert_file_msys_to_w32
++ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
++ test -n "$func_cygming_ms_implib_tmp"
++}
++
++# func_cygming_dll_for_implib_fallback ARG
++# Platform-specific function to extract the
++# name of the DLL associated with the specified
++# import library ARG.
++#
++# This fallback implementation is for use when $DLLTOOL
++# does not support the --identify-strict option.
++# Invoked by eval'ing the libtool variable
++# $sharedlib_from_linklib_cmd
++# Result is available in the variable
++# $sharedlib_from_linklib_result
++func_cygming_dll_for_implib_fallback ()
++{
++ $opt_debug
++ if func_cygming_gnu_implib_p "$1" ; then
++ # binutils import library
++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
++ elif func_cygming_ms_implib_p "$1" ; then
++ # ms-generated import library
++ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
++ else
++ # unknown
++ sharedlib_from_linklib_result=""
++ fi
++}
+
+
+ # func_extract_an_archive dir oldlib
+@@ -2598,7 +3715,18 @@
+ $opt_debug
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
++ if test "$lock_old_archive_extraction" = yes; then
++ lockfile=$f_ex_an_ar_oldlib.lock
++ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
++ func_echo "Waiting for $lockfile to be removed"
++ sleep 2
++ done
++ fi
++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
++ 'stat=$?; rm -f "$lockfile"; exit $stat'
++ if test "$lock_old_archive_extraction" = yes; then
++ $opt_dry_run || rm -f "$lockfile"
++ fi
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+@@ -2669,7 +3797,7 @@
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+ $LIPO -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ $RM -rf unfat-$$
+@@ -2684,25 +3812,30 @@
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+ done
+
+ func_extract_archives_result="$my_oldobjs"
+ }
+
+
+-
+-# func_emit_wrapper_part1 [arg=no]
++# func_emit_wrapper [arg=no]
+ #
+-# Emit the first part of a libtool wrapper script on stdout.
+-# For more information, see the description associated with
+-# func_emit_wrapper(), below.
+-func_emit_wrapper_part1 ()
+-{
+- func_emit_wrapper_part1_arg1=no
+- if test -n "$1" ; then
+- func_emit_wrapper_part1_arg1=$1
+- fi
++# Emit a libtool wrapper script on stdout.
++# Don't directly open a file because we may want to
++# incorporate the script contents within a cygwin/mingw
++# wrapper executable. Must ONLY be called from within
++# func_mode_link because it depends on a number of variables
++# set therein.
++#
++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
++# variable will take. If 'yes', then the emitted script
++# will assume that the directory in which it is stored is
++# the $objdir directory. This is a cygwin/mingw-specific
++# behavior.
++func_emit_wrapper ()
++{
++ func_emit_wrapper_arg1=${1-no}
+
+ $ECHO "\
+ #! $SHELL
+@@ -2718,7 +3851,6 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
+ # Be Bourne compatible
+@@ -2749,31 +3881,135 @@
+ else
+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+- ECHO=\"$qecho\"
+- file=\"\$0\"
+- # Make sure echo works.
+- if test \"X\$1\" = X--no-reexec; then
+- # Discard the --no-reexec flag, and continue.
+- shift
+- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+- # Yippee, \$ECHO works!
+- :
+- else
+- # Restart under the correct shell, and then maybe \$ECHO will work.
+- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+- fi
+- fi\
++ file=\"\$0\""
++
++ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
++ $ECHO "\
++
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++ eval 'cat <<_LTECHO_EOF
++\$1
++_LTECHO_EOF'
++}
++ ECHO=\"$qECHO\"
++ fi
++
++# Very basic option parsing. These options are (a) specific to
++# the libtool wrapper, (b) are identical between the wrapper
++# /script/ and the wrapper /executable/ which is used only on
++# windows platforms, and (c) all begin with the string "--lt-"
++# (application programs are unlikely to have options which match
++# this pattern).
++#
++# There are only two supported options: --lt-debug and
++# --lt-dump-script. There is, deliberately, no --lt-help.
++#
++# The first argument to this parsing function should be the
++# script's $0 value, followed by "$@".
++lt_option_debug=
++func_parse_lt_options ()
++{
++ lt_script_arg0=\$0
++ shift
++ for lt_opt
++ do
++ case \"\$lt_opt\" in
++ --lt-debug) lt_option_debug=1 ;;
++ --lt-dump-script)
++ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
++ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
++ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
++ cat \"\$lt_dump_D/\$lt_dump_F\"
++ exit 0
++ ;;
++ --lt-*)
++ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
++ exit 1
++ ;;
++ esac
++ done
++
++ # Print the debug banner immediately:
++ if test -n \"\$lt_option_debug\"; then
++ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
++ fi
++}
++
++# Used when --lt-debug. Prints its arguments to stdout
++# (redirection is the responsibility of the caller)
++func_lt_dump_args ()
++{
++ lt_dump_args_N=1;
++ for lt_arg
++ do
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
++ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
++ done
++}
++
++# Core function for launching the target application
++func_exec_program_core ()
++{
+ "
+- $ECHO "\
++ case $host in
++ # Backslashes separate directories on plain windows
++ *-*-mingw | *-*-os2* | *-cegcc*)
++ $ECHO "\
++ if test -n \"\$lt_option_debug\"; then
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
++ func_lt_dump_args \${1+\"\$@\"} 1>&2
++ fi
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
++ ;;
++
++ *)
++ $ECHO "\
++ if test -n \"\$lt_option_debug\"; then
++ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
++ func_lt_dump_args \${1+\"\$@\"} 1>&2
++ fi
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
++ ;;
++ esac
++ $ECHO "\
++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
++ exit 1
++}
++
++# A function to encapsulate launching the target application
++# Strips options in the --lt-* namespace from \$@ and
++# launches target application with the remaining arguments.
++func_exec_program ()
++{
++ case \" \$* \" in
++ *\\ --lt-*)
++ for lt_wr_arg
++ do
++ case \$lt_wr_arg in
++ --lt-*) ;;
++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
++ esac
++ shift
++ done ;;
++ esac
++ func_exec_program_core \${1+\"\$@\"}
++}
++
++ # Parse options
++ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+ # Find the directory that this script lives in.
+- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
++ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
++ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
++ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+@@ -2783,30 +4019,13 @@
+ esac
+ fi
+
+- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
++ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+ done
+-"
+-}
+-# end: func_emit_wrapper_part1
+-
+-# func_emit_wrapper_part2 [arg=no]
+-#
+-# Emit the second part of a libtool wrapper script on stdout.
+-# For more information, see the description associated with
+-# func_emit_wrapper(), below.
+-func_emit_wrapper_part2 ()
+-{
+- func_emit_wrapper_part2_arg1=no
+- if test -n "$1" ; then
+- func_emit_wrapper_part2_arg1=$1
+- fi
+-
+- $ECHO "\
+
+ # Usually 'no', except on cygwin/mingw when embedded into
+ # the cwrapper.
+- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+ # special case for '.'
+ if test \"\$thisdir\" = \".\"; then
+@@ -2814,7 +4033,7 @@
+ fi
+ # remove .libs from thisdir
+ case \"\$thisdir\" in
+- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ $objdir ) thisdir=. ;;
+ esac
+ fi
+@@ -2869,6 +4088,18 @@
+
+ if test -f \"\$progdir/\$program\"; then"
+
++ # fixup the dll searchpath if we need to.
++ #
++ # Fix the DLL searchpath if we need to. Do this before prepending
++ # to shlibpath, because on Windows, both are PATH and uninstalled
++ # libraries must come first.
++ if test -n "$dllsearchpath"; then
++ $ECHO "\
++ # Add the dll search path components to the executable PATH
++ PATH=$dllsearchpath:\$PATH
++"
++ fi
++
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+@@ -2877,253 +4108,28 @@
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+ export $shlibpath_var
+ "
+ fi
+
+- # fixup the dll searchpath if we need to.
+- if test -n "$dllsearchpath"; then
+- $ECHO "\
+- # Add the dll search path components to the executable PATH
+- PATH=$dllsearchpath:\$PATH
+-"
+- fi
+-
+ $ECHO "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+-"
+- case $host in
+- # Backslashes separate directories on plain windows
+- *-*-mingw | *-*-os2* | *-cegcc*)
+- $ECHO "\
+- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+-"
+- ;;
+-
+- *)
+- $ECHO "\
+- exec \"\$progdir/\$program\" \${1+\"\$@\"}
+-"
+- ;;
+- esac
+- $ECHO "\
+- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+- exit 1
++ func_exec_program \${1+\"\$@\"}
+ fi
+ else
+ # The program doesn't exist.
+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
++ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+ fi
+ fi\
+ "
+ }
+-# end: func_emit_wrapper_part2
+-
+-
+-# func_emit_wrapper [arg=no]
+-#
+-# Emit a libtool wrapper script on stdout.
+-# Don't directly open a file because we may want to
+-# incorporate the script contents within a cygwin/mingw
+-# wrapper executable. Must ONLY be called from within
+-# func_mode_link because it depends on a number of variables
+-# set therein.
+-#
+-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+-# variable will take. If 'yes', then the emitted script
+-# will assume that the directory in which it is stored is
+-# the $objdir directory. This is a cygwin/mingw-specific
+-# behavior.
+-func_emit_wrapper ()
+-{
+- func_emit_wrapper_arg1=no
+- if test -n "$1" ; then
+- func_emit_wrapper_arg1=$1
+- fi
+-
+- # split this up so that func_emit_cwrapperexe_src
+- # can call each part independently.
+- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+-}
+-
+-
+-# func_to_host_path arg
+-#
+-# Convert paths to host format when used with build tools.
+-# Intended for use with "native" mingw (where libtool itself
+-# is running under the msys shell), or in the following cross-
+-# build environments:
+-# $build $host
+-# mingw (msys) mingw [e.g. native]
+-# cygwin mingw
+-# *nix + wine mingw
+-# where wine is equipped with the `winepath' executable.
+-# In the native mingw case, the (msys) shell automatically
+-# converts paths for any non-msys applications it launches,
+-# but that facility isn't available from inside the cwrapper.
+-# Similar accommodations are necessary for $host mingw and
+-# $build cygwin. Calling this function does no harm for other
+-# $host/$build combinations not listed above.
+-#
+-# ARG is the path (on $build) that should be converted to
+-# the proper representation for $host. The result is stored
+-# in $func_to_host_path_result.
+-func_to_host_path ()
+-{
+- func_to_host_path_result="$1"
+- if test -n "$1" ; then
+- case $host in
+- *mingw* )
+- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+- case $build in
+- *mingw* ) # actually, msys
+- # awkward: cmd appends spaces to result
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
+- func_to_host_path_tmp1=`cygpath -w "$1"`
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- * )
+- # Unfortunately, winepath does not exit with a non-zero
+- # error code, so we are forced to check the contents of
+- # stdout. On the other hand, if the command is not
+- # found, the shell will set an exit code of 127 and print
+- # *an error message* to stdout. So we must check for both
+- # error code of zero AND non-empty stdout, which explains
+- # the odd construction:
+- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- else
+- # Allow warning below.
+- func_to_host_path_result=""
+- fi
+- ;;
+- esac
+- if test -z "$func_to_host_path_result" ; then
+- func_error "Could not determine host path corresponding to"
+- func_error " '$1'"
+- func_error "Continuing, but uninstalled executables may not work."
+- # Fallback:
+- func_to_host_path_result="$1"
+- fi
+- ;;
+- esac
+- fi
+-}
+-# end: func_to_host_path
+
+-# func_to_host_pathlist arg
+-#
+-# Convert pathlists to host format when used with build tools.
+-# See func_to_host_path(), above. This function supports the
+-# following $build/$host combinations (but does no harm for
+-# combinations not listed here):
+-# $build $host
+-# mingw (msys) mingw [e.g. native]
+-# cygwin mingw
+-# *nix + wine mingw
+-#
+-# Path separators are also converted from $build format to
+-# $host format. If ARG begins or ends with a path separator
+-# character, it is preserved (but converted to $host format)
+-# on output.
+-#
+-# ARG is a pathlist (on $build) that should be converted to
+-# the proper representation on $host. The result is stored
+-# in $func_to_host_pathlist_result.
+-func_to_host_pathlist ()
+-{
+- func_to_host_pathlist_result="$1"
+- if test -n "$1" ; then
+- case $host in
+- *mingw* )
+- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+- # Remove leading and trailing path separator characters from
+- # ARG. msys behavior is inconsistent here, cygpath turns them
+- # into '.;' and ';.', and winepath ignores them completely.
+- func_to_host_pathlist_tmp2="$1"
+- # Once set for this call, this variable should not be
+- # reassigned. It is used in tha fallback case.
+- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+- $SED -e 's|^:*||' -e 's|:*$||'`
+- case $build in
+- *mingw* ) # Actually, msys.
+- # Awkward: cmd appends spaces to result.
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
+- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- * )
+- # unfortunately, winepath doesn't convert pathlists
+- func_to_host_pathlist_result=""
+- func_to_host_pathlist_oldIFS=$IFS
+- IFS=:
+- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+- IFS=$func_to_host_pathlist_oldIFS
+- if test -n "$func_to_host_pathlist_f" ; then
+- func_to_host_path "$func_to_host_pathlist_f"
+- if test -n "$func_to_host_path_result" ; then
+- if test -z "$func_to_host_pathlist_result" ; then
+- func_to_host_pathlist_result="$func_to_host_path_result"
+- else
+- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+- fi
+- fi
+- fi
+- IFS=:
+- done
+- IFS=$func_to_host_pathlist_oldIFS
+- ;;
+- esac
+- if test -z "$func_to_host_pathlist_result" ; then
+- func_error "Could not determine the host path(s) corresponding to"
+- func_error " '$1'"
+- func_error "Continuing, but uninstalled executables may not work."
+- # Fallback. This may break if $1 contains DOS-style drive
+- # specifications. The fix is not to complicate the expression
+- # below, but for the user to provide a working wine installation
+- # with winepath so that path translation in the cross-to-mingw
+- # case works properly.
+- lt_replace_pathsep_nix_to_dos="s|:|;|g"
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+- $SED -e "$lt_replace_pathsep_nix_to_dos"`
+- fi
+- # Now, add the leading and trailing path separators back
+- case "$1" in
+- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+- ;;
+- esac
+- case "$1" in
+- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+- ;;
+- esac
+- ;;
+- esac
+- fi
+-}
+-# end: func_to_host_pathlist
+
+ # func_emit_cwrapperexe_src
+ # emit the source code for a wrapper executable on stdout
+@@ -3141,41 +4147,71 @@
+
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+-
+- Currently, it simply execs the wrapper *script* "$SHELL $output",
+- but could eventually absorb all of the scripts functionality and
+- exec $objdir/$outputname directly.
+ */
+ EOF
+ cat <<"EOF"
++#ifdef _MSC_VER
++# define _CRT_SECURE_NO_DEPRECATE 1
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef _MSC_VER
+ # include <direct.h>
+ # include <process.h>
+ # include <io.h>
+-# define setmode _setmode
+ #else
+ # include <unistd.h>
+ # include <stdint.h>
+ # ifdef __CYGWIN__
+ # include <io.h>
+-# define HAVE_SETENV
+-# ifdef __STRICT_ANSI__
++# endif
++#endif
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <sys/stat.h>
++
++/* declarations of non-ANSI functions */
++#if defined(__MINGW32__)
++# ifdef __STRICT_ANSI__
++int _putenv (const char *);
++# endif
++#elif defined(__CYGWIN__)
++# ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
+ int putenv (char *);
+ int setenv (const char *, const char *, int);
+-# endif
+ # endif
++/* #elif defined (other platforms) ... */
++#endif
++
++/* portability defines, excluding path handling macros */
++#if defined(_MSC_VER)
++# define setmode _setmode
++# define stat _stat
++# define chmod _chmod
++# define getcwd _getcwd
++# define putenv _putenv
++# define S_IXUSR _S_IEXEC
++# ifndef _INTPTR_T_DEFINED
++# define _INTPTR_T_DEFINED
++# define intptr_t int
++# endif
++#elif defined(__MINGW32__)
++# define setmode _setmode
++# define stat _stat
++# define chmod _chmod
++# define getcwd _getcwd
++# define putenv _putenv
++#elif defined(__CYGWIN__)
++# define HAVE_SETENV
++# define FOPEN_WB "wb"
++/* #elif defined (other platforms) ... */
+ #endif
+-#include <malloc.h>
+-#include <stdarg.h>
+-#include <assert.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/stat.h>
+
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -3192,14 +4228,7 @@
+ # define S_IXGRP 0
+ #endif
+
+-#ifdef _MSC_VER
+-# define S_IXUSR _S_IEXEC
+-# define stat _stat
+-# ifndef _INTPTR_T_DEFINED
+-# define intptr_t int
+-# endif
+-#endif
+-
++/* path handling portability macros */
+ #ifndef DIR_SEPARATOR
+ # define DIR_SEPARATOR '/'
+ # define PATH_SEPARATOR ':'
+@@ -3230,10 +4259,6 @@
+ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+ #endif /* PATH_SEPARATOR_2 */
+
+-#ifdef __CYGWIN__
+-# define FOPEN_WB "wb"
+-#endif
+-
+ #ifndef FOPEN_WB
+ # define FOPEN_WB "w"
+ #endif
+@@ -3246,22 +4271,13 @@
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
+-#undef LTWRAPPER_DEBUGPRINTF
+-#if defined DEBUGWRAPPER
+-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+-static void
+-ltwrapper_debugprintf (const char *fmt, ...)
+-{
+- va_list args;
+- va_start (args, fmt);
+- (void) vfprintf (stderr, fmt, args);
+- va_end (args);
+-}
++#if defined(LT_DEBUGWRAPPER)
++static int lt_debug = 1;
+ #else
+-# define LTWRAPPER_DEBUGPRINTF(args)
++static int lt_debug = 0;
+ #endif
+
+-const char *program_name = NULL;
++const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+ void *xmalloc (size_t num);
+ char *xstrdup (const char *string);
+@@ -3271,41 +4287,27 @@
+ int make_executable (const char *path);
+ int check_executable (const char *path);
+ char *strendzap (char *str, const char *pat);
+-void lt_fatal (const char *message, ...);
++void lt_debugprintf (const char *file, int line, const char *fmt, ...);
++void lt_fatal (const char *file, int line, const char *message, ...);
++static const char *nonnull (const char *s);
++static const char *nonempty (const char *s);
+ void lt_setenv (const char *name, const char *value);
+ char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+-void lt_opt_process_env_set (const char *arg);
+-void lt_opt_process_env_prepend (const char *arg);
+-void lt_opt_process_env_append (const char *arg);
+-int lt_split_name_value (const char *arg, char** name, char** value);
+ void lt_update_exe_path (const char *name, const char *value);
+ void lt_update_lib_path (const char *name, const char *value);
+-
+-static const char *script_text_part1 =
+-EOF
+-
+- func_emit_wrapper_part1 yes |
+- $SED -e 's/\([\\"]\)/\\\1/g' \
+- -e 's/^/ "/' -e 's/$/\\n"/'
+- echo ";"
+- cat <<EOF
+-
+-static const char *script_text_part2 =
++char **prepare_spawn (char **argv);
++void lt_dump_script (FILE *f);
+ EOF
+- func_emit_wrapper_part2 yes |
+- $SED -e 's/\([\\"]\)/\\\1/g' \
+- -e 's/^/ "/' -e 's/$/\\n"/'
+- echo ";"
+
+ cat <<EOF
+-const char * MAGIC_EXE = "$magic_exe";
++volatile const char * MAGIC_EXE = "$magic_exe";
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
+ EOF
+
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+- func_to_host_pathlist "$temp_rpath"
++ func_to_host_path "$temp_rpath"
+ cat <<EOF
+-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
++const char * LIB_PATH_VALUE = "$func_to_host_path_result";
+ EOF
+ else
+ cat <<"EOF"
+@@ -3314,10 +4316,10 @@
+ fi
+
+ if test -n "$dllsearchpath"; then
+- func_to_host_pathlist "$dllsearchpath:"
++ func_to_host_path "$dllsearchpath:"
+ cat <<EOF
+ const char * EXE_PATH_VARNAME = "PATH";
+-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
++const char * EXE_PATH_VALUE = "$func_to_host_path_result";
+ EOF
+ else
+ cat <<"EOF"
+@@ -3340,24 +4342,10 @@
+ cat <<"EOF"
+
+ #define LTWRAPPER_OPTION_PREFIX "--lt-"
+-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
+
+-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
+ static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+-
+ static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
+-
+-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
+- /* argument is putenv-style "foo=bar", value of foo is set to bar */
+-
+-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
+- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+-
+-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
+- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
++static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
+
+ int
+ main (int argc, char *argv[])
+@@ -3374,10 +4362,13 @@
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
++ newargz = XMALLOC (char *, argc + 1);
+
+- /* very simple arg parsing; don't want to rely on getopt */
++ /* very simple arg parsing; don't want to rely on getopt
++ * also, copy all non cwrapper options to newargz, except
++ * argz[0], which is handled differently
++ */
++ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
+ if (strcmp (argv[i], dumpscript_opt) == 0)
+@@ -3391,25 +4382,57 @@
+ esac
+
+ cat <<"EOF"
+- printf ("%s", script_text_part1);
+- printf ("%s", script_text_part2);
++ lt_dump_script (stdout);
+ return 0;
+ }
++ if (strcmp (argv[i], debug_opt) == 0)
++ {
++ lt_debug = 1;
++ continue;
++ }
++ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
++ {
++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
++ namespace, but it is not one of the ones we know about and
++ have already dealt with, above (inluding dump-script), then
++ report an error. Otherwise, targets might begin to believe
++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
++ namespace. The first time any user complains about this, we'll
++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
++ or a configure.ac-settable value.
++ */
++ lt_fatal (__FILE__, __LINE__,
++ "unrecognized %s option: '%s'",
++ ltwrapper_option_prefix, argv[i]);
++ }
++ /* otherwise ... */
++ newargz[++newargc] = xstrdup (argv[i]);
+ }
++ newargz[++newargc] = NULL;
++
++EOF
++ cat <<EOF
++ /* The GNU banner must be the first non-error debug message */
++ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
++EOF
++ cat <<"EOF"
++ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
++ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+- newargz = XMALLOC (char *, argc + 1);
+ tmp_pathspec = find_executable (argv[0]);
+ if (tmp_pathspec == NULL)
+- lt_fatal ("Couldn't find %s", argv[0]);
+- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+- tmp_pathspec));
++ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
++ lt_debugprintf (__FILE__, __LINE__,
++ "(main) found exe (before symlink chase) at: %s\n",
++ tmp_pathspec);
+
+ actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+- actual_cwrapper_path));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(main) found exe (after symlink chase) at: %s\n",
++ actual_cwrapper_path);
+ XFREE (tmp_pathspec);
+
+- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
++ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+ strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+ /* wrapper name transforms */
+@@ -3427,8 +4450,9 @@
+ target_name = tmp_pathspec;
+ tmp_pathspec = 0;
+
+- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+- target_name));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(main) libtool target name: %s\n",
++ target_name);
+ EOF
+
+ cat <<EOF
+@@ -3478,80 +4502,19 @@
+
+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */
+- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
++ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
++ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
++ because on Windows, both *_VARNAMEs are PATH but uninstalled
++ libraries must come first. */
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+- newargc=0;
+- for (i = 1; i < argc; i++)
+- {
+- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+- {
+- if (argv[i][env_set_opt_len] == '=')
+- {
+- const char *p = argv[i] + env_set_opt_len + 1;
+- lt_opt_process_env_set (p);
+- }
+- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+- {
+- lt_opt_process_env_set (argv[++i]); /* don't copy */
+- }
+- else
+- lt_fatal ("%s missing required argument", env_set_opt);
+- continue;
+- }
+- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+- {
+- if (argv[i][env_prepend_opt_len] == '=')
+- {
+- const char *p = argv[i] + env_prepend_opt_len + 1;
+- lt_opt_process_env_prepend (p);
+- }
+- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+- {
+- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+- }
+- else
+- lt_fatal ("%s missing required argument", env_prepend_opt);
+- continue;
+- }
+- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+- {
+- if (argv[i][env_append_opt_len] == '=')
+- {
+- const char *p = argv[i] + env_append_opt_len + 1;
+- lt_opt_process_env_append (p);
+- }
+- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+- {
+- lt_opt_process_env_append (argv[++i]); /* don't copy */
+- }
+- else
+- lt_fatal ("%s missing required argument", env_append_opt);
+- continue;
+- }
+- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+- {
+- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+- namespace, but it is not one of the ones we know about and
+- have already dealt with, above (inluding dump-script), then
+- report an error. Otherwise, targets might begin to believe
+- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+- namespace. The first time any user complains about this, we'll
+- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+- or a configure.ac-settable value.
+- */
+- lt_fatal ("Unrecognized option in %s namespace: '%s'",
+- ltwrapper_option_prefix, argv[i]);
+- }
+- /* otherwise ... */
+- newargz[++newargc] = xstrdup (argv[i]);
+- }
+- newargz[++newargc] = NULL;
+-
+- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
++ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
++ nonnull (lt_argv_zero));
+ for (i = 0; i < newargc; i++)
+ {
+- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
++ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
++ i, nonnull (newargz[i]));
+ }
+
+ EOF
+@@ -3560,11 +4523,14 @@
+ mingw*)
+ cat <<"EOF"
+ /* execv doesn't actually work on mingw as expected on unix */
++ newargz = prepare_spawn (newargz);
+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(main) failed to launch target \"%s\": %s\n",
++ lt_argv_zero, nonnull (strerror (errno)));
+ return 127;
+ }
+ return rval;
+@@ -3586,7 +4552,7 @@
+ {
+ void *p = (void *) malloc (num);
+ if (!p)
+- lt_fatal ("Memory exhausted");
++ lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+ return p;
+ }
+@@ -3620,8 +4586,8 @@
+ {
+ struct stat st;
+
+- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+- path ? (*path ? path : "EMPTY!") : "NULL!"));
++ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
++ nonempty (path));
+ if ((!path) || (!*path))
+ return 0;
+
+@@ -3638,8 +4604,8 @@
+ int rval = 0;
+ struct stat st;
+
+- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+- path ? (*path ? path : "EMPTY!") : "NULL!"));
++ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
++ nonempty (path));
+ if ((!path) || (!*path))
+ return 0;
+
+@@ -3665,8 +4631,8 @@
+ int tmp_len;
+ char *concat_name;
+
+- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
++ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
++ nonempty (wrapper));
+
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
+@@ -3719,7 +4685,8 @@
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+- lt_fatal ("getcwd failed");
++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++ nonnull (strerror (errno)));
+ tmp_len = strlen (tmp);
+ concat_name =
+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+@@ -3744,7 +4711,8 @@
+ }
+ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+- lt_fatal ("getcwd failed");
++ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
++ nonnull (strerror (errno)));
+ tmp_len = strlen (tmp);
+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+@@ -3770,8 +4738,9 @@
+ int has_symlinks = 0;
+ while (strlen (tmp_pathspec) && !has_symlinks)
+ {
+- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+- tmp_pathspec));
++ lt_debugprintf (__FILE__, __LINE__,
++ "checking path component for symlinks: %s\n",
++ tmp_pathspec);
+ if (lstat (tmp_pathspec, &s) == 0)
+ {
+ if (S_ISLNK (s.st_mode) != 0)
+@@ -3793,8 +4762,9 @@
+ }
+ else
+ {
+- char *errstr = strerror (errno);
+- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
++ lt_fatal (__FILE__, __LINE__,
++ "error accessing file \"%s\": %s",
++ tmp_pathspec, nonnull (strerror (errno)));
+ }
+ }
+ XFREE (tmp_pathspec);
+@@ -3807,7 +4777,8 @@
+ tmp_pathspec = realpath (pathspec, buf);
+ if (tmp_pathspec == 0)
+ {
+- lt_fatal ("Could not follow symlinks for %s", pathspec);
++ lt_fatal (__FILE__, __LINE__,
++ "could not follow symlinks for %s", pathspec);
+ }
+ return xstrdup (tmp_pathspec);
+ #endif
+@@ -3833,11 +4804,25 @@
+ return str;
+ }
+
++void
++lt_debugprintf (const char *file, int line, const char *fmt, ...)
++{
++ va_list args;
++ if (lt_debug)
++ {
++ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
++ va_start (args, fmt);
++ (void) vfprintf (stderr, fmt, args);
++ va_end (args);
++ }
++}
++
+ static void
+-lt_error_core (int exit_status, const char *mode,
++lt_error_core (int exit_status, const char *file,
++ int line, const char *mode,
+ const char *message, va_list ap)
+ {
+- fprintf (stderr, "%s: %s: ", program_name, mode);
++ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
+
+@@ -3846,20 +4831,32 @@
+ }
+
+ void
+-lt_fatal (const char *message, ...)
++lt_fatal (const char *file, int line, const char *message, ...)
+ {
+ va_list ap;
+ va_start (ap, message);
+- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+ va_end (ap);
+ }
+
++static const char *
++nonnull (const char *s)
++{
++ return s ? s : "(null)";
++}
++
++static const char *
++nonempty (const char *s)
++{
++ return (s && !*s) ? "(empty)" : nonnull (s);
++}
++
+ void
+ lt_setenv (const char *name, const char *value)
+ {
+- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+- (name ? name : "<NULL>"),
+- (value ? value : "<NULL>")));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(lt_setenv) setting '%s' to '%s'\n",
++ nonnull (name), nonnull (value));
+ {
+ #ifdef HAVE_SETENV
+ /* always make a copy, for consistency with !HAVE_SETENV */
+@@ -3904,95 +4901,12 @@
+ return new_value;
+ }
+
+-int
+-lt_split_name_value (const char *arg, char** name, char** value)
+-{
+- const char *p;
+- int len;
+- if (!arg || !*arg)
+- return 1;
+-
+- p = strchr (arg, (int)'=');
+-
+- if (!p)
+- return 1;
+-
+- *value = xstrdup (++p);
+-
+- len = strlen (arg) - strlen (*value);
+- *name = XMALLOC (char, len);
+- strncpy (*name, arg, len-1);
+- (*name)[len - 1] = '\0';
+-
+- return 0;
+-}
+-
+-void
+-lt_opt_process_env_set (const char *arg)
+-{
+- char *name = NULL;
+- char *value = NULL;
+-
+- if (lt_split_name_value (arg, &name, &value) != 0)
+- {
+- XFREE (name);
+- XFREE (value);
+- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+- }
+-
+- lt_setenv (name, value);
+- XFREE (name);
+- XFREE (value);
+-}
+-
+-void
+-lt_opt_process_env_prepend (const char *arg)
+-{
+- char *name = NULL;
+- char *value = NULL;
+- char *new_value = NULL;
+-
+- if (lt_split_name_value (arg, &name, &value) != 0)
+- {
+- XFREE (name);
+- XFREE (value);
+- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+- }
+-
+- new_value = lt_extend_str (getenv (name), value, 0);
+- lt_setenv (name, new_value);
+- XFREE (new_value);
+- XFREE (name);
+- XFREE (value);
+-}
+-
+-void
+-lt_opt_process_env_append (const char *arg)
+-{
+- char *name = NULL;
+- char *value = NULL;
+- char *new_value = NULL;
+-
+- if (lt_split_name_value (arg, &name, &value) != 0)
+- {
+- XFREE (name);
+- XFREE (value);
+- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+- }
+-
+- new_value = lt_extend_str (getenv (name), value, 1);
+- lt_setenv (name, new_value);
+- XFREE (new_value);
+- XFREE (name);
+- XFREE (value);
+-}
+-
+ void
+ lt_update_exe_path (const char *name, const char *value)
+ {
+- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+- (name ? name : "<NULL>"),
+- (value ? value : "<NULL>")));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++ nonnull (name), nonnull (value));
+
+ if (name && *name && value && *value)
+ {
+@@ -4011,9 +4925,9 @@
+ void
+ lt_update_lib_path (const char *name, const char *value)
+ {
+- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+- (name ? name : "<NULL>"),
+- (value ? value : "<NULL>")));
++ lt_debugprintf (__FILE__, __LINE__,
++ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++ nonnull (name), nonnull (value));
+
+ if (name && *name && value && *value)
+ {
+@@ -4023,11 +4937,158 @@
+ }
+ }
+
++EOF
++ case $host_os in
++ mingw*)
++ cat <<"EOF"
++
++/* Prepares an argument vector before calling spawn().
++ Note that spawn() does not by itself call the command interpreter
++ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
++ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
++ GetVersionEx(&v);
++ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
++ }) ? "cmd.exe" : "command.com").
++ Instead it simply concatenates the arguments, separated by ' ', and calls
++ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
++ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
++ special way:
++ - Space and tab are interpreted as delimiters. They are not treated as
++ delimiters if they are surrounded by double quotes: "...".
++ - Unescaped double quotes are removed from the input. Their only effect is
++ that within double quotes, space and tab are treated like normal
++ characters.
++ - Backslashes not followed by double quotes are not special.
++ - But 2*n+1 backslashes followed by a double quote become
++ n backslashes followed by a double quote (n >= 0):
++ \" -> "
++ \\\" -> \"
++ \\\\\" -> \\"
++ */
++#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
++#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
++char **
++prepare_spawn (char **argv)
++{
++ size_t argc;
++ char **new_argv;
++ size_t i;
++
++ /* Count number of arguments. */
++ for (argc = 0; argv[argc] != NULL; argc++)
++ ;
++
++ /* Allocate new argument vector. */
++ new_argv = XMALLOC (char *, argc + 1);
++
++ /* Put quoted arguments into the new argument vector. */
++ for (i = 0; i < argc; i++)
++ {
++ const char *string = argv[i];
++
++ if (string[0] == '\0')
++ new_argv[i] = xstrdup ("\"\"");
++ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
++ {
++ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
++ size_t length;
++ unsigned int backslashes;
++ const char *s;
++ char *quoted_string;
++ char *p;
++
++ length = 0;
++ backslashes = 0;
++ if (quote_around)
++ length++;
++ for (s = string; *s != '\0'; s++)
++ {
++ char c = *s;
++ if (c == '"')
++ length += backslashes + 1;
++ length++;
++ if (c == '\\')
++ backslashes++;
++ else
++ backslashes = 0;
++ }
++ if (quote_around)
++ length += backslashes + 1;
++
++ quoted_string = XMALLOC (char, length + 1);
++
++ p = quoted_string;
++ backslashes = 0;
++ if (quote_around)
++ *p++ = '"';
++ for (s = string; *s != '\0'; s++)
++ {
++ char c = *s;
++ if (c == '"')
++ {
++ unsigned int j;
++ for (j = backslashes + 1; j > 0; j--)
++ *p++ = '\\';
++ }
++ *p++ = c;
++ if (c == '\\')
++ backslashes++;
++ else
++ backslashes = 0;
++ }
++ if (quote_around)
++ {
++ unsigned int j;
++ for (j = backslashes; j > 0; j--)
++ *p++ = '\\';
++ *p++ = '"';
++ }
++ *p = '\0';
++
++ new_argv[i] = quoted_string;
++ }
++ else
++ new_argv[i] = (char *) string;
++ }
++ new_argv[argc] = NULL;
++
++ return new_argv;
++}
++EOF
++ ;;
++ esac
+
++ cat <<"EOF"
++void lt_dump_script (FILE* f)
++{
++EOF
++ func_emit_wrapper yes |
++ $SED -n -e '
++s/^\(.\{79\}\)\(..*\)/\1\
++\2/
++h
++s/\([\\"]\)/\\\1/g
++s/$/\\n/
++s/\([^\n]*\).*/ fputs ("\1", f);/p
++g
++D'
++ cat <<"EOF"
++}
+ EOF
+ }
+ # end: func_emit_cwrapperexe_src
+
++# func_win32_import_lib_p ARG
++# True if ARG is an import lib, as indicated by $file_magic_cmd
++func_win32_import_lib_p ()
++{
++ $opt_debug
++ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
++ *import*) : ;;
++ *) false ;;
++ esac
++}
++
+ # func_mode_link arg...
+ func_mode_link ()
+ {
+@@ -4072,6 +5133,7 @@
+ new_inherited_linker_flags=
+
+ avoid_version=no
++ bindir=
+ dlfiles=
+ dlprefiles=
+ dlself=no
+@@ -4164,6 +5226,11 @@
+ esac
+
+ case $prev in
++ bindir)
++ bindir="$arg"
++ prev=
++ continue
++ ;;
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+@@ -4195,9 +5262,9 @@
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+- dlfiles="$dlfiles $arg"
++ func_append dlfiles " $arg"
+ else
+- dlprefiles="$dlprefiles $arg"
++ func_append dlprefiles " $arg"
+ fi
+ prev=
+ continue
+@@ -4221,7 +5288,7 @@
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
++ *) func_append deplibs " $qarg.ltframework" # this is fixed later
+ ;;
+ esac
+ ;;
+@@ -4240,7 +5307,7 @@
+ moreargs=
+ for fil in `cat "$save_arg"`
+ do
+-# moreargs="$moreargs $fil"
++# func_append moreargs " $fil"
+ arg=$fil
+ # A libtool-controlled object.
+
+@@ -4269,7 +5336,7 @@
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+- dlfiles="$dlfiles $pic_object"
++ func_append dlfiles " $pic_object"
+ prev=
+ continue
+ else
+@@ -4281,7 +5348,7 @@
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+- dlprefiles="$dlprefiles $pic_object"
++ func_append dlprefiles " $pic_object"
+ prev=
+ fi
+
+@@ -4351,12 +5418,12 @@
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+- *) rpath="$rpath $arg" ;;
++ *) func_append rpath " $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+- *) xrpath="$xrpath $arg" ;;
++ *) func_append xrpath " $arg" ;;
+ esac
+ fi
+ prev=
+@@ -4368,28 +5435,28 @@
+ continue
+ ;;
+ weak)
+- weak_libs="$weak_libs $arg"
++ func_append weak_libs " $arg"
+ prev=
+ continue
+ ;;
+ xcclinker)
+- linker_flags="$linker_flags $qarg"
+- compiler_flags="$compiler_flags $qarg"
++ func_append linker_flags " $qarg"
++ func_append compiler_flags " $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xcompiler)
+- compiler_flags="$compiler_flags $qarg"
++ func_append compiler_flags " $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xlinker)
+- linker_flags="$linker_flags $qarg"
+- compiler_flags="$compiler_flags $wl$qarg"
++ func_append linker_flags " $qarg"
++ func_append compiler_flags " $wl$qarg"
+ prev=
+ func_append compile_command " $wl$qarg"
+ func_append finalize_command " $wl$qarg"
+@@ -4425,6 +5492,11 @@
+ continue
+ ;;
+
++ -bindir)
++ prev=bindir
++ continue
++ ;;
++
+ -dlopen)
+ prev=dlfiles
+ continue
+@@ -4475,15 +5547,16 @@
+ ;;
+
+ -L*)
+- func_stripname '-L' '' "$arg"
+- dir=$func_stripname_result
+- if test -z "$dir"; then
++ func_stripname "-L" '' "$arg"
++ if test -z "$func_stripname_result"; then
+ if test "$#" -gt 0; then
+ func_fatal_error "require no space between \`-L' and \`$1'"
+ else
+ func_fatal_error "need path for \`-L' option"
+ fi
+ fi
++ func_resolve_sysroot "$func_stripname_result"
++ dir=$func_resolve_sysroot_result
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+@@ -4495,24 +5568,30 @@
+ ;;
+ esac
+ case "$deplibs " in
+- *" -L$dir "*) ;;
++ *" -L$dir "* | *" $arg "*)
++ # Will only happen for absolute or sysroot arguments
++ ;;
+ *)
+- deplibs="$deplibs -L$dir"
+- lib_search_path="$lib_search_path $dir"
++ # Preserve sysroot, but never include relative directories
++ case $dir in
++ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
++ *) func_append deplibs " -L$dir" ;;
++ esac
++ func_append lib_search_path " $dir"
+ ;;
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
++ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ ::) dllsearchpath=$dir;;
+- *) dllsearchpath="$dllsearchpath:$dir";;
++ *) func_append dllsearchpath ":$dir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+- *) dllsearchpath="$dllsearchpath:$testbindir";;
++ *) func_append dllsearchpath ":$testbindir";;
+ esac
+ ;;
+ esac
+@@ -4522,7 +5601,7 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+@@ -4536,7 +5615,7 @@
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+- deplibs="$deplibs System.ltframework"
++ func_append deplibs " System.ltframework"
+ continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+@@ -4556,7 +5635,7 @@
+ ;;
+ esac
+ fi
+- deplibs="$deplibs $arg"
++ func_append deplibs " $arg"
+ continue
+ ;;
+
+@@ -4568,21 +5647,22 @@
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
+ # classes, name mangling, and exception handling.
+ # Darwin uses the -arch flag to determine output architecture.
+- -model|-arch|-isysroot)
+- compiler_flags="$compiler_flags $arg"
++ -model|-arch|-isysroot|--sysroot)
++ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ prev=xcompiler
+ continue
+ ;;
+
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+- compiler_flags="$compiler_flags $arg"
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
++ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case "$new_inherited_linker_flags " in
+ *" $arg "*) ;;
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
++ * ) func_append new_inherited_linker_flags " $arg" ;;
+ esac
+ continue
+ ;;
+@@ -4649,13 +5729,17 @@
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
++ =*)
++ func_stripname '=' '' "$dir"
++ dir=$lt_sysroot$func_stripname_result
++ ;;
+ *)
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+- *) xrpath="$xrpath $dir" ;;
++ *) func_append xrpath " $dir" ;;
+ esac
+ continue
+ ;;
+@@ -4708,8 +5792,8 @@
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+- arg="$arg $wl$func_quote_for_eval_result"
+- compiler_flags="$compiler_flags $func_quote_for_eval_result"
++ func_append arg " $func_quote_for_eval_result"
++ func_append compiler_flags " $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+@@ -4724,9 +5808,9 @@
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+- arg="$arg $wl$func_quote_for_eval_result"
+- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+- linker_flags="$linker_flags $func_quote_for_eval_result"
++ func_append arg " $wl$func_quote_for_eval_result"
++ func_append compiler_flags " $wl$func_quote_for_eval_result"
++ func_append linker_flags " $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+@@ -4754,23 +5838,27 @@
+ arg="$func_quote_for_eval_result"
+ ;;
+
+- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+- # -r[0-9][0-9]* specifies the processor on the SGI compiler
+- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+- # +DA*, +DD* enable 64-bit mode on the HP compiler
+- # -q* pass through compiler args for the IBM compiler
+- # -m*, -t[45]*, -txscale* pass through architecture-specific
+- # compiler args for GCC
+- # -F/path gives path to uninstalled frameworks, gcc on darwin
+- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+- # @file GCC response files
++ # Flags to be passed through unchanged, with rationale:
++ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
++ # -r[0-9][0-9]* specify processor for the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
++ # +DA*, +DD* enable 64-bit mode for the HP compiler
++ # -q* compiler args for the IBM compiler
++ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
++ # -F/path path to uninstalled frameworks, gcc on darwin
++ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
++ # @file GCC response files
++ # -tp=* Portland pgcc target processor selection
++ # --sysroot=* for sysroot support
++ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+- compiler_flags="$compiler_flags $arg"
++ func_append compiler_flags " $arg"
+ continue
+ ;;
+
+@@ -4782,7 +5870,7 @@
+
+ *.$objext)
+ # A standard object.
+- objs="$objs $arg"
++ func_append objs " $arg"
+ ;;
+
+ *.lo)
+@@ -4813,7 +5901,7 @@
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+- dlfiles="$dlfiles $pic_object"
++ func_append dlfiles " $pic_object"
+ prev=
+ continue
+ else
+@@ -4825,7 +5913,7 @@
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+- dlprefiles="$dlprefiles $pic_object"
++ func_append dlprefiles " $pic_object"
+ prev=
+ fi
+
+@@ -4870,24 +5958,25 @@
+
+ *.$libext)
+ # An archive.
+- deplibs="$deplibs $arg"
+- old_deplibs="$old_deplibs $arg"
++ func_append deplibs " $arg"
++ func_append old_deplibs " $arg"
+ continue
+ ;;
+
+ *.la)
+ # A libtool-controlled library.
+
++ func_resolve_sysroot "$arg"
+ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+- dlfiles="$dlfiles $arg"
++ func_append dlfiles " $func_resolve_sysroot_result"
+ prev=
+ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+- dlprefiles="$dlprefiles $arg"
++ func_append dlprefiles " $func_resolve_sysroot_result"
+ prev=
+ else
+- deplibs="$deplibs $arg"
++ func_append deplibs " $func_resolve_sysroot_result"
+ fi
+ continue
+ ;;
+@@ -4925,7 +6014,7 @@
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+@@ -4934,6 +6023,8 @@
+
+ func_dirname "$output" "/" ""
+ output_objdir="$func_dirname_result$objdir"
++ func_to_tool_file "$output_objdir/"
++ tool_output_objdir=$func_to_tool_file_result
+ # Create the object directory.
+ func_mkdir_p "$output_objdir"
+
+@@ -4954,12 +6045,12 @@
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+- if $opt_duplicate_deps ; then
++ if $opt_preserve_dup_deps ; then
+ case "$libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+- libs="$libs $deplib"
++ func_append libs " $deplib"
+ done
+
+ if test "$linkmode" = lib; then
+@@ -4972,9 +6063,9 @@
+ if $opt_duplicate_compiler_generated_deps; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+ esac
+- pre_post_deps="$pre_post_deps $pre_post_dep"
++ func_append pre_post_deps " $pre_post_dep"
+ done
+ fi
+ pre_post_deps=
+@@ -5033,10 +6124,7 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link)
+- libs="$deplibs %DEPLIBS%"
+- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+- ;;
++ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ esac
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5044,17 +6132,19 @@
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+ dependency_libs=
++ func_resolve_sysroot "$lib"
+ case $lib in
+- *.la) func_source "$lib" ;;
++ *.la) func_source "$func_resolve_sysroot_result" ;;
+ esac
+
+ # Collect preopened libtool deplibs, except any this library
+ # has declared as weak libs
+ for deplib in $dependency_libs; do
+- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
++ func_basename "$deplib"
++ deplib_base=$func_basename_result
+ case " $weak_libs " in
+ *" $deplib_base "*) ;;
+- *) deplibs="$deplibs $deplib" ;;
++ *) func_append deplibs " $deplib" ;;
+ esac
+ done
+ done
+@@ -5070,16 +6160,17 @@
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+- compiler_flags="$compiler_flags $deplib"
++ func_append compiler_flags " $deplib"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
++ * ) func_append new_inherited_linker_flags " $deplib" ;;
+ esac
+ fi
+ fi
+@@ -5164,7 +6255,7 @@
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
++ * ) func_append new_inherited_linker_flags " $deplib" ;;
+ esac
+ fi
+ fi
+@@ -5177,7 +6268,8 @@
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ func_stripname '-L' '' "$deplib"
+- newlib_search_path="$newlib_search_path $func_stripname_result"
++ func_resolve_sysroot "$func_stripname_result"
++ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ prog)
+ if test "$pass" = conv; then
+@@ -5191,7 +6283,8 @@
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ func_stripname '-L' '' "$deplib"
+- newlib_search_path="$newlib_search_path $func_stripname_result"
++ func_resolve_sysroot "$func_stripname_result"
++ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ *)
+ func_warning "\`-L' is ignored for archives/objects"
+@@ -5202,17 +6295,21 @@
+ -R*)
+ if test "$pass" = link; then
+ func_stripname '-R' '' "$deplib"
+- dir=$func_stripname_result
++ func_resolve_sysroot "$func_stripname_result"
++ dir=$func_resolve_sysroot_result
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+ *" $dir "*) ;;
+- *) xrpath="$xrpath $dir" ;;
++ *) func_append xrpath " $dir" ;;
+ esac
+ fi
+ deplibs="$deplib $deplibs"
+ continue
+ ;;
+- *.la) lib="$deplib" ;;
++ *.la)
++ func_resolve_sysroot "$deplib"
++ lib=$func_resolve_sysroot_result
++ ;;
+ *.$libext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+@@ -5230,7 +6327,7 @@
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
++ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+@@ -5240,15 +6337,15 @@
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
+- $ECHO
++ echo
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which you do not appear to have"
+- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+- $ECHO "*** that it is just a static archive that I should not use here."
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which you do not appear to have"
++ echo "*** because the file extensions .$libext of this argument makes me believe"
++ echo "*** that it is just a static archive that I should not use here."
+ else
+- $ECHO
++ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+@@ -5275,11 +6372,11 @@
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+- newdlprefiles="$newdlprefiles $deplib"
++ func_append newdlprefiles " $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+- newdlfiles="$newdlfiles $deplib"
++ func_append newdlfiles " $deplib"
+ fi
+ fi
+ continue
+@@ -5321,20 +6418,20 @@
+
+ # Convert "-framework foo" to "foo.ltframework"
+ if test -n "$inherited_linker_flags"; then
+- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
++ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+ case " $new_inherited_linker_flags " in
+ *" $tmp_inherited_linker_flag "*) ;;
+- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
++ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+ esac
+ done
+ fi
+- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
++ test -n "$dlopen" && func_append dlfiles " $dlopen"
++ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+ fi
+
+ if test "$pass" = conv; then
+@@ -5345,30 +6442,36 @@
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+ # It is a libtool convenience library, so add in its objects.
+- convenience="$convenience $ladir/$objdir/$old_library"
+- old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
++ func_append convenience " $ladir/$objdir/$old_library"
++ func_append old_convenience " $ladir/$objdir/$old_library"
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_preserve_dup_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
++ esac
++ fi
++ func_append tmp_libs " $deplib"
++ done
+ continue
+ fi # $pass = conv
+
+
+ # Get the name of the library we link against.
+ linklib=
+- for l in $old_library $library_names; do
+- linklib="$l"
+- done
++ if test -n "$old_library" &&
++ { test "$prefer_static_libs" = yes ||
++ test "$prefer_static_libs,$installed" = "built,no"; }; then
++ linklib=$old_library
++ else
++ for l in $old_library $library_names; do
++ linklib="$l"
++ done
++ fi
+ if test -z "$linklib"; then
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+@@ -5385,9 +6488,9 @@
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+ # bomb out in the load deplibs phase.
+- dlprefiles="$dlprefiles $lib $dependency_libs"
++ func_append dlprefiles " $lib $dependency_libs"
+ else
+- newdlfiles="$newdlfiles $lib"
++ func_append newdlfiles " $lib"
+ fi
+ continue
+ fi # $pass = dlopen
+@@ -5409,14 +6512,14 @@
+
+ # Find the relevant object directory and library name.
+ if test "X$installed" = Xyes; then
+- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ func_warning "library \`$lib' was moved."
+ dir="$ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ dir="$lt_sysroot$libdir"
++ absdir="$lt_sysroot$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -5424,12 +6527,12 @@
+ dir="$ladir"
+ absdir="$abs_ladir"
+ # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ func_append notinst_path " $abs_ladir"
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ func_append notinst_path " $abs_ladir"
+ fi
+ fi # $installed = yes
+ func_stripname 'lib' '.la' "$laname"
+@@ -5440,20 +6543,46 @@
+ if test -z "$libdir" && test "$linkmode" = prog; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ fi
+- # Prefer using a static library (so that no silly _DYNAMIC symbols
+- # are required to link).
+- if test -n "$old_library"; then
+- newdlprefiles="$newdlprefiles $dir/$old_library"
+- # Keep a list of preopened convenience libraries to check
+- # that they are being used correctly in the link pass.
+- test -z "$libdir" && \
+- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+- # Otherwise, use the dlname, so that lt_dlopen finds it.
+- elif test -n "$dlname"; then
+- newdlprefiles="$newdlprefiles $dir/$dlname"
+- else
+- newdlprefiles="$newdlprefiles $dir/$linklib"
+- fi
++ case "$host" in
++ # special handling for platforms with PE-DLLs.
++ *cygwin* | *mingw* | *cegcc* )
++ # Linker will automatically link against shared library if both
++ # static and shared are present. Therefore, ensure we extract
++ # symbols from the import library if a shared library is present
++ # (otherwise, the dlopen module name will be incorrect). We do
++ # this by putting the import library name into $newdlprefiles.
++ # We recover the dlopen module name by 'saving' the la file
++ # name in a special purpose variable, and (later) extracting the
++ # dlname from the la file.
++ if test -n "$dlname"; then
++ func_tr_sh "$dir/$linklib"
++ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
++ func_append newdlprefiles " $dir/$linklib"
++ else
++ func_append newdlprefiles " $dir/$old_library"
++ # Keep a list of preopened convenience libraries to check
++ # that they are being used correctly in the link pass.
++ test -z "$libdir" && \
++ func_append dlpreconveniencelibs " $dir/$old_library"
++ fi
++ ;;
++ * )
++ # Prefer using a static library (so that no silly _DYNAMIC symbols
++ # are required to link).
++ if test -n "$old_library"; then
++ func_append newdlprefiles " $dir/$old_library"
++ # Keep a list of preopened convenience libraries to check
++ # that they are being used correctly in the link pass.
++ test -z "$libdir" && \
++ func_append dlpreconveniencelibs " $dir/$old_library"
++ # Otherwise, use the dlname, so that lt_dlopen finds it.
++ elif test -n "$dlname"; then
++ func_append newdlprefiles " $dir/$dlname"
++ else
++ func_append newdlprefiles " $dir/$linklib"
++ fi
++ ;;
++ esac
+ fi # $pass = dlpreopen
+
+ if test -z "$libdir"; then
+@@ -5471,7 +6600,7 @@
+
+
+ if test "$linkmode" = prog && test "$pass" != link; then
+- newlib_search_path="$newlib_search_path $ladir"
++ func_append newlib_search_path " $ladir"
+ deplibs="$lib $deplibs"
+
+ linkalldeplibs=no
+@@ -5484,7 +6613,8 @@
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+- newlib_search_path="$newlib_search_path $func_stripname_result"
++ func_resolve_sysroot "$func_stripname_result"
++ func_append newlib_search_path " $func_resolve_sysroot_result"
+ ;;
+ esac
+ # Need to link against all dependency_libs?
+@@ -5495,12 +6625,12 @@
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+- if $opt_duplicate_deps ; then
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+- tmp_libs="$tmp_libs $deplib"
++ func_append tmp_libs " $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+@@ -5515,7 +6645,7 @@
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+- *) temp_rpath="$temp_rpath$absdir:" ;;
++ *) func_append temp_rpath "$absdir:" ;;
+ esac
+ fi
+
+@@ -5527,7 +6657,7 @@
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+- *) compile_rpath="$compile_rpath $absdir"
++ *) func_append compile_rpath " $absdir" ;;
+ esac
+ ;;
+ esac
+@@ -5536,7 +6666,7 @@
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir"
++ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ ;;
+ esac
+@@ -5561,12 +6691,12 @@
+ case $host in
+ *cygwin* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+- notinst_deplibs="$notinst_deplibs $lib"
++ func_append notinst_deplibs " $lib"
+ need_relink=no
+ ;;
+ *)
+ if test "$installed" = no; then
+- notinst_deplibs="$notinst_deplibs $lib"
++ func_append notinst_deplibs " $lib"
+ need_relink=yes
+ fi
+ ;;
+@@ -5583,7 +6713,7 @@
+ fi
+ done
+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+- $ECHO
++ echo
+ if test "$linkmode" = prog; then
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
+ else
+@@ -5601,7 +6731,7 @@
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+- *) compile_rpath="$compile_rpath $absdir"
++ *) func_append compile_rpath " $absdir" ;;
+ esac
+ ;;
+ esac
+@@ -5610,7 +6740,7 @@
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir"
++ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ ;;
+ esac
+@@ -5664,7 +6794,7 @@
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+- if test "$linkmode" = prog || test "$mode" != relink; then
++ if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -5686,9 +6816,9 @@
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+- $ECHO
+- $ECHO "*** And there doesn't seem to be a static archive available"
+- $ECHO "*** The link will probably fail, sorry"
++ echo
++ echo "*** And there doesn't seem to be a static archive available"
++ echo "*** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+@@ -5715,12 +6845,12 @@
+ test "$hardcode_direct_absolute" = no; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+- add_dir="-L$dir"
++ add_dir="-L$absdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+- add_dir="$add_dir -L$inst_prefix_dir$libdir"
++ func_append add_dir " -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -5742,7 +6872,7 @@
+ if test -n "$add_shlibpath"; then
+ case :$compile_shlibpath: in
+ *":$add_shlibpath:"*) ;;
+- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
++ *) func_append compile_shlibpath "$add_shlibpath:" ;;
+ esac
+ fi
+ if test "$linkmode" = prog; then
+@@ -5756,13 +6886,13 @@
+ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++ *) func_append finalize_shlibpath "$libdir:" ;;
+ esac
+ fi
+ fi
+ fi
+
+- if test "$linkmode" = prog || test "$mode" = relink; then
++ if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -5776,7 +6906,7 @@
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
++ *) func_append finalize_shlibpath "$libdir:" ;;
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+@@ -5793,7 +6923,7 @@
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+- add_dir="$add_dir -L$inst_prefix_dir$libdir"
++ func_append add_dir " -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -5828,21 +6958,21 @@
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+- $ECHO
++ echo
+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which you do not appear to have."
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+- $ECHO "*** But as you try to build a module library, libtool will still create "
+- $ECHO "*** a static module, that should work as long as the dlopening application"
+- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
++ echo "*** But as you try to build a module library, libtool will still create "
++ echo "*** a static module, that should work as long as the dlopening application"
++ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+- $ECHO
+- $ECHO "*** However, this would only work if libtool was able to extract symbol"
+- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- $ECHO "*** not find such a program. So, this module is probably useless."
+- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
++ echo
++ echo "*** However, this would only work if libtool was able to extract symbol"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ echo "*** not find such a program. So, this module is probably useless."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+@@ -5870,27 +7000,33 @@
+ temp_xrpath=$func_stripname_result
+ case " $xrpath " in
+ *" $temp_xrpath "*) ;;
+- *) xrpath="$xrpath $temp_xrpath";;
++ *) func_append xrpath " $temp_xrpath";;
+ esac;;
+- *) temp_deplibs="$temp_deplibs $libdir";;
++ *) func_append temp_deplibs " $libdir";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+- newlib_search_path="$newlib_search_path $absdir"
++ func_append newlib_search_path " $absdir"
+ # Link against this library
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+- if $opt_duplicate_deps ; then
++ case $deplib in
++ -L*) func_stripname '-L' '' "$deplib"
++ func_resolve_sysroot "$func_stripname_result";;
++ *) func_resolve_sysroot "$deplib" ;;
++ esac
++ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ *" $func_resolve_sysroot_result "*)
++ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+ esac
+ fi
+- tmp_libs="$tmp_libs $deplib"
++ func_append tmp_libs " $func_resolve_sysroot_result"
+ done
+
+ if test "$link_all_deplibs" != no; then
+@@ -5900,8 +7036,10 @@
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
++ func_resolve_sysroot "$deplib"
++ deplib=$func_resolve_sysroot_result
+ func_dirname "$deplib" "" "."
+- dir="$func_dirname_result"
++ dir=$func_dirname_result
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+@@ -5928,8 +7066,8 @@
+ if test -z "$darwin_install_name"; then
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
++ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+@@ -5962,7 +7100,7 @@
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
+ dependency_libs="$newdependency_libs"
+@@ -5979,7 +7117,7 @@
+ for dir in $newlib_search_path; do
+ case "$lib_search_path " in
+ *" $dir "*) ;;
+- *) lib_search_path="$lib_search_path $dir" ;;
++ *) func_append lib_search_path " $dir" ;;
+ esac
+ done
+ newlib_search_path=
+@@ -6037,10 +7175,10 @@
+ -L*)
+ case " $tmp_libs " in
+ *" $deplib "*) ;;
+- *) tmp_libs="$tmp_libs $deplib" ;;
++ *) func_append tmp_libs " $deplib" ;;
+ esac
+ ;;
+- *) tmp_libs="$tmp_libs $deplib" ;;
++ *) func_append tmp_libs " $deplib" ;;
+ esac
+ done
+ eval $var=\"$tmp_libs\"
+@@ -6056,7 +7194,7 @@
+ ;;
+ esac
+ if test -n "$i" ; then
+- tmp_libs="$tmp_libs $i"
++ func_append tmp_libs " $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+@@ -6097,7 +7235,7 @@
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+- objs="$objs$old_deplibs"
++ func_append objs "$old_deplibs"
+ ;;
+
+ lib)
+@@ -6130,10 +7268,10 @@
+ if test "$deplibs_check_method" != pass_all; then
+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ else
+- $ECHO
++ echo
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+ $ECHO "*** objects $objs is not portable!"
+- libobjs="$libobjs $objs"
++ func_append libobjs " $objs"
+ fi
+ fi
+
+@@ -6192,13 +7330,14 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
++ # correct linux to gnu/linux during the next big refactor
+ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|freebsd-elf|qnx|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -6210,9 +7349,6 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
+- *)
+- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+- ;;
+ esac
+ ;;
+ no)
+@@ -6311,7 +7447,7 @@
+ versuffix="$major.$revision"
+ ;;
+
+- linux)
++ linux) # correct to gnu/linux during the next big refactor
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix="$major.$age.$revision"
+@@ -6334,7 +7470,7 @@
+ done
+
+ # Make executables depend on our current version.
+- verstring="$verstring:${current}.0"
++ func_append verstring ":${current}.0"
+ ;;
+
+ qnx)
+@@ -6402,10 +7538,10 @@
+ fi
+
+ func_generate_dlsyms "$libname" "$libname" "yes"
+- libobjs="$libobjs $symfileobj"
++ func_append libobjs " $symfileobj"
+ test "X$libobjs" = "X " && libobjs=
+
+- if test "$mode" != relink; then
++ if test "$opt_mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+@@ -6421,7 +7557,7 @@
+ continue
+ fi
+ fi
+- removelist="$removelist $p"
++ func_append removelist " $p"
+ ;;
+ *) ;;
+ esac
+@@ -6432,27 +7568,28 @@
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+- oldlibs="$oldlibs $output_objdir/$libname.$libext"
++ func_append oldlibs " $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
++ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+ #for path in $notinst_path; do
+- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
++ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
++ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
++ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ temp_xrpath=
+ for libdir in $xrpath; do
+- temp_xrpath="$temp_xrpath -R$libdir"
++ func_replace_sysroot "$libdir"
++ func_append temp_xrpath " -R$func_replace_sysroot_result"
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir" ;;
++ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ done
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+@@ -6466,7 +7603,7 @@
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+ *" $lib "*) ;;
+- *) dlfiles="$dlfiles $lib" ;;
++ *) func_append dlfiles " $lib" ;;
+ esac
+ done
+
+@@ -6476,19 +7613,19 @@
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+ *" $lib "*) ;;
+- *) dlprefiles="$dlprefiles $lib" ;;
++ *) func_append dlprefiles " $lib" ;;
+ esac
+ done
+
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+- deplibs="$deplibs System.ltframework"
++ func_append deplibs " System.ltframework"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+@@ -6505,7 +7642,7 @@
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+- deplibs="$deplibs -lc"
++ func_append deplibs " -lc"
+ fi
+ ;;
+ esac
+@@ -6554,7 +7691,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ i=""
+ ;;
+ esac
+@@ -6565,21 +7702,21 @@
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+- $ECHO
++ echo
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which I believe you do not have"
+- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which I believe you do not have"
++ echo "*** because a test_compile did reveal that the linker did not use it for"
++ echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ ;;
+ *)
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ ;;
+ esac
+ done
+@@ -6597,7 +7734,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ i=""
+ ;;
+ esac
+@@ -6608,29 +7745,29 @@
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+- $ECHO
++ echo
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which you do not appear to have"
+- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which you do not appear to have"
++ echo "*** because a test_compile did reveal that the linker did not use this one"
++ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+- $ECHO
++ echo
+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
+- $ECHO "*** make it link in! You will probably need to install it or some"
+- $ECHO "*** library that it depends on before this library will be fully"
+- $ECHO "*** functional. Installing it before continuing would be even better."
++ echo "*** make it link in! You will probably need to install it or some"
++ echo "*** library that it depends on before this library will be fully"
++ echo "*** functional. Installing it before continuing would be even better."
+ fi
+ ;;
+ *)
+- newdeplibs="$newdeplibs $i"
++ func_append newdeplibs " $i"
+ ;;
+ esac
+ done
+@@ -6647,15 +7784,27 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
++ if test -n "$file_magic_glob"; then
++ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
++ else
++ libnameglob=$libname
++ fi
++ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++ if test "$want_nocaseglob" = yes; then
++ shopt -s nocaseglob
++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++ $nocaseglob
++ else
++ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
++ fi
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null |
+@@ -6672,13 +7821,13 @@
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+@@ -6687,12 +7836,12 @@
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- $ECHO
++ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which you do not appear to have"
+- $ECHO "*** because I did check the linker path looking for a file starting"
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which you do not appear to have"
++ echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+@@ -6703,7 +7852,7 @@
+ ;;
+ *)
+ # Add a -L argument.
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
+@@ -6719,7 +7868,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+@@ -6730,9 +7879,9 @@
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ potlib="$potent_lib" # see symlink-check above in file_magic test
+- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
++ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+@@ -6741,12 +7890,12 @@
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- $ECHO
++ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+- $ECHO "*** I have the capability to make that library automatically link in when"
+- $ECHO "*** you link to this library. But I can only do this if you have a"
+- $ECHO "*** shared version of the library, which you do not appear to have"
+- $ECHO "*** because I did check the linker path looking for a file starting"
++ echo "*** I have the capability to make that library automatically link in when"
++ echo "*** you link to this library. But I can only do this if you have a"
++ echo "*** shared version of the library, which you do not appear to have"
++ echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+@@ -6757,32 +7906,32 @@
+ ;;
+ *)
+ # Add a -L argument.
+- newdeplibs="$newdeplibs $a_deplib"
++ func_append newdeplibs " $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
++ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
++ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ done
+ fi
+- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+- $GREP . >/dev/null; then
+- $ECHO
++ case $tmp_deplibs in
++ *[!\ \ ]*)
++ echo
+ if test "X$deplibs_check_method" = "Xnone"; then
+- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
++ echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
++ echo "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+- $ECHO "*** All declared inter-library dependencies are being dropped."
++ echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+- fi
++ ;;
++ esac
+ ;;
+ esac
+ versuffix=$versuffix_save
+@@ -6794,23 +7943,23 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library with the System framework
+- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+ ;;
+ esac
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+- $ECHO
+- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
++ echo
++ echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+- $ECHO "*** a static module, that should work as long as the dlopening"
+- $ECHO "*** application is linked with the -dlopen flag."
++ echo "*** a static module, that should work as long as the dlopening"
++ echo "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+- $ECHO
+- $ECHO "*** However, this would only work if libtool was able to extract symbol"
+- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- $ECHO "*** not find such a program. So, this module is probably useless."
+- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
++ echo
++ echo "*** However, this would only work if libtool was able to extract symbol"
++ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ echo "*** not find such a program. So, this module is probably useless."
++ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+@@ -6820,16 +7969,16 @@
+ build_libtool_libs=no
+ fi
+ else
+- $ECHO "*** The inter-library dependencies that have been dropped here will be"
+- $ECHO "*** automatically added whenever a program is linked with this library"
+- $ECHO "*** or is declared to -dlopen it."
++ echo "*** The inter-library dependencies that have been dropped here will be"
++ echo "*** automatically added whenever a program is linked with this library"
++ echo "*** or is declared to -dlopen it."
+
+ if test "$allow_undefined" = no; then
+- $ECHO
+- $ECHO "*** Since this library must not contain undefined symbols,"
+- $ECHO "*** because either the platform does not support them or"
+- $ECHO "*** it was explicitly requested with -no-undefined,"
+- $ECHO "*** libtool will only create a static version of it."
++ echo
++ echo "*** Since this library must not contain undefined symbols,"
++ echo "*** because either the platform does not support them or"
++ echo "*** it was explicitly requested with -no-undefined,"
++ echo "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+@@ -6846,9 +7995,9 @@
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+@@ -6861,7 +8010,7 @@
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+- new_libs="$new_libs -L$path/$objdir" ;;
++ func_append new_libs " -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+@@ -6871,10 +8020,10 @@
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+- *) new_libs="$new_libs $deplib" ;;
++ *) func_append new_libs " $deplib" ;;
+ esac
+ ;;
+- *) new_libs="$new_libs $deplib" ;;
++ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+@@ -6886,15 +8035,22 @@
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
++ # Remove ${wl} instances when linking with ld.
++ # FIXME: should test the right _cmds variable.
++ case $archive_cmds in
++ *\$LD\ *) wl= ;;
++ esac
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$mode" != relink && rpath="$compile_rpath$rpath"
++ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
++ func_replace_sysroot "$libdir"
++ libdir=$func_replace_sysroot_result
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+@@ -6903,18 +8059,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- dep_rpath="$dep_rpath $flag"
++ func_append dep_rpath " $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+- *) perm_rpath="$perm_rpath $libdir" ;;
++ *) func_append perm_rpath " $libdir" ;;
+ esac
+ fi
+ done
+@@ -6922,17 +8078,13 @@
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+- if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+- else
+- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+- fi
++ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+- rpath="$rpath$dir:"
++ func_append rpath "$dir:"
+ done
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ fi
+@@ -6940,7 +8092,7 @@
+ fi
+
+ shlibpath="$finalize_shlibpath"
+- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+@@ -6966,18 +8118,18 @@
+ linknames=
+ for link
+ do
+- linknames="$linknames $link"
++ func_append linknames " $link"
+ done
+
+ # Use standard objects if they are pic
+- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ test "X$libobjs" = "X " && libobjs=
+
+ delfiles=
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+ export_symbols="$output_objdir/$libname.uexp"
+- delfiles="$delfiles $export_symbols"
++ func_append delfiles " $export_symbols"
+ fi
+
+ orig_export_symbols=
+@@ -7008,13 +8160,45 @@
+ $opt_dry_run || $RM $export_symbols
+ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+- for cmd in $cmds; do
++ for cmd1 in $cmds; do
+ IFS="$save_ifs"
+- eval cmd=\"$cmd\"
+- func_len " $cmd"
+- len=$func_len_result
+- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++ # Take the normal branch if the nm_file_list_spec branch
++ # doesn't work or if tool conversion is not needed.
++ case $nm_file_list_spec~$to_tool_file_cmd in
++ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
++ try_normal_branch=yes
++ eval cmd=\"$cmd1\"
++ func_len " $cmd"
++ len=$func_len_result
++ ;;
++ *)
++ try_normal_branch=no
++ ;;
++ esac
++ if test "$try_normal_branch" = yes \
++ && { test "$len" -lt "$max_cmd_len" \
++ || test "$max_cmd_len" -le -1; }
++ then
++ func_show_eval "$cmd" 'exit $?'
++ skipped_export=false
++ elif test -n "$nm_file_list_spec"; then
++ func_basename "$output"
++ output_la=$func_basename_result
++ save_libobjs=$libobjs
++ save_output=$output
++ output=${output_objdir}/${output_la}.nm
++ func_to_tool_file "$output"
++ libobjs=$nm_file_list_spec$func_to_tool_file_result
++ func_append delfiles " $output"
++ func_verbose "creating $NM input file list: $output"
++ for obj in $save_libobjs; do
++ func_to_tool_file "$obj"
++ $ECHO "$func_to_tool_file_result"
++ done > "$output"
++ eval cmd=\"$cmd1\"
+ func_show_eval "$cmd" 'exit $?'
++ output=$save_output
++ libobjs=$save_libobjs
+ skipped_export=false
+ else
+ # The command line is too long to execute in one step.
+@@ -7036,7 +8220,7 @@
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+@@ -7048,7 +8232,7 @@
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+@@ -7058,7 +8242,7 @@
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+- tmp_deplibs="$tmp_deplibs $test_deplib"
++ func_append tmp_deplibs " $test_deplib"
+ ;;
+ esac
+ done
+@@ -7078,21 +8262,21 @@
+ test "X$libobjs" = "X " && libobjs=
+ else
+ gentop="$output_objdir/${outputname}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+- libobjs="$libobjs $func_extract_archives_result"
++ func_append libobjs " $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+ fi
+
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+- linker_flags="$linker_flags $flag"
++ func_append linker_flags " $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+- if test "$mode" = relink; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+ fi
+
+@@ -7137,7 +8321,8 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
+- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
++ func_basename "$output"
++ output_la=$func_basename_result
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -7150,13 +8335,16 @@
+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+- $ECHO 'INPUT (' > $output
++ echo 'INPUT (' > $output
+ for obj in $save_libobjs
+ do
+- $ECHO "$obj" >> $output
++ func_to_tool_file "$obj"
++ $ECHO "$func_to_tool_file_result" >> $output
+ done
+- $ECHO ')' >> $output
+- delfiles="$delfiles $output"
++ echo ')' >> $output
++ func_append delfiles " $output"
++ func_to_tool_file "$output"
++ output=$func_to_tool_file_result
+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+ output=${output_objdir}/${output_la}.lnk
+ func_verbose "creating linker input file list: $output"
+@@ -7170,10 +8358,12 @@
+ fi
+ for obj
+ do
+- $ECHO "$obj" >> $output
++ func_to_tool_file "$obj"
++ $ECHO "$func_to_tool_file_result" >> $output
+ done
+- delfiles="$delfiles $output"
+- output=$firstobj\"$file_list_spec$output\"
++ func_append delfiles " $output"
++ func_to_tool_file "$output"
++ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+@@ -7197,17 +8387,19 @@
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++ reload_objs=$objlist
++ eval concat_cmds=\"$reload_cmds\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
++ reload_objs="$objlist $last_robj"
++ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+ fi
+ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+ output=$output_objdir/$output_la-${k}.$objext
+- objlist=$obj
++ objlist=" $obj"
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+ len=$func_arith_result
+@@ -7217,11 +8409,12 @@
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
++ reload_objs="$objlist $last_robj"
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+- delfiles="$delfiles $output"
++ func_append delfiles " $output"
+
+ else
+ output=
+@@ -7255,7 +8448,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test "$mode" = relink; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -7276,7 +8469,7 @@
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
++ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test -n "$orig_export_symbols"; then
+@@ -7288,7 +8481,7 @@
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
++ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+@@ -7329,10 +8522,10 @@
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+- libobjs="$libobjs $func_extract_archives_result"
++ func_append libobjs " $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+
+@@ -7348,7 +8541,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test "$mode" = relink; then
++ if test "$opt_mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -7360,7 +8553,7 @@
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+- if test "$mode" = relink; then
++ if test "$opt_mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+@@ -7441,18 +8634,21 @@
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
++ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+
+ func_extract_archives $gentop $convenience
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
++ # If we're not building shared, we need to use non_pic_objs
++ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
++
+ # Create the old-style object.
+- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+@@ -7512,8 +8708,8 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
++ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ ;;
+ esac
+
+@@ -7524,14 +8720,14 @@
+ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+- compile_command="$compile_command ${wl}-bind_at_load"
+- finalize_command="$finalize_command ${wl}-bind_at_load"
++ func_append compile_command " ${wl}-bind_at_load"
++ func_append finalize_command " ${wl}-bind_at_load"
+ ;;
+ esac
+ fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+@@ -7545,7 +8741,7 @@
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+- new_libs="$new_libs -L$path/$objdir" ;;
++ func_append new_libs " -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+@@ -7555,17 +8751,17 @@
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+- *) new_libs="$new_libs $deplib" ;;
++ *) func_append new_libs " $deplib" ;;
+ esac
+ ;;
+- *) new_libs="$new_libs $deplib" ;;
++ *) func_append new_libs " $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
+
+
+- compile_command="$compile_command $compile_deplibs"
+- finalize_command="$finalize_command $finalize_deplibs"
++ func_append compile_command " $compile_deplibs"
++ func_append finalize_command " $finalize_deplibs"
+
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -7573,7 +8769,7 @@
+ # This is the magic to use -rpath.
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) finalize_rpath="$finalize_rpath $libdir" ;;
++ *) func_append finalize_rpath " $libdir" ;;
+ esac
+ done
+ fi
+@@ -7592,18 +8788,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- rpath="$rpath $flag"
++ func_append rpath " $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+- *) perm_rpath="$perm_rpath $libdir" ;;
++ *) func_append perm_rpath " $libdir" ;;
+ esac
+ fi
+ case $host in
+@@ -7612,12 +8808,12 @@
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ ::) dllsearchpath=$libdir;;
+- *) dllsearchpath="$dllsearchpath:$libdir";;
++ *) func_append dllsearchpath ":$libdir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+- *) dllsearchpath="$dllsearchpath:$testbindir";;
++ *) func_append dllsearchpath ":$testbindir";;
+ esac
+ ;;
+ esac
+@@ -7643,18 +8839,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- rpath="$rpath $flag"
++ func_append rpath " $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++ *) func_append finalize_perm_rpath " $libdir" ;;
+ esac
+ fi
+ done
+@@ -7668,8 +8864,8 @@
+
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
++ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ fi
+
+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+@@ -7681,15 +8877,15 @@
+
+ wrappers_required=yes
+ case $host in
++ *cegcc* | *mingw32ce*)
++ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
++ wrappers_required=no
++ ;;
+ *cygwin* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
+- *cegcc)
+- # Disable wrappers for cegcc, we are cross compiling anyway.
+- wrappers_required=no
+- ;;
+ *)
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+@@ -7698,13 +8894,19 @@
+ esac
+ if test "$wrappers_required" = no; then
+ # Replace the output file specification.
+- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ exit_status=0
+ func_show_eval "$link_command" 'exit_status=$?'
+
++ if test -n "$postlink_cmds"; then
++ func_to_tool_file "$output"
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++ func_execute_cmds "$postlink_cmds" 'exit $?'
++ fi
++
+ # Delete the generated files.
+ if test -f "$output_objdir/${outputname}S.${objext}"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+@@ -7727,7 +8929,7 @@
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+- rpath="$rpath$dir:"
++ func_append rpath "$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+@@ -7735,7 +8937,7 @@
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+- rpath="$rpath$dir:"
++ func_append rpath "$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+@@ -7745,11 +8947,18 @@
+ # We don't need to create a wrapper script.
+ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+ $opt_dry_run || $RM $output
+ # Link the executable and exit
+ func_show_eval "$link_command" 'exit $?'
++
++ if test -n "$postlink_cmds"; then
++ func_to_tool_file "$output"
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++ func_execute_cmds "$postlink_cmds" 'exit $?'
++ fi
++
+ exit $EXIT_SUCCESS
+ fi
+
+@@ -7764,7 +8973,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -7776,13 +8985,19 @@
+ fi
+
+ # Replace the output file specification.
+- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+ # Delete the old output files.
+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+ func_show_eval "$link_command" 'exit $?'
+
++ if test -n "$postlink_cmds"; then
++ func_to_tool_file "$output_objdir/$outputname"
++ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
++ func_execute_cmds "$postlink_cmds" 'exit $?'
++ fi
++
+ # Now create the wrapper script.
+ func_verbose "creating $output"
+
+@@ -7800,18 +9015,7 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+- fi
+-
+- # Quote $ECHO for shipping.
+- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
+- case $progpath in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+- esac
+- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
+- else
+- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if not in dry run mode.
+@@ -7891,7 +9095,7 @@
+ else
+ oldobjs="$old_deplibs $non_pic_objects"
+ if test "$preload" = yes && test -f "$symfileobj"; then
+- oldobjs="$oldobjs $symfileobj"
++ func_append oldobjs " $symfileobj"
+ fi
+ fi
+ addlibs="$old_convenience"
+@@ -7899,10 +9103,10 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+
+ func_extract_archives $gentop $addlibs
+- oldobjs="$oldobjs $func_extract_archives_result"
++ func_append oldobjs " $func_extract_archives_result"
+ fi
+
+ # Do each command in the archive commands.
+@@ -7913,10 +9117,10 @@
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+- oldobjs="$oldobjs $func_extract_archives_result"
++ func_append oldobjs " $func_extract_archives_result"
+ fi
+
+ # POSIX demands no paths to be encoded in archives. We have
+@@ -7932,9 +9136,9 @@
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+- $ECHO "copying selected object files to avoid basename conflicts..."
++ echo "copying selected object files to avoid basename conflicts..."
+ gentop="$output_objdir/${outputname}x"
+- generated="$generated $gentop"
++ func_append generated " $gentop"
+ func_mkdir_p "$gentop"
+ save_oldobjs=$oldobjs
+ oldobjs=
+@@ -7958,18 +9162,30 @@
+ esac
+ done
+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+- oldobjs="$oldobjs $gentop/$newobj"
++ func_append oldobjs " $gentop/$newobj"
+ ;;
+- *) oldobjs="$oldobjs $obj" ;;
++ *) func_append oldobjs " $obj" ;;
+ esac
+ done
+ fi
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+ eval cmds=\"$old_archive_cmds\"
+
+ func_len " $cmds"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ cmds=$old_archive_cmds
++ elif test -n "$archiver_list_spec"; then
++ func_verbose "using command file archive linking..."
++ for obj in $oldobjs
++ do
++ func_to_tool_file "$obj"
++ $ECHO "$func_to_tool_file_result"
++ done > $output_objdir/$libname.libcmd
++ func_to_tool_file "$output_objdir/$libname.libcmd"
++ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
++ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ func_verbose "using piecewise archive linking..."
+@@ -8043,7 +9259,7 @@
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+@@ -8063,12 +9279,23 @@
+ *.la)
+ func_basename "$deplib"
+ name="$func_basename_result"
+- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ func_resolve_sysroot "$deplib"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+- newdependency_libs="$newdependency_libs $libdir/$name"
++ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
++ ;;
++ -L*)
++ func_stripname -L '' "$deplib"
++ func_replace_sysroot "$func_stripname_result"
++ func_append newdependency_libs " -L$func_replace_sysroot_result"
+ ;;
+- *) newdependency_libs="$newdependency_libs $deplib" ;;
++ -R*)
++ func_stripname -R '' "$deplib"
++ func_replace_sysroot "$func_stripname_result"
++ func_append newdependency_libs " -R$func_replace_sysroot_result"
++ ;;
++ *) func_append newdependency_libs " $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+@@ -8082,9 +9309,9 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+- newdlfiles="$newdlfiles $libdir/$name"
++ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+- *) newdlfiles="$newdlfiles $lib" ;;
++ *) func_append newdlfiles " $lib" ;;
+ esac
+ done
+ dlfiles="$newdlfiles"
+@@ -8101,7 +9328,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+- newdlprefiles="$newdlprefiles $libdir/$name"
++ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ esac
+ done
+@@ -8113,7 +9340,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+- newdlfiles="$newdlfiles $abs"
++ func_append newdlfiles " $abs"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+@@ -8122,15 +9349,33 @@
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+- newdlprefiles="$newdlprefiles $abs"
++ func_append newdlprefiles " $abs"
+ done
+ dlprefiles="$newdlprefiles"
+ fi
+ $RM $output
+ # place dlname in correct position for cygwin
++ # In fact, it would be nice if we could use this code for all target
++ # systems that can't hard-code library paths into their executables
++ # and that have no shared library path variable independent of PATH,
++ # but it turns out we can't easily determine that from inspecting
++ # libtool variables, so we have to hard-code the OSs to which it
++ # applies here; at the moment, that means platforms that use the PE
++ # object format with DLL files. See the long comment at the top of
++ # tests/bindir.at for full details.
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
++ # If a -bindir argument was supplied, place the dll there.
++ if test "x$bindir" != x ;
++ then
++ func_relative_path "$install_libdir" "$bindir"
++ tdlname=$func_relative_path_result$dlname
++ else
++ # Otherwise fall back on heuristic.
++ tdlname=../bin/$dlname
++ fi
++ ;;
+ esac
+ $ECHO > $output "\
+ # $outputname - a libtool library file
+@@ -8189,7 +9434,7 @@
+ exit $EXIT_SUCCESS
+ }
+
+-{ test "$mode" = link || test "$mode" = relink; } &&
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+ func_mode_link ${1+"$@"}
+
+
+@@ -8209,9 +9454,9 @@
+ for arg
+ do
+ case $arg in
+- -f) RM="$RM $arg"; rmforce=yes ;;
+- -*) RM="$RM $arg" ;;
+- *) files="$files $arg" ;;
++ -f) func_append RM " $arg"; rmforce=yes ;;
++ -*) func_append RM " $arg" ;;
++ *) func_append files " $arg" ;;
+ esac
+ done
+
+@@ -8220,24 +9465,23 @@
+
+ rmdirs=
+
+- origobjdir="$objdir"
+ for file in $files; do
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+ if test "X$dir" = X.; then
+- objdir="$origobjdir"
++ odir="$objdir"
+ else
+- objdir="$dir/$origobjdir"
++ odir="$dir/$objdir"
+ fi
+ func_basename "$file"
+ name="$func_basename_result"
+- test "$mode" = uninstall && objdir="$dir"
++ test "$opt_mode" = uninstall && odir="$dir"
+
+- # Remember objdir for removal later, being careful to avoid duplicates
+- if test "$mode" = clean; then
++ # Remember odir for removal later, being careful to avoid duplicates
++ if test "$opt_mode" = clean; then
+ case " $rmdirs " in
+- *" $objdir "*) ;;
+- *) rmdirs="$rmdirs $objdir" ;;
++ *" $odir "*) ;;
++ *) func_append rmdirs " $odir" ;;
+ esac
+ fi
+
+@@ -8263,18 +9507,17 @@
+
+ # Delete the libtool libraries and symlinks.
+ for n in $library_names; do
+- rmfiles="$rmfiles $objdir/$n"
++ func_append rmfiles " $odir/$n"
+ done
+- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
++ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+- case "$mode" in
++ case "$opt_mode" in
+ clean)
+- case " $library_names " in
+- # " " in the beginning catches empty $dlname
++ case " $library_names " in
+ *" $dlname "*) ;;
+- *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+ esac
+- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+ ;;
+ uninstall)
+ if test -n "$library_names"; then
+@@ -8302,19 +9545,19 @@
+ # Add PIC object to the list of files to remove.
+ if test -n "$pic_object" &&
+ test "$pic_object" != none; then
+- rmfiles="$rmfiles $dir/$pic_object"
++ func_append rmfiles " $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+ if test -n "$non_pic_object" &&
+ test "$non_pic_object" != none; then
+- rmfiles="$rmfiles $dir/$non_pic_object"
++ func_append rmfiles " $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+- if test "$mode" = clean ; then
++ if test "$opt_mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+@@ -8324,7 +9567,7 @@
+ noexename=$func_stripname_result
+ # $file with .exe has already been added to rmfiles,
+ # add $file without .exe
+- rmfiles="$rmfiles $file"
++ func_append rmfiles " $file"
+ ;;
+ esac
+ # Do a test to see if this is a libtool program.
+@@ -8333,7 +9576,7 @@
+ func_ltwrapper_scriptname "$file"
+ relink_command=
+ func_source $func_ltwrapper_scriptname_result
+- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
++ func_append rmfiles " $func_ltwrapper_scriptname_result"
+ else
+ relink_command=
+ func_source $dir/$noexename
+@@ -8341,12 +9584,12 @@
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+ if test "$fast_install" = yes && test -n "$relink_command"; then
+- rmfiles="$rmfiles $objdir/lt-$name"
++ func_append rmfiles " $odir/lt-$name"
+ fi
+ if test "X$noexename" != "X$name" ; then
+- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
++ func_append rmfiles " $odir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+@@ -8354,7 +9597,6 @@
+ esac
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
+ done
+- objdir="$origobjdir"
+
+ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+@@ -8366,16 +9608,16 @@
+ exit $exit_status
+ }
+
+-{ test "$mode" = uninstall || test "$mode" = clean; } &&
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+ func_mode_uninstall ${1+"$@"}
+
+-test -z "$mode" && {
++test -z "$opt_mode" && {
+ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+ }
+
+ test -z "$exec_cmd" && \
+- func_fatal_help "invalid operation mode \`$mode'"
++ func_fatal_help "invalid operation mode \`$opt_mode'"
+
+ if test -n "$exec_cmd"; then
+ eval exec "$exec_cmd"
+Only in src/hal-0.5.14: Makefile
+diff -u -r hal-0.5.14/Makefile.in src/hal-0.5.14/Makefile.in
+--- hal-0.5.14/Makefile.in 2009-11-30 23:22:42.000000000 +0100
++++ src/hal-0.5.14/Makefile.in 2011-12-19 20:40:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -164,6 +164,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -206,6 +207,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -226,6 +228,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -248,6 +252,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -281,7 +286,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -426,7 +430,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -451,7 +455,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -615,7 +619,8 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -659,17 +664,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+Only in src/hal-0.5.14/partutil: .deps
+Only in src/hal-0.5.14/partutil: libpartutil.la
+Only in src/hal-0.5.14/partutil: .libs
+Only in src/hal-0.5.14/partutil: logger.lo
+Only in src/hal-0.5.14/partutil: Makefile
+diff -u -r hal-0.5.14/partutil/Makefile.in src/hal-0.5.14/partutil/Makefile.in
+--- hal-0.5.14/partutil/Makefile.in 2009-11-30 23:22:41.000000000 +0100
++++ src/hal-0.5.14/partutil/Makefile.in 2011-12-19 20:40:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -113,6 +113,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -155,6 +156,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -175,6 +177,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -197,6 +201,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -230,7 +235,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/partutil: partutil.lo
+Only in src/hal-0.5.14/policy: Makefile
+diff -u -r hal-0.5.14/policy/Makefile.in src/hal-0.5.14/policy/Makefile.in
+--- hal-0.5.14/policy/Makefile.in 2009-11-30 23:22:41.000000000 +0100
++++ src/hal-0.5.14/policy/Makefile.in 2011-12-19 20:40:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -115,6 +115,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -157,6 +158,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -177,6 +179,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -199,6 +203,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -232,7 +237,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14: stamp-h1
+Only in src/hal-0.5.14/tools: .deps
+Only in src/hal-0.5.14/tools/freebsd: Makefile
+diff -u -r hal-0.5.14/tools/freebsd/Makefile.in src/hal-0.5.14/tools/freebsd/Makefile.in
+--- hal-0.5.14/tools/freebsd/Makefile.in 2009-11-30 23:22:42.000000000 +0100
++++ src/hal-0.5.14/tools/freebsd/Makefile.in 2011-12-19 20:40:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -106,6 +106,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -148,6 +149,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -168,6 +170,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -190,6 +194,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -223,7 +228,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+diff -u -r hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux src/hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux
+--- hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux 2008-11-10 11:14:12.000000000 +0100
++++ src/hal-0.5.14/tools/linux/hal-system-killswitch-get-power-linux 2011-12-19 20:39:54.000000000 +0100
+@@ -8,11 +8,6 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
+-DELL_WCTL=/usr/bin/dellWirelessCtl
+-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
+- DELL_WCTL=/usr/sbin/dellWirelessCtl
+-fi
+-
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ value="`hal-system-sonypic getbluetooth`"
+@@ -22,25 +17,6 @@
+ exit 1
+ fi
+ exit ${value}
+- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # TODO: write our own binary that links with libsmbios?
+- $DELL_WCTL --st_bt
+- value=$?
+- if [ "$value" = "0" ]; then
+- exit 1
+- elif [ "$value" = "1" ]; then
+- exit 0
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $value" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
+ read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
+ if [ $? -eq 0 ]; then
+@@ -53,56 +29,6 @@
+ else
+ echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+ echo "Access type not supported" >&2
+- exit 1
+- fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # TODO: write our own binary that links with libsmbios?
+- $DELL_WCTL --st_wlan
+- value=$?
+- if [ "$value" = "0" ]; then
+- exit 1
+- elif [ "$value" = "1" ]; then
+- exit 0
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $value" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "Access type not supported" >&2
+- exit 1
+- fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
+- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # TODO: write our own binary that links with libsmbios?
+- $DELL_WCTL --st_wwan
+- value=$?
+- if [ "$value" = "0" ]; then
+- exit 1
+- elif [ "$value" = "1" ]; then
+- exit 0
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $value" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "Access type not supported" >&2
+ exit 1
+ fi
+ else
+diff -u -r hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux src/hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux
+--- hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux 2008-11-10 11:14:12.000000000 +0100
++++ src/hal-0.5.14/tools/linux/hal-system-killswitch-set-power-linux 2011-12-19 20:39:54.000000000 +0100
+@@ -8,11 +8,6 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
+-DELL_WCTL=/usr/bin/dellWirelessCtl
+-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
+- DELL_WCTL=/usr/sbin/dellWirelessCtl
+-fi
+-
+ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
+ hal-system-sonypic setbluetooth $value
+@@ -23,26 +18,6 @@
+ exit 1
+ fi
+ exit 0
+- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # TODO: write our own binary that links with libsmbios?
+- if [ "$value" = "true" ]; then
+- $DELL_WCTL --bt 1
+- ret=$?
+- else
+- $DELL_WCTL --bt 0
+- ret=$?
+- fi
+- if [ "$ret" != "0" ]; then
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $ret" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
+ if [ "$value" = "true" ]; then
+ bit=1;
+@@ -59,60 +34,6 @@
+ else
+ echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+ echo "Access type not supported" >&2
+- exit 1
+- fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
+- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # As a side effect we disable the physical kill switch
+- # TODO: write our own binary that links with libsmbios?
+- if [ "$value" = "true" ]; then
+- $DELL_WCTL --sw_wlan 0 --wlan 1
+- ret=$?
+- else
+- $DELL_WCTL --sw_wlan 0 --wlan 0
+- ret=$?
+- fi
+- if [ "$ret" != "0" ]; then
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $ret" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "Access type not supported" >&2
+- exit 1
+- fi
+-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
+- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
+- if [ -x "$DELL_WCTL" ]; then
+- # As a side effect we disable the physical kill switch
+- # TODO: write our own binary that links with libsmbios?
+- if [ "$value" = "true" ]; then
+- $DELL_WCTL --sw_wwan 0 --wwan 1
+- ret=$?
+- else
+- $DELL_WCTL --sw_wwan 0 --wwan 0
+- ret=$?
+- fi
+- if [ "$ret" != "0" ]; then
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl returned $ret" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
+- exit 1
+- fi
+- else
+- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
+- echo "Access type not supported" >&2
+ exit 1
+ fi
+ else
+Only in src/hal-0.5.14/tools/linux: Makefile
+diff -u -r hal-0.5.14/tools/linux/Makefile.in src/hal-0.5.14/tools/linux/Makefile.in
+--- hal-0.5.14/tools/linux/Makefile.in 2009-11-30 23:22:42.000000000 +0100
++++ src/hal-0.5.14/tools/linux/Makefile.in 2011-12-19 20:40:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -112,6 +112,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -154,6 +155,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -174,6 +176,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -196,6 +200,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -229,7 +234,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+Only in src/hal-0.5.14/tools: Makefile
+diff -u -r hal-0.5.14/tools/Makefile.in src/hal-0.5.14/tools/Makefile.in
+--- hal-0.5.14/tools/Makefile.in 2009-11-30 23:22:42.000000000 +0100
++++ src/hal-0.5.14/tools/Makefile.in 2011-12-19 20:40:22.000000000 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -357,6 +357,7 @@
+ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -399,6 +400,7 @@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MAN_PAGES_ENABLED = @MAN_PAGES_ENABLED@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+@@ -419,6 +421,8 @@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PCI_IDS_DIR = @PCI_IDS_DIR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POLKIT_CFLAGS = @POLKIT_CFLAGS@
+ POLKIT_LIBS = @POLKIT_LIBS@
+ POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
+@@ -441,6 +445,7 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -474,7 +479,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -912,7 +916,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -937,7 +941,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
diff --git a/abs/core/hal/hal.service b/abs/core/hal/hal.service
new file mode 100644
index 0000000..8851cfe
--- /dev/null
+++ b/abs/core/hal/hal.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Hardware Abstraction Layer
+Requires=dbus.service
+Wants=acpid.service
+After=dbus.service syslog.target acpid.service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Hal
+ExecStart=/usr/sbin/hald --daemon=no --use-syslog
+
+[Install]
+WantedBy=multi-user.target
+Alias=dbus-org.freedesktop.Hal.service
diff --git a/abs/core/hal/hald b/abs/core/hal/hald
new file mode 100644
index 0000000..3d016ed
--- /dev/null
+++ b/abs/core/hal/hald
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ #Check for running dbus, start when not running
+ ck_daemon dbus && /etc/rc.d/dbus start
+ if [ -x /etc/rc.d/acpid ]; then
+ ck_daemon acpid && /etc/rc.d/acpid start
+ fi
+ stat_busy "Starting Hardware Abstraction Layer"
+ if [ ! -x /var/cache/hald ] ; then
+ install -m755 -g 82 -o 82 -d /var/cache/hald
+ fi
+ if [ ! -x /var/run/hald ]; then
+ install -m755 -g 82 -o 82 -d /var/run/hald
+ fi
+ if [ ! -x /var/run/hald/hald-local ]; then
+ install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
+ fi
+ if [ ! -x /var/run/hald/hald-runner ]; then
+ install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
+ fi
+ /usr/sbin/hald
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon hald
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Hardware Abstraction Layer"
+ [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon hald
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+ ;;
+esac
+exit 0
diff --git a/abs/core/hal/udev-update.patch b/abs/core/hal/udev-update.patch
new file mode 100644
index 0000000..f2ca597
--- /dev/null
+++ b/abs/core/hal/udev-update.patch
@@ -0,0 +1,55 @@
+diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
+--- hal-0.5.14_origin/hald/linux/blockdev.c 2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/blockdev.c 2012-02-15 01:45:12.000000000 +0100
+@@ -1864,7 +1864,7 @@
+ char *ret;
+ char *u_stdout;
+ int u_exit_status;
+- const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
++ const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
+ GError *g_error;
+
+ ret = NULL;
+diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
+--- hal-0.5.14_origin/hald/linux/coldplug.c 2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/coldplug.c 2012-07-16 20:59:15.880478378 -0700
+@@ -154,8 +154,7 @@
+ static gboolean
+ hal_util_init_sysfs_to_udev_map (void)
+ {
+- char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
+- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
++ char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
+ int udevinfo_exitcode;
+ UdevInfo *info = NULL;
+ char *p;
+@@ -163,26 +162,9 @@
+
+ sysfs_to_udev_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, udev_info_free);
+
+- /* get udevroot */
+- if (g_spawn_sync ("/", udevroot_argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, NULL,
+- &udevinfo_stdout,
+- NULL,
+- &udevinfo_exitcode,
+- NULL) != TRUE) {
+- HAL_ERROR (("Couldn't invoke %s", udevroot_argv[0]));
+- goto error;
+- }
+- if (udevinfo_exitcode != 0) {
+- HAL_ERROR (("%s returned %d", udevroot_argv[0], udevinfo_exitcode));
+- goto error;
+- }
+-
+- g_strlcpy(dev_root, udevinfo_stdout, sizeof(dev_root));
+- p = strchr(dev_root, '\n');
+- if (p != NULL)
+- p[0] = '\0';
+- g_free(udevinfo_stdout);
+- HAL_INFO (("dev_root is %s", dev_root));
++ /* get udevroot - hardcode to /dev to fix udevadm commit
++ * http://cgit.freedesktop.org/systemd/systemd/commit/?id=4f5d327a49e1a40ae0a3b8f1855dc90f3c0d953f */
++ g_strlcpy(dev_root, "/dev", sizeof(dev_root));
+
+ /* get udevdb export */
+ if (g_spawn_sync ("/", udevdb_export_argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, NULL,
diff --git a/abs/not_built/core/hal-info/PKGBUILD b/abs/not_built/core/hal-info/PKGBUILD
deleted file mode 100644
index ca6f5ad..0000000
--- a/abs/not_built/core/hal-info/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 61557 2009-12-19 19:17:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=hal-info
-_date=20091130
-pkgver=0.${_date}
-pkgrel=1
-pkgdesc="Hardware Abstraction Layer information files"
-arch=(any)
-license=('GPL' 'custom')
-url="http://www.freedesktop.org/wiki/Software/hal"
-source=(http://hal.freedesktop.org/releases/hal-info-${_date}.tar.gz)
-md5sums=('34375489a02a00b250fdc0b280be11b8')
-
-build() {
- cd "${srcdir}/${pkgname}-${_date}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --enable-killswitch-dell-wlan=no --enable-killswitch-dell-bluetooth=no \
- --enable-killswitch-dell-wwan=no || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-}
diff --git a/abs/not_built/core/hal/PKGBUILD b/abs/not_built/core/hal/PKGBUILD
deleted file mode 100644
index 6e928fd..0000000
--- a/abs/not_built/core/hal/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 82401 2010-06-10 21:48:17Z thomas $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=hal
-pkgver=0.5.14
-pkgrel=4
-pkgdesc="Hardware Abstraction Layer"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-url="http://www.freedesktop.org/wiki/Software/hal"
-depends=('dbus-glib>=0.82' 'libusb>=0.1.12' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16')
-makedepends=('pkgconfig' 'gperf')
-options=('!libtool' '!makeflags')
-install=hal.install
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
- hal
- hal-0.5.9-hide-diagnostic.patch
- hal-remove-dell-killswitch.patch
- hal-KVM-evdev.patch
- hal-HDAPS-blacklist.patch
- hal-xen-unignore-axes.patch
- hal-use-at-console.patch
- fix-libusb-detection.patch
- dbus-error-init.patch
- path-max.patch
- handle-input-touchpad.patch
- macbook-fix-ioperm.patch)
-md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
- '277e96ac130d7bfce0b30f0b80db8782'
- '4d4b6801a1cedca22b8bdd9db73b16fb'
- '6d87c3e63184ae3a69caafc846f538a3'
- '6507e5091ee2d11a87ae738a8e2caecb'
- '1171c2d83b76059f2da7a3538e08fa4e'
- '52bd305299aa22ae07f1a862c22d30fa'
- '3f11234fb5e5044fbfc5199ec65b182c'
- 'da088f12cfc2d190bbf95b747e19ab9e'
- '634f4ec2203eff7de8fa2ed2c6b9cbe0'
- 'f8c9b3a40d03907b498feef571d42466'
- '0575677614db0632b17b1a719798c7e0'
- '46a5db3ff896ee37762aa8d7e70942c4')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1
- patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" || return 1
- patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" || return 1
- patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch" || return 1
- patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch" || return 1
- patch -Np1 -i "${srcdir}/hal-use-at-console.patch" || return 1
- patch -Np1 -i "${srcdir}/fix-libusb-detection.patch" || return 1
- patch -Np1 -i "${srcdir}/dbus-error-init.patch" || return 1
- patch -Np1 -i "${srcdir}/path-max.patch" || return 1
- patch -Np1 -i "${srcdir}/handle-input-touchpad.patch" || return 1
- patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch" || return 1
-
- libtoolize --force || return 1
- aclocal || return 1
- autoconf || return 1
- automake || return 1
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \
- --enable-static=no --disable-acpi-ibm \
- --disable-docbook-docs --disable-console-kit \
- --disable-policy-kit --disable-acl-management \
- --enable-umount-helper --disable-smbios \
- --with-hal-user=hal --with-hal-group=hal \
- --with-pid-file=/var/run/hald.pid \
- --disable-gtk-doc || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -m755 -d "${pkgdir}/etc/rc.d"
- install -m755 -d "${pkgdir}/media" || return 1
- install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/" || return 1
-
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-
- # Fix udev rule location
- install -d -m755 "${pkgdir}/lib"
- mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
-}
diff --git a/abs/not_built/core/hal/cryptsetup_location.patch b/abs/not_built/core/hal/cryptsetup_location.patch
deleted file mode 100644
index 1e4f5ef..0000000
--- a/abs/not_built/core/hal/cryptsetup_location.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-remove-linux hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux
---- hal-0.5.8.1/tools/linux/hal-luks-remove-linux 2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux 2007-02-11 13:04:46.000000000 +0100
-@@ -6,7 +6,7 @@
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License version 2.
-
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
-
- echo LUKS cryptotext device $HAL_PROP_INFO_UDI is going away
-
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-setup-linux hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux
---- hal-0.5.8.1/tools/linux/hal-luks-setup-linux 2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux 2007-02-11 13:04:45.000000000 +0100
-@@ -9,7 +9,7 @@
- read password
- PASSWORD=${PASSWORD//[^[:alnum:]_=[:space:]:.+-]/@}
-
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
-
- if [ ! -f $CRYPTSETUP ]; then
- echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-teardown-linux hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux
---- hal-0.5.8.1/tools/linux/hal-luks-teardown-linux 2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux 2007-02-11 13:04:44.000000000 +0100
-@@ -6,7 +6,7 @@
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License version 2.
-
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
-
- if [ ! -f $CRYPTSETUP ]; then
- echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2
diff --git a/abs/not_built/core/hal/dbus-error-init.patch b/abs/not_built/core/hal/dbus-error-init.patch
deleted file mode 100644
index fb3ad02..0000000
--- a/abs/not_built/core/hal/dbus-error-init.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Date: Wed, 30 Dec 2009 11:42:52 +0000
-Subject: linux/probe-input: don't use error prio init
-
-it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is
-called before the error structure is initialized via
-dbus_error_init (&error). This could lead to a segfault during startup
-as seen in dmesg:
-
-|Intel AES-NI instructions are not detected.
-|padlock: VIA PadLock not detected.
-|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000]
-|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000]
-|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000]
-|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000]
-|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000]
-|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000]
-|RPC: Registered udp transport module.
-|RPC: Registered tcp transport module.
-
-What I run into seems to be reported as Debian #562068 [0]. This patch
-makes the segfault go away on my machine.
-
-[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c
-index 94e9929..cad47d3 100644
---- a/hald/linux/probing/probe-input.c
-+++ b/hald/linux/probing/probe-input.c
-@@ -70,6 +70,7 @@ main (int argc, char *argv[])
- fd = -1;
-
- setup_logger ();
-+ dbus_error_init (&error);
-
- button_type = getenv ("HAL_PROP_BUTTON_TYPE");
- if (button_type == NULL)
-@@ -96,7 +97,6 @@ main (int argc, char *argv[])
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
---
-cgit v0.8.3-6-g21f6
-From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 24 Feb 2010 16:19:28 +0000
-Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR()
-
-If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is
-called on that error, then it is uninitialized and may segfault. This
-means that dbus_error_init() must be called before any "goto out" if
-"out:" calls LIBHAL_FREE_DBUS_ERROR().
-
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
-index 45d2084..bffc040 100644
---- a/hald/linux/probing/probe-hiddev.c
-+++ b/hald/linux/probing/probe-hiddev.c
-@@ -57,11 +57,12 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c
-index 70b0f86..aaa92e2 100644
---- a/hald/linux/probing/probe-ieee1394-unit.c
-+++ b/hald/linux/probing/probe-ieee1394-unit.c
-@@ -388,6 +388,8 @@ int main (int argc, char *argv[])
-
- setup_logger ();
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-@@ -396,7 +398,6 @@ int main (int argc, char *argv[])
- if (ieee1394_udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
-index 0b1b912..e911eea 100644
---- a/hald/linux/probing/probe-net-bluetooth.c
-+++ b/hald/linux/probing/probe-net-bluetooth.c
-@@ -141,6 +141,8 @@ main (int argc, char *argv[])
- DBusMessage *reply = NULL;
- DBusError error;
-
-+ dbus_error_init (&error);
-+
- udi = getenv ("UDI");
- if (udi == NULL)
- goto out;
-@@ -151,8 +153,6 @@ main (int argc, char *argv[])
-
- HAL_INFO (("Investigating '%s'", iface));
-
-- dbus_error_init (&error);
--
- if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
-index 91ed7bc..7c6d1c6 100644
---- a/hald/linux/probing/probe-printer.c
-+++ b/hald/linux/probing/probe-printer.c
-@@ -66,6 +66,8 @@ main (int argc, char *argv[])
- ret = 1;
-
- setup_logger ();
-+
-+ dbus_error_init (&error);
-
- udi = getenv ("UDI");
- if (udi == NULL) {
-@@ -73,7 +75,6 @@ main (int argc, char *argv[])
- goto out;
- }
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- HAL_ERROR (("ctx init failed"));
- goto out;
-diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
-index 0bc9689..15c0d4f 100644
---- a/hald/linux/probing/probe-smbios.c
-+++ b/hald/linux/probing/probe-smbios.c
-@@ -129,6 +129,8 @@ main (int argc, char *argv[])
- ret = 1;
-
- setup_logger ();
-+
-+ dbus_error_init (&error);
-
- udi = getenv ("UDI");
- if (udi == NULL) {
-@@ -136,7 +138,6 @@ main (int argc, char *argv[])
- goto out;
- }
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
- HAL_ERROR (("ctx init failed"));
- goto out;
-diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
-index 824a82e..dd524ca 100644
---- a/hald/linux/probing/probe-storage.c
-+++ b/hald/linux/probing/probe-storage.c
-@@ -109,6 +109,8 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- if ((udi = getenv ("UDI")) == NULL)
- goto out;
- if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -127,7 +129,6 @@ main (int argc, char *argv[])
- else
- only_check_for_fs = FALSE;
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
-diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
-index cf913c0..7bc13e8 100644
---- a/hald/linux/probing/probe-video4linux.c
-+++ b/hald/linux/probing/probe-video4linux.c
-@@ -58,6 +58,8 @@ main (int argc, char *argv[])
-
- setup_logger ();
-
-+ dbus_error_init (&error);
-+
- device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE");
- if (device_file == NULL)
- goto out;
-@@ -66,7 +68,6 @@ main (int argc, char *argv[])
- if (udi == NULL)
- goto out;
-
-- dbus_error_init (&error);
- ctx = libhal_ctx_init_direct (&error);
- if (ctx == NULL)
- goto out;
-diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index 0de1b91..7268fff 100644
---- a/hald/linux/probing/probe-volume.c
-+++ b/hald/linux/probing/probe-volume.c
-@@ -318,6 +318,8 @@ main (int argc, char *argv[])
- /* assume failure */
- ret = 1;
-
-+ dbus_error_init (&error);
-+
- if ((udi = getenv ("UDI")) == NULL)
- goto out;
- if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL)
-@@ -346,7 +348,6 @@ main (int argc, char *argv[])
-
- fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE");
-
-- dbus_error_init (&error);
- if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
- goto out;
-
---
-cgit v0.8.3-6-g21f6
diff --git a/abs/not_built/core/hal/fix-libusb-detection.patch b/abs/not_built/core/hal/fix-libusb-detection.patch
deleted file mode 100644
index d4f966d..0000000
--- a/abs/not_built/core/hal/fix-libusb-detection.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001
-From: Joe Marcus Clarke <marcus@FreeBSD.org>
-Date: Tue, 08 Dec 2009 00:05:27 +0000
-Subject: Fix libusb detection on Linux
-
-Adjust the FreeBSD libusb20 code so that it does not interfere with the
-Linux libusb detection.
-
-Reported by: Robby Workman <rw@rlworkman.net>
----
-diff --git a/configure.in b/configure.in
-index a8fda51..8363595 100644
---- a/configure.in
-+++ b/configure.in
-@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
- fi
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
-
--USE_LIBUSB20=no
--USE_LIBUSB=no
--LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- AS_HELP_STRING([--with-backend=<name>],
- [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
- if test "x$HALD_BACKEND" = "xfreebsd"; then
-- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
--fi
--if test "x$USE_LIBUSB20" = "xno"; then
-- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
--fi
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
--AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
--if test "x$USE_LIBUSB20" = "xyes"; then
-- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-- LIBUSB20_LIBS="-lusb20"
--elif test "x$USE_LIBUSB" = "xyes"; then
-- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-- LIBUSB20_LIBS="-lusb"
-+ USE_BSDLIBUSB20=no
-+ USE_BSDLIBUSB=no
-+ LIBUSB20_LIBS=""
-+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no])
-+ if test "x$USE_BSDLIBUSB20" = "xno"; then
-+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no])
-+ fi
-+ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"])
-+ if test "x$USE_BSDLIBUSB20" = "xyes"; then
-+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-+ LIBUSB20_LIBS="-lusb20"
-+ elif test "x$USE_BSDLIBUSB" = "xyes"; then
-+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-+ LIBUSB20_LIBS="-lusb"
-+ fi
-+ AC_SUBST(LIBUSB20_LIBS)
-+else
-+ AM_CONDITIONAL([HAVE_LIBUSB20], [false])
- fi
--AC_SUBST(LIBUSB20_LIBS)
-
- dnl DBUS API is subject to changes
- AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
---
-cgit v0.8.3-6-g21f6
diff --git a/abs/not_built/core/hal/fix-udev-compatibility.patch b/abs/not_built/core/hal/fix-udev-compatibility.patch
deleted file mode 100644
index 2cfa3ad..0000000
--- a/abs/not_built/core/hal/fix-udev-compatibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c
---- hal-0.5.11.orig/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200
-+++ hal-0.5.11/hald/linux/blockdev.c 2008-09-12 19:38:36.000000000 +0200
-@@ -1750,11 +1750,11 @@
- char *ret;
- char *u_stdout;
- int u_exit_status;
-- const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL};
-+ const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
- GError *g_error;
-
- ret = NULL;
-- argv[5] = sysfs_path;
-+ argv[6] = sysfs_path;
-
- g_error = NULL;
-
-diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c
---- hal-0.5.11.orig/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200
-+++ hal-0.5.11/hald/linux/coldplug.c 2008-09-12 19:37:47.000000000 +0200
-@@ -149,8 +149,8 @@
- static gboolean
- hal_util_init_sysfs_to_udev_map (void)
- {
-- char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL };
-- char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
-+ char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
-+ char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
- int udevinfo_exitcode;
- UdevInfo *info = NULL;
- char *p;
diff --git a/abs/not_built/core/hal/hal b/abs/not_built/core/hal/hal
deleted file mode 100644
index 012d456..0000000
--- a/abs/not_built/core/hal/hal
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- #Check for running dbus, start when not running
- ck_daemon dbus && /etc/rc.d/dbus start
- if [ -x /etc/rc.d/acpid ]; then
- ck_daemon acpid && /etc/rc.d/acpid start
- fi
- stat_busy "Starting Hardware Abstraction Layer"
- if [ ! -x /var/cache/hald ] ; then
- install -m755 -g 82 -o 82 -d /var/cache/hald
- fi
- if [ ! -x /var/run/hald ]; then
- install -m755 -g 82 -o 82 -d /var/run/hald
- fi
- if [ ! -x /var/run/hald/hald-local ]; then
- install -m755 -g 0 -o 0 -d /var/run/hald/hald-local
- fi
- if [ ! -x /var/run/hald/hald-runner ]; then
- install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner
- fi
- /usr/sbin/hald
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon hal
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Hardware Abstraction Layer"
- [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon hal
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/abs/not_built/core/hal/hal-0.5.9-hide-diagnostic.patch b/abs/not_built/core/hal/hal-0.5.9-hide-diagnostic.patch
deleted file mode 100644
index 58c882d..0000000
--- a/abs/not_built/core/hal/hal-0.5.9-hide-diagnostic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-05-01 21:39:31.000000000 +0000
-+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi 2007-05-01 21:51:14.000000000 +0000
-@@ -100,6 +100,11 @@
- </match>
- </match>
-
-+ <!-- Hide partitions marked as Compaq Diagnostics -->
-+ <match key="volume.partition.type" string="0x12">
-+ <merge key="volume.ignore" type="bool">true</merge>
-+ </match>
-+
- <!-- EFI firmware partitions -->
- <match key="volume.fstype" string="vfat">
- <match key="volume.label" string="EFI">
diff --git a/abs/not_built/core/hal/hal-HDAPS-blacklist.patch b/abs/not_built/core/hal/hal-HDAPS-blacklist.patch
deleted file mode 100644
index 8a68228..0000000
--- a/abs/not_built/core/hal/hal-HDAPS-blacklist.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 25 Jun 2009 09:47:27 +1000
-Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X.
-
-This device posts accelerometer data through ABS_X/ABS_Y, making X unusable
-if it's controlling the pointer.
----
- fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index a342421..89ba672 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -38,5 +38,11 @@
- <merge key="input.x11_driver" type="string">evdev</merge>
- </match>
- </match>
-+
-+ <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442
-+ Posts accel data through ABS_X/ABS_Y, makes X unusable -->
-+ <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
-+ <remove key="input.x11_driver" />
-+ </match>
- </device>
- </deviceinfo>
---
-1.6.3.rc1.2.g0164.dirty
-
diff --git a/abs/not_built/core/hal/hal-KVM-evdev.patch b/abs/not_built/core/hal/hal-KVM-evdev.patch
deleted file mode 100644
index 917655e..0000000
--- a/abs/not_built/core/hal/hal-KVM-evdev.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 20 Mar 2009 14:37:24 +1000
-Subject: [PATCH] Add x11_driver for American Megatrends KVM.
-
-This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick
-assigned but not input.mouse, hence the default evdev mapping doesn't pick up
-on it.
-
-Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 769f75b..eb9767e 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -2,6 +2,12 @@
- <deviceinfo version="0.2">
- <device>
-
-+ <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick
-+ set by hal and doesn't get picked up by default -->
-+ <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse">
-+ <merge key="input.x11_driver" type="string">evdev</merge>
-+ </match>
-+
- <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode -->
- <match key="input.product" contains="QEMU USB Tablet">
- <merge key="input.x11_driver" type="string">evdev</merge>
---
-1.6.0.6
-
diff --git a/abs/not_built/core/hal/hal-policy.patch b/abs/not_built/core/hal/hal-policy.patch
deleted file mode 100644
index 96528b5..0000000
--- a/abs/not_built/core/hal/hal-policy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- hal-0.5.11/hal.conf.in 2008-05-27 16:09:25.000000000 +0200
-+++ hal-0.5.11/hal.conf.in 2008-05-27 16:21:28.000000000 +0200
-@@ -37,9 +37,27 @@
- receive_sender="org.freedesktop.Hal"/>
- </policy>
-
-- <!-- Default policy for the exported interfaces; if PolicyKit is not used
-- for access control you will need to modify this -->
-+ <!-- Default policy for the exported interfaces -->
- <policy context="default">
-+ <deny send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+ <deny send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
-+ <deny send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+ <deny send_interface="org.freedesktop.Hal.Device.Volume"/>
-+ <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+ </policy>
-+
-+ <policy group="power">
-+ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+ </policy>
-+
-+ <policy group="storage">
-+ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
-+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+ </policy>
-+
-+ <!-- You can change this to a more suitable user, or make per-group -->
-+ <policy user="0">
- <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
- <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
- <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
diff --git a/abs/not_built/core/hal/hal-remove-dell-killswitch.patch b/abs/not_built/core/hal/hal-remove-dell-killswitch.patch
deleted file mode 100644
index ae0cf7a..0000000
--- a/abs/not_built/core/hal/hal-remove-dell-killswitch.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
-
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
-- DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- value="`hal-system-sonypic getbluetooth`"
-@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- exit 1
- fi
- exit ${value}
-- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # TODO: write our own binary that links with libsmbios?
-- $DELL_WCTL --st_bt
-- value=$?
-- if [ "$value" = "0" ]; then
-- exit 1
-- elif [ "$value" = "1" ]; then
-- exit 0
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $value" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
- read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
- if [ $? -eq 0 ]; then
-@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- echo "Access type not supported" >&2
- exit 1
- fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
-- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # TODO: write our own binary that links with libsmbios?
-- $DELL_WCTL --st_wlan
-- value=$?
-- if [ "$value" = "0" ]; then
-- exit 1
-- elif [ "$value" = "1" ]; then
-- exit 0
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $value" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "Access type not supported" >&2
-- exit 1
-- fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # TODO: write our own binary that links with libsmbios?
-- $DELL_WCTL --st_wwan
-- value=$?
-- if [ "$value" = "0" ]; then
-- exit 1
-- elif [ "$value" = "1" ]; then
-- exit 0
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $value" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "Access type not supported" >&2
-- exit 1
-- fi
- else
- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
- echo "Killswitch type not supported" >&2
-diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux
---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100
-+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000
-@@ -8,11 +8,6 @@
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
-
--DELL_WCTL=/usr/bin/dellWirelessCtl
--if [ -x "/usr/sbin/dellWirelessCtl" ]; then
-- DELL_WCTL=/usr/sbin/dellWirelessCtl
--fi
--
- if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
- hal-system-sonypic setbluetooth $value
-@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- exit 1
- fi
- exit 0
-- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # TODO: write our own binary that links with libsmbios?
-- if [ "$value" = "true" ]; then
-- $DELL_WCTL --bt 1
-- ret=$?
-- else
-- $DELL_WCTL --bt 0
-- ret=$?
-- fi
-- if [ "$ret" != "0" ]; then
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $ret" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
- if [ "$value" = "true" ]; then
- bit=1;
-@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
- echo "Access type not supported" >&2
- exit 1
- fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
-- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # As a side effect we disable the physical kill switch
-- # TODO: write our own binary that links with libsmbios?
-- if [ "$value" = "true" ]; then
-- $DELL_WCTL --sw_wlan 0 --wlan 1
-- ret=$?
-- else
-- $DELL_WCTL --sw_wlan 0 --wlan 0
-- ret=$?
-- fi
-- if [ "$ret" != "0" ]; then
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $ret" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "Access type not supported" >&2
-- exit 1
-- fi
--elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-- if [ -x "$DELL_WCTL" ]; then
-- # As a side effect we disable the physical kill switch
-- # TODO: write our own binary that links with libsmbios?
-- if [ "$value" = "true" ]; then
-- $DELL_WCTL --sw_wwan 0 --wwan 1
-- ret=$?
-- else
-- $DELL_WCTL --sw_wwan 0 --wwan 0
-- ret=$?
-- fi
-- if [ "$ret" != "0" ]; then
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl returned $ret" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-- exit 1
-- fi
-- else
-- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-- echo "Access type not supported" >&2
-- exit 1
-- fi
- else
- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
- echo "Killswitch type not supported" >&2
diff --git a/abs/not_built/core/hal/hal-use-at-console.patch b/abs/not_built/core/hal/hal-use-at-console.patch
deleted file mode 100644
index 0b32f17..0000000
--- a/abs/not_built/core/hal/hal-use-at-console.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in
---- hal-0.5.13/hal.conf.in.drop-polkit 2009-02-04 17:07:23.000000000 -0500
-+++ hal-0.5.13/hal.conf.in 2009-07-29 23:15:16.866766074 -0400
-@@ -25,7 +25,41 @@
- send_interface="org.freedesktop.Hal.Device"/>
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Manager"/>
-+ </policy>
-+
-+ <!-- Only allow users at the local console to manipulate devices -->
-+ <policy at_console="true">
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.DockStation"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.KillSwitch"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.Leds"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.LightSensor"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.Storage"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.Storage.Removable"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.Volume"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
-+ <allow send_destination="org.freedesktop.Hal"
-+ send_interface="org.freedesktop.Hal.Device.WakeOnLan"/>
-+
-+ </policy>
-
-+ <!-- well,...and root too -->
-+ <policy user="root">
- <allow send_destination="org.freedesktop.Hal"
- send_interface="org.freedesktop.Hal.Device.CPUFreq"/>
- <allow send_destination="org.freedesktop.Hal"
diff --git a/abs/not_built/core/hal/hal-xen-unignore-axes.patch b/abs/not_built/core/hal/hal-xen-unignore-axes.patch
deleted file mode 100644
index b248639..0000000
--- a/abs/not_built/core/hal/hal-xen-unignore-axes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 19 Oct 2009 14:27:20 +1000
-Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer.
-
-The evdev-internal axis type picking fails for the Xen Virtual Pointer as it
-exposes both relative and absolute axes. Evdev picks the relative axes by
-default, leading to a immovable pointer if the Xen backend only sends
-absolute coordinates.
-
-Explicitly tell evdev to not ignore the absolute axes.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=523914
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- fdi/policy/10osvendor/10-x11-input.fdi | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index 89ba672..752c4ab 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -44,5 +44,12 @@
- <match key="info.product" contains="ThinkPad HDAPS accelerometer data">
- <remove key="input.x11_driver" />
- </match>
-+
-+ <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914
-+ Mouse does not move in PV Xen guest -->
-+ <match key="info.product" contains="Xen Virtual Pointer">
-+ <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge>
-+ <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge>
-+ </match>
- </device>
- </deviceinfo>
---
-1.6.2.5
-
diff --git a/abs/not_built/core/hal/hal.install b/abs/not_built/core/hal/hal.install
deleted file mode 100644
index d6afee3..0000000
--- a/abs/not_built/core/hal/hal.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
- getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal
- getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical
- getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy
- getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage
- getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal
- usr/bin/passwd -l hal &>/dev/null
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
- if getent passwd hal &>/dev/null; then
- usr/sbin/userdel hal
- fi
- if getent group hal &>/dev/null; then
- usr/sbin/groupdel hal
- fi
-}
diff --git a/abs/not_built/core/hal/handle-input-touchpad.patch b/abs/not_built/core/hal/handle-input-touchpad.patch
deleted file mode 100644
index 9cd6464..0000000
--- a/abs/not_built/core/hal/handle-input-touchpad.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001
-From: Michael Witten <mfwitten@gmail.com>
-Date: Wed, 06 Jan 2010 00:53:17 +0000
-Subject: Policy: handle `input.touchpad' explicitly
-
-This commit essentially duplicates the policy for:
-
- <match key="info.capabilities" contains="input.mouse">
-
-and then changes `input.mouse' to `input.touchpad'. This
-is necessary because in Linus Torvalds's Linux repo:
-
- git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
-
-the following commit:
-
- commit 7105d2ea73e1391b681d0e1212c42f561c64d429
- Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
- Date: Fri Dec 11 23:54:54 2009 -0800
-
- Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
-
- Relative events are only reported via secondary device therefore device
- associated with the touchpad should not advertise these capabilities.
-
- Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-
-made these few changes:
-
- diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
- index a3f492a..b03e7e0 100644
- /--- a/drivers/input/mouse/alps.c
- /+++ b/drivers/input/mouse/alps.c
- /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse)
- if (alps_hw_init(psmouse))
- goto init_fail;
-
- + /*
- + * Undo part of setup done for us by psmouse core since touchpad
- + * is not a relative device.
- + */
- + __clear_bit(EV_REL, dev1->evbit);
- + __clear_bit(REL_X, dev1->relbit);
- + __clear_bit(REL_Y, dev1->relbit);
- +
- + /*
- + * Now set up our capabilities.
- + */
- dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
- dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
- dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER);
-
-so that HAL no longer adds:
-
- input.mouse
-
-to an ALPS touchpad's:
-
- info.capabilities
-
-so that HAL no longer marks the ALPS touchpad with:
-
- input.x11_driver = 'evdev'
-
-because the policy file:
-
- fdi/policy/10osvendor/10-x11-input.fdi
-
-doesn't define the policy for:
-
- <match key="info.capabilities" contains="input.touchpad">
-
-which was previous unnecessary because everything used to
-be caught by the policy for:
-
- <match key="info.capabilities" contains="input.mouse">
-
-Signed-off-by: Michael Witten <mfwitten@gmail.com>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
-index cff8fc5..8bbe263 100644
---- a/fdi/policy/10osvendor/10-x11-input.fdi
-+++ b/fdi/policy/10osvendor/10-x11-input.fdi
-@@ -16,6 +16,14 @@
- </match>
- </match>
-
-+ <match key="info.capabilities" contains="input.touchpad">
-+ <merge key="input.x11_driver" type="string">mouse</merge>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-+ string="Linux">
-+ <merge key="input.x11_driver" type="string">evdev</merge>
-+ </match>
-+ </match>
-+
- <match key="info.capabilities" contains="input.tablet">
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
---
-cgit v0.8.3-6-g21f6
diff --git a/abs/not_built/core/hal/macbook-fix-ioperm.patch b/abs/not_built/core/hal/macbook-fix-ioperm.patch
deleted file mode 100644
index 14d0b39..0000000
--- a/abs/not_built/core/hal/macbook-fix-ioperm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Thu, 25 Feb 2010 10:25:18 +0000
-Subject: Fix incorrect arguments to ioperm() call
-
-The second argument of ioperm() is not the last port to be accessed
-but rather length of the port range [port, port + len).
-
-Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
-diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
-index e869192..54e4ea3 100644
---- a/hald/linux/addons/addon-imac-backlight.c
-+++ b/hald/linux/addons/addon-imac-backlight.c
-@@ -158,7 +158,8 @@ main (int argc, char **argv)
- goto out;
- }
-
-- if (ioperm(0xB2, 0xB3, 1) < 0)
-+ /* Allow access to ports 0xB2 and 0xB3 */
-+ if (ioperm(0xB2, 2, 1) < 0)
- {
- HAL_ERROR (("ioperm failed (you should be root)."));
- exit(1);
-diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
-index 2a6fef6..c1bbbac 100644
---- a/hald/linux/addons/addon-macbookpro-backlight.c
-+++ b/hald/linux/addons/addon-macbookpro-backlight.c
-@@ -507,7 +507,8 @@ main (int argc, char *argv[])
- state = INREG(0x7ae4);
- OUTREG(0x7ae4, state);
-
-- if (ioperm (0x300, 0x304, 1) < 0) {
-+ /* Allow access to porta 0x300 through 0x304 */
-+ if (ioperm (0x300, 5, 1) < 0) {
- HAL_ERROR (("ioperm failed (you should be root)."));
- exit(1);
- }
---
-cgit v0.8.3-6-g21f6
diff --git a/abs/not_built/core/hal/ntfs-mount-fix.patch b/abs/not_built/core/hal/ntfs-mount-fix.patch
deleted file mode 100644
index 13597f2..0000000
--- a/abs/not_built/core/hal/ntfs-mount-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/hal-storage-mount.c.orig 2008-04-21 01:48:27.000000000 +0200
-+++ tools/hal-storage-mount.c 2008-04-21 01:47:44.000000000 +0200
-@@ -769,13 +769,13 @@
-
- if (pol_is_fixed) {
- if (pol_change_uid) {
-- action = NULL; /* "hal-storage-mount-fixed-extra-options"; TODO: rethink */
-+ action = "hal-storage-mount-fixed-extra-options"; /*TODO: rethink */
- } else {
- action = "org.freedesktop.hal.storage.mount-fixed";
- }
- } else {
- if (pol_change_uid) {
-- action = NULL; /* "hal-storage-mount-removable-extra-options"; TODO: rethink "extra-options" */
-+ action = "hal-storage-mount-removable-extra-options"; /*TODO: rethink "extra-options" */
- } else {
- action = "org.freedesktop.hal.storage.mount-removable";
- }
diff --git a/abs/not_built/core/hal/ntfs3g-valid-options.patch b/abs/not_built/core/hal/ntfs3g-valid-options.patch
deleted file mode 100644
index 4731442..0000000
--- a/abs/not_built/core/hal/ntfs3g-valid-options.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-10-28 19:40:22.000000000 +0000
-+++ fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-28 19:40:58.000000000 +0000
-@@ -240,6 +240,8 @@
- <append key="volume.mount.valid_options" type="strlist">uid=</append>
- <append key="volume.mount.valid_options" type="strlist">gid=</append>
- <append key="volume.mount.valid_options" type="strlist">umask=</append>
-+ <append key="volume.mount.valid_options" type="strlist">dmask=</append>
-+ <append key="volume.mount.valid_options" type="strlist">fmask=</append>
- <append key="volume.mount.valid_options" type="strlist">locale=</append>
- <append key="volume.mount.valid_options" type="strlist">utf8</append>
- </match>
diff --git a/abs/not_built/core/hal/path-max.patch b/abs/not_built/core/hal/path-max.patch
deleted file mode 100644
index 304185d..0000000
--- a/abs/not_built/core/hal/path-max.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 04 Jan 2010 15:56:13 +0000
-Subject: Bump HAL_PATH_MAX to 4096
-
-Some bits in the code use realpath() with destination paths of size
-HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than
-HAL_PATH_MAX (which was 512 until now).
-
-Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which
-apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on
-Linux), to avoid potential buffer overflows and also fix hal on Linux when
-enabling FORTIFY in gcc.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=25888
----
-diff --git a/hald/util.h b/hald/util.h
-index c2a1584..7883333 100644
---- a/hald/util.h
-+++ b/hald/util.h
-@@ -38,7 +38,7 @@
- #endif
-
- #define HAL_NAME_MAX 256
--#define HAL_PATH_MAX 512
-+#define HAL_PATH_MAX 4096
-
- gboolean hal_util_remove_trailing_slash (gchar *path);
-
---
-cgit v0.8.3-6-g21f6
--
cgit v0.12
From 0294b4c7a4444cbdb28ad3761eed86fc1145a216 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 6 Oct 2014 22:27:49 +0000
Subject: mythtv & mythplugins: update to latest -fixes
add videoAlwaysUseBookmark.patch to use a bookmark if it exists and not show the dialog asking to start at bookmark or beginning.
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 4 +++-
.../mythtv/videoAlwaysUseBookmark.patch | 22 ++++++++++++++++++++++
4 files changed, 27 insertions(+), 3 deletions(-)
create mode 100644 abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 921bf3d..7695526 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-629f7112ec77ddd6732ae00378ccf1b7283cbeec
+c68eae16a2e894d81e3b4a9b39410443f2eb17c1
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index cbcf82e..8a8af3f 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27.3
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 9a4cc81..bb2d723 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27.3
-pkgrel=3
+pkgrel=4
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -20,6 +20,7 @@ backup=()
install='mythtv.install'
patches=('myth_settings.patch'
+ 'videoAlwaysUseBookmark.patch'
'suggestedstarttime.patch.v1')
#http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb
@@ -101,5 +102,6 @@ package() {
}
md5sums=('5f3e43567e62afe17bad39f5a9b604cf'
+ '41098e898361a5a3cde3eaae358482a8'
'35a7fd3e3057691e3b1bf355bb9e8b16'
'65a08d8949431ecdeb51a686dc6f9c21')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch b/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch
new file mode 100644
index 0000000..7a0b428
--- /dev/null
+++ b/abs/core/mythtv/stable-0.27/mythtv/videoAlwaysUseBookmark.patch
@@ -0,0 +1,22 @@
+--- src/mythtv/programs/mythfrontend/main.cpp.orig 2014-10-05 21:16:54.226667223 +0000
++++ src/mythtv/programs/mythfrontend/main.cpp 2014-10-06 20:31:16.822482368 +0000
+@@ -1166,14 +1166,11 @@
+
+ if (useBookmark && bookmarkPresent)
+ {
+- MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+- BookmarkDialog *bookmarkdialog = new BookmarkDialog(pginfo, mainStack);
+- if (!bookmarkdialog->Create())
+- {
+- delete bookmarkdialog;
+- delete pginfo;
+- return res;
+- }
++ TV::StartTV(pginfo, kStartTVNoFlags);
++
++ res = 0;
++
++ delete pginfo;
+ }
+ else
+ {
--
cgit v0.12
From 1caaf4f490f2bd7491789cb0ec15d5b748d55d0f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 19:21:26 +0000
Subject: tdb: udpate to 1.3.0
---
...01-tdb-include-include-stdbool.h-in-tdb.h.patch | 27 ++++++++++++++++++++++
abs/core/tdb/PKGBUILD | 15 ++++++++----
2 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 abs/core/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
diff --git a/abs/core/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch b/abs/core/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
new file mode 100644
index 0000000..33a15cb
--- /dev/null
+++ b/abs/core/tdb/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
@@ -0,0 +1,27 @@
+From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 23 May 2014 10:08:14 -0700
+Subject: [PATCH] tdb/include: include stdbool.h in tdb.h
+
+Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does
+not include stdbool.h. This causes any build including tdb.h to fail, at least
+for me with GCC 4.9.0.
+---
+ lib/tdb/include/tdb.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/tdb.h b/include/tdb.h
+index 5ea5e60..03e429c 100644
+--- a/include/tdb.h
++++ b/include/tdb.h
+@@ -31,6 +31,7 @@ extern "C" {
+ #endif
+
+ #include <signal.h>
++#include <stdbool.h>
+
+ /**
+ * @defgroup tdb The tdb API
+--
+1.9.3
+
diff --git a/abs/core/tdb/PKGBUILD b/abs/core/tdb/PKGBUILD
index d0e3a79..277b37c 100644
--- a/abs/core/tdb/PKGBUILD
+++ b/abs/core/tdb/PKGBUILD
@@ -4,15 +4,23 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=tdb
-pkgver=1.2.12
-pkgrel=1
+pkgver=1.3.0
+pkgrel=2
pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
arch=(i686 x86_64)
license=('GPL3')
url="http://tdb.samba.org/"
-source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
makedepends=('python2' 'libxslt' 'docbook-xsl')
optdepends=('python2: for python bindings')
+source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
+md5sums=('f18cd6afc4f5670edfe58f72d2665f94'
+ '2b0b6003b3d8ca03adccd4aa1a3b8313')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ../0001-tdb-include-include-stdbool.h-in-tdb.h.patch
+}
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -33,4 +41,3 @@ package() {
export PYTHON=/usr/bin/python2
make DESTDIR=$pkgdir/ install
}
-md5sums=('53e6168a7c2c93735a1c024fd2c3a7b4')
--
cgit v0.12
From 3f9ba2bf1dd81a0d2797448f4093900c453ccc54 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 19:26:54 +0000
Subject: ldb: update to 1.1.17.
---
abs/extra/ldb/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/extra/ldb/PKGBUILD b/abs/extra/ldb/PKGBUILD
index 9717290..9a41c98 100644
--- a/abs/extra/ldb/PKGBUILD
+++ b/abs/extra/ldb/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Marco A Rojas <marquicus at gmail dot com>
pkgname=ldb
-pkgver=1.1.16
+pkgver=1.1.17
pkgrel=1
pkgdesc="A schema-less, ldap like, API and database"
arch=('i686' 'x86_64')
@@ -37,4 +37,4 @@ package() {
make DESTDIR=${pkgdir}/ install
}
-md5sums=('60865c0b5704469ee2e59703087c8ec8')
+md5sums=('7c2ab4e3f2a4186493aa06eabbc61cc0')
--
cgit v0.12
From 43119008f7b05b24cfdb85fc2b715503b1f93da9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 20:03:30 +0000
Subject: samba: update to 4.1.12
---
abs/extra/samba/PKGBUILD | 27 +++++++--------------------
abs/extra/samba/__changelog | 3 ++-
abs/extra/samba/readline-6.3.patch | 26 --------------------------
3 files changed, 9 insertions(+), 47 deletions(-)
delete mode 100644 abs/extra/samba/readline-6.3.patch
diff --git a/abs/extra/samba/PKGBUILD b/abs/extra/samba/PKGBUILD
index c65cf93..d1b2e44 100644
--- a/abs/extra/samba/PKGBUILD
+++ b/abs/extra/samba/PKGBUILD
@@ -10,17 +10,17 @@
pkgbase=samba
pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.6
+pkgver=4.1.12
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=4.1.6
-pkgrel=3
+_realver=4.1.12
+pkgrel=1
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
- 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam'
+ 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.17' 'krb5' 'pam'
'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus')
source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
samba.logrotate
@@ -32,8 +32,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
nmbd.service
smbd@.service
winbindd.service
- samba.conf
- readline-6.3.patch)
+ samba.conf)
### UNINSTALL dmapi package before building!!!
build() {
@@ -63,7 +62,6 @@ _samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
cd ${srcdir}/samba-${_realver}
- patch -Np1 -i ${srcdir}/readline-6.3.patch
./configure --enable-fhs \
--prefix=/usr \
--sbindir=/usr/bin \
@@ -80,6 +78,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
--enable-gnutls \
--with-pam \
--with-pammodulesdir=/usr/lib/security \
+ --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \
--with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \
--disable-rpath-install
@@ -242,7 +241,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
-md5sums=('9dc64658c0cc81e7637f9b975c19638c'
+md5sums=('232016d7581a1ba11e991ec2674553c4'
'5697da77590ec092cc8a883bae06093c'
'96f82c38f3f540b53f3e5144900acf17'
'ee4763a656cf00d92bfda31b6bb2c5cb'
@@ -253,15 +252,3 @@ md5sums=('9dc64658c0cc81e7637f9b975c19638c'
'70afd2db60a2e8eff7615dbdecd887ac'
'd5f56f43e1280bba20f6bbd88d16fa41'
'49abd7b719e3713a3f75a8a50958e381')
-md5sums=('9dc64658c0cc81e7637f9b975c19638c'
- '5697da77590ec092cc8a883bae06093c'
- '96f82c38f3f540b53f3e5144900acf17'
- 'ee4763a656cf00d92bfda31b6bb2c5cb'
- '6c447748a064d631435dbef0a3dcf32f'
- 'e4ae6a3cac080602120aa151918c4a36'
- 'a78b9aa93eb14b0ac445897395693225'
- 'df6380c73cb73163968eabc8650f7358'
- '70afd2db60a2e8eff7615dbdecd887ac'
- 'd5f56f43e1280bba20f6bbd88d16fa41'
- '49abd7b719e3713a3f75a8a50958e381'
- '1179c1dcdb95f79b0d5813698d010d2c')
diff --git a/abs/extra/samba/__changelog b/abs/extra/samba/__changelog
index bb83999..b6a8d39 100644
--- a/abs/extra/samba/__changelog
+++ b/abs/extra/samba/__changelog
@@ -1 +1,2 @@
-removed fam/gamin
+PKGBUILD: removefam/gamin, systemd
+samba.install: add systemconfig.py -m fileshare
diff --git a/abs/extra/samba/readline-6.3.patch b/abs/extra/samba/readline-6.3.patch
deleted file mode 100644
index 0dcb1cf..0000000
--- a/abs/extra/samba/readline-6.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Function, CPFunction, CPPFunction and VFunction typedefs are considered
-old-style (deprecated) starting from readline 4.2.
-Compatibility typedefs have been in place up to readline 6.2 but were
-removed with the 6.3 release thus causing builds to break.
-Swtich to the new-style specific prototyped typedef.
-
-Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
----
- libcli/smbreadline/smbreadline.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
-index cff25a7..80e10b0 100644
---- a/libcli/smbreadline/smbreadline.c
-+++ b/libcli/smbreadline/smbreadline.c
-@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
-
- #if HAVE_DECL_RL_EVENT_HOOK
- if (callback)
-- rl_event_hook = (Function *)callback;
-+ rl_event_hook = (rl_hook_func_t *)callback;
- #endif
- ret = readline(prompt);
- if (ret && *ret)
---
-1.8.3.2
--
cgit v0.12
From 2b8abda1f2068a86eaf7ff7d7c06e7ff7fa8c169 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 20:23:12 +0000
Subject: LinHES-config: mv_fileshare.py: create samba user mythtv
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_fileshare.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index adf5d69..d91dc1c 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=3
+pkgrel=4
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -169,7 +169,7 @@ md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
- '73ed13881c748375296454746c865cd2'
+ '02efe6e6da4fb76c668425fad7f8e01b'
'781f161a79c3188a31c8615b8258b241'
'888a6c57f272d9fa3e77e216a421562b'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_fileshare.py b/abs/core/LinHES-config/mv_fileshare.py
index 14ce26b..a849b98 100755
--- a/abs/core/LinHES-config/mv_fileshare.py
+++ b/abs/core/LinHES-config/mv_fileshare.py
@@ -270,7 +270,9 @@ create mask = 0755 ''' %(data_config.MYTHHOME,shreadonly)
f.close()
logging.debug(" %s",homelines)
-
+ logging.info(" Creating samba user mythtv")
+ cmd = "(echo mythtv; echo mythtv) | smbpasswd -an mythtv"
+ mv_common.runcmd(cmd)
mv_common.add_service("nmbd")
mv_common.add_service("smbd")
mv_common.restart_service("nmbd")
--
cgit v0.12
From 08c59afcf72864465ea0c7c68627f1fe76b99a7e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 20:25:30 +0000
Subject: system-templates: smb.conf.template: set guest account to mythtv
---
abs/core/system-templates/PKGBUILD | 4 ++--
abs/core/system-templates/templates/samba/smb.conf.template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 4492e51..b9f5e6d 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
-pkgver=2.0
-pkgrel=31
+pkgver=8.2
+pkgrel=1
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/samba/smb.conf.template b/abs/core/system-templates/templates/samba/smb.conf.template
index 590b01b..eea2616 100644
--- a/abs/core/system-templates/templates/samba/smb.conf.template
+++ b/abs/core/system-templates/templates/samba/smb.conf.template
@@ -37,7 +37,7 @@
# Uncomment this if you want a guest account, you must add this to /etc/passwd
# otherwise the user "nobody" is used
-; guest account = pcguest
+ guest account = mythtv
# this tells Samba to use a separate log file for each machine
# that connects
--
cgit v0.12
From 6358892e473348dfff97ec76938b73b42ac333ce Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Oct 2014 21:00:21 +0000
Subject: LinHES-config: mv_fileshare.py: fix typo
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_fileshare.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index d91dc1c..9a17b4a 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=4
+pkgrel=5
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -169,7 +169,7 @@ md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
- '02efe6e6da4fb76c668425fad7f8e01b'
+ '595663a2cb0b43c4ea3fb3dac915a3c8'
'781f161a79c3188a31c8615b8258b241'
'888a6c57f272d9fa3e77e216a421562b'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_fileshare.py b/abs/core/LinHES-config/mv_fileshare.py
index a849b98..58c11d8 100755
--- a/abs/core/LinHES-config/mv_fileshare.py
+++ b/abs/core/LinHES-config/mv_fileshare.py
@@ -271,7 +271,7 @@ create mask = 0755 ''' %(data_config.MYTHHOME,shreadonly)
logging.debug(" %s",homelines)
logging.info(" Creating samba user mythtv")
- cmd = "(echo mythtv; echo mythtv) | smbpasswd -an mythtv"
+ cmd = "(echo mythtv; echo mythtv) | smbpasswd -a mythtv"
mv_common.runcmd(cmd)
mv_common.add_service("nmbd")
mv_common.add_service("smbd")
--
cgit v0.12
From 2ea48e47ea995e476ded4f64d98f1e2b481a11dd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 8 Oct 2014 20:01:44 +0000
Subject: supplemental-web: process.py: add loading indicator for all
operations.
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/process.py | 63 ++++++++++++++++++++-------
2 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 2a25f72..2dd59c8 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index 7ad9af6..d624f60 100755
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -266,12 +266,45 @@ def go_restart_mbe_local():
-mainpage = '''
- <html><head>
- <style type="text/css">@import "/frame.css";</style>
- <!--<meta http-equiv="refresh" content="6">-->
- <title>Receiving a Form</title>
- </head><body>%s</body></html>'''
+mainpage = '''<title>%s</title>'''
+
+loading = '''
+<html>
+ <head>
+ <style type="text/css">@import "/frame.css";</style>
+ <script src="/ajaxloader.min.js"></script>
+ <meta http-equiv="cache-control" content="max-age=0">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
+ <meta http-equiv="pragma" content="no-cache">
+ <title>LinHES</title>
+ </head>
+
+ <body>
+ <div id="header">
+ %s
+ </div>
+ <div id="container">
+ <br> <br>
+ <h3>Working. Please Wait...</h3>
+ <br><br>
+ <div>
+ <canvas id="spinner"></canvas>
+ </div>
+ </div>
+ <script type="text/javascript">
+ var opts = {
+ size: 72, // Width and height of the spinner
+ factor: 0.25, // Factor of thickness, density, etc.
+ color: "#ebb81c", // Color #rgb or #rrggbb
+ speed: 1.0, // Number of turns per second
+ clockwise: true // Direction of rotation
+ };
+ var ajaxLoader = new AjaxLoader("spinner", opts);
+ ajaxLoader.show();
+ </script>
+'''
error = '''
<h1>Error</h1>
@@ -316,8 +349,9 @@ if __name__ == '__main__':
body = result % (radio, hidden)
-
-
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print loading % body
#print mainpage % body
selection=radio
myhost=hidden.lower()
@@ -328,7 +362,6 @@ if __name__ == '__main__':
mylogfile=go_backup(myhost)
elif selection == "Dbackup":
mylogfile=go_download_backup(dl_file)
-
elif selection == "Update":
mylogfile=go_update(myhost,update_type)
elif selection == "Shutdown":
@@ -350,16 +383,15 @@ if __name__ == '__main__':
elif selection == "RestartMBE":
mylogfile = go_restart_mbe_local()
-
- cgiprint(contentheader) # content header
+ #cgiprint(contentheader) # content header
cgiprint() # finish headers with blank line
- print mainpage % body
+ #print mainpage % body
#box=''' </br> </br>
#<div style="border: 1px solid #aaa; width:700px; height:700px; overflow:auto; color:#FFF;text-align:left;">
#<code id="box" style="display: block; height: 700px; width: 700px; overflow: auto;">
#'''
- box='''</br> </br>
+ box='''<br> <br>
<div id="resultbox" >
'''
@@ -370,7 +402,9 @@ if __name__ == '__main__':
'''
javascript='''
<script type="text/javascript">
- var objDiv = document.getElementById("box");
+ document.getElementById("container").style.display = 'none';
+ ajaxLoader.hide();
+ var objDiv = document.getElementById("resultbox");
objDiv.scrollTop = objDiv.scrollHeight;
</script>
'''
@@ -387,4 +421,3 @@ if __name__ == '__main__':
#<a href="myfile.htm"><img src="rainbow.gif"></a>
#print oldurl
print javascript
-
--
cgit v0.12
From 7f8352160c45b572d55776d85b3b0260851059bf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 8 Oct 2014 23:35:00 +0000
Subject: supplemental-web: fe_status: a few tweaks to redirect
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/fe_status.shtml | 2 +-
abs/core/supplemental-web/contents/fe_status_load.shtml | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 2dd59c8..d4a6513 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.2
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/fe_status.shtml b/abs/core/supplemental-web/contents/fe_status.shtml
index 41ad117..8fda3df 100644
--- a/abs/core/supplemental-web/contents/fe_status.shtml
+++ b/abs/core/supplemental-web/contents/fe_status.shtml
@@ -6,7 +6,7 @@
<meta http-equiv="expires" content="0" />
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
<meta http-equiv="pragma" content="no-cache" />
- <meta http-equiv="refresh" content="60">
+ <meta http-equiv="refresh" content="30">
</head>
<body>
diff --git a/abs/core/supplemental-web/contents/fe_status_load.shtml b/abs/core/supplemental-web/contents/fe_status_load.shtml
index 4476cd1..b83c13f 100755
--- a/abs/core/supplemental-web/contents/fe_status_load.shtml
+++ b/abs/core/supplemental-web/contents/fe_status_load.shtml
@@ -8,9 +8,13 @@
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="refresh" content="0; url=/fe_status.shtml">
+ <script language="javascript">
+ function redirect() {
+ window.location.replace("/fe_status.shtml");}
+ </script>
</head>
- <body>
+ <body onload="redirect()">
<div id="header">
<h1>MythFrontend Status</h1>
</div>
--
cgit v0.12
From d59746359f4f4b7f1d0c07eb3fd3b47434355f0e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Oct 2014 00:15:41 +0000
Subject: google-chrome: update to 38.0.2125.101
---
abs/extra/google-chrome/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index a8906a0..041f98a 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,11 +5,11 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=37.0.2062.120
+pkgver=38.0.2125.101
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
-url="https://www.google.com/chrome"
+url="https://www.google.com/chrome/index.html"
license=('custom:chrome')
depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme'
'icu' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils')
@@ -24,9 +24,9 @@ _arch=amd64
[[ $CARCH = i686 ]] && _arch=i386
source=("google-chrome-${_channel}_${pkgver}_$_arch.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_$_arch.deb"
'eula_text.html')
-md5sums=('ad13b2cd986933a57cf348dc0efc50cf'
+md5sums=('d5fdcb11298d5cfc73ea52b42d8d826a'
'b7e752f549b215ac77f284b6486794b6')
-[[ $CARCH = i686 ]] && md5sums[0]='fc4fd42aa00222a7df9ad89417f8d219'
+[[ $CARCH = i686 ]] && md5sums[0]='84353f292685c20e19c3cd9a6d8712db'
package() {
msg2 "Extracting the data.tar.lzma"
--
cgit v0.12
From 9ab119f94f92c62c505a86c97d32f6df19054c01 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Oct 2014 17:40:56 +0000
Subject: php-composer: initial commit; dep of mfdb-json
---
abs/extra/php-composer/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++++++
abs/extra/php-composer/php.ini | 11 +++++++++
2 files changed, 64 insertions(+)
create mode 100644 abs/extra/php-composer/PKGBUILD
create mode 100644 abs/extra/php-composer/php.ini
diff --git a/abs/extra/php-composer/PKGBUILD b/abs/extra/php-composer/PKGBUILD
new file mode 100644
index 0000000..0cd1b13
--- /dev/null
+++ b/abs/extra/php-composer/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=php-composer
+pkgver=1.0.0.alpha8.532
+pkgrel=1
+pkgdesc="Dependency Manager for PHP"
+arch=('any')
+license=('MIT')
+url='http://getcomposer.org/'
+depends=('php' 'php-intl')
+makedepends=('git' "${pkgname}")
+checkdepends=('mercurial')
+source=("${pkgname}::git+https://github.com/composer/composer.git"
+ 'php.ini')
+md5sums=('SKIP'
+ '9d871623bc2ec0a37a7d78f708a7f838')
+
+pkgver() {
+ cd ${srcdir}/${pkgname}
+
+ local _tag=$(git tag -l --sort -version:refname | head -1)
+ echo "${_tag}.$(git rev-list ${_tag}.. --count)" | sed 's/-/./g'
+}
+
+prepare() {
+ cd ${srcdir}/${pkgname}
+
+ sed "s~^#!/usr/bin/env php~#!/usr/bin/php -nc/usr/share/${pkgname}/php.ini~g" -i src/Composer/Compiler.php
+ /usr/bin/composer -on install
+}
+
+check() {
+ cd ${srcdir}/${pkgname}
+
+ git config --global user.email "${USER}@${HOST}"
+ git config --global user.name "${USER}"
+ /usr/bin/php -nc ${srcdir}/php.ini vendor/phpunit/phpunit/phpunit.php
+}
+
+build() {
+ cd ${srcdir}/${pkgname}
+
+ /usr/bin/php -nc ${srcdir}/php.ini bin/compile
+}
+
+package() {
+ cd ${srcdir}/${pkgname}
+
+ install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 ${srcdir}/php.ini ${pkgdir}/usr/share/php-composer/php.ini
+ install -Dm755 composer.phar ${pkgdir}/usr/bin/composer
+}
diff --git a/abs/extra/php-composer/php.ini b/abs/extra/php-composer/php.ini
new file mode 100644
index 0000000..f6a59a5
--- /dev/null
+++ b/abs/extra/php-composer/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+memory_limit=-1
+extension=openssl.so
+extension=phar.so
+extension=zip.so
+extension=curl.so
+extension=intl.so
+[Date]
+date.timezone=UTC
+[Phar]
+phar.readonly=Off
--
cgit v0.12
From ceaa14a9a98c061e6a046f0d21af059436766e9c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Oct 2014 18:18:49 +0000
Subject: mfdb-json-git: initial commit
---
abs/core/mfdb-json-git/PKGBUILD | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 abs/core/mfdb-json-git/PKGBUILD
diff --git a/abs/core/mfdb-json-git/PKGBUILD b/abs/core/mfdb-json-git/PKGBUILD
new file mode 100644
index 0000000..aca7a60
--- /dev/null
+++ b/abs/core/mfdb-json-git/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Jameson Pugh <imntreal@gmail.com>
+
+pkgname=mfdb-json-git
+pkgver=6e5d774
+pkgrel=1
+pkgdesc="mythfilldatabase replacement for new SchedulesDirect format"
+arch=('i686' 'x86_64')
+url="https://github.com/SchedulesDirect/mfdb-json"
+license=('GPLv2')
+depends=('php-composer')
+provides=(mfdb-json)
+conflicts=(mfdb-json)
+source=("mfdb-json-git::git://github.com/SchedulesDirect/mfdb-json#branch=API-20140530")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd ${pkgname}
+ git describe --always | sed 's|-|.|g'
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+
+ composer install
+ install -dm 755 "${pkgdir}/opt/mfdb-json"
+ install -dm 755 "${pkgdir}/usr/bin"
+ cp -rv ./* "${pkgdir}/opt/mfdb-json"
+ ln -s /opt/mfdb-json/sd-utility.php "${pkgdir}/usr/bin/sd-utility"
+ ln -s /opt/mfdb-json/mfdb-json.php "${pkgdir}/usr/bin/mfdb-json"
+}
+
+# vim: set ts=2 sw=2 ft=sh noet:
--
cgit v0.12
From 54fb52252c8067c8b2d5b8c10fab5bc299db93cb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Oct 2014 22:51:53 +0000
Subject: supplemental-web: process.py: dont' run the loader for some actions.
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/process.py | 106 ++++++++++++++++----------
2 files changed, 66 insertions(+), 42 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index d4a6513..603b9cf 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.2
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/process.py b/abs/core/supplemental-web/contents/process.py
index d624f60..60714ee 100755
--- a/abs/core/supplemental-web/contents/process.py
+++ b/abs/core/supplemental-web/contents/process.py
@@ -17,14 +17,6 @@ def cgiprint(inline=''):
sys.stdout.flush()
contentheader = 'Content-Type: text/html'
-thepage = '''<html><head>
-<title>%s</title>
-</head><body>
-%s
-</body></html>
-'''
-h1 = '<h1>%s</h1>'
-
def getform(theform, valuelist, notpresent='', nolist=False):
"""
This function, given a CGI form as a
@@ -127,19 +119,14 @@ def go_download_backup(dl_file):
print str
return results
-
def go_restore(restorefile,myhost,prestore):
myhostname = socket.gethostname()
psc = ''
if prestore == "on":
psc = "partial"
-
if myhostname.strip() == myhost.strip():
command="sudo /usr/LH/bin/lh_system_restore_job %s %s" %(restorefile , psc)
-
-
-
else:
#this should never execute
sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@"
@@ -162,16 +149,13 @@ def go_upload(up_file):
line = '''The backup has been uploaded and is now available for restore.
To restore from the file, check "Restore database" then select the file from the drop down menu'''
-
results.append(line)
command2="sleep 1; sudo -u nobody /home/xymon/server/ext/hbnotes.py"
os.popen(command2,'r')
-
return results
-
def go_optimize(myhost):
#myhostname = socket.gethostname()
#if myhostname.strip() == myhost.strip():
@@ -191,14 +175,12 @@ def go_update(myhost,update_type):
return results
def go_updateall(allupdate_type):
-
cmd=" sudo /usr/bin/update_system_all "
cmd+=allupdate_type
command= cmd + " 2>&1 "
results=os.popen(command,'r')
return results
-
def go_shutdown(myhost):
myhostname = socket.gethostname()
message="Shutdown from MBE"
@@ -217,7 +199,7 @@ def go_shutdownall():
db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
# create a cursor
cursor = db.cursor()
- # execute SQL statement
+ # execute SQL statement
myhostname = socket.gethostname()
results=["Sent shutdown command to: \n "]
cursor.execute("SELECT distinct(hostname) from settings where not hostname = %s ; ",(myhostname))
@@ -265,10 +247,25 @@ def go_restart_mbe_local():
return results
+mainpage = '''
+<html>
+ <head>
+ <style type="text/css">@import "/frame.css";</style>
+ <meta http-equiv="cache-control" content="max-age=0">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
+ <meta http-equiv="pragma" content="no-cache">
+ <title>LinHES</title>
+ </head>
+ <body>
+ %s
+ </body>
+</html>
+'''
-mainpage = '''<title>%s</title>'''
-loading = '''
+loadingpage = '''
<html>
<head>
<style type="text/css">@import "/frame.css";</style>
@@ -280,13 +277,12 @@ loading = '''
<meta http-equiv="pragma" content="no-cache">
<title>LinHES</title>
</head>
-
<body>
<div id="header">
%s
</div>
<div id="container">
- <br> <br>
+ <br><br>
<h3>Working. Please Wait...</h3>
<br><br>
<div>
@@ -306,20 +302,20 @@ loading = '''
</script>
'''
+
error = '''
<h1>Error</h1>
<h2>No Form Submission Was Received</h2>'''
+
result = '''
<h1>%s of %s</h1>
'''
+
possible_parameters = ['param1', 'param2', 'param3', 'param4','hiddenparam','param5','param6','param7','uFile','param8']
if __name__ == '__main__':
- #cgiprint(contentheader) # content header
- #cgiprint() # finish headers with blank line
-
theform = cgi.FieldStorage()
#print theform
formdict = getform(theform, possible_parameters)
@@ -348,50 +344,78 @@ if __name__ == '__main__':
prestore = "off"
body = result % (radio, hidden)
-
- cgiprint(contentheader) # content header
- cgiprint() # finish headers with blank line
- print loading % body
- #print mainpage % body
selection=radio
myhost=hidden.lower()
if selection == "Restore":
mylogfile=go_restore(name,myhost,prestore)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Backup":
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print loadingpage % body
mylogfile=go_backup(myhost)
elif selection == "Dbackup":
mylogfile=go_download_backup(dl_file)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Update":
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print loadingpage % body
mylogfile=go_update(myhost,update_type)
elif selection == "Shutdown":
mylogfile=go_shutdown(myhost)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Reboot":
mylogfile=go_reboot(myhost)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Optimize":
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print loadingpage % body
mylogfile=go_optimize(myhost)
elif selection == "WOL":
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print loadingpage % body
mylogfile=go_wake(myhost)
elif selection == "UpdateAll":
mylogfile=go_updateall(all_update_type)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "ShutdownAll":
mylogfile=go_shutdownall()
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Kill":
mylogfile=go_kill(myhost,kill_type)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "Upload":
mylogfile = go_upload(up_file)
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
elif selection == "RestartMBE":
mylogfile = go_restart_mbe_local()
+ cgiprint(contentheader) # content header
+ cgiprint() # finish headers with blank line
+ print mainpage % body
- #cgiprint(contentheader) # content header
cgiprint() # finish headers with blank line
- #print mainpage % body
- #box=''' </br> </br>
- #<div style="border: 1px solid #aaa; width:700px; height:700px; overflow:auto; color:#FFF;text-align:left;">
- #<code id="box" style="display: block; height: 700px; width: 700px; overflow: auto;">
- #'''
- box='''<br> <br>
+ box='''<br><br>
<div id="resultbox" >
'''
@@ -407,14 +431,14 @@ if __name__ == '__main__':
var objDiv = document.getElementById("resultbox");
objDiv.scrollTop = objDiv.scrollHeight;
</script>
- '''
+ '''
print box
for line in mylogfile:
- print line + '</br> \r\n'
+ print line + '<br> \r\n'
print endbox
- print "</br></br>"
+ print "<br><br>"
#print '<a href=', oldurl, ' > Back </a> '
s='<a href="%s"><img src="back.png"></a>' %oldurl
print s
--
cgit v0.12
From 5978b72c31a429a87bb67dbc5aa832079f6b2fc4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 9 Oct 2014 23:00:34 +0000
Subject: xymon: hbnotes.py: edit alert texts
---
abs/core/xymon/PKGBUILD | 4 ++--
abs/core/xymon/hbnotes.py | 16 +++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index f8cb26b..38b8805 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=('xymonserver' 'xymonclient')
pkgver=4.3.17
-pkgrel=3
+pkgrel=4
pkgdesc="Xymon is a system for monitoring of hosts and networks"
license="GPL"
arch=('i686' 'x86_64')
@@ -138,7 +138,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
'758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
- '3e39cdc95a0f9320b4e805417ce16eea'
+ 'b8c3b00db8fec518289b5caa0df0060b'
'526c169e020b570b5b02661a831aa4e6'
'166279c006c3ef7bf0c21537cf89fc83'
'80d9cfac86c6d96836e6f406e35e7cf5'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index ca9d39d..b12cc7b 100755
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -282,7 +282,7 @@ function Do_it ()
}
else
{
- alert(" database was not restored");
+ alert("The database was not restored.");
}
}
else if (chosen == "Backup")
@@ -293,14 +293,13 @@ function Do_it ()
}
else
{
- alert(" backup cancelled");
+ alert("Backup cancelled.");
}
}
else if (chosen == "Upload")
{
- if (confirm('About to upload the backup file to server'))
+ if (confirm('Upload the backup file to the server?'))
{
- alert("Uploading file to server");
do_submission();
}
}
@@ -312,7 +311,7 @@ function Do_it ()
}
else
{
- alert("Optimization cancelled");
+ alert("Optimization cancelled.");
}
}
@@ -323,7 +322,7 @@ function Do_it ()
if (confirm('Continue with server shutdown?'))
{
do_submission();
- alert("system is powering off");
+ alert("The system is powering off.");
}
}
@@ -332,7 +331,7 @@ function Do_it ()
if (confirm('Continue with server restart?'))
{
do_submission();
- alert("system is restarting");
+ alert("The system is restarting.");
}
}
@@ -341,7 +340,7 @@ function Do_it ()
if (confirm('Continue with powering off all servers except master backend?'))
{
do_submission();
- alert("systems are powering off");
+ alert("Systems are powering off.");
}
}
@@ -351,7 +350,6 @@ function Do_it ()
if (confirm('Continue with applying updates?'))
{
do_submission();
- alert("system is updating");
}
}
--
cgit v0.12
From b9705240e9eab916ab5fce5a2dede50e28b6a560 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 13 Oct 2014 10:52:29 -0500
Subject: dhcpcd: recompile hooks
---
abs/core/dhcpcd/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD
index 34525d8..81ea3be 100644
--- a/abs/core/dhcpcd/PKGBUILD
+++ b/abs/core/dhcpcd/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=dhcpcd
pkgver=6.1.0
-pkgrel=2
+pkgrel=4
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
arch=('i686' 'x86_64')
--
cgit v0.12
From 049194bf48fd866614687a0a083e3773de9bb151 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 13 Oct 2014 10:52:58 -0500
Subject: LinHES-config: updates for 8.2 iso install
---
abs/core/LinHES-config/PKGBUILD | 6 +-
abs/core/LinHES-config/install_functions.sh | 2 +-
abs/core/LinHES-config/mv_install.py | 152 ++++++++++++++++------------
3 files changed, 92 insertions(+), 68 deletions(-)
mode change 100755 => 100644 abs/core/LinHES-config/mv_install.py
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 9a17b4a..dfce8b7 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=5
+pkgrel=10
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -133,13 +133,13 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('63f1a1f3725f28b1c07875f4f43bdd6a'
+md5sums=('c3304ee845d49a1f02b1efcbb9d85726'
'3f6855b7bb860a44f96a972c2e80f497'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
'985891a43f7c4c983eb2a362162f1a0f'
'261ba62515edd7a13d46cbeb1b0eadca'
- '31106caee7f621e7c5f008ccd9600b36'
+ '6821fdfacf2aac44275200d3acaadb56'
'f73d6d6f98839e900cb6685bf5dc4eae'
'b8becf69d4309b938ceba3178c799270'
'2a7f3b34e522acfd08283b86c8926aba'
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index d841947..e8e0a62 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -292,7 +292,7 @@ function request_dhcp(){
if [ $status -eq 1 ]
then
#interface is down, lets see if dhcp responds
- dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null
+ dhcpcd -Td -t5 $ndev -h " " > /tmp/dhcpinfo.$ndev 2>&1
#check for hostname here
TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2`
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
old mode 100755
new mode 100644
index 4abdaa7..20ec7bf
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -214,13 +214,20 @@ def runcmd(cmd):
return cmdout
def mysqldb(cmd, inchroot):
- if cmd == "start":
- mycmd = " /etc/rc.d/mysqld start"
- elif cmd == "stop":
- mycmd = " /etc/rc.d/mysqld stop"
if inchroot == "chroot":
- mycmd = " chroot /new_boot %s" %mycmd
- runcmd(mycmd)
+ if cmd == "start":
+ cmd = "chroot /new_boot /etc/rc.d/mysqld start"
+ elif cmd == "stop":
+ cmd = " chroot /new_boot /etc/rc.d/mysqld stop"
+ else:
+ if cmd == "start":
+ cmd = "systemctl start mysqld.service"
+ elif cmd == "stop":
+ cmd = "systemctl stop mysqld.service"
+
+ #if inchroot == "chroot":
+ # mycmd = " chroot /new_boot %s" %mycmd
+ runcmd(cmd)
def mount_bind_chroot():
@@ -446,13 +453,13 @@ def create_partitions_gpt(diskdevice, start,size,partition_type):
cmd = "parted %s -a optimal --script unit MB -- mkpart primary %s %s" %(diskdevice, start, last_sector)
runcmd(cmd)
-
+
newstart = last_sector
#print newstart
return newstart
-
-
-
+
+
+
@@ -471,17 +478,17 @@ def partition_disk():
runcmd(cmd)
cmd = "parted %s -a optimal --script mklabel gpt" %datadisk
runcmd(cmd)
-
+
start_sector = 1
start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["rootsize"], "primary")
start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["swapsize"], "primary")
- hostoptions["rootpartition"] = hostoptions["rootdisk"]+str(1)
+ hostoptions["rootpartition"] = hostoptions["rootdisk"]+str(1)
hostoptions["swappartition"] = hostoptions["rootdisk"] + str(2)
hostoptions["home_partition"] = hostoptions["rootdisk"]+str(5)
hostoptions["sql_partition"] = hostoptions["rootdisk"]+str(6)
hostoptions["datapartition"] = hostoptions["datadisk"]+str(7)
-
-
+
+
#create 1 blank to match up with extended/logical layout from 8.0
start_sector = create_partitions_gpt(rootdisk, start_sector, "NO", "primary")
@@ -490,31 +497,31 @@ def partition_disk():
start_sector = create_partitions_gpt(rootdisk, start_sector, 2 , "primary")
cmd = "parted %s set 4 bios_grub on" %rootdisk
runcmd(cmd)
-
+
#create home_partition
start_sector = start_sector + 1
start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["homesize"], "primary")
-
+
##create mysql
start_sector = start_sector + 1
start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["sqlsize"], "primary")
-
+
start_sector = start_sector + 1
#create data
if datadisk != rootdisk:
create_partitions_gpt(datadisk, 1, hostoptions["datasize"], "primary")
else:
create_partitions_gpt(datadisk, start_sector, hostoptions["datasize"], "primary")
-
+
#set active
logging.debug("setting active partition for mbr")
-
+
cmd = "parted %s set 1 boot on" %rootdisk
runcmd(cmd)
cmd = "sfdisk --force -A1 %s" %rootdisk
runcmd(cmd)
-
+
logging.debug("sleeping for 5 seconds")
time.sleep(5)
@@ -739,18 +746,20 @@ def create_squashlist():
def mount_for_copy_it():
mounts = {}
- mounts['/image_mount/root'] = 'root-image'
- mounts['/image_mount/usr/share'] = 'usr-share'
- mounts['/image_mount/lib/modules'] = 'lib-modules'
- mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman'
- mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg'
+ #mounts['/image_mount/root'] = 'root-image'
+ #mounts['/image_mount/usr/share'] = 'usr-share'
+ #mounts['/image_mount/lib/modules'] = 'lib-modules'
+ #mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman'
+ #mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg'
#mounts['/image_mount/var/cache/pacman'] = 'var-cache-pacman'
+ mounts['/image_mount'] = 'airootfs'
for image_mount, fsimage in mounts.iteritems():
try:
os.makedirs(image_mount)
except:
pass
- cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount)
+ #cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount)
+ cmd = 'mount /run/archiso/sfs/%s/%s.img %s' %(fsimage,fsimage,image_mount)
rc = runcmd(cmd)[0]
if rc != 0 :
error_out("Mount image %s" %fsimage)
@@ -822,60 +831,55 @@ def mount_for_copy_it():
def umount_for_copy_it():
mounts = {}
+ mounts['/image_mount'] = 'airootfs'
+
- mounts['/image_mount/root'] = 'root-image'
- mounts['/image_mount/usr/share'] = 'usr-share'
- mounts['/image_mount/lib/modules'] = 'lib-modules'
- mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman'
- mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg'
+ #mounts['/image_mount/root'] = 'root-image'
+ #mounts['/image_mount/usr/share'] = 'usr-share'
+ #mounts['/image_mount/lib/modules'] = 'lib-modules'
+ #mounts['/image_mount/var/lib/pacman'] = 'var-lib-pacman'
+ #mounts['/image_mount/data/storage/disk0/pacman/pkg'] = 'data-storage-disk0-pacman-pkg'
#mounts['/image_mount/var/cache/pacman'] = 'var-cache-pacman'
+
+
+
for image_mount, fsimage in mounts.iteritems():
- cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount)
+ #cmd = 'mount /run/archiso/sfs/%s/%s.fs %s' %(fsimage,fsimage,image_mount)
cmd='umount %s' %(image_mount)
rc = runcmd(cmd)[0]
if rc != 0 :
error_out("unMount image %s" %image_mount)
- #cmd='umount %s' %('/image_mount/lib/modules')
- #rc = runcmd(cmd)[0]
- #if rc != 0 :
- #error_out("unMount image lib_modules")
-
- #cmd='umount %s' %('/image_mount/usr/share')
- #rc = runcmd(cmd)[0]
- #if rc != 0 :
- #error_out("unMount image usr_share")
-
- #cmd='umount %s' %('/image_mount/root')
- #rc = runcmd(cmd)[0]
- #if rc != 0 :
- #error_out("unMount image /")
-
- #cmd='umount %s' %('/image_mount/var/cache/pacman')
- #rc = runcmd(cmd)[0]
- #if rc != 0 :
- #error_out("unMount image var-cache-pacman")
-
- #cmd='umount %s' %('/image_mount/var/lib/pacman')
- #rc = runcmd(cmd)[0]
- #if rc != 0 :
- #error_out("unMount image var-lib-pacman")
def copy_it(install_type):
logging.info("______Transferring to disk______")
mount_for_copy_it()
+
logging.debug( install_type)
if ( install_type == "install"):
logging.info("Transferring system")
- cmdlist = ['rsync -arp /image_mount/root/* /new_boot',
- 'rsync -arp /image_mount/lib/* /new_boot/lib/',
- 'rsync -arp /image_mount/usr /new_boot',
- 'rsync -arp /image_mount/var /new_boot',
- 'rsync -arp /image_mount/data/storage/disk0/* /new_boot/data/storage/disk0/'
- ]
+ #cmdlist = ['rsync -arp /image_mount/root/* /new_boot',
+ ##'rsync -arp /image_mount/lib/* /new_boot/lib/',
+ #'rsync -arp /image_mount/lib /new_boot/',
+ #'rsync -arp /image_mount/lib64 /new_boot/',
+ #'rsync -arp /image_mount/usr /new_boot',
+ #'rsync -arp /image_mount/sbin /new_boot',
+ #'rsync -arp /image_mount/bin /new_boot',
+ #'rsync -arp /image_mount/var /new_boot',
+ #'rsync -arp /image_mount/data/storage/disk0/* /new_boot/data/storage/disk0/',
+ #'rysnc -arp /image_mount/var-lib-pacman/sync /new_boot/var/lib/pacman/'
+ #]
+
+ #cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig /image_mount/* /new_boot',
+ # 'rsync -arp /image_mount/var-lib-pacman/sync /new_boot/var/lib/pacman/',
+ # 'rsync -arp /image_mount/boot-orig/* /new_boot/boot/ '
+ # ]
+
+
+ cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig /image_mount/* /new_boot']
for cmd in cmdlist:
rc = runcmd(cmd)[0]
@@ -908,8 +912,15 @@ def copy_it(install_type):
os.makedirs(mp)
except OSError:
logging.debug(" __Could not create %s", mp)
+
#copy of locale
cp_and_log("/usr/lib/locale/locale-archive", data_config.MOUNTPOINT+"/usr/lib/locale/locale-archive")
+
+ #copy dhcpcd lease and duid file
+ #needed to retain dhcp address between reboots.
+ cp_and_log("/etc/dhcpcd.duid", data_config.MOUNTPOINT+"/etc/dhcpcd.duid")
+ cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/")
+
# General fixup
cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
runcmd(cmd)
@@ -931,6 +942,9 @@ def copy_it(install_type):
runcmd(cmd)
cmd = "chmod +s %s/bin/mount" %(data_config.MOUNTPOINT)
runcmd(cmd)
+
+
+
#sys.exit(3)
apply_pristine()
post_process()
@@ -1175,6 +1189,13 @@ def fstab_it(install_type):
#f.write("\n")
f.close()
+def install_kernel_it():
+ logging.info("______Start of kernel install______")
+ cmd = "chroot %s pacman --noconfirm -S linux" %(data_config.MOUNTPOINT)
+ logging.info(" Running pacman to install kernelinstall")
+ runcmd(cmd)
+
+
def grub_it():
logging.info("______Start of grub install______")
cmd = "chroot %s grub-install --target=i386-pc --recheck --debug /dev/%s" %(data_config.MOUNTPOINT,hostoptions["rootdisk"])
@@ -1615,6 +1636,7 @@ def full_install(hostoptions):
statusmsg = "Partitioning %s" %( hostoptions["rootdisk"])
update_status(statusmsg)
progress(1)
+
if data_config.NOOPDEBUG == "FALSE":
partition_disk()
else:
@@ -1663,7 +1685,9 @@ def full_install(hostoptions):
special_hardware_check()
mount_bind_chroot()
+ install_kernel_it()
grub_it()
+
umount_bind_chroot()
genlocale() #currently does nothing
@@ -2148,11 +2172,11 @@ def main(argv):
- if ( hostoptions["op"] == "upgrade") or ( hostoptions["op"] == "find_upgrade" ):
+ if ( hostoptions["op"] == "upgrade") or ( hostoptions["op"] == "find_upgrade" ) or (data_config.NOOPDEBUG != "FALSE"):
hostoptions["datafs"] = "no_format"
hostoptions["homefs"] = "no_format"
hostoptions["sqlfs"] = "no_format"
-
+ print "hi"
#hardcoding partitions
hostoptions["rootpartition"] = hostoptions["rootdisk"]+str(1) ##hardcoded partition 1
hostoptions["swappartition"] = hostoptions["rootdisk"] + str(2)
--
cgit v0.12
From 654a09604a149dbc22f9002dcc1142888e6f7068 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 16 Oct 2014 20:53:14 +0000
Subject: open-dyslexic-fonts: initial inclusion. closes #972
---
abs/extra/open-dyslexic-fonts/PKGBUILD | 39 ++++++++++++++++++++++
.../open-dyslexic-fonts.install | 15 +++++++++
2 files changed, 54 insertions(+)
create mode 100644 abs/extra/open-dyslexic-fonts/PKGBUILD
create mode 100644 abs/extra/open-dyslexic-fonts/open-dyslexic-fonts.install
diff --git a/abs/extra/open-dyslexic-fonts/PKGBUILD b/abs/extra/open-dyslexic-fonts/PKGBUILD
new file mode 100644
index 0000000..ae54058
--- /dev/null
+++ b/abs/extra/open-dyslexic-fonts/PKGBUILD
@@ -0,0 +1,39 @@
+# Contributor: timthelion <timothyhobbs@seznam.cz>
+
+pkgname=open-dyslexic-fonts
+pkgver=20120920
+pkgrel=1
+pkgdesc="A set of fonts developed with improved readability for dyslexics in mind."
+arch=('any')
+url="http://dyslexicfonts.com/"
+license=('CC-By 3.0')
+depends=('fontconfig')
+makedepends=('git')
+install=open-dyslexic-fonts.install
+
+_gitroot="https://github.com/antijingoist/open-dyslexic.git"
+_gitname="master"
+
+build() {
+ cd ${srcdir}
+ msg "Connecting to GIT server...."
+ if [[ -d "$_gitname" ]]; then
+ cd "$_gitname" && git pull origin
+ msg "The local files are updated."
+ else
+ git clone "$_gitroot" "$_gitname"
+ fi
+
+ msg "GIT checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_gitname-build"
+ git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname-build"
+
+ cd otf/
+ mkdir -p ${pkgdir}/usr/share/fonts/open-dyslexic
+ install -m644 *.otf ${pkgdir}/usr/share/fonts/open-dyslexic/ || return 1
+}
+
+md5sums=()
diff --git a/abs/extra/open-dyslexic-fonts/open-dyslexic-fonts.install b/abs/extra/open-dyslexic-fonts/open-dyslexic-fonts.install
new file mode 100644
index 0000000..ba4a567
--- /dev/null
+++ b/abs/extra/open-dyslexic-fonts/open-dyslexic-fonts.install
@@ -0,0 +1,15 @@
+post_install() {
+ echo -n "Updating font cache... "
+ fc-cache /usr/share/fonts/open-dyslexic
+ mkfontscale /usr/share/fonts/open-dyslexic
+ mkfontdir /usr/share/fonts/open-dyslexic
+ echo "done."
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
--
cgit v0.12
From ae110ea38e6970cf88d19b721646854268e2cf82 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 16 Oct 2014 21:27:39 +0000
Subject: google-chrome: update to 38.0.2125.104
---
abs/extra/google-chrome/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 041f98a..a6ff092 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
pkgname=google-chrome
-pkgver=38.0.2125.101
+pkgver=38.0.2125.104
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -22,9 +22,9 @@ install=$pkgname.install
_channel=stable
_arch=amd64
[[ $CARCH = i686 ]] && _arch=i386
-source=("google-chrome-${_channel}_${pkgver}_$_arch.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_$_arch.deb"
+source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
'eula_text.html')
-md5sums=('d5fdcb11298d5cfc73ea52b42d8d826a'
+md5sums=('a2b61a623da973f12e1cb18674b9fb93'
'b7e752f549b215ac77f284b6486794b6')
[[ $CARCH = i686 ]] && md5sums[0]='84353f292685c20e19c3cd9a6d8712db'
--
cgit v0.12
From 3a1460413989c6c75a96ed7173682d93fc8c51db Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 16 Oct 2014 22:11:18 +0000
Subject: mythtv mythplugins & mythinstall: update to latest -fixes tag 0.27.4
---
abs/core/mythinstall/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 4 ++--
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index b741439..57f0e27 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.2
-pkgrel=2
+pkgrel=3
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 7695526..bbb99eb 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-c68eae16a2e894d81e3b4a9b39410443f2eb17c1
+e830993e89fc3b7244e9614c2384ab074c449d1f
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 8a8af3f..ad4eba3 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=('mytharchive'
'mythnews'
'mythweather'
'mythzoneminder')
-pkgver=0.27.3
-pkgrel=4
+pkgver=0.27.4
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index bb2d723..01ee6b2 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
-pkgver=0.27.3
-pkgrel=4
+pkgver=0.27.4
+pkgrel=1
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From e7e5b1f1e39009ce432aca0ba36e1a5c4df3b386 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Oct 2014 00:37:21 +0000
Subject: mythinstall: recompile
---
abs/core/mythinstall/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 57f0e27..e268ddd 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.2
-pkgrel=3
+pkgrel=4
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From cd1f7ccce1403408bc77fe3ce1fc37241b8d21fc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Oct 2014 15:01:57 +0000
Subject: supplemental-web: add MythWeb sub menu
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/header.html | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 603b9cf..1101cf0 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.2
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
license=('GPL')
backup=('data/srv/httpd/cgi/extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index c50cfee..9e1472d 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -39,7 +39,18 @@ function beStatus()
<ul id="nav">
<li><a href="home.shtml" TARGET="content" id="current">Home</a></li>
-<li><a href="mythweb/">MythWeb</a></li>
+<li><a href="mythweb/">MythWeb »</a>
+ <ul>
+ <li><a href="mythweb/tv/list" >Listings</a></li>
+ <li><a href="mythweb/tv/recorded" >Recorded</a></li>
+ <li><a href="mythweb/tv/schedules" >Schedules</a></li>
+ <li><a href="mythweb/tv/searches" >Searches</a></li>
+ <li><a href="mythweb/status" >Status</a></li>
+ <li><a href="mythweb/tv/upcoming" >Upcoming</a></li>
+ <li><a href="mythweb/music" >Music</a></li>
+ <li><a href="mythweb/video" >Video</a></li>
+ </ul>
+</li>
<li><a href="fe_status_load.shtml">MythFrontend Status</a></li>
--
cgit v0.12
From c31220cf9458daf319ab22eff1b0f2dbba57e147 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 17 Oct 2014 22:59:41 +0000
Subject: linhes-theme: update for upstream and patch osd.xml browse_info
window
---
abs/core/linhes-theme/PKGBUILD | 6 +-
abs/core/linhes-theme/osd.xml.patch | 134 ++++++++++++++++++++++++++----------
2 files changed, 102 insertions(+), 38 deletions(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index cb85af5..79917dc 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=4
+pkgrel=5
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -9,7 +9,7 @@ url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
-#The LinHES theme is based on TintedGlass 4.54 by Harley Peters
+#The LinHES theme is based on TintedGlass 4.56 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
'background.png' 'preview.png' 'tux_thoughts.png'
'LHLogoAndText.png')
@@ -77,7 +77,7 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- '51e11c48dc73467f7c94644b6db1b840'
+ 'ae7e975caea816bf16eba651c8fa8e6a'
'71f4fa39d7fefe5443ef0f7bd6820ccd'
'c75c83b90969fb07755062113f858e88'
'9fe3371a8b964a7028126405cfaa330b'
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index b6cb761..787408f 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,42 +1,106 @@
---- osd.xml.orig 2014-09-23 17:43:57.630552593 +0000
-+++ osd.xml 2014-09-23 17:46:50.325639736 +0000
-@@ -975,19 +975,19 @@
- <template>%LONGREPEAT% Size: %FILESIZE_STR%</template>
+--- osd.xml.orig 2014-10-17 22:50:17.316245246 +0000
++++ osd.xml 2014-10-17 22:55:11.065572222 +0000
+@@ -1028,6 +1028,11 @@
+ <pixelsize>24</pixelsize>
+ </fontdef>
+
++ <fontdef name="title" from="small">
++ <color>#d9d900</color>
++ <pixelsize>26</pixelsize>
++ </fontdef>
++
+ <fontdef name="large" from="small">
+ <pixelsize>26</pixelsize>
+ </fontdef>
+@@ -1084,7 +1089,7 @@
+ </shape>
+
+ <shape name="title-backdrop-line">
+- <area>219,489,834,68</area>
++ <area>219,489,996,68</area>
+ <type>roundbox</type>
+ <fill color="#000000" alpha="0" />
+ <line color="#ffffff" alpha="45" width="2" />
+@@ -1092,11 +1097,11 @@
+ </shape>
+
+ <shape name="title-top-line" from="channel-top-line">
+- <area>220,490,832,2</area>
++ <area>220,490,994,2</area>
+ </shape>
+
+ <shape name="title-bottom-line" from="channel-top-line">
+- <area>220,554,832,2</area>
++ <area>220,554,994,2</area>
+ </shape>
+
+ <shape name="title-left-line" from="channel-left-line">
+@@ -1104,30 +1109,6 @@
+ </shape>
+
+ <shape name="title-right-line" from="channel-left-line">
+- <area>1050,492,2,62</area>
+- </shape>
+-
+- <shape name="clock-backdrop-line">
+- <area>1057,489,158,68</area>
+- <type>roundbox</type>
+- <fill color="#000000" alpha="0" />
+- <line color="#ffffff" alpha="45" width="2" />
+- <cornerradius>6</cornerradius>
+- </shape>
+-
+- <shape name="clock-top-line" from="channel-top-line">
+- <area>1058,490,156,2</area>
+- </shape>
+-
+- <shape name="clock-bottom-line" from="channel-top-line">
+- <area>1058,554,156,2</area>
+- </shape>
+-
+- <shape name="clock-left-line" from="channel-left-line">
+- <area>1058,492,2,62</area>
+- </shape>
+-
+- <shape name="clock-right-line" from="channel-left-line">
+ <area>1212,492,2,62</area>
+ </shape>
+
+@@ -1175,30 +1156,30 @@
+ </textarea>
+
+ <textarea name="title">
+- <font>medium</font>
++ <font>title</font>
+ <area>228,494,816,30</area>
+ <align>left,vcenter</align>
</textarea>
-- <textarea name="channum">
-+ <textarea name="channum" depends="!coverart">
- <font>large</font>
- <area>68,490,162,46</area>
- <align>allcenter</align>
+ <textarea name="timedate">
+- <font>smallerblue</font>
++ <font>smaller</font>
+ <area>228,529,497,22</area>
+ <align>vcenter</align>
+ <template>%TIMEDATE% : %LENMINS%</template>
</textarea>
-- <textarea name="callsign">
-+ <textarea name="callsign" depends="!coverart">
- <font>large</font>
- <area>68,634,162,46</area>
- <align>allcenter</align>
+ <textarea name="longrepeat">
+- <font>smallerblue</font>
+- <area>740,530,304,20</area>
++ <font>smaller</font>
++ <area>902,530,310,20</area>
+ <align>right,vcenter</align>
+ <template>%LONGREPEAT%</template>
</textarea>
-- <imagetype name="iconpath">
-+ <imagetype name="iconpath" depends="!coverart">
- <area>84,536,130,98</area>
- <preserveaspect>true</preserveaspect>
- <mask>images/osd/masks/osd_program_icon_mask.png</mask>
-@@ -996,12 +996,14 @@
+ <clock name="clock">
+- <area>1060,492,152,62</area>
+- <font>large</font>
++ <area>1086,494,120,30</area>
++ <font>medium</font>
+ <template>%TIME%</template>
+- <align>allcenter</align>
++ <align>right,vcenter</align>
+ </clock>
- <!-- Commit 6216029d2 makes this show up in both recordings and video. -->
- <!-- Since I only want it in video and there is no way to control it. I have no choice but to disable it. -->
--<!--
-+
- <imagetype name="coverart">
- <area>70,492,158,186</area>
-+ <preserveaspect>true</preserveaspect>
-+ <mask>images/masks/watchrecordings_coverart_mask.png</mask>
- <alpha>255</alpha>
- </imagetype>
---->
-+
- <textarea name="category">
- <font>supersmallblue</font>
- <area>257,490,937,28</area>
+ <textarea name="description">
--
cgit v0.12
From a2ab677040c35b12c2554f3b4aa1cbbdaaa336eb Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 19 Oct 2014 18:10:03 -0500
Subject: LinHES-config: fix remotes starting when it shouldn't. This was due
to not checking all the correct values for the blaster type
Fix upgrades for the new system images
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_install.py | 18 +++++++++++++-----
abs/core/LinHES-config/mv_ir.py | 22 ++++++++++++----------
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index dfce8b7..f42ded1 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=10
+pkgrel=11
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -133,7 +133,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('c3304ee845d49a1f02b1efcbb9d85726'
+md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'3f6855b7bb860a44f96a972c2e80f497'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
@@ -159,7 +159,7 @@ md5sums=('c3304ee845d49a1f02b1efcbb9d85726'
'c0549457750c4f8e8038d904a0f3012a'
'08dff9a1fc70c30bf4759e1821e824bd'
'b845de3e05c1734cce4b9ac5e8f1baaf'
- '6356c271bf6639002d4c59406250a1f6'
+ '885fcb99a0179d9704385e14aefd7af6'
'8b7dce4a3a0a281fa6656aa8781a648e'
'8903d2e17a6955ba59e6f17a65bfc082'
'824e49d9b01fed295c704ab68908b464'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 20ec7bf..9556a0e 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -891,10 +891,13 @@ def copy_it(install_type):
if ( install_type == "upgrade"):
logging.info("Upgrading system")
- cmdlist = ['rsync -arp --exclude /home --exclude /data/srv/mysql /image_mount/root/* /new_boot',
- 'rsync -arp /image_mount/lib/* /new_boot/lib/',
- 'rsync -arp /image_mount/usr /new_boot',
- 'rsync -arp /image_mount/var /new_boot']
+ #cmdlist = ['rsync -arp --exclude /home --exclude /data/srv/mysql /image_mount/root/* /new_boot',
+ #'rsync -arp /image_mount/lib/* /new_boot/lib/',
+ #'rsync -arp /image_mount/usr /new_boot',
+ #'rsync -arp /image_mount/var /new_boot']
+
+ cmdlist = ['rsync -arp --exclude var-lib-pacman --exclude boot-orig --exclude /home --exclude /data/srv/mysql /image_mount/* /new_boot']
+
for cmd in cmdlist:
#runcmd(cmd)
@@ -920,7 +923,7 @@ def copy_it(install_type):
#needed to retain dhcp address between reboots.
cp_and_log("/etc/dhcpcd.duid", data_config.MOUNTPOINT+"/etc/dhcpcd.duid")
cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/")
-
+
# General fixup
cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
runcmd(cmd)
@@ -1824,9 +1827,12 @@ def find_upgrade():
cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
+ cp_and_log("/tmp/etc/dhcpcd.duid", "/etc/dhcpcd.duid")
+
else:
logging.info("Could not find systemconfig file %s", srcfile)
cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
+ cp_and_log("/tmp/etc/dhcpcd.duid", "/etc/dhcpcd.duid")
cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
cp_and_log("/tmp/etc/mdadm.conf", "/etc")
timezone_to_db("/tmp/etc/timezone")
@@ -1989,6 +1995,8 @@ def upgrade(hostoptions):
destfile = "%s/etc/mplayer/mplayer.conf" %(data_config.MOUNTPOINT)
cp_and_log(srcfile, destfile)
+
+
if not os.path.exists("/tmp/etc/KnoppMyth-version"):
logging.debug(" standard upgrade, restoring auth files")
cp_and_log(data_config.MOUNTPOINT+"/etc.old/passwd", data_config.MOUNTPOINT+"/etc/passwd")
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index 1eae985..c4386cc 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -87,7 +87,9 @@ def include_file( incfile,filename):
def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
logging.debug(" Setup of remote type %s",Remotetype)
- if Remotetype == "no_remote" and HostBlasterType == "None" :
+ #if Remotetype == "no_remote" and HostBlasterType == "None" :
+ HostBlasterType_values=["None",""]
+ if Remotetype == "no_remote" and (HostBlasterType in HostBlasterType_values) :
mv_common.remove_service("remotes")
elif Remotetype == "tinker":
pass #do nothing
@@ -139,7 +141,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
#if remote has a special xbmc file, use it.
xbmcfile= remote_path + "/xbmc.xml"
userxmbcfile = mythhome+"/.xbmc/userdata/Lircmap.xml"
-
+
if os.path.exists(xbmcfile):
logging.debug(" XBMC lirc file present")
logging.info(" Setting up lirc for xbmc")
@@ -153,7 +155,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
os.mkdir(mythhome+"/.xbmc/userdata/")
except:
logging.debug(" Couldn't create .xbmc/userdata ")
-
+
try:
cmd = ''' chown -R mythtv %s/.xbmc''' %mythhome
mv_common.runcmd(cmd)
@@ -161,7 +163,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
mv_common.runcmd(cmd)
except:
logging.debug(" Couldn't change permissions for .xbmc")
- pass
+ pass
try:
cmd = ''' rm -f %s''' %(userxmbcfile)
mv_common.runcmd(cmd)
@@ -171,12 +173,12 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
pass
else:
logging.debug(" XBMC lirc file %s not present" %xbmcfile)
-
-
-
-
-
-
+
+
+
+
+
+
#remote has it's own modprobe.d/conf filename
cmd = "rm -f /etc/modprobe.d/mv_ir.conf"
--
cgit v0.12
From db420b9dfa1df8082f1b9655cdc9e2ebc1a0d002 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 19 Oct 2014 18:10:55 -0500
Subject: runit-scripts: change frontend, evrouter, vnc to use sudo instead of
su. This allows runit to start/stop the service as needed.
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/evrouter/run | 3 ++-
abs/core/runit-scripts/runitscripts/services/frontend/run | 4 ++--
abs/core/runit-scripts/runitscripts/services/vnc/finish | 2 +-
abs/core/runit-scripts/runitscripts/services/vnc/run | 4 ++--
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index d43e59f..fd78f72 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.2
-pkgrel=2
+pkgrel=3
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/evrouter/run b/abs/core/runit-scripts/runitscripts/services/evrouter/run
index 7d9e1d2..82d0268 100755
--- a/abs/core/runit-scripts/runitscripts/services/evrouter/run
+++ b/abs/core/runit-scripts/runitscripts/services/evrouter/run
@@ -16,6 +16,7 @@ then
sv start Xvfb
fi
- su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
+ #su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
+ exec sudo -u mythtv -i DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*
fi
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run
index 3711058..22b65db 100755
--- a/abs/core/runit-scripts/runitscripts/services/frontend/run
+++ b/abs/core/runit-scripts/runitscripts/services/frontend/run
@@ -21,5 +21,5 @@ stat_runit "Starting LinHES frontend"
# fi
#echo "Starting LinHES frontend" >/dev/tty1
-exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start
-
+#exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start
+exec sudo -u mythtv -i /usr/LH/bin/LinHES-start
diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/finish b/abs/core/runit-scripts/runitscripts/services/vnc/finish
index 605a0c4..c026673 100755
--- a/abs/core/runit-scripts/runitscripts/services/vnc/finish
+++ b/abs/core/runit-scripts/runitscripts/services/vnc/finish
@@ -6,7 +6,7 @@ export TERM=linux
. /etc/rc.d/functions
stat_runit "Stopping vnc service"
rm -f /etc/avahi/services/vnc.service 2>/dev/null
-su vncsvc -c "vncserver -kill :1"
+sudo -u vncsvc vncserver -kill :1
XFILE="/tmp/.X11-unix/X1"
if [ -e $XFILE ]
then
diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run
index 1c01371..bc411b1 100755
--- a/abs/core/runit-scripts/runitscripts/services/vnc/run
+++ b/abs/core/runit-scripts/runitscripts/services/vnc/run
@@ -11,5 +11,5 @@ geometry=1024x768
#. /etc/conf.d/vncserver 2>/dev/null
cp -f $MV_ROOT/templates/vnc.service /etc/avahi/services/vnc.service 2>/dev/null
cd ~vncsvc
-exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log
-
+#exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log
+exec sudo -u vncsvc -i /usr/bin/vncserver -fg -geometry $geometry :1 2>/var/log/vnc.log
--
cgit v0.12
From bf92c78f459a0856adafa065317cb25a39444ccb Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 19 Oct 2014 18:11:11 -0500
Subject: system-templates: recompile to fix permissions on remotes dir
---
abs/core/system-templates/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index b9f5e6d..40aeefb 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=8.2
-pkgrel=1
+pkgrel=2
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
--
cgit v0.12
From 4c7427ac2a34fd0cf47f2ef83372d8d2c77a5fff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 20 Oct 2014 17:02:54 +0000
Subject: LinHES-config: mv_network.py: blank mtu set to default of 1500
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_network.py | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index f42ded1..cc90500 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=11
+pkgrel=12
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -161,7 +161,7 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'885fcb99a0179d9704385e14aefd7af6'
'8b7dce4a3a0a281fa6656aa8781a648e'
- '8903d2e17a6955ba59e6f17a65bfc082'
+ '4b10fff21a0274f950f97f2b61e92463'
'824e49d9b01fed295c704ab68908b464'
'fe5e31b833cc6707209e9d656b6eb53c'
'71b4860bbc8b7d94311acee7efa7269c'
diff --git a/abs/core/LinHES-config/mv_network.py b/abs/core/LinHES-config/mv_network.py
index cf01c31..a4ad0c9 100755
--- a/abs/core/LinHES-config/mv_network.py
+++ b/abs/core/LinHES-config/mv_network.py
@@ -356,6 +356,8 @@ def setup_interface(netdev,systemconfig):
logging.info(" Using default mtu value")
cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev)
mv_common.runcmd(cmd)
+ cmd = ''' echo "mtu 1500" >> %s/%s/iplink''' %(etcnetdir,netdev)
+ mv_common.runcmd(cmd)
def change_iface_state(netdev, state):
--
cgit v0.12
From be2c4f5e6bf5ea5423ae9abd6bc1dcc3491bd3ca Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 20 Oct 2014 19:00:16 +0000
Subject: update81-82.sh: add warning if R8.2 pkgs are not found in repo
check /sbin and /usr/sbin if symlinks
---
abs/core/update81-82.sh | 55 +++++++++++++++++++++++++++++++++----------------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index 60c1a02..8967549 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -7,7 +7,7 @@
echo ""
echo "About to update the OS to LinHES 8.2"
echo "This process will only work if currently running LinHES 8.1 or later"
-echo "* Please respond with Y to all the yes/no questions"
+echo "* Please respond with Y to ALL the yes/no questions"
echo "* Answer Y to remove sysvinit"
echo "* If prompted about libgl, select the gl that is appropiate for your system"
echo ""
@@ -17,15 +17,31 @@ echo "Press Y to continue, any other key to stop"
read a
if [ x$a != "xY" ]
then
- echo " Y NOT selected, exiting"
- exit 3
+ echo " Y NOT selected, exiting"
+ exit 3
fi
+pacman -Ssyy LinHES-system | awk '{print $2}' | grep -q "8.2-"
+pr=$?
+if [ $pr != 0 ]
+then
+ echo ""
+ echo "WARNING! The current repos in /etc/pacman.conf do not look like they"
+ echo " contain packages for LinHES 8.2."
+ echo "Press Y to continue (not recommended), any other key to stop"
+
+ read ans
+ if [ x$ans != "xY" ]
+ then
+ echo " Y NOT selected, exiting"
+ exit 3
+ fi
+fi
-echo "Downloading filesystem and glibc for later use, please wait"
+echo "Downloading filesystem and glibc for later use, please wait..."
curl -o filesystem-itermediate.pkg.tar.xz http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz
rc=$?
if [ $rc != 0 ]
@@ -47,35 +63,39 @@ else
fi
+pacman -S --noconfirm tdb
-
-pacman -Sy --noconfirm tdb
-echo "Removing select symlinks and files not in poweroff-scripts package "
+echo "Removing select symlinks and files not in poweroff-scripts package..."
rm -f /usr/lib/libtalloc.so.1
rm -f /usr/lib/libtalloc.so.2
-rm -f /usr/sbin/re*
-rm -f /usr/sbin/pow*
-rm -f /usr/sbin/hal*
-rm -f /sbin/re*
-rm -f /sbin/pow*
-rm -f /sbin/hal*
+if [ -L /usr/sbin ]
+then
+ rm -f /usr/sbin/reb*
+ rm -f /usr/sbin/pow*
+ rm -f /usr/sbin/hal*
+fi
+if [ -L /sbin ]
+then
+ rm -f /sbin/reb*
+ rm -f /sbin/pow*
+ rm -f /sbin/hal*
+fi
+
+echo "Updating packages..."
pacman -Syu --ignore filesystem,bash,glibc
pacman -R tcp_wrappers --noconfirm
pacman -S bash --noconfirm
-
-
-
pacman -U ./glibc-2.18-11-x86_64.pkg.tar.xz ./filesystem-itermediate.pkg.tar.xz --noconfirm
rc=$?
if [ $rc != 0 ]
then
- echo "Filesystem update was unable to install"
+ echo "Filesystem-itermediate update was unable to install"
echo "Please check /bin /usr/sbin /sbin "
echo "for packages that need to be updated"
exit 2
@@ -104,4 +124,3 @@ else
echo "upgrade was a success"
echo "please reboot"
fi
-
--
cgit v0.12
From a5590691acb7c18f049290a89b098b735e2ed032 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 20 Oct 2014 22:23:55 +0000
Subject: xbmc: recompile
---
abs/extra/xbmc/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 8e6cc91..9594b7e 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -12,7 +12,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=13.2
_codename=Gotham
-pkgrel=4
+pkgrel=5
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
--
cgit v0.12
From 7cc3bdc2af9b89235a1552c7c2988227434ab6ae Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 20 Oct 2014 23:41:06 +0000
Subject: xbmc: recompile take 2; add glu dep
---
abs/extra/xbmc/PKGBUILD | 4 ++--
abs/extra/xbmc/__changelog | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 9594b7e..ab30af1 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -12,13 +12,13 @@ _prefix=/usr
pkgname=xbmc
pkgver=13.2
_codename=Gotham
-pkgrel=5
+pkgrel=6
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL2')
depends=(
-'avahi' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad'
+'avahi' 'glu' 'hicolor-icon-theme' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad'
'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient'
'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt'
'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image'
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
index 20b50eb..a50187f 100644
--- a/abs/extra/xbmc/__changelog
+++ b/abs/extra/xbmc/__changelog
@@ -1,4 +1,4 @@
-PKGBUILD - remove libpulse dep and remove --enable-pulse config option
+PKGBUILD - remove libpulse dep and remove --enable-pulse config option; add glu dep
PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/
xbmc.install - add gen_lib_xml.py to post_install and post_remove
xbmc.install - comment out autostart message since we don't use systemd
--
cgit v0.12
From 4d9e0928c1756fa28b62b29cc0d79f9fc1b953f8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 21 Oct 2014 17:19:58 +0000
Subject: LinHES-config: mv_software.py: remove miro
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_software.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index cc90500..b389fb0 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=12
+pkgrel=13
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -164,7 +164,7 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'4b10fff21a0274f950f97f2b61e92463'
'824e49d9b01fed295c704ab68908b464'
'fe5e31b833cc6707209e9d656b6eb53c'
- '71b4860bbc8b7d94311acee7efa7269c'
+ '16778701173c8465c4a288cd31d94de4'
'087a0ef743bc8af915503f8773536ce4'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index 097a7bc..98fe2cf 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -31,6 +31,9 @@ def setup_software(systemconfig, data_config):
logging.info("____Start of Software install____")
postfix=''
+ logging.info(" Refreshing pacman package list from server")
+ cmd="pacman -Syy"
+ mv_common.runcmd(cmd)
if data_config.SYSTEMTYPE == "MythVantage":
#look for the installed prefix
cmd="pacman -Q mythtv-release-fixes"
@@ -66,7 +69,6 @@ def setup_software(systemconfig, data_config):
"dolphinemu",
"xe",
"mythappletrailers",
- "miro",
"webonlinhes",
"huludesktop",
"xbmc",
--
cgit v0.12
From 485c58c50fed5d253874b41f28f9ec75ff4f4910 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 21 Oct 2014 19:06:29 +0000
Subject: mythinstall & LinHES-config: remove miro
add webmin
---
abs/core/LinHES-config/PKGBUILD | 6 +-
abs/core/LinHES-config/mv_common.py | 1 -
abs/core/LinHES-config/mv_software.py | 1 +
.../mythinstall/installsettings.cpp | 137 ++++-----------------
.../MythVantage-app/mythinstall/installsettings.h | 14 +--
.../MythVantage-app/mythinstall/main.cpp | 4 +-
abs/core/mythinstall/PKGBUILD | 2 +-
7 files changed, 31 insertions(+), 134 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index b389fb0..8ce1e97 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=13
+pkgrel=14
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -157,14 +157,14 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'e959df98947eb0d2ea64ff616b61aab5'
'2506860a416e1988934225d80d501c2c'
'c0549457750c4f8e8038d904a0f3012a'
- '08dff9a1fc70c30bf4759e1821e824bd'
+ '1224a6a51cfe3283b562e3c250688b53'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'885fcb99a0179d9704385e14aefd7af6'
'8b7dce4a3a0a281fa6656aa8781a648e'
'4b10fff21a0274f950f97f2b61e92463'
'824e49d9b01fed295c704ab68908b464'
'fe5e31b833cc6707209e9d656b6eb53c'
- '16778701173c8465c4a288cd31d94de4'
+ '36dc1ae5fae0bbf99cb2bf5ae9419e67'
'087a0ef743bc8af915503f8773536ce4'
'38665330aeb3a8bdf7be24857fe035bb'
'80685e047993b00161be29e3580f3a40'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index bc5382d..3160989 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -212,7 +212,6 @@ def pacinstall(pkg):
elif pkg == "dvdcss":
pacinstall("libdvdcss")
elif pkg == "webmin":
- pacinstall("webmin")
add_service("webmin")
elif pkg == "fuppes":
pacinstall("fuppes-svn")
diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py
index 98fe2cf..13f0f2f 100755
--- a/abs/core/LinHES-config/mv_software.py
+++ b/abs/core/LinHES-config/mv_software.py
@@ -69,6 +69,7 @@ def setup_software(systemconfig, data_config):
"dolphinemu",
"xe",
"mythappletrailers",
+ "webmin",
"webonlinhes",
"huludesktop",
"xbmc",
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
index 3171c67..3592f09 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
@@ -936,16 +936,6 @@ static HostCheckBox *Hostpluginmythbrowser()
};
-// static HostCheckBox *Hostpluginmythcontrols()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostpluginmythcontrols");
-// gc->setLabel(QObject::tr("mythcontrols"));
-// gc->setValue(true);
-// gc->setHelpText(QObject::tr("check to enable mythcontrols"));
-// return gc;
-// };
-
-
static HostCheckBox *Hostpluginmythnetvision()
{
HostCheckBox *gc = new HostCheckBox("Hostpluginmythnetvision");
@@ -1048,17 +1038,6 @@ static HostCheckBox *HostpluginmythgameXe()
};
-/*
-static HostCheckBox *Hostpluginmythmovietime()
-{
- HostCheckBox *gc = new HostCheckBox("Hostpluginmythmovietime");
- gc->setLabel(QObject::tr("mythmovietime"));
- gc->setValue(true);
- gc->setHelpText(QObject::tr("Check to enable mythmovietime"));
- return gc;
-};*/
-
-
static HostCheckBox *Hostpluginmythmusic()
{
HostCheckBox *gc = new HostCheckBox("Hostpluginmythmusic");
@@ -1079,25 +1058,6 @@ static HostCheckBox *Hostpluginmythnews()
};
-// static HostCheckBox *Hostpluginmythsmolt()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostpluginmythsmolt");
-// gc->setLabel(QObject::tr("mythsmolt"));
-// gc->setValue(true);
-// gc->setHelpText(QObject::tr("check to enable mythsmolt"));
-// return gc;
-// };
-
-
-// static HostCheckBox *Hostpluginmythvideo()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo");
-// gc->setLabel(QObject::tr("mythvideo"));
-// gc->setValue(true);
-// gc->setHelpText(QObject::tr("check to enable mythvideo"));
-// return gc;
-// };
-
static HostCheckBox *Hostpluginmythvideo_dvdcss()
{
HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo_dvdcss");
@@ -1109,15 +1069,6 @@ static HostCheckBox *Hostpluginmythvideo_dvdcss()
-// static HostCheckBox *Hostpluginmythstream()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostpluginmythstream");
-// gc->setLabel(QObject::tr("mythstream"));
-// gc->setValue(false);
-// gc->setHelpText(QObject::tr("MythStream is an unofficial MythTv plugin that plays Internet audio and video streams."));
-// return gc;
-// };
-
static HostCheckBox *Hostpluginmythappletrailers()
{
HostCheckBox *gc = new HostCheckBox("Hostpluginmythappletrailers");
@@ -1138,14 +1089,14 @@ static HostCheckBox *Hostpluginmythweather()
};
-static HostCheckBox *HostMiro()
-{
- HostCheckBox *gc = new HostCheckBox("HostMiro");
- gc->setLabel(QObject::tr("Miro"));
- gc->setValue(false);
- gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any other platform."));
- return gc;
-};
+//static HostCheckBox *HostMiro()
+//{
+// HostCheckBox *gc = new HostCheckBox("HostMiro");
+// gc->setLabel(QObject::tr("Miro"));
+// gc->setValue(false);
+// gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any other platform."));
+// return gc;
+//};
// static HostCheckBox *HostXine()
@@ -1158,23 +1109,15 @@ static HostCheckBox *HostMiro()
// };
-// static HostCheckBox *Hostwebmin()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostwebmin");
-// gc->setLabel(QObject::tr("Webmin"));
-// gc->setValue(false);
-// gc->setHelpText(QObject::tr("Webmin is a web-based interface for system administration for Unix. Once installed, you can access it at https://ip.of.back.end:10000 using your root password."));
-// return gc;
-// };
+static HostCheckBox *Hostwebmin()
+{
+ HostCheckBox *gc = new HostCheckBox("Hostwebmin");
+ gc->setLabel(QObject::tr("Webmin"));
+ gc->setValue(false);
+ gc->setHelpText(QObject::tr("Webmin is a web-based interface for system administration. Once installed, access it at https://ip.of.back.end:10000 using your root password."));
+ return gc;
+};
-// static HostCheckBox *Hostfuppes()
-// {
-// HostCheckBox *gc = new HostCheckBox("Hostfuppes");
-// gc->setLabel(QObject::tr("Fuppes"));
-// gc->setValue(false);
-// gc->setHelpText(QObject::tr("Upnp server"));
-// return gc;
-// };
static HostCheckBox *Hostfoldingathome()
{
@@ -4026,16 +3969,11 @@ void writesettings ()
//plugins
hostparm.ThisHostpluginmytharchive = gCoreContext->GetSetting("Hostpluginmytharchive");
hostparm.ThisHostpluginmythbrowser = gCoreContext->GetSetting("Hostpluginmythbrowser");
- //hostparm.ThisHostpluginmythcontrols = gCoreContext->GetSetting("Hostpluginmythcontrols");
hostparm.ThisHostpluginmythnetvision = gCoreContext->GetSetting("Hostpluginmythnetvision");
hostparm.ThisHostpluginmythgallery = gCoreContext->GetSetting("Hostpluginmythgallery");
hostparm.ThisHostpluginmythgame = gCoreContext->GetSetting("Hostpluginmythgame");
- // hostparm.ThisHostpluginmythmovietime = gCoreContext->GetSetting("Hostpluginmythmovietime");
hostparm.ThisHostpluginmythmusic = gCoreContext->GetSetting("Hostpluginmythmusic");
hostparm.ThisHostpluginmythnews = gCoreContext->GetSetting("Hostpluginmythnews");
-// hostparm.ThisHostpluginmythphone = gCoreContext->GetSetting("Hostpluginmythphone");
-// hostparm.ThisHostpluginmythsmolt = gCoreContext->GetSetting("Hostpluginmythsmolt");
-// hostparm.ThisHostpluginmythvideo = gCoreContext->GetSetting("Hostpluginmythvideo");
hostparm.ThisHostpluginmythweather = gCoreContext->GetSetting("Hostpluginmythweather");
hostparm.ThisHostpluginmythzoneminder = gCoreContext->GetSetting("Hostpluginmythzoneminder");
hostparm.ThisHostpluginmythgamefceux = gCoreContext->GetSetting("Hostpluginmythgamefceux");
@@ -4046,24 +3984,16 @@ void writesettings ()
hostparm.ThisHostpluginmythvideo_dvdcss = gCoreContext->GetSetting("Hostpluginmythvideo_dvdcss");
hostparm.ThisHostpluginmythappletrailers= gCoreContext->GetSetting("Hostpluginmythappletrailers");
-// hostparm.ThisHostpluginmythstream= gCoreContext->GetSetting("Hostpluginmythstream");
-// hostparm.ThisHostpluginmythvodka= gCoreContext->GetSetting("Hostpluginmythvodka");
- hostparm.ThisHostMiro= gCoreContext->GetSetting("HostMiro");
+// hostparm.ThisHostMiro= gCoreContext->GetSetting("HostMiro");
hostparm.ThisHostpluginmythgameMednafen= gCoreContext->GetSetting("HostpluginmythgameMednafen");
hostparm.ThisHostpluginmythgameROMDB= gCoreContext->GetSetting("HostpluginmythgameROMDB");
hostparm.ThisHostpluginmythgameMupen64= gCoreContext->GetSetting("HostpluginmythgameMupen64");
// hostparm.ThisHostXine = gCoreContext->GetSetting("HostXine");
-// hostparm.ThisHostwebmin = gCoreContext->GetSetting("Hostwebmin");
-// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes");
+ hostparm.ThisHostwebmin = gCoreContext->GetSetting("Hostwebmin");
hostparm.ThisHostHuluDesktop = gCoreContext->GetSetting("HostHuluDesktop");
hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes");
hostparm.ThisHostXBMC = gCoreContext->GetSetting("HostXBMC");
-// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes");
-
-
-
-
hostparm.ThisHostfoldingathome = gCoreContext->GetSetting("Hostfoldingathome");
hostparm.ThisHostfoldingusername = gCoreContext->GetSetting("Hostfoldingusername");
hostparm.ThisHostfoldingworksize = gCoreContext->GetSetting("Hostfoldingworksize");
@@ -4392,23 +4322,15 @@ void writesettings ()
myfile << "dvdcss=\"" + hostparm.ThisHostpluginmythvideo_dvdcss + "\"\n";
myfile << "mythappletrailers=\"" + hostparm.ThisHostpluginmythappletrailers + "\"\n";
- myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n";
+// myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n";
myfile << "webonlinhes=\"" + hostparm.ThisHostwebonlinhes + "\"\n";
myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n";
myfile << "xbmc=\"" + hostparm.ThisHostXBMC + "\"\n";
- //myfile << "fuppes=\"" + hostparm.ThisHostfuppes + "\"\n";
myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n";
myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n";
myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize + "\"\n";
- //myfile << "mythstream=\"" + hostparm.ThisHostpluginmythstream + "\"\n";
- // myfile << "mythphone=\"" + hostparm.ThisHostpluginmythphone + "\"\n";
- // myfile << "mythsmolt=\"" + hostparm.ThisHostpluginmythsmolt + "\"\n";
- // myfile << "mythvideo=\"" + hostparm.ThisHostpluginmythvideo + "\"\n";
- // myfile << "mythcontrols=\"" + hostparm.ThisHostpluginmythcontrols + "\"\n";
- // myfile << "mythmovietime=\"" + hostparm.ThisHostpluginmythmovietime + "\"\n";
- // myfile << "mythvodka=\"" +hostparm.ThisHostpluginmythvodka + "\"\n";
// myfile << "xine=\"" + hostparm.ThisHostXine + "\"\n";
- // myfile << "webmin=\"" + hostparm.ThisHostwebmin + "\"\n";er + "\"\n";
+ myfile << "webmin=\"" + hostparm.ThisHostwebmin + "\"\n";
systemheader="\n# ddns settings\n" ;
@@ -4790,30 +4712,20 @@ MythInstallSettings::MythInstallSettings()
GridShowPlugin->setLabel(QObject::tr("Programs (1/4)"));
GridShowPlugin->addChild(Hostpluginmytharchive());
GridShowPlugin->addChild(Hostpluginmythbrowser());
- //GridShowPlugin->addChild(Hostpluginmythcontrols());
GridShowPlugin->addChild(Hostpluginmythnetvision());
GridShowPlugin->addChild(Hostpluginmythgallery());
- //GridShowPlugin->addChild(Hostpluginmythmovietime());
//ConfigurationGroup *GridShowPlugin2 = new GridConfigurationGroup(2);
GridShowPlugin->addChild(Hostpluginmythmusic());
GridShowPlugin->addChild(Hostpluginmythnews());
- //GridShowPlugin2->addChild(Hostpluginmythphone());
- //GridShowPlugin2->addChild(Hostpluginmythsmolt());
GridShowPlugin->addChild(Hostpluginmythweather());
GridShowPlugin->addChild(Hostpluginmythzoneminder());
-// ConfigurationGroup *Mythvideoplugin = new HorizontalConfigurationGroup();
-// Mythvideoplugin->addChild(Hostpluginmythvideo());
-// Mythvideoplugin->addChild(Hostpluginmythvideo_dvdcss());
-
-
ConfigurationGroup *GridShowPlugin3 = new VerticalConfigurationGroup(false,true);
GridShowPlugin3->setLabel(QObject::tr("Programs (2/4)"));
GridShowPlugin3->addChild(new MythGamesettings);
GridShowPlugin3->addChild(Hostpluginmythvideo_dvdcss());
- //GridShowPlugin3->addChild(Mythvideoplugin);
addChild(GridShowPlugin);
// addChild(GridShowPlugin2);
@@ -4833,19 +4745,14 @@ MythInstallSettings::MythInstallSettings()
ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2,false);
GridShowPlugin4->setLabel(QObject::tr("Programs (3/4)"));
GridShowPlugin4->addChild(Hostpluginmythappletrailers());
- //GridShowPlugin4->addChild(Hostpluginmythstream());
- //GridShowPlugin4->addChild(Hostpluginmythvodka());
- GridShowPlugin4->addChild(HostMiro());
+ //GridShowPlugin4->addChild(HostMiro());
//GridShowPlugin4->addChild(HostXine());
- //GridShowPlugin4->addChild(Hostwebmin());
- //GridShowPlugin4->addChild(Hostfuppes());
GridShowPlugin4->addChild(HostHuluDesktop());
+ GridShowPlugin4->addChild(Hostwebmin());
GridShowPlugin4->addChild(Hostwebonlinhes());
GridShowPlugin4->addChild(HostXBMC());
-
ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2);
- //GridShowPlugin5->addChild(Hostfuppes());
ConfigurationGroup *GridShowPlugin6 = new VerticalConfigurationGroup(false,true);
GridShowPlugin6->setLabel(QObject::tr("Programs (4/4)"));
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
index 719eea5..6ce0eff 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h
@@ -510,27 +510,18 @@ struct HostParms
QString ThisHostRemoteBackupDir;
QString ThisHostpluginmytharchive;
QString ThisHostpluginmythbrowser;
- QString ThisHostpluginmythcontrols;
QString ThisHostpluginmythnetvision;
QString ThisHostpluginmythgallery;
QString ThisHostpluginmythgame;
- QString ThisHostpluginmythmovietime;
QString ThisHostpluginmythmusic;
QString ThisHostpluginmythnews;
- QString ThisHostpluginmythphone;
- QString ThisHostpluginmythsmolt;
- QString ThisHostpluginmythvideo;
QString ThisHostpluginmythweather;
QString ThisHostpluginmythzoneminder;
-
-
QString ThisHostpluginmythvideo_dvdcss;
QString ThisHostpluginmythappletrailers;
- QString ThisHostpluginmythstream;
- QString ThisHostpluginmythvodka;
- QString ThisHostMiro;
+// QString ThisHostMiro;
QString ThisHostwebonlinhes;
QString ThisHostXBMC;
QString ThisHostHuluDesktop;
@@ -545,8 +536,7 @@ struct HostParms
QString ThisHostpluginmythgameXe;
// QString ThisHostXine;
-// QString ThisHostwebmin;
-// QString ThisHostfuppes;
+ QString ThisHostwebmin;
QString ThisHostfoldingathome;
QString ThisHostfoldingusername;
QString ThisHostfoldingworksize;
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
index bac24ad..a9f0aa9 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp
@@ -330,8 +330,8 @@ int main(int argc, char **argv)
"mythweather",
"mythzoneminder",
"huludesktop",
- "miro",
"xbmc",
+ "webmin",
"web-on-linhes",
"foldingathome"};
QString progDBNamesArray[] = { "Hostpluginmythappletrailers",
@@ -354,8 +354,8 @@ int main(int argc, char **argv)
"Hostpluginmythweather",
"Hostpluginmythzoneminder",
"HostHuluDesktop",
- "HostMiro",
"HostXBMC",
+ "Hostwebmin",
"Hostwebonlinhes",
"Hostfoldingathome"};
char cmd[200];
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index e268ddd..45fbd26 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.2
-pkgrel=4
+pkgrel=6
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From cdfcefd59e970d491b6a87fde614e70137ef0dde Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 21 Oct 2014 19:53:49 +0000
Subject: LinHES-config: xconfig.sh: update libgl to mesa-libgl
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/xconfig.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 8ce1e97..8591b81 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=14
+pkgrel=15
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -144,7 +144,7 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'b8becf69d4309b938ceba3178c799270'
'2a7f3b34e522acfd08283b86c8926aba'
'b596d2e3779a434435bc0f0277b1ba3e'
- '5012fbd31d205a6d6b0a1d8caf3eba8f'
+ '5f308b40c57f588a118a5c1d8655e833'
'157e73d0f90d7b306aba8f5921aeedd3'
'f8f803cb5738ce0021cd37c1ab514c45'
'879c692ebfd86cdd60d93278f1df8041'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index eda67b4..2c8c86d 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -59,7 +59,7 @@ function presetupX {
}
function nvidia_prepare {
- for i in libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
+ for i in mesa-libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
do
pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1
done
--
cgit v0.12
From f45ada77628912eb87c0f76c1e1ea15170255ea9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 21 Oct 2014 20:59:18 +0000
Subject: mythtv & plugins: update to latest -fixes & add mjpegtools as dep of
mytharchive
---
abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 4 ++--
abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index bbb99eb..90dd836 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-e830993e89fc3b7244e9614c2384ab074c449d1f
+b305eb5b7fc662146e74983fa3754d622695cdeb
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index ad4eba3..1747521 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.27.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
@@ -50,7 +50,7 @@ build() {
package_mytharchive() {
pkgdesc="Create DVDs or archive recorded shows in MythTV"
depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' "mythtv>=${pkgver}"
- 'python2-pillow')
+ 'mjpegtools' 'python2-pillow')
cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive"
patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1
patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 01ee6b2..1ecc448 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythtv
pkgver=0.27.4
-pkgrel=1
+pkgrel=2
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
--
cgit v0.12
From 18ccd8a8df91f38ec7918d108aa31f4c35451ba4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 21 Oct 2014 23:32:35 +0000
Subject: linux: remove nouveau modules
---
abs/core/linux/PKGBUILD | 5 ++++-
abs/core/linux/__changelog | 1 +
abs/core/linux/linux.install.pkg | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 abs/core/linux/__changelog
diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD
index 1ccdf59..5a4b9c3 100644
--- a/abs/core/linux/PKGBUILD
+++ b/abs/core/linux/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-3.13
pkgver=3.13.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
@@ -190,6 +190,9 @@ _package() {
mkdir -p "${pkgdir}/usr"
mv "${pkgdir}/lib" "${pkgdir}/usr/"
+ #remove nouvea
+ find $pkgdir/usr/lib -name "nouvea*" -exec rm -f {} \;
+
# add vmlinux
install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux"
}
diff --git a/abs/core/linux/__changelog b/abs/core/linux/__changelog
new file mode 100644
index 0000000..9a2e2b1
--- /dev/null
+++ b/abs/core/linux/__changelog
@@ -0,0 +1 @@
+PKGBUILD: remove nouveau modules
diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg
index 863ef82..13f1c5e 100644
--- a/abs/core/linux/linux.install.pkg
+++ b/abs/core/linux/linux.install.pkg
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.13.7-1-ARCH
+KERNEL_VERSION=3.13.7-2-ARCH
post_install () {
# updating module dependencies
--
cgit v0.12
From 9787b2418aa08da734190c4c1159ca5d1c6db1e0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 22 Oct 2014 10:42:31 -0500
Subject: lirc: add iguana-ir to the depends line
---
abs/core/lirc/PKGBUILD | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index 5a9d5e5..e924cc8 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -4,8 +4,8 @@
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=70
-epoch=1
+pkgrel=73
+#epoch=1
_extramodules=extramodules-3.13-ARCH
arch=('i686' 'x86_64')
url="http://www.lirc.org/"
@@ -24,17 +24,6 @@ source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.b
lircm.service
irexec.service
lirc.tmpfiles)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '9ee196bd03ea44af5a752fb0cc6ca96a'
- '3deb02604b37811d41816e9b4385fcc3'
- 'a9ab637e7207472e61e55a2fa75dc555'
- '1847b9997685bc3ad2cf11bea4590a92'
- '07131d117fcfe9dcd50c453c3a5e9531'
- 'febf25c154a7d36f01159e84f26c2d9a')
prepare() {
cd "${srcdir}/lirc-${pkgver}"
@@ -97,7 +86,7 @@ package_lirc() {
package_lirc-utils() {
pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair')
optdepends=('python2: pronto2lirc utility')
options=('strip')
install=lirc-utils.install
@@ -119,3 +108,14 @@ package_lirc-utils() {
# remove built modules
rm -r "${pkgdir}/usr/lib/modules"
}
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
+ '3deb02604b37811d41816e9b4385fcc3'
+ 'a9ab637e7207472e61e55a2fa75dc555'
+ '1847b9997685bc3ad2cf11bea4590a92'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a')
--
cgit v0.12
From 91ef8a48add825c038daf4f880903bde0046334b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 22 Oct 2014 21:43:36 +0000
Subject: update81-82.sh: exit if some pacman installs fail. remove conflicting
file
---
abs/core/update81-82.sh | 47 +++++++++++++++++++++++++++++++++--------------
1 file changed, 33 insertions(+), 14 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index 8967549..47d3d14 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -21,7 +21,7 @@ then
exit 3
fi
-
+echo "Syncing pacman repos..."
pacman -Ssyy LinHES-system | awk '{print $2}' | grep -q "8.2-"
pr=$?
if [ $pr != 0 ]
@@ -39,37 +39,36 @@ then
fi
fi
-
-
echo "Downloading filesystem and glibc for later use, please wait..."
curl -o filesystem-itermediate.pkg.tar.xz http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz
rc=$?
if [ $rc != 0 ]
then
- echo "Couldn't download filesystem pkg"
+ echo "Couldn't download filesystem package"
exit 1
else
- echo "Filesystem pkg downloaded"
+ echo "filesystem package downloaded"
fi
curl -o glibc-2.18-11-x86_64.pkg.tar.xz http://linhes.org/repo/x86_64/core-testing/glibc-2.18-11-x86_64.pkg.tar.xz
rc=$?
if [ $rc != 0 ]
then
- echo "Couldn't download glibc pkg"
+ echo "Couldn't download glibc package"
exit 1
else
- echo "glibc pkg downloaded"
+ echo "glibc package downloaded"
fi
-
+echo "Installing tdb..."
pacman -S --noconfirm tdb
-echo "Removing select symlinks and files not in poweroff-scripts package..."
-
+echo "Removing miscellanous files not in packages..."
rm -f /usr/lib/libtalloc.so.1
rm -f /usr/lib/libtalloc.so.2
+rm -f /etc/ssl/certs/java/cacerts
+echo "Removing symlinks not in poweroff-scripts package..."
if [ -L /usr/sbin ]
then
rm -f /usr/sbin/reb*
@@ -86,10 +85,28 @@ fi
echo "Updating packages..."
-pacman -Syu --ignore filesystem,bash,glibc
+pacman -Syu lirc lirc-utils --ignore filesystem,bash,glibc
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "FAILED: pacman -Syu lirc lirc-utils --ignore filesystem,bash,glibc"
+ exit 2
+fi
+
pacman -R tcp_wrappers --noconfirm
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "FAILED: pacman -R tcp_wrappers"
+ exit 2
+fi
pacman -S bash --noconfirm
-
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "FAILED: pacman -S bash"
+ exit 2
+fi
pacman -U ./glibc-2.18-11-x86_64.pkg.tar.xz ./filesystem-itermediate.pkg.tar.xz --noconfirm
rc=$?
@@ -100,6 +117,7 @@ then
echo "for packages that need to be updated"
exit 2
fi
+
pacman -Su
@@ -111,6 +129,7 @@ fi
ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
pacman -S linux --noconfirm
+
pacman -S filesystem --noconfirm
rc=$?
if [ $rc != 0 ]
@@ -121,6 +140,6 @@ then
exit 2
else
echo "New filesystem in place"
- echo "upgrade was a success"
- echo "please reboot"
+ echo "LinHES 8.2 upgrade was successful!"
+ echo "Please reboot"
fi
--
cgit v0.12
From 51df4a02b962588f922e95328d89e2b67eebdab6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 22 Oct 2014 17:06:37 -0500
Subject: mythinstall: fix serial transmitter selection screen. The serial
blaster was an empty screen when it should have shown the blaster set to use.
Simply a case of Serial vs serial
---
abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp | 4 ++--
abs/core/mythinstall/PKGBUILD | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp
index 34a2a33..cd56683 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp
@@ -528,7 +528,7 @@ static HostComboBox *HostBlasterType()
//gc->addSelection("pvr150");
gc->addSelection("iguanaIR-usb");
gc->addSelection("hd_pvr");
- gc->setHelpText(QObject::tr("The type of infrared transmitter being used. Selecting CommandIR or iguanaIR-usb will use that device for both transmitting and receiving. All other receivers will be disabled."));
+ gc->setHelpText(QObject::tr("The type of infrared transmitter being used. Receiver will use the receiver settings. Selecting CommandIR or iguanaIR-usb will use that device for both transmitting and receiving. All other receivers will be disabled."));
gc->setValue("None");
return gc;
};
@@ -673,7 +673,7 @@ public:
addTarget("None", blanksettings);
addTarget("Receiver", transmit_1);
- addTarget("Serial", serial_settings);
+ addTarget("serial", serial_settings);
addTarget("CommandIR", CommandIRsettings);
//addTarget("pvr150",blanksettings);
addTarget("hd_pvr",transmit_1);
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 45fbd26..c37757d 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=8.2
-pkgrel=6
+pkgrel=7
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.27')
--
cgit v0.12
From b42c748872eacf405f710d0df9f1a623b4bb594b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 22 Oct 2014 23:22:37 +0000
Subject: update81-82.sh: revert a fail msg
---
abs/core/update81-82.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index 47d3d14..853a004 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -94,12 +94,6 @@ then
fi
pacman -R tcp_wrappers --noconfirm
-rc=$?
-if [ $rc != 0 ]
-then
- echo "FAILED: pacman -R tcp_wrappers"
- exit 2
-fi
pacman -S bash --noconfirm
rc=$?
if [ $rc != 0 ]
--
cgit v0.12
From 06a53e553c308f1b02c8413046963ca1d5061a32 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Oct 2014 12:02:09 +0000
Subject: update81-82.sh: exit if repo doesn't look like 8.2
---
abs/core/update81-82.sh | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index 853a004..b8a61b4 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -29,14 +29,8 @@ then
echo ""
echo "WARNING! The current repos in /etc/pacman.conf do not look like they"
echo " contain packages for LinHES 8.2."
- echo "Press Y to continue (not recommended), any other key to stop"
-
- read ans
- if [ x$ans != "xY" ]
- then
- echo " Y NOT selected, exiting"
- exit 3
- fi
+ echo "The update cannot continue. Exiting."
+ exit 3
fi
echo "Downloading filesystem and glibc for later use, please wait..."
--
cgit v0.12
From 506ab259e8910000e65b7d2bc6f00ee984da404e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Oct 2014 17:16:48 +0000
Subject: LinHES-config: xconfig.sh: make mesa-libgl install on non nvidia
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/xconfig.sh | 30 ++++++++++++++++++++++--------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 8591b81..d26a94f 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=15
+pkgrel=16
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -144,7 +144,7 @@ md5sums=('af15ebdfbbc3442626a807569a0db2a4'
'b8becf69d4309b938ceba3178c799270'
'2a7f3b34e522acfd08283b86c8926aba'
'b596d2e3779a434435bc0f0277b1ba3e'
- '5f308b40c57f588a118a5c1d8655e833'
+ '9b3d200e101d2ba814de00318a41db8f'
'157e73d0f90d7b306aba8f5921aeedd3'
'f8f803cb5738ce0021cd37c1ab514c45'
'879c692ebfd86cdd60d93278f1df8041'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 2c8c86d..52dc952 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -21,6 +21,7 @@ home_check
function Xvalues {
+ echo $VGACARDTYPE
if [ "x$VGACARDTYPE" = "x" ]
then
CMDLINE=$(cat /proc/cmdline)
@@ -59,7 +60,7 @@ function presetupX {
}
function nvidia_prepare {
- for i in mesa-libgl nvidia nvidia-utils nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
+ for i in mesa-libgl nvidia nvidia-utils nvidia-libgl nvidia-173xx nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils
do
pacman --noconfirm -Rdd $i >> $LOGFILE 2>&1
done
@@ -86,10 +87,17 @@ function nvidia_driver_install {
echo "Installing Nvidia driver"
cp "$TEMPLATES/xorg/xorg.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf
#install latest drivers
- pkg_check nvidia-utils
- echo "Installing current nvidia drivers"
+ LIST="nvidia nvidia-libgl nvidia-utils"
+ for i in `echo ${LIST}`
+ do
+ pkg_check $i
+ done
+ #this is used to remove nvidia
nvidia_prepare
- pacman --noconfirm -S nvidia nvidia-utils >> $LOGFILE 2>&1
+ for i in `echo ${LIST}`
+ do
+ pacman -S --noconfirm $i >> $LOGFILE 2>&1
+ done
installed=1
echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
}
@@ -97,31 +105,37 @@ function nvidia_driver_install {
function vmware_driver_install {
echo "Installing VMware driver"
echo "Installing VMware driver" >> $LOGFILE 2>&1
- LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri"
+ LIST="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri mesa-libgl"
for i in `echo ${LIST}`
do
pkg_check $i
done
+ #this is used to remove nvidia
+ nvidia_prepare
for i in `echo ${LIST}`
do
pacman -S --noconfirm $i >> $LOGFILE 2>&1
done
-
}
function vesa_driver_install {
echo "Installing Vesa driver"
echo "Installing Vesa driver" >> $LOGFILE 2>&1
- pacman -S --noconfirm xf86-video-vesa >> $LOGFILE 2>&1
+ pkg_check xf86-video-vesa
+ pkg_check mesa-libgl
+ #this is used to remove nvidia
+ nvidia_prepare
+ pacman -S --noconfirm xf86-video-vesa mesa-libgl >> $LOGFILE 2>&1
}
function intel_driver_install {
echo "Installing Intel driver"
echo "Installing Intel driver" >> $LOGFILE 2>&1
pkg_check xf86-video-intel
+ pkg_check mesa-libgl
#this is used to remove nvidia
nvidia_prepare
- pacman -S --noconfirm xf86-video-intel >> $LOGFILE 2>&1
+ pacman -S --noconfirm xf86-video-intel mesa-libgl >> $LOGFILE 2>&1
echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG"
}
--
cgit v0.12
From 9e8cb5cbe8cfc1a3c96ab1ab6c171060e582067d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Oct 2014 17:19:18 +0000
Subject: update81-82.sh: exit if tdb install fails
---
abs/core/update81-82.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index b8a61b4..872b462 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -56,6 +56,12 @@ fi
echo "Installing tdb..."
pacman -S --noconfirm tdb
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "FAILED: pacman -S tdb"
+ exit 2
+fi
echo "Removing miscellanous files not in packages..."
rm -f /usr/lib/libtalloc.so.1
--
cgit v0.12
From e1efffa1304b62cbff2ae7c160339a8bcae1b514 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 23 Oct 2014 18:09:21 +0000
Subject: update81-82.sh: add spacing
---
abs/core/update81-82.sh | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh
index 872b462..7061311 100644
--- a/abs/core/update81-82.sh
+++ b/abs/core/update81-82.sh
@@ -21,6 +21,7 @@ then
exit 3
fi
+echo ""
echo "Syncing pacman repos..."
pacman -Ssyy LinHES-system | awk '{print $2}' | grep -q "8.2-"
pr=$?
@@ -33,6 +34,7 @@ then
exit 3
fi
+echo ""
echo "Downloading filesystem and glibc for later use, please wait..."
curl -o filesystem-itermediate.pkg.tar.xz http://linhes.org/repo/x86_64/filesystem-itermediate.pkg.tar.xz
rc=$?
@@ -63,11 +65,13 @@ then
exit 2
fi
+echo ""
echo "Removing miscellanous files not in packages..."
rm -f /usr/lib/libtalloc.so.1
rm -f /usr/lib/libtalloc.so.2
rm -f /etc/ssl/certs/java/cacerts
+echo ""
echo "Removing symlinks not in poweroff-scripts package..."
if [ -L /usr/sbin ]
then
@@ -84,6 +88,7 @@ then
fi
+echo ""
echo "Updating packages..."
pacman -Syu lirc lirc-utils --ignore filesystem,bash,glibc
rc=$?
@@ -112,8 +117,13 @@ then
exit 2
fi
-pacman -Su
-
+pacman -Su --noconfirm
+rc=$?
+if [ $rc != 0 ]
+then
+ echo "FAILED: pacman -Su"
+ exit 2
+fi
if [ -e /etc/udev/rules.d/80-net-name-slot.rules ]
then
@@ -133,6 +143,8 @@ then
echo "for packages that need to be updated"
exit 2
else
+ echo ""
+ echo ""
echo "New filesystem in place"
echo "LinHES 8.2 upgrade was successful!"
echo "Please reboot"
--
cgit v0.12
From 05273a8f4d16f4c4bf13fa86f38a0150b95227b3 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 24 Oct 2014 11:07:22 -0500
Subject: lcdproc: add xosd as depends. This is needed for the driver type
xosd
---
abs/extra/lcdproc/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 abs/extra/lcdproc/PKGBUILD
diff --git a/abs/extra/lcdproc/PKGBUILD b/abs/extra/lcdproc/PKGBUILD
old mode 100644
new mode 100755
index 3106af2..7695503
--- a/abs/extra/lcdproc/PKGBUILD
+++ b/abs/extra/lcdproc/PKGBUILD
@@ -4,12 +4,12 @@
pkgname=lcdproc
pkgver=0.5.6
-pkgrel=4
+pkgrel=5
pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
arch=('i686' 'x86_64')
url="http://lcdproc.omnipotent.net/"
license=('GPL')
-depends=('libftdi-compat')
+depends=('libftdi-compat' 'xosd')
optdepends=('perl: needed for some lcdproc tools')
backup=('etc/LCDd.conf'
'etc/lcdexec.conf'
--
cgit v0.12
From e9615db9786ec5d51e2dd4720fb77223192819a4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 24 Oct 2014 14:13:41 -0500
Subject: dvd+rw-tools: add shell wrapper for sudo workaround
---
abs/core/dvd+rw-tools/PKGBUILD | 7 ++++++-
abs/core/dvd+rw-tools/__changelog | 1 +
abs/core/dvd+rw-tools/growisofs.sh | 5 +++++
3 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 abs/core/dvd+rw-tools/__changelog
create mode 100644 abs/core/dvd+rw-tools/growisofs.sh
diff --git a/abs/core/dvd+rw-tools/PKGBUILD b/abs/core/dvd+rw-tools/PKGBUILD
index 21ea762..081cd6e 100644
--- a/abs/core/dvd+rw-tools/PKGBUILD
+++ b/abs/core/dvd+rw-tools/PKGBUILD
@@ -3,13 +3,14 @@
pkgname=dvd+rw-tools
pkgver=7.1
-pkgrel=4
+pkgrel=5
pkgdesc="dvd burning tools"
arch=('i686' 'x86_64')
license=('GPL')
url="http://fy.chalmers.se/~appro/linux/DVD+RW"
depends=('cdrkit' 'gcc-libs')
source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz"
+ 'growisofs.sh'
'dvd+rw-tools-7.0-dvddl.patch'
'dvd+rw-tools-7.0-glibc2.6.90.patch'
'dvd+rw-tools-7.0-wctomb.patch'
@@ -35,8 +36,12 @@ package() {
install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/"
install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1
+ mv ${pkgdir}/usr/bin/growisofs ${pkgdir}/usr/bin/growisofs.bin
+ install -m755 ${srcdir}/growisofs.sh "${pkgdir}/usr/bin/growisofs"
+
}
md5sums=('8acb3c885c87f6838704a0025e435871'
+ '8bc0f9438b0ba922260741bf4e6179b2'
'65d30aa98ff314f256d0a1afb9e3edf6'
'1be5401035ca850edb7e522f22aead4b'
'3ba1af063b30f942e1cd2004044702d3'
diff --git a/abs/core/dvd+rw-tools/__changelog b/abs/core/dvd+rw-tools/__changelog
new file mode 100644
index 0000000..93b0cbf
--- /dev/null
+++ b/abs/core/dvd+rw-tools/__changelog
@@ -0,0 +1 @@
+add growisofs shell script to get around sudo
diff --git a/abs/core/dvd+rw-tools/growisofs.sh b/abs/core/dvd+rw-tools/growisofs.sh
new file mode 100644
index 0000000..e0b287c
--- /dev/null
+++ b/abs/core/dvd+rw-tools/growisofs.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+unset SUDO_COMMAND
+export MKISOFS=/usr/bin/mkisofs
+exec growisofs.bin "$@"
+
--
cgit v0.12
From 219a99493390ccc3689ff42dcfde858b5b68ca75 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 24 Oct 2014 14:15:00 -0500
Subject: ceton_infinitv: recompile for new kernel
---
abs/core/ceton_infinitv/PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD
index 2e73f8c..98b8a92 100755
--- a/abs/core/ceton_infinitv/PKGBUILD
+++ b/abs/core/ceton_infinitv/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Cecil Watson<knoppmyth@gmail.com>
pkgname=ceton_infinitv
-_kernver=3.13.7-1-ARCH
+_kernver=3.13.7-2-ARCH
pkgver=2013_0326_2226
-pkgrel=3
+pkgrel=4
usb_pkgver=0.1.0
pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb "
arch=('i686' 'x86_64')
@@ -40,7 +40,7 @@ package() {
install -Dm755 ${srcdir}/ifctn.sh ${pkgdir}/usr/LH/bin/
install -m755 ${srcdir}/reset_network.py ${pkgdir}/usr/bin/infinitv_reset_network.py
}
-md5sums=('7ae02309e86ee642b13aeb2f446462bb'
+md5sums=('de329d7c9477a22fa8cb18f3a74b2ff5'
'554f2c1bcc5d7169659f0ad3d8a513a5'
'b5db78e2b9cccd65d6ea4c88dd028ace'
'9f95a08bdd8c2a9e8d62e7daf52a90f6'
--
cgit v0.12
From fb1559ad4d28296dcba806b40776976b857536ab Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 24 Oct 2014 14:15:23 -0500
Subject: LinHES-config: copy over cnt interfaces during upgrades
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_install.py | 13 ++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index d26a94f..1f7d048 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.2
-pkgrel=16
+pkgrel=17
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -133,7 +133,7 @@ package() {
install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('af15ebdfbbc3442626a807569a0db2a4'
+md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff'
'3f6855b7bb860a44f96a972c2e80f497'
'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 9556a0e..7dfbddb 100644
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -924,6 +924,10 @@ def copy_it(install_type):
cp_and_log("/etc/dhcpcd.duid", data_config.MOUNTPOINT+"/etc/dhcpcd.duid")
cp_and_log("/var/lib/dhcpcd/*.lease", data_config.MOUNTPOINT+"/var/lib/dhcpcd/")
+
+
+
+
# General fixup
cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
runcmd(cmd)
@@ -1828,7 +1832,7 @@ def find_upgrade():
cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
cp_and_log("/tmp/etc/dhcpcd.duid", "/etc/dhcpcd.duid")
-
+
else:
logging.info("Could not find systemconfig file %s", srcfile)
cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
@@ -1975,6 +1979,13 @@ def upgrade(hostoptions):
cp_and_log2(srcfile, destfile, '*.pkl')
+ #ctn interfaces
+ srcfile = "%s/etc.old/net/ifaces/" %(data_config.MOUNTPOINT)
+ destfile = "%s/etc/net/ifaces/" %(data_config.MOUNTPOINT)
+ cp_and_log2(srcfile, destfile, 'ctn*')
+
+
+
mdfile = mdadm_find("/tmp")
cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")
--
cgit v0.12
From 9d924e1f0cb0a641365280ceeca085f2a519d552 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 24 Oct 2014 20:19:10 +0000
Subject: change font to Overlock
---
abs/core/linhes-theme/PKGBUILD | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 79917dc..aa83de9 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=5
+pkgrel=6
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -71,6 +71,9 @@ package() {
#blue
grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+ msg "Modifying fonts to Overlock"
+ grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g"
+
msg "Updating themeinfo.xml version number"
IFS="." read -a array <<< "$pkgver"
sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
--
cgit v0.12
From b9b79a541a03c2e964dc3765ecdfd7bf92c28de1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 26 Oct 2014 16:29:41 +0000
Subject: mplayer: recompile without libmpeg2
---
abs/core/mplayer/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index f32c1d3..01b69c4 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=mplayer
pkgname=('mplayer' 'mencoder')
pkgver=37051
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
makedepends=(
'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
--
cgit v0.12
From 525bfed2bec6b2671ad3a82aa88b9baf1b01111c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 26 Oct 2014 12:03:56 -0500
Subject: xymon: add gputemp.sh, fix permissions, and add some extra try/except
to hbnotes refs #979
---
abs/core/xymon/PKGBUILD | 47 ++++++++++++++------
abs/core/xymon/clientlaunch.cfg.patch | 19 +++++---
abs/core/xymon/gpu-temp.sh | 76 ++++++++++++++++++++++++++++++++
abs/core/xymon/graph.cfg.diff | 23 +++++++---
abs/core/xymon/hbnotes.py | 64 +++++++++++++++------------
abs/core/xymon/hobbitserver.cfg.diff | 45 -------------------
abs/core/xymon/tasks.d.mv | 6 +++
abs/core/xymon/xymon-gputemp.sh | 83 +++++++++++++++++++++++++++++++++++
abs/core/xymon/xymon.install | 37 +++++++++++++---
abs/core/xymon/xymonserver.cfg.diff | 19 ++++----
10 files changed, 304 insertions(+), 115 deletions(-)
mode change 100644 => 100755 abs/core/xymon/clientlaunch.cfg.patch
create mode 100644 abs/core/xymon/gpu-temp.sh
mode change 100644 => 100755 abs/core/xymon/graph.cfg.diff
delete mode 100644 abs/core/xymon/hobbitserver.cfg.diff
mode change 100644 => 100755 abs/core/xymon/tasks.d.mv
create mode 100644 abs/core/xymon/xymon-gputemp.sh
mode change 100644 => 100755 abs/core/xymon/xymonserver.cfg.diff
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 38b8805..e8b73ac 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,19 +1,37 @@
pkgbase=xymon
pkgname=('xymonserver' 'xymonclient')
pkgver=4.3.17
-pkgrel=4
+pkgrel=9
pkgdesc="Xymon is a system for monitoring of hosts and networks"
license="GPL"
arch=('i686' 'x86_64')
url="http://www.xymon.com/"
source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz"
- 'hobbitadd.py' 'xymon_ghost_check' 'graph.cfg.diff' 'xymonserver.cfg.diff'
- 'tasks.d.mv' 'clientlaunch.cfg.patch' 'hobbitstorage.py' 'hbnotes.py'
- 'hobbit-myth-orphan.sh' 'analysis.cfg' 'hbfunc.py' 'be.png' 'tuner.png'
- 'tv.png' 'hobbit-mem-myth.sh' 'hobbit_notify.sh' 'login_notify.sh'
- 'alerts.cfg' 'hobbit_myth_data.py' 'logrotate-server.xymon'
- 'logrotate-client.xymon' 'log_list.sh' 'client-local.cfg.patch'
- 'led_themes.tar.gz' 'xymon-server.rules' 'hosts.cfg.patch')
+ 'hobbitadd.py'
+ 'xymon_ghost_check'
+ 'graph.cfg.diff'
+ 'xymonserver.cfg.diff'
+ 'tasks.d.mv'
+ 'clientlaunch.cfg.patch'
+ 'hobbitstorage.py'
+ 'hbnotes.py'
+ 'hobbit-myth-orphan.sh'
+ 'analysis.cfg'
+ 'hbfunc.py'
+ 'be.png' 'tuner.png' 'tv.png'
+ 'hobbit-mem-myth.sh'
+ 'hobbit_notify.sh'
+ 'login_notify.sh'
+ 'alerts.cfg'
+ 'hobbit_myth_data.py'
+ 'xymon-gputemp.sh'
+ 'logrotate-server.xymon'
+ 'logrotate-client.xymon'
+ 'log_list.sh'
+ 'client-local.cfg.patch'
+ 'led_themes.tar.gz'
+ 'xymon-server.rules'
+ 'hosts.cfg.patch')
depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz')
install=xymon.install
@@ -62,6 +80,7 @@ package_xymonserver(){
install -D -m755 ${srcdir}/hbnotes.py ${pkgdir}/home/xymon/server/ext/hbnotes.py
install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/server/ext/hobbit_myth_data.py
install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/server/ext/hobbit-mem-myth.sh
+ install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/server/ext/xymon-gputemp.sh
install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh
install -m755 analysis.cfg ${pkgdir}/home/xymon/etc/analysis.cfg
@@ -122,6 +141,7 @@ package_xymonclient(){
install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh
install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client
install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh
+ install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/client/ext/xymon-gputemp.sh
cp -rp ${pkgdir}/../xymonserver/home/xymon/client/ ${pkgdir}/home/xymon/
cd -
@@ -133,12 +153,12 @@ package_xymonclient(){
md5sums=('d8d119a777e7b7204d1292fb27314312'
'a0fbb9cbeb3600a40943e6205790f22f'
'c60b0d59bb39505ee3d62c6dd65429c5'
- 'a45dd4cdb84817bcf3e51b25cc713799'
- '034658a1084510ecbbb0dc166c0401eb'
- '758cdd9f1ba5ae3e1b42e811172806f3'
- 'ee608dcafc050d790e28647a670f6b60'
+ '53f1af1054d3c70f4d6b6fe952cf7e11'
+ 'b2f404913400a25f13c63b27f064ad2e'
+ 'e40c31eb53ef17c0c544389a525de957'
+ '3ad3ce12b84cca82dd34ef97984c315e'
'b2f98ac0df013332deedc1efae0a270d'
- 'b8c3b00db8fec518289b5caa0df0060b'
+ '4a8244c1bb44fe35ca7372355b01cec4'
'526c169e020b570b5b02661a831aa4e6'
'166279c006c3ef7bf0c21537cf89fc83'
'80d9cfac86c6d96836e6f406e35e7cf5'
@@ -150,6 +170,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
'22d4c9065fd959efe82f121dcb511305'
'9af2ad60ac4c3cb653754618f603e311'
'b8eb10070f2ad6a245d3da15091694ba'
+ 'e8f2ac43a1e3b28f5af438d787c86db2'
'b4e8641e97e6b689dbc634af785e6799'
'e2844513e2c92e8b5084818f3b2a478d'
'98e9242ae346f729b14cb195786571f2'
diff --git a/abs/core/xymon/clientlaunch.cfg.patch b/abs/core/xymon/clientlaunch.cfg.patch
old mode 100644
new mode 100755
index ec475f9..8c1915a
--- a/abs/core/xymon/clientlaunch.cfg.patch
+++ b/abs/core/xymon/clientlaunch.cfg.patch
@@ -1,12 +1,17 @@
---- clientlaunch.cfg.orig 2011-11-25 19:07:19.000000000 -0600
-+++ clientlaunch.cfg 2011-11-25 19:09:55.000000000 -0600
-@@ -25,4 +25,9 @@
- CMD $XYMONCLIENTHOME/bin/xymonclient.sh
- LOGFILE $XYMONCLIENTLOGS/xymonclient.log
- INTERVAL 5m
+--- clientlaunch.cfg.orig 2014-10-25 11:56:01.947006791 -0500
++++ clientlaunch.cfg 2014-10-25 11:57:02.632312788 -0500
+@@ -26,3 +26,14 @@
+ LOGFILE $XYMONCLIENTLOGS/xymonclient.log
+ INTERVAL 5m
+
+[memmyth]
+ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg
+ CMD /home/xymon/client/ext/hobbit-mem-myth.sh
+ LOGFILE $XYMONCLIENTLOGS/mythmem.log
+ INTERVAL 5m
-
++
++[gputemp]
++ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg
++ CMD /home/xymon/client/ext/xymon-gputemp.sh
++ LOGFILE $XYMONCLIENTLOGS/xymon-gputemp.log
++ INTERVAL 5m
diff --git a/abs/core/xymon/gpu-temp.sh b/abs/core/xymon/gpu-temp.sh
new file mode 100644
index 0000000..09f79ca
--- /dev/null
+++ b/abs/core/xymon/gpu-temp.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+
+
+gpu_temp=0
+gpu_color="clear"
+
+if ! test -x /usr/bin/nvidia-smi ; then
+
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ GPUTEMP:$gpu_temp
+ Couldn't find nvidia-smi
+ "
+ exit 0
+fi
+
+# Use NVidia SMI to determine the model
+gpu_model=`nvidia-smi -L`
+if test -z "$gpu_model" ; then
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ GPUTEMP:$gpu_temp
+ Couldn't find nvidia card
+ "
+ exit 0
+fi
+
+# Determine GPU maximum temperature based on GPU model
+if test $(echo $gpu_model | grep -c -i 'GeForce 210') -eq 0 ; then
+ # GT 210 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 220') -eq 0 ; then
+ # GT 220 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 240') -eq 0 ; then
+ # GT 240 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 430') -eq 0 ; then
+ # GT 430 maximum GPU temperature is 98 C
+ max_temp=98
+elif test $(echo $gpu_model | grep -c -i 'GeForce GTS 450') -eq 0 ; then
+ # GTS 450 maximum GPU temperature is 100 C
+ max_temp=100
+elif test $(echo $gpu_model | grep -c -i 'GeForce GT 520') -eq 0 ; then
+ # GT 520 maximum GPU temperature is 102 C
+ max_temp=102
+else
+ # Assume 100 is the maximum
+ max_temp=100
+fi
+crit_temp=`expr $max_temp - 5`
+warn_temp=`expr $crit_temp - 10`
+
+if test -x /usr/bin/nvidia-smi ; then
+ temp=`nvidia-smi -q -g 0 -d TEMPERATURE | grep -Ei 'Gpu[[:space:]]+:[[:space:]]+[[:digit:]]+ C'`
+ gpu_temp=`echo $temp | sed -e 's/[^0-9]*//g'`
+ #echo "GPUTEMP:$gpu_temp" > /tmp/gputemp.txt
+ if test -n "$gpu_temp" ; then
+ # Have some type of number
+ if test $gpu_temp -lt $warn_temp ; then
+ gpu_color=green
+ elif test $gpu_temp -lt $crit_temp ; then
+ gpu_color=yellow
+ else
+ gpu_color=red
+ fi
+ #echo gputemp $gpu_temp $gpu_color
+ #echo $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ #`cat /tmp/gputemp.txt`
+ #"
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ GPUTEMP:$gpu_temp
+ "
+ fi
+fi
+
+exit 0
\ No newline at end of file
diff --git a/abs/core/xymon/graph.cfg.diff b/abs/core/xymon/graph.cfg.diff
old mode 100644
new mode 100755
index c92479a..a105bd7
--- a/abs/core/xymon/graph.cfg.diff
+++ b/abs/core/xymon/graph.cfg.diff
@@ -1,11 +1,11 @@
---- graphs.cfg.orig 2011-11-22 07:56:12.240933957 -0800
-+++ graphs.cfg 2011-11-22 07:57:26.902933853 -0800
-@@ -2094,4 +2094,40 @@
+--- graphs.cfg.orig 2014-10-25 12:01:22.209825001 -0500
++++ graphs.cfg 2014-10-25 21:55:22.065856064 -0500
+@@ -2100,4 +2100,50 @@
GPRINT:qlen@RRDIDX@:AVERAGE: %6.1lf (avg)\n
-
+
########### end of ifmib graphs ###########
+[storage]
-+ TITLE Storage Groups
++ TITLE Storage Groups
+ YAXIS recordings
+ DEF:storage1=storage.rrd:rectvtotal:AVERAGE
+ LINE2:storage1#00CCCC:current recorded
@@ -40,4 +40,15 @@
+
+ DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE
+ LINE2:vmrss#00CC11:vmrss
-
++
++[gputemp]
++ TITLE GPU Temperature
++ YAXIS Temperature
++ DEF:gputemp=gputemp.rrd:GPUTEMP:AVERAGE
++ LINE2:gputemp#00CC11:gputemp
++ GPRINT:gputemp:LAST: \: %5.1lf (cur)
++ GPRINT:gputemp:MAX: \: %5.1lf (max)
++ GPRINT:gputemp:MIN: \: %5.1lf (min)
++ GPRINT:gputemp:AVERAGE: \: %5.1lf (avg)\n
+
+
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index b12cc7b..d14d62a 100755
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -122,44 +122,46 @@ def create_dot_file():
#----------------------------------Create graphviz dot files
dotfilename="/home/xymon/server/etc/mythdot"
+ try:
+ dotfile=open(dotfilename,'w')
+ dotfile.write("digraph G { " + "\n" )
+ dotfile.write("graph [bgcolor=transparent]" + "\n" )
+ #print tunerdict
- dotfile=open(dotfilename,'w')
- dotfile.write("digraph G { " + "\n" )
- dotfile.write("graph [bgcolor=transparent]" + "\n" )
- #print tunerdict
-
- #define the nodes
- dotfile.write( dotMBE + " \n" )
+ #define the nodes
+ dotfile.write( dotMBE + " \n" )
- dotfile.write("tunermbe"+ " [ label= \"" + tunerdict["MBE"] + "\" , shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tuner.png\" fontcolor=\"white\" color=red ] \n" )
+ dotfile.write("tunermbe"+ " [ label= \"" + tunerdict["MBE"] + "\" , shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tuner.png\" fontcolor=\"white\" color=red ] \n" )
- for fe in dotfrontend:
- dotfile.write("FEND"+fe + "[ label=\"frontend \\n " + fe + "\" ,shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tv.png\" , fontcolor=\"white\" , imagescale=\"true\" color=\"gold2\" ] \n" )
+ for fe in dotfrontend:
+ dotfile.write("FEND"+fe + "[ label=\"frontend \\n " + fe + "\" ,shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tv.png\" , fontcolor=\"white\" , imagescale=\"true\" color=\"gold2\" ] \n" )
- for fe in dotslave:
- cslave="STUNER"+fe
- #adding tuners to dot file
- if tunerdict[cslave] != "" :
- dotfile.write(cslave+ " [ label= \"" + tunerdict[cslave] + "\" , shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tuner.png\" fontcolor=\"white\" color=red ] \n" )
- #adding slave to dot file
- dotfile.write("SLAVE"+fe + "[ label=\"slave backend \\n " + fe + "\" shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/be.png\" fontcolor=\"white\" color=green ] \n" )
+ for fe in dotslave:
+ cslave="STUNER"+fe
+ #adding tuners to dot file
+ if tunerdict[cslave] != "" :
+ dotfile.write(cslave+ " [ label= \"" + tunerdict[cslave] + "\" , shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/tuner.png\" fontcolor=\"white\" color=red ] \n" )
+ #adding slave to dot file
+ dotfile.write("SLAVE"+fe + "[ label=\"slave backend \\n " + fe + "\" shapefile=\"/data/srv/httpd/htdocs/xymon/gifs/be.png\" fontcolor=\"white\" color=green ] \n" )
- #connect up the nodes!
- dotfile.write("tunermbe -> MBE [color=\"red\"] \n " )
+ #connect up the nodes!
+ dotfile.write("tunermbe -> MBE [color=\"red\"] \n " )
- for fe in dotfrontend:
- dotfile.write("MBE -> FEND" + fe + "[color=\"gold2\"] \n " )
+ for fe in dotfrontend:
+ dotfile.write("MBE -> FEND" + fe + "[color=\"gold2\"] \n " )
- for fe in dotslave:
- cslave="STUNER"+fe
- dotfile.write("SLAVE" + fe + "-> MBE [color=\"green\"] \n " )
- if tunerdict[cslave] != "" :
- dotfile.write(cslave + "-> SLAVE"+fe + "[color=\"red\"]" "\n" )
+ for fe in dotslave:
+ cslave="STUNER"+fe
+ dotfile.write("SLAVE" + fe + "-> MBE [color=\"green\"] \n " )
+ if tunerdict[cslave] != "" :
+ dotfile.write(cslave + "-> SLAVE"+fe + "[color=\"red\"]" "\n" )
- dotfile.write("} " + "\n" )
- dotfile.close()
+ dotfile.write("} " + "\n" )
+ dotfile.close()
+ except:
+ print "Problem writing %s" %dotfilename
cmd="/usr/bin/unflatten -l1 -c3 -f " + dotfilename + " |/usr/bin/dot -Tpng -o/data/srv/httpd/htdocs/xymon/gifs/network.png "
@@ -248,8 +250,12 @@ def create_notes():
filename="/home/xymon/server/www/notes/"
filename+=str(row[0])
filename+=(".html")
+ try:
+ file = open(filename,'w')
+ except:
+ print "problem opening %s" %filename
+ continue
- file = open(filename,'w')
string='''
<html>
<head> <style type="text/css">@import "/frame.css";</style>
diff --git a/abs/core/xymon/hobbitserver.cfg.diff b/abs/core/xymon/hobbitserver.cfg.diff
deleted file mode 100644
index 7c829fe..0000000
--- a/abs/core/xymon/hobbitserver.cfg.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- hobbitserver.cfg.orig 2008-01-08 15:25:34.000000000 +0000
-+++ hobbitserver.cfg 2008-01-08 16:22:56.000000000 +0000
-@@ -105,7 +105,7 @@
- CONNTEST="TRUE" # Should we 'ping' hosts ?
- IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE" # If TRUE, then failing network tests go CLEAR if conn-test fails.
- NONETPAGE="" # Network tests that go YELLOW upon failure
--FPING="/usr/sbin/fping" # Path and options for the ping program.
-+FPING="hobbitping" # Path and options for the ping program.
- NTPDATE="ntpdate" # Path to the 'ntpdate' program
- TRACEROUTE="traceroute" # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
- BBROUTERTEXT="router" # What to call a failing intermediate network device.
-@@ -120,7 +120,9 @@
- # Size of the generated graph images
- RRDHEIGHT="120"
- RRDWIDTH="576" # The RRD's contain 576 data points, so this is a good value
--
-+NCV_storage="*:GAUGE"
-+NCV_memmbe="*:GAUGE"
-+NCV_memmfe="*:GAUGE"
- # TEST2RRD defines the status- and data-messages you want to collect RRD data
- # about. You will normally not need to modify this, unless you have added a
- # script to pick up RRD data from custom tests (the hobbitd_larrd --extra-script
-@@ -132,11 +134,11 @@
- #
- # This is also used by the bb-hostsvc.cgi script to determine if the detailed
- # status view of a test should include a graph.
--TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines"
-+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,storage=ncv,memmbe=ncv,memmfe=ncv"
-
- # This defines which RRD files to include on the "trends" column webpage,
- # and the order in which they appear.
--GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines"
-+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,storage,memmbe,memmfe"
-
- # These two settings can be used to restrict what filesystems are being
- # tracked (i.e. have their utilisation graphed) by Hobbit.
-@@ -158,7 +160,7 @@
- HTMLCONTENTTYPE="text/html" # You can add charset options here.
-
- # Fonts and texts
--HOBBITLOGO="Hobbit" # HTML inserted on all header pages at top-left corner.
-+HOBBITLOGO="" # HTML inserted on all header pages at top-left corner.
- MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
- MKBBREMOTE="<B><I>Remote Status Display</I></B>"
- MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"
diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv
old mode 100644
new mode 100755
index 5ea7841..02afc14
--- a/abs/core/xymon/tasks.d.mv
+++ b/abs/core/xymon/tasks.d.mv
@@ -37,3 +37,9 @@
CMD /home/xymon/server/bin/hobbitadd.py
LOGFILE $BBSERVERLOGS/hobbitadd.log
INTERVAL 5m
+
+[gputemp]
+ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg
+ CMD /home/xymon/server/ext/xymon-gputemp.sh
+ LOGFILE $BBSERVERLOGS/xymon-gputemp.log
+ INTERVAL 5m
\ No newline at end of file
diff --git a/abs/core/xymon/xymon-gputemp.sh b/abs/core/xymon/xymon-gputemp.sh
new file mode 100644
index 0000000..cebea41
--- /dev/null
+++ b/abs/core/xymon/xymon-gputemp.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+
+
+gpu_temp=0
+gpu_color="clear"
+
+if ! test -x /usr/bin/nvidia-smi ; then
+
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ Couldn't find nvidia-smi
+
+ GPUTEMP : $gpu_temp
+
+ "
+ exit 0
+fi
+
+# Use NVidia SMI to determine the model
+gpu_model=`nvidia-smi -L`
+if test -z "$gpu_model" ; then
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ Couldn't find nVidia card
+
+ GPUTEMP : $gpu_temp
+
+ "
+ exit 0
+fi
+
+# Determine GPU maximum temperature based on GPU model
+if test $(echo $gpu_model | grep -c -i 'GeForce 210') -eq 0 ; then
+ # GT 210 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 220') -eq 0 ; then
+ # GT 220 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 240') -eq 0 ; then
+ # GT 240 maximum GPU temperature is 105 C
+ max_temp=105
+elif test $(echo $gpu_model | grep -c -i 'GeForce 430') -eq 0 ; then
+ # GT 430 maximum GPU temperature is 98 C
+ max_temp=98
+elif test $(echo $gpu_model | grep -c -i 'GeForce GTS 450') -eq 0 ; then
+ # GTS 450 maximum GPU temperature is 100 C
+ max_temp=100
+elif test $(echo $gpu_model | grep -c -i 'GeForce GT 520') -eq 0 ; then
+ # GT 520 maximum GPU temperature is 102 C
+ max_temp=102
+else
+ # Assume 100 is the maximum
+ max_temp=100
+fi
+crit_temp=`expr $max_temp - 5`
+warn_temp=`expr $crit_temp - 10`
+
+if test -x /usr/bin/nvidia-smi ; then
+ temp=`nvidia-smi -q -g 0 -d TEMPERATURE | grep -Ei 'Gpu[[:space:]]+:[[:space:]]+[[:digit:]]+ C'`
+ gpu_temp=`echo $temp | sed -e 's/[^0-9]*//g'`
+ #echo "GPUTEMP:$gpu_temp" > /tmp/gputemp.txt
+ if test -n "$gpu_temp" ; then
+ # Have some type of number
+ if test $gpu_temp -lt $warn_temp ; then
+ gpu_color=green
+ elif test $gpu_temp -lt $crit_temp ; then
+ gpu_color=yellow
+ else
+ gpu_color=red
+ fi
+ #echo gputemp $gpu_temp $gpu_color
+ #echo $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ #`cat /tmp/gputemp.txt`
+ #"
+ $XYMON $XYMSRV "status $MACHINE.gputemp $gpu_color `date`
+ GPU model is $gpu_model
+ max temp is $max_temp
+
+ GPUTEMP : $gpu_temp
+ "
+ fi
+fi
+
+exit 0
\ No newline at end of file
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
index 62feb36..4461df4 100755
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -17,16 +17,41 @@ post_install() {
sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg
sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg
sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg
- #fix permissions
- chown -R nobody /home/xymon
- chown -R nobody /data/srv/httpd/htdocs/xymon
-
- chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap
+ #fix permissions
+ chown -R nobody:nobody /home/xymon
+ chown -R nobody:nobody /data/srv/httpd/htdocs/xymon
+
+ chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap
chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep
- chmod -R 775 /data/srv/httpd/htdocs/xymon/rep
+ chmod -R 775 /data/srv/httpd/htdocs/xymon/rep
chmod -R 775 /data/srv/httpd/htdocs/xymon/snap
+ chmod g+s /data/srv/httpd/htdocs/xymon/notes/
+ setfacl -d -m g::rw /data/srv/httpd/htdocs/xymon/notes/
+ setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/notes/
+
+ file="/data/srv/httpd/htdocs/xymon/gifs/network.png"
+ if [ -f $file ]
+ then
+ setfacl -m u:nobody:rw $file
+ fi
+
+
+ setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/gifs/
+
+ chmod g+s /home/xymon/etc
+ setfacl -d -m g::rw /home/xymon/etc/
+ setfacl -d -m u::rw /home/xymon/etc/
+ setfacl -d -m u:nobody:rwx /home/xymon/etc/
+
+ file="/home/xymon/etc/mythdot"
+ if [ -f $file ]
+ then
+ setfacl -m u:nobody:rw $file
+ fi
+
+
chown -R nobody /var/log/hobbit
chown root /home/xymon/server/bin/xymonping
diff --git a/abs/core/xymon/xymonserver.cfg.diff b/abs/core/xymon/xymonserver.cfg.diff
old mode 100644
new mode 100755
index a8a469d..8850670
--- a/abs/core/xymon/xymonserver.cfg.diff
+++ b/abs/core/xymon/xymonserver.cfg.diff
@@ -1,29 +1,30 @@
---- xymonserver.cfg.orig 2011-11-22 07:58:19.405933864 -0800
-+++ xymonserver.cfg 2011-11-22 08:01:32.452933536 -0800
-@@ -125,6 +125,10 @@
+--- xymonserver.cfg.orig 2014-10-25 22:05:16.611876375 -0500
++++ xymonserver.cfg 2014-10-25 22:07:35.818604144 -0500
+@@ -145,6 +145,11 @@
RRDHEIGHT="120"
RRDWIDTH="576" # The RRD's contain 576 data points, so this is a good value
-
+
+NCV_storage="*:GAUGE"
+NCV_memmbe="*:GAUGE"
+NCV_memmfe="*:GAUGE"
++NCV_gputemp="*:GAUGE"
+
# TEST2RRD defines the status- and data-messages you want to collect RRD data
# about. You will normally not need to modify this, unless you have added a
# script to pick up RRD data from custom tests (the xymond_rrd --extra-script
-@@ -136,11 +140,13 @@
+@@ -156,11 +161,13 @@
#
# This is also used by the svcstatus.cgi script to determine if the detailed
# status view of a test should include a graph.
-TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
+#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv"
-
++TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv"
+
# This defines which RRD files to include on the "trends" column webpage,
# and the order in which they appear.
-GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
+#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe"
-
++GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp"
+
# These two settings can be used to restrict what filesystems are being
# tracked (i.e. have their utilisation graphed) by Xymon.
--
cgit v0.12
From 3a6f9152e03720d73eaf386fdb203028573aebd0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 26 Oct 2014 20:26:46 +0000
Subject: linhes-theme: adjustments to font sizes
---
abs/core/linhes-theme/PKGBUILD | 9 +-
abs/core/linhes-theme/base.xml.patch | 229 +++++++++++++++++++++++++++-
abs/core/linhes-theme/osd.xml.patch | 204 ++++++++++++++++++++++++-
abs/core/linhes-theme/schedule-ui.xml.patch | 11 ++
4 files changed, 440 insertions(+), 13 deletions(-)
create mode 100644 abs/core/linhes-theme/schedule-ui.xml.patch
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index aa83de9..c8e97ab 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,13 +1,13 @@
pkgname=linhes-theme
pkgver=8.2
-pkgrel=6
+pkgrel=7
pkgdesc="Default LinHES MythTV theme"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://linhes.org/"
patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
- 'menu-ui-vert.xml.patch' 'qtlook.txt.patch')
+ 'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch')
#The LinHES theme is based on TintedGlass 4.56 by Harley Peters
source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
@@ -80,9 +80,10 @@ package() {
sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
}
md5sums=('2dca856c2a4d1f959473512c94e43b60'
- 'ae7e975caea816bf16eba651c8fa8e6a'
- '71f4fa39d7fefe5443ef0f7bd6820ccd'
+ 'e857e084963166bb37c6236463750dc1'
+ '5fccb4e20c15d87223ea5de4c40faa06'
'c75c83b90969fb07755062113f858e88'
+ '22ff4044c8c29560451fb51dcbf4d44e'
'9fe3371a8b964a7028126405cfaa330b'
'5a8fb2a5f0e657d52be6f0a6a006ce72'
'a0201e0aa1608eeab27ee754e4d2c1de'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 13aba27..a0715f6 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,200 @@
---- base.xml.orig 2014-09-23 18:09:09.984607409 +0000
-+++ base.xml 2014-09-23 18:09:22.626356280 +0000
+--- base.xml.orig 2014-10-26 18:47:37.279439028 +0000
++++ base.xml 2014-10-26 19:02:50.565913686 +0000
+@@ -3,55 +3,55 @@
+ <mythuitheme>
+
+ <!-- Base Font Definitions -->
+- <fontdef name="basefont" face="DejaVu Sans">
++ <fontdef name="basefont" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>21</pixelsize>
++ <pixelsize>23</pixelsize>
+ </fontdef>
+
+ <fontdef name="basesupersmall" from="basefont">
+- <pixelsize>11</pixelsize>
++ <pixelsize>13</pixelsize>
+ <weight>bold</weight>
+ </fontdef>
+
+ <fontdef name="baseextrasmall" from="basefont">
+ <weight>bold</weight>
+- <pixelsize>13</pixelsize>
++ <pixelsize>15</pixelsize>
+ </fontdef>
+
+ <fontdef name="baseevensmaller" from="basefont">
+ <weight>bold</weight>
+- <pixelsize>16</pixelsize>
++ <pixelsize>18</pixelsize>
+ </fontdef>
+
+ <fontdef name="basesmaller" from="basefont">
+- <pixelsize>18</pixelsize>
++ <pixelsize>20</pixelsize>
+ </fontdef>
+
+ <fontdef name="basesomewhatsmaller" from="basefont">
+- <pixelsize>19</pixelsize>
++ <pixelsize>21</pixelsize>
+ </fontdef>
+
+ <fontdef name="basesmall" from="basefont">
+- <pixelsize>20</pixelsize>
++ <pixelsize>22</pixelsize>
+ </fontdef>
+
+ <fontdef name="basemedium" from="basefont">
+- <pixelsize>22</pixelsize>
++ <pixelsize>24</pixelsize>
+ </fontdef>
+
+ <fontdef name="basemediumshadow" from="basefont">
+- <pixelsize>22</pixelsize>
++ <pixelsize>24</pixelsize>
+ <shadowcolor>#000000</shadowcolor>
+ <shadowoffset>2,2</shadowoffset>
+ <shadowalpha>100</shadowalpha>
+ </fontdef>
+
+ <fontdef name="basemediumlarger" from="basefont">
+- <pixelsize>25</pixelsize>
++ <pixelsize>27</pixelsize>
+ </fontdef>
+
+ <fontdef name="basemediumlargerbold" from="basefont">
+- <pixelsize>25</pixelsize>
++ <pixelsize>27</pixelsize>
+ <shadowcolor>#000000</shadowcolor>
+ <shadowoffset>3,3</shadowoffset>
+ <shadowalpha>100</shadowalpha>
+@@ -59,15 +59,15 @@
+ </fontdef>
+
+ <fontdef name="baselarge" from="basefont">
+- <pixelsize>28</pixelsize>
++ <pixelsize>30</pixelsize>
+ </fontdef>
+
+ <fontdef name="baseextralarge" from="basefont">
+- <pixelsize>32</pixelsize>
++ <pixelsize>34</pixelsize>
+ </fontdef>
+
+ <fontdef name="baseextralargebold" from="basefont">
+- <pixelsize>32</pixelsize>
++ <pixelsize>34</pixelsize>
+ <shadowcolor>#000000</shadowcolor>
+ <shadowoffset>3,3</shadowoffset>
+ <shadowalpha>100</shadowalpha>
+@@ -85,31 +85,31 @@
+ </fontdef>
+
+ <fontdef name="basesupersmallblue" from="basesupersmall">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="baseextrasmallblue" from="baseextrasmall">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="baseevensmallerblue" from="baseevensmaller">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="basesomewhatsmallerblue" from="basesomewhatsmaller">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="basesmallerblue" from="basesmaller">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="basesmallblue" from="basesmall">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="basemediumblue" from="basemedium">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="basesupersmallgreen" from="basesupersmall">
+@@ -241,55 +241,55 @@
+ </fontdef>
+
+ <fontdef name="basesupersmallyellow" from="basesupersmall">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="baseextrasmallyellow" from="baseextrasmall">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="baseevensmalleryellow" from="basesmaller">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basesmalleryellow" from="basesmaller">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basesmallyellow" from="basesmall">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basemediumyellow" from="basemedium">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basemediumlargeryellow" from="basemediumlarger">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="baselargeyellow" from="baselarge">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="baseextralargeyellow" from="baseextralarge">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basesmalldarkyellow" from="basesmall">
+- <color>#CCCC29</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basemediumdarkyellow" from="basemedium">
+- <color>#CCCC29</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="basemediumlargerdarkyellow" from="basemediumlarger">
+- <color>#CCCC29</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <fontdef name="baselargedarkyellow" from="baselarge">
+- <color>#CCCC29</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <!-- Base definition of a textarea -->
@@ -411,7 +411,7 @@
<area>283,436,50,11</area>
<type>roundbox</type>
@@ -18,6 +213,36 @@
</shape>
<!-- Base definition of a heading group -->
+@@ -667,10 +667,10 @@
+ <type>box</type>
+ <fill style="gradient">
+ <gradient direction="horizontal" alpha="50">
+- <stop position="0" color="#d9d900" />
+- <stop position="25" color="#d9d900" alpha="255" />
+- <stop position="50" color="#d9d900" />
+- <stop position="100" color="#d9d900" />
++ <stop position="0" color="#ebb81c" />
++ <stop position="25" color="#ebb81c" alpha="255" />
++ <stop position="50" color="#ebb81c" />
++ <stop position="100" color="#ebb81c" />
+ </gradient>
+ </fill>
+ </shape>
+@@ -679,10 +679,10 @@
+ <type>box</type>
+ <fill style="gradient">
+ <gradient direction="horizontal" alpha="50">
+- <stop position="0" color="#d9d900" />
+- <stop position="50" color="#d9d900" />
+- <stop position="75" color="#d9d900" alpha="255"/>
+- <stop position="100" color="#d9d900" />
++ <stop position="0" color="#ebb81c" />
++ <stop position="50" color="#ebb81c" />
++ <stop position="75" color="#ebb81c" alpha="255"/>
++ <stop position="100" color="#ebb81c" />
+ </gradient>
+ </fill>
+ </shape>
@@ -863,7 +863,7 @@
<type>roundbox</type>
<fill color="#1a1a1a" alpha="175" />
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 787408f..6c29161 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,17 +1,144 @@
---- osd.xml.orig 2014-10-17 22:50:17.316245246 +0000
-+++ osd.xml 2014-10-17 22:55:11.065572222 +0000
-@@ -1028,6 +1028,11 @@
- <pixelsize>24</pixelsize>
+--- osd.xml.orig 2014-10-26 18:47:55.853729172 +0000
++++ osd.xml 2014-10-26 19:11:25.023453880 +0000
+@@ -7,13 +7,13 @@
+ <window name="osd_debug">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="medium" face="DejaVu Sans">
+- <pixelsize>16</pixelsize>
++ <fontdef name="medium" face="Overlock">
++ <pixelsize>18</pixelsize>
+ <color>#e6e6e6</color>
</fontdef>
-+ <fontdef name="title" from="small">
-+ <color>#d9d900</color>
+ <fontdef name="mediumblue" from="medium">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <shape name="osd-debug-backdrop">
+@@ -252,8 +252,8 @@
+ <window name="osd_message">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="medium" face="DejaVu Sans">
+- <pixelsize>24</pixelsize>
++ <fontdef name="medium" face="Overlock">
++ <pixelsize>28</pixelsize>
+ <color>#e6e6e6</color>
+ </fontdef>
+
+@@ -315,9 +315,9 @@
+ <window name="osd_input">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="large" face="DejaVu Sans">
++ <fontdef name="large" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>32</pixelsize>
++ <pixelsize>34</pixelsize>
+ </fontdef>
+
+ <shape name="osd-input-backdrop">
+@@ -378,9 +378,9 @@
+ <window name="osd_status">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>18</pixelsize>
++ <pixelsize>20</pixelsize>
+ </fontdef>
+
+ <shape name="osd-status-backdrop">
+@@ -470,39 +470,39 @@
+ <window name="program_info">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>21</pixelsize>
++ <pixelsize>23</pixelsize>
+ </fontdef>
+
+ <fontdef name="supersmall" from="small">
+ <weight>bold</weight>
+- <pixelsize>12</pixelsize>
++ <pixelsize>14</pixelsize>
+ </fontdef>
+
+ <fontdef name="smaller" from="small">
+- <pixelsize>16</pixelsize>
++ <pixelsize>18</pixelsize>
+ </fontdef>
+
+ <fontdef name="mediumsmall" from="small">
+- <pixelsize>18</pixelsize>
++ <pixelsize>20</pixelsize>
+ </fontdef>
+
+ <fontdef name="medium" from="small">
+- <pixelsize>22</pixelsize>
++ <pixelsize>24</pixelsize>
+ </fontdef>
+
+ <fontdef name="title" from="small">
+- <color>#d9d900</color>
+- <pixelsize>26</pixelsize>
++ <color>#ebb81c</color>
++ <pixelsize>28</pixelsize>
+ </fontdef>
+
+ <fontdef name="large" from="small">
+- <pixelsize>28</pixelsize>
++ <pixelsize>30</pixelsize>
+ </fontdef>
+
+ <fontdef name="supersmallblue" from="supersmall">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <shape name="program-info-backdrop">
+@@ -1015,25 +1015,30 @@
+ <window name="browse_info">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>21</pixelsize>
++ <pixelsize>23</pixelsize>
+ </fontdef>
+
+ <fontdef name="smaller" from="small">
+- <pixelsize>18</pixelsize>
++ <pixelsize>20</pixelsize>
+ </fontdef>
+
+ <fontdef name="medium" from="small">
+- <pixelsize>24</pixelsize>
+ <pixelsize>26</pixelsize>
+ </fontdef>
+
++ <fontdef name="title" from="small">
++ <color>#ebb81c</color>
++ <pixelsize>28</pixelsize>
+ </fontdef>
+
<fontdef name="large" from="small">
- <pixelsize>26</pixelsize>
+- <pixelsize>26</pixelsize>
++ <pixelsize>28</pixelsize>
+ </fontdef>
+
+ <fontdef name="smallerblue" from="smaller">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
</fontdef>
+
+ <shape name="browse-info-backdrop">
@@ -1084,7 +1089,7 @@
</shape>
@@ -104,3 +231,66 @@
</clock>
<textarea name="description">
+@@ -1214,9 +1195,9 @@
+ <window name="ChannelEditor">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>20</pixelsize>
++ <pixelsize>22</pixelsize>
+ </fontdef>
+
+ <fontdef name="smallblack" from="small">
+@@ -1224,7 +1205,7 @@
+ </fontdef>
+
+ <fontdef name="smallblue" from="small">
+- <color>#3a9ade</color>
++ <color>#0072bc</color>
+ </fontdef>
+
+ <fontdef name="smallgrey" from="small">
+@@ -1232,7 +1213,7 @@
+ </fontdef>
+
+ <fontdef name="medium" from="small">
+- <pixelsize>24</pixelsize>
++ <pixelsize>26</pixelsize>
+ </fontdef>
+
+ <shape name="channel-editor-backdrop">
+@@ -1610,9 +1591,9 @@
+ <window name="osd_program_editor">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#e6e6e6</color>
+- <pixelsize>18</pixelsize>
++ <pixelsize>20</pixelsize>
+ </fontdef>
+
+ <shape name="osd-program-editor-backdrop">
+@@ -1749,9 +1730,9 @@
+ <window name="MythPopupBox">
+ <area>0,0,1280,720</area>
+
+- <fontdef name="small" face="DejaVu Sans">
++ <fontdef name="small" face="Overlock">
+ <color>#ffffff</color>
+- <pixelsize>21</pixelsize>
++ <pixelsize>23</pixelsize>
+ </fontdef>
+
+ <fontdef name="smallgrey" from="small">
+@@ -1759,7 +1740,7 @@
+ </fontdef>
+
+ <fontdef name="smallyellow" from="small">
+- <color>#d9d900</color>
++ <color>#ebb81c</color>
+ </fontdef>
+
+ <shape name="mythpopupbox-backdrop">
diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch
new file mode 100644
index 0000000..930c26f
--- /dev/null
+++ b/abs/core/linhes-theme/schedule-ui.xml.patch
@@ -0,0 +1,11 @@
+--- schedule-ui.xml.orig 2014-10-26 18:47:27.740659484 +0000
++++ schedule-ui.xml 2014-10-26 18:45:31.642195458 +0000
+@@ -126,7 +126,7 @@
+ <conflictingcolor>#ff6600</conflictingcolor>
+ <cutdown>no</cutdown>
+ <multiline>yes</multiline>
+- <textoffset>6,7</textoffset>
++ <textoffset>6,2</textoffset>
+ <recordstatus type="SingleRecord" image="images/gg-rs-single.png"></recordstatus>
+ <recordstatus type="TimeslotRecord" image="images/gg-rs-timeslot.png"></recordstatus>
+ <recordstatus type="ChannelRecord" image="images/gg-rs-channel.png"></recordstatus>
--
cgit v0.12