diff options
Diffstat (limited to 'testing')
381 files changed, 0 insertions, 43403 deletions
diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD deleted file mode 100644 index d96040ac1..000000000 --- a/testing/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151916 2012-03-04 09:59:30Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.7.1 -pkgrel=1 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('54e0556d73c22c7b3393069071e0b717') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/testing/akonadi/akonadi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD deleted file mode 100644 index 337139b90..000000000 --- a/testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 151663 2012-02-29 21:12:35Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=3.0.1 -pkgrel=1 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('5dec239c89165d159faa2154bc0724cd') - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} diff --git a/testing/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD deleted file mode 100644 index 396c17171..000000000 --- a/testing/avogadro/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 151803 2012-03-03 08:08:41Z ibiru $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.0.3 -pkgrel=5 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' - 'fix-boost.patch' - 'fix-opengl-headers.patch') -md5sums=('92c2702c1980f70fb6d87a1a58147911' - 'aec516daab066c15326a9681f8f15abc' - '46282e4709429447e44a0a54d51ad2ec' - 'f420bfd22e3d5d8fcddc625cf5e711f6') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch - patch -p1 -i "${srcdir}"/fix-boost.patch - patch -p1 -i "${srcdir}"/fix-opengl-headers.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt/mkspecs - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install deleted file mode 100644 index 2eaa60550..000000000 --- a/testing/avogadro/avogadro.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch deleted file mode 100644 index 8fb53ef12..000000000 --- a/testing/avogadro/fix-boost.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 -+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 -@@ -149,7 +149,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 -+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 -@@ -11,7 +11,7 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --QT4_WRAP_CPP(MOC_SRCS moleculelist.h) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) ---- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 -+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 -@@ -18,7 +18,7 @@ - # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp - # We should probably scan the header to verify the Q_OBJECT macro is used - string(REPLACE ".cpp" ".h" hdr_list "${src_list}") -- qt4_wrap_cpp(moc_files ${hdr_list}) -+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - # Now sort out the ui and qrc files, process them as appropriate - set(ui_plugin_files) - set(qrc_plugin_files) diff --git a/testing/avogadro/fix-opengl-headers.patch b/testing/avogadro/fix-opengl-headers.patch deleted file mode 100644 index e6e8bc3b5..000000000 --- a/testing/avogadro/fix-opengl-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 -+++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 -@@ -25,6 +25,8 @@ - #include "camera.h" - #include "glwidget.h" - #include <avogadro/molecule.h> -+#include <Eigen/LU> -+#include <GL/glu.h> - - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 -+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 -@@ -42,6 +42,7 @@ - #include <QColor> - #include <QVarLengthArray> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 -+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 -@@ -70,6 +70,8 @@ - - #include <openbabel/mol.h> - -+#include <GL/glu.h> -+ - using namespace OpenBabel; - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 -@@ -36,6 +36,7 @@ - #include <QFile> - #include <QDebug> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 -@@ -44,6 +44,8 @@ - #include <QComboBox> - #include <QDebug> - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch deleted file mode 100644 index 11f58a505..000000000 --- a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 -@@ -75,6 +75,42 @@ - zmatrix.h - ) - -+SET(libavogadro_MOC_HDRS -+ animation.h -+ atom.h -+ bond.h -+ color.h -+ colorbutton.h -+ colors/elementcolor.h -+ cube.h -+ elementdetail_p.h -+ elementtranslator.h -+ engine.h -+ engines/bsdyengine.h -+ extension.h -+ fragment.h -+ glwidget.h -+ mesh.h -+ molecule.h -+ moleculefile.h -+ moleculefile_p.h -+ periodictablescene_p.h -+ periodictableview.h -+ plotwidget.h -+ plugin.h -+ pluginmanager.h -+ primitive.h -+ protein.h -+ pythonengine_p.h -+ pythonerror.h -+ pythonextension_p.h -+ pythontool_p.h -+ residue.h -+ tool.h -+ toolgroup.h -+ zmatrix.h -+) -+ - set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) - # Also add in the qtiocompressor class - #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) -@@ -113,7 +148,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --qt4_automoc(${libavogadro_SRCS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) -@@ -149,7 +184,7 @@ - COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") - endforeach(headerFile ${libavogadro_HDRS}) - --add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) -+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) - set_target_properties(avogadro - PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) - target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp ---- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 -@@ -224,5 +224,3 @@ - } - - } // end namespace Avogadro -- --#include "animation.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp ---- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 -@@ -293,5 +293,3 @@ - } - - } // End namespace Avogadro -- --#include "atom.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp ---- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 -@@ -166,5 +166,3 @@ - } - - } // End namespace Avogadro -- --#include "bond.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp ---- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 -@@ -152,5 +152,3 @@ - return "Generic Color"; - } - } -- --#include "color.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp ---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 -@@ -94,5 +94,3 @@ - } - - } // end namespace -- --#include "colorbutton.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp ---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 -@@ -63,7 +63,5 @@ - - } - --#include "elementcolor.moc" - //this is a static color plugin... - //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp ---- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 -@@ -322,5 +322,3 @@ - } - - } // End namespace Avogadro -- --#include "cube.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp ---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 -@@ -132,5 +132,3 @@ - } - - } // End namespace Avogadro -- --#include "elementdetail_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp ---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 -@@ -401,5 +401,3 @@ - } - - } // End namespace Avogadro -- --#include "elementtranslator.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp ---- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 -@@ -377,5 +377,3 @@ - return m_molecule->bonds(); - } - } -- --#include "engine.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp ---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 -@@ -442,7 +442,5 @@ - } - - } -- --#include "bsdyengine.moc" - // This is a static engine... - // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp ---- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 -@@ -80,5 +80,3 @@ - } - - } -- --#include "extension.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp ---- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 -@@ -82,5 +82,3 @@ - } - - } // End namespace Avogadro -- --#include "fragment.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 -@@ -1966,5 +1966,3 @@ - d->updateCache = true; - } - } -- --#include "glwidget.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp ---- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 -@@ -231,5 +231,3 @@ - } - - } // End namespace Avogadro -- --#include "mesh.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp ---- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 -@@ -1575,5 +1575,3 @@ - } - - } // End namespace Avogadro -- --#include "molecule.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp ---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 -@@ -22,23 +22,14 @@ - 02110-1301, USA. - **********************************************************************/ - --#include "moleculefile.h" -+#include "moleculefile_p.h" - - #include <avogadro/molecule.h> - --#include <QFile> - #include <QFileInfo> --#include <QStringList> --#include <QThread> - #include <QDebug> - #include <QPointer> - --#include <openbabel/mol.h> --#include <openbabel/obconversion.h> -- --// Included in obconversion.h --//#include <iostream> -- - namespace Avogadro { - - using OpenBabel::OBConversion; -@@ -578,164 +569,6 @@ - return false; - } - -- class ReadFileThread : public QThread -- { -- // Q_OBJECT -- -- public: -- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -- { -- } -- -- void addConformer(const OpenBabel::OBMol &conformer) -- { -- unsigned int numAtoms = conformer.NumAtoms(); -- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -- for (unsigned int i = 0; i < numAtoms; ++i) -- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -- m_moleculeFile->m_conformers.push_back(coords); -- } -- -- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -- { -- if (!c) { -- // this is the first molecule read -- m_moleculeFile->setConformerFile(true); -- addConformer(current); -- return; -- } -- -- if (!m_moleculeFile->isConformerFile()) -- return; -- -- // as long as we are not sure if this really is a -- // conformer/trajectory file, add the conformers -- addConformer(current); -- -- // performance: check only certain molecule 1-10,20,50 -- switch (c) { -- case 1: -- case 2: -- case 3: -- case 4: -- case 5: -- case 6: -- case 7: -- case 8: -- case 9: -- case 10: -- case 20: -- case 50: -- break; -- default: -- return; -- } -- -- if (first.NumAtoms() != current.NumAtoms()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- -- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- } -- } -- -- void run() -- { -- // Check that the file can be read from disk -- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -- // Cannot read the file -- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- -- // Construct the OpenBabel objects, set the file type -- OpenBabel::OBConversion conv; -- OpenBabel::OBFormat *inFormat; -- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -- // Input format not supported -- m_moleculeFile->m_error.append( -- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -- return; -- } else { -- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -- if (!inFormat || !conv.SetInFormat(inFormat)) { -- // Input format not supported -- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- } -- -- // set any options -- if (!m_moleculeFile->m_fileOptions.isEmpty()) { -- foreach(const QString &option, -- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -- } -- } -- -- // Now attempt to read the molecule in -- ifstream ifs; -- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -- if (!ifs) // Should not happen, already checked file could be opened -- return; -- -- // read all molecules -- OpenBabel::OBMol firstOBMol, currentOBMol; -- unsigned int c = 0; -- conv.SetInStream(&ifs); -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- while (ifs.good() && conv.Read(¤tOBMol)) { -- if (!c) -- firstOBMol = currentOBMol; -- -- if (c > 20 && !m_moleculeFile->isConformerFile()) -- m_moleculeFile->setFirstReady(true); -- -- // detect conformer/trajectory files -- detectConformers(c, firstOBMol, currentOBMol); -- // store information about molecule -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -- // increment count -- ++c; -- } -- m_moleculeFile->streamposRef().pop_back(); -- -- // signle molecule files are not conformer files -- if (c == 1) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- } -- -- // check for empty titles -- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -- if (!m_moleculeFile->titlesRef()[i].isEmpty()) -- continue; -- -- QString title; -- if (m_moleculeFile->isConformerFile()) -- title = tr("Conformer %1").arg(i+1); -- else -- title = tr("Molecule %1").arg(i+1); -- -- m_moleculeFile->titlesRef()[i] = title; -- } -- } -- -- MoleculeFile *m_moleculeFile; -- }; // end ReadFileThread class -- - MoleculeFile* MoleculeFile::readFile(const QString &fileName, - const QString &fileType, const QString &fileOptions, bool wait) - { -@@ -794,6 +627,3 @@ - } - - } // end namespace Avogadro -- --#include "moleculefile.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h ---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 -@@ -0,0 +1,202 @@ -+/********************************************************************** -+ MoleculeFile - Class representing molecule file. -+ -+ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch -+ -+ This file is part of the Avogadro molecular editor project. -+ For more information, see <http://avogadro.openmolecules.net/> -+ -+ Avogadro 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. -+ -+ Avogadro 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 Street, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ **********************************************************************/ -+ -+#ifndef MOLECULEFILE_P_H -+#define MOLECULEFILE_P_H -+ -+#include "moleculefile.h" -+ -+#include <openbabel/mol.h> -+#include <openbabel/obconversion.h> -+ -+#include <QFile> -+#include <QStringList> -+#include <QThread> -+ -+namespace Avogadro { -+ -+ using OpenBabel::OBConversion; -+ using std::ifstream; -+ -+class ReadFileThread : public QThread -+{ -+ Q_OBJECT -+ -+ public: -+ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -+ { -+ } -+ -+ void addConformer(const OpenBabel::OBMol &conformer) -+ { -+ unsigned int numAtoms = conformer.NumAtoms(); -+ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -+ for (unsigned int i = 0; i < numAtoms; ++i) -+ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -+ m_moleculeFile->m_conformers.push_back(coords); -+ } -+ -+ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -+ { -+ if (!c) { -+ // this is the first molecule read -+ m_moleculeFile->setConformerFile(true); -+ addConformer(current); -+ return; -+ } -+ -+ if (!m_moleculeFile->isConformerFile()) -+ return; -+ -+ // as long as we are not sure if this really is a -+ // conformer/trajectory file, add the conformers -+ addConformer(current); -+ -+ // performance: check only certain molecule 1-10,20,50 -+ switch (c) { -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ case 5: -+ case 6: -+ case 7: -+ case 8: -+ case 9: -+ case 10: -+ case 20: -+ case 50: -+ break; -+ default: -+ return; -+ } -+ -+ if (first.NumAtoms() != current.NumAtoms()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ -+ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -+ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -+ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -+ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ } -+ } -+ -+ void run() -+ { -+ // Check that the file can be read from disk -+ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -+ // Cannot read the file -+ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ -+ // Construct the OpenBabel objects, set the file type -+ OpenBabel::OBConversion conv; -+ OpenBabel::OBFormat *inFormat; -+ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -+ // Input format not supported -+ m_moleculeFile->m_error.append( -+ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -+ return; -+ } else { -+ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -+ if (!inFormat || !conv.SetInFormat(inFormat)) { -+ // Input format not supported -+ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ } -+ -+ // set any options -+ if (!m_moleculeFile->m_fileOptions.isEmpty()) { -+ foreach(const QString &option, -+ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -+ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -+ } -+ } -+ -+ // Now attempt to read the molecule in -+ ifstream ifs; -+ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -+ if (!ifs) // Should not happen, already checked file could be opened -+ return; -+ -+ // read all molecules -+ OpenBabel::OBMol firstOBMol, currentOBMol; -+ unsigned int c = 0; -+ conv.SetInStream(&ifs); -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ while (ifs.good() && conv.Read(¤tOBMol)) { -+ if (!c) -+ firstOBMol = currentOBMol; -+ -+ if (c > 20 && !m_moleculeFile->isConformerFile()) -+ m_moleculeFile->setFirstReady(true); -+ -+ // detect conformer/trajectory files -+ detectConformers(c, firstOBMol, currentOBMol); -+ // store information about molecule -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -+ // increment count -+ ++c; -+ } -+ m_moleculeFile->streamposRef().pop_back(); -+ -+ // signle molecule files are not conformer files -+ if (c == 1) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ } -+ -+ // check for empty titles -+ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -+ if (!m_moleculeFile->titlesRef()[i].isEmpty()) -+ continue; -+ -+ QString title; -+ if (m_moleculeFile->isConformerFile()) -+ title = tr("Conformer %1").arg(i+1); -+ else -+ title = tr("Molecule %1").arg(i+1); -+ -+ m_moleculeFile->titlesRef()[i] = title; -+ } -+ } -+ -+ MoleculeFile *m_moleculeFile; -+}; -+ -+} // end namespace Avogadro -+ -+#endif // MOLECULEFILE_P_H -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp ---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -213,5 +213,3 @@ - } - - } // End namespace Avogadro -- --#include "periodictablescene_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp ---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -69,4 +69,3 @@ - - } // End namespace Avogadro - --#include "periodictableview.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp ---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 -@@ -27,7 +27,6 @@ - **********************************************************************/ - - #include "plotwidget.h" --#include "plotwidget.moc" - - #include <math.h> - #include <QDebug> -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp ---- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 -@@ -65,5 +65,3 @@ - } - - } // end namespace Avogadro -- --#include "plugin.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp ---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 -@@ -784,5 +784,3 @@ - } - - } -- --#include "pluginmanager.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp ---- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 -@@ -77,5 +77,3 @@ - } - - } -- --#include "primitive.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp ---- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 -@@ -978,5 +978,3 @@ - } - - } // End namespace Avogadro -- --#include "protein.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 -@@ -11,9 +11,9 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --qt4_automoc(moleculelist.cpp) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h) - --ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) -+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) - SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") - if (WIN32) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp ---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 -@@ -70,4 +70,3 @@ - - } - --#include "moleculelist.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 -@@ -289,5 +289,3 @@ - - - } -- --#include "pythonengine_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp ---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 -@@ -112,4 +112,3 @@ - - } // namespace - --#include "pythonerror.moc" - -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 -@@ -340,5 +340,3 @@ - } - - } -- --#include "pythonextension_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 -@@ -344,5 +344,3 @@ - } - - } -- --#include "pythontool_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp ---- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 -@@ -160,6 +160,3 @@ - } - - } // End namespace Avogadro -- -- #include "residue.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp ---- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 -@@ -117,5 +117,3 @@ - } - - } // end namespace Avogadro -- --#include "tool.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp ---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 -@@ -206,5 +206,3 @@ - } - - } // end namespace Avogadro -- --#include "toolgroup.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp ---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 -@@ -149,5 +149,3 @@ - - - } // End namespace Avogadro -- --#include "zmatrix.moc" diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD deleted file mode 100644 index 6a0ae5ae2..000000000 --- a/testing/bash/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# $Id: PKGBUILD 153697 2012-03-18 06:05:58Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=bash -_basever=4.2 -_patchlevel=024 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=2 -pkgdesc="The GNU Bourne Again shell" -arch=('i686' 'x86_64') -license=('GPL') -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') -provides=('sh') -install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} - dot.bashrc - dot.bash_profile - dot.bash_logout - system.bashrc - system.bash_logout) -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() { - 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) - done - - _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\"\' - -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 - make -} - -check() { - cd "${srcdir}"/${pkgname}-$_basever - make check -} - -package() { - cd "${srcdir}"/${pkgname}-$_basever - make DESTDIR="${pkgdir}" install - - # for now, bash is our default /bin/sh - cd "${pkgdir}"/bin - ln -s bash sh - - 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 - - # 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 -} - -md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' - '027d6bd8f5f6a06b75bb7698cb478089' - '2902e0fee7a9168f3a4fd2ccd60ff047' - '42f4400ed2314bd7519c020d0187edc5' - '3546099a1b2f667adc9794f52e78e35b' - '472f536d7c9e8250dc4568ec4cfaf294' - '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' - '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' - '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' - 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' - 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' - 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' - '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' - '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' - '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' - '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' - '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' - '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' - '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' - 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' - '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' - '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' - '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' - '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' - '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' - 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' - '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' - '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' - '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' - '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c') diff --git a/testing/bash/bash.install b/testing/bash/bash.install deleted file mode 100644 index bc75e9b6a..000000000 --- a/testing/bash/bash.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(bash.info) - -post_install() { - [ -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 - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout deleted file mode 100644 index 0e4e4f184..000000000 --- a/testing/bash/dot.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# ~/.bash_logout -# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile deleted file mode 100644 index 5545f007e..000000000 --- a/testing/bash/dot.bash_profile +++ /dev/null @@ -1,5 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc deleted file mode 100644 index a355b0cd3..000000000 --- a/testing/bash/dot.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout deleted file mode 100644 index a76e48e4a..000000000 --- a/testing/bash/system.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/bash.bash_logout -# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc deleted file mode 100644 index a2231e861..000000000 --- a/testing/bash/system.bashrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -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/~}"' - - ;; - screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - ;; -esac - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/bluez/fix-a2dp.patch b/testing/bluez/fix-a2dp.patch deleted file mode 100644 index e4bb1372a..000000000 --- a/testing/bluez/fix-a2dp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Thu, 26 Jan 2012 23:39:02 +0200 -Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket - is disabled - -Local endpoints can only be used when UNIX socket API is available. ---- - audio/a2dp.c | 15 +++++++-------- - 1 files changed, 7 insertions(+), 8 deletions(-) - -diff --git a/audio/a2dp.c b/audio/a2dp.c -index 5ca105c..bbb91ce 100644 ---- a/audio/a2dp.c -+++ b/audio/a2dp.c -@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) - - int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - { -- int sbc_srcs = 1, sbc_sinks = 1; -+ int sbc_srcs = 0, sbc_sinks = 0; - int mpeg12_srcs = 0, mpeg12_sinks = 0; -- gboolean source = TRUE, sink = FALSE, socket = TRUE; -+ gboolean source = TRUE, sink = FALSE, socket = FALSE; - gboolean delay_reporting = FALSE; - char *str; - GError *err = NULL; -@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - source = TRUE; - if (strstr(str, "Source")) - sink = TRUE; -+ if (strstr(str, "Socket")) -+ socket = TRUE; - g_free(str); - } - -@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - } - - /* Don't register any local sep if Socket is disabled */ -- if (socket == FALSE) { -- sbc_srcs = 0; -- sbc_sinks = 0; -- mpeg12_srcs = 0; -- mpeg12_sinks = 0; -+ if (socket == FALSE) - goto proceed; -- } - - str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); - if (err) { - DBG("audio.conf: %s", err->message); - g_clear_error(&err); -+ sbc_srcs = 1; - } else { - sbc_srcs = atoi(str); - g_free(str); -@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - if (err) { - DBG("audio.conf: %s", err->message); - g_clear_error(&err); -+ sbc_sinks = 1; - } else { - sbc_sinks = atoi(str); - g_free(str); --- -1.7.6.5 - diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD deleted file mode 100644 index f771f698b..000000000 --- a/testing/boost/PKGBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# $Id: PKGBUILD 151805 2012-03-03 08:08:44Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> -# Contributor: Luca Roccia <little_rock@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.49.0 -_boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz - exceptions.patch) -license=('custom') -md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca' - '9b44c28b36303152050c8c82469569c5') - -_stagedir="${srcdir}/stagedir" - -build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - # https://svn.boost.org/trac/boost/ticket/5731 - patch -p0 -i "${srcdir}/exceptions.patch" - - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=system \ - ${MAKEFLAGS} \ - install -} - -package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ - - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt -} - -package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} diff --git a/testing/boost/exceptions.patch b/testing/boost/exceptions.patch deleted file mode 100644 index 9faa71526..000000000 --- a/testing/boost/exceptions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp ---- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 -+++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 -@@ -20,6 +20,7 @@ - - #include "boost/mpl/if.hpp" - #include "boost/mpl/integral_c.hpp" -+#include "boost/throw_exception.hpp" - - namespace boost { namespace numeric - { -@@ -159,9 +160,9 @@ struct def_overflow_handler - void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) - { - if ( r == cNegOverflow ) -- throw negative_overflow() ; -+ boost::throw_exception( negative_overflow() ) ; - else if ( r == cPosOverflow ) -- throw positive_overflow() ; -+ boost::throw_exception( positive_overflow() ) ; - } - } ; - - -Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/testing/bootchart/PKGBUILD b/testing/bootchart/PKGBUILD deleted file mode 100644 index d8f606056..000000000 --- a/testing/bootchart/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 153849 2012-03-19 21:13:34Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -pkgname="bootchart" -pkgver=1.15 -pkgrel=1 -pkgdesc="a 'startup' graphing tool" -url="https://meego.gitorious.org/meego-developer-tools/bootchart" -license=('GPL2') -arch=(i686 x86_64) -depends=('glibc') -source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'build.patch') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../build.patch - - make -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -md5sums=('e24cad9db140521fca5193a88589e669' - '5546709bc77b775290cb54a29affa6ec') diff --git a/testing/bootchart/build.patch b/testing/bootchart/build.patch deleted file mode 100644 index 82c6e1bfd..000000000 --- a/testing/bootchart/build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Fri, 16 Mar 2012 01:34:10 +0100 -Subject: [PATCH] Makefile: move binary and avoid empty dirs - -Install to /usr/bin by default, and don't install an empty /etc. ---- - Makefile | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 566a848..c017509 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,12 +6,10 @@ CC := gcc - all: bootchartd - - install: bootchartd -- mkdir -p $(DESTDIR)/sbin -- mkdir -p $(DESTDIR)/etc -- mkdir -p $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0755 bootchartd $(DESTDIR)/sbin/ -- install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/ -+ install -d $(DESTDIR)/usr/bin -+ install -d $(DESTDIR)/usr/share/doc/bootchart -+ install -m0755 bootchartd $(DESTDIR)/usr/bin/ -+ install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ - - OBJS := log.o svg.o bootchart.o - --- -1.7.9.4 - diff --git a/testing/capi4hylafax/PKGBUILD b/testing/capi4hylafax/PKGBUILD deleted file mode 100644 index ff9680255..000000000 --- a/testing/capi4hylafax/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 153867 2012-03-20 08:29:04Z tpowa $ -#Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=capi4hylafax -pkgver=010300 -pkgrel=6 -pkgdesc="capi plugin for hylafax to enable isdn faxing" -arch=(i686 x86_64) -url="ftp://ftp.avm.de/tools" -license=('GPL') -depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') -source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz - config.faxCAPI capi4hylafax.rc) -md5sums=('d37dc652ac80d1525ef8693be55ee67f' - '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07') -install=capi4hylafax.install -backup=(var/spool/hylafax/etc/config.faxCAPI) - -build() { - cd "$srcdir"/$pkgname-01.03.00 -# fix config file - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in - autoreconf --force --install - ./configure - make -} - -package() { - cd "$srcdir"/$pkgname-01.03.00 - install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend - install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv - install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem - install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax -# adding FIFO - mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI - chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI -# fix /var/spool/hylafax permission - chown 10 "$pkgdir"/var/spool/hylafax - chgrp 14 "$pkgdir"/var/spool/hylafax -# adding udev rule - mkdir -p "$pkgdir"/lib/udev/rules.d -cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules -# CAPI devices -SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp" -SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp" - -EOF -# fix c2faxadd - sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem - echo "main_config_dialog" >> "$pkgdir"/usr/bin/c2faxaddmodem -} diff --git a/testing/capi4hylafax/capi4hylafax.install b/testing/capi4hylafax/capi4hylafax.install deleted file mode 100644 index 20c2d8f63..000000000 --- a/testing/capi4hylafax/capi4hylafax.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { -cat << EOF -For more information about setting up the package, please have a look here: -"http://wiki.archlinux.org/index.php/capi4hylafax" -EOF -} - -post_upgrade() { - post_install $1 -} - -post_remove() { -cat << EOF -Please remove your additions to /var/spool/hylafax/etc/config -EOF -} diff --git a/testing/capi4hylafax/capi4hylafax.rc b/testing/capi4hylafax/capi4hylafax.rc deleted file mode 100755 index 51025b020..000000000 --- a/testing/capi4hylafax/capi4hylafax.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/c2faxrecv` -case "$1" in - start) - stat_busy "Starting capi4hylafax" - if [ -z "$PID" ]; then - /usr/bin/c2faxrecv > /dev/null & - faxmodem faxCAPI - fi - if [ ! -f /var/run/faxq.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -f /var/run/hfaxd.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon capi4hylafax - stat_done - fi - ;; - stop) - stat_busy "Stopping capi4hylafax" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon capi4hylafax - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/capi4hylafax/config.faxCAPI b/testing/capi4hylafax/config.faxCAPI deleted file mode 100644 index b2137757a..000000000 --- a/testing/capi4hylafax/config.faxCAPI +++ /dev/null @@ -1,397 +0,0 @@ -# -# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP -# - -# Grundsätzliches: -# - Es gibt für jeden Wert einen Standardzustand (default), sodass jede Zeile -# der Datei oder auch das komplette Configfile ausgelassen werden kann. -# - Es gibt ausschließlich ein Configfile, in dem alle nötigen Angaben für -# "c2faxsend/-receive" eingetragen werden können. -# - Werden für HylaFAX mehrere virtuelle Geräte (devices) angelegt, muss es -# für jedes Device ein Configfile im Format config.[DeviceName] geben. -# Dessen Existenz wird von HylaFAX überprüft. Ohne dieses File kann die -# Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer -# solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile -# oder ein minimales "dummy"-ConfigFile nachgewiesen werden. -# -# Basics: -# - There is a default condition for each value, such that each line of the -# file or the complete configfile can be left out. -# - There is only one configfile in which all information required for -# "c2faxsend/-receive" can be entered. -# - If multiple virtual devices are created for HylaFAX, there must be a -# Configfile in the format config.[DeviceName] for each device. HylaFAX -# checks that this file exists. Without this file, it is not possible to -# start working with the device. The easiest way to establish the existence -# of such a file is to create a link to this ConfigFile or a minimum -# "dummy" ConfigFile. - - -# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die -# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die -# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb -# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert. -# -# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX- -# compatible operation or in which received faxes are to be saved in -# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in -# the directory $(SpoolDir)/recvq. -# -# default /var/spool/hylafax -# -SpoolDir: /var/spool/hylafax - - -# "FaxRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein Fax -# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter -# übergeben als für HylaFAX (mehr dazu im sample_faxrcvd). -# -# "FaxRcvdCmd" indicates the script performed whenever a fax is -# received. Parameters other than the ones for HylaFAX are returned in -# stand-alone operation (see sample_faxrcvd for more information). -# -# default /var/spool/hylafax/bin/faxrcvd -# -FaxRcvdCmd: /var/spool/hylafax/bin/faxrcvd - - -# "PollRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein -# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden -# andereParameter übergeben als für HylaFAX (mehr dazu im -# sample_faxrcvd). -# -# "PollRcvdCmd" indicates the script performed whenever a fax was -# received by fax polling. Parameters other than the ones for HylaFAX -# are returned in stand-alone operation (see sample_faxrcvd for more -# information). -# -# default /var/spool/hylafax/bin/pollrcvd -# -PollRcvdCmd: /var/spool/hylafax/bin/pollrcvd - - -# "FaxReceiveUser" ist der User, als der c2faxrecv ausgeführt wird. -# Die Änderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte -# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag -# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp" -# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von -# /dev/capi20 nicht geändert werden sollen oder Ihre Linux-Distribution einen -# anderen User voraussetzt. -# -# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be -# changed only by the Superuser or "root" user. If c2faxrecv is started by -# another user, this entry will be ignored. Here it is a good idea to enter a -# value other than the hylafax default value "uucp", for instance, if the -# rights of /dev/capi20 are not to be changed or your Linux distribution -# requires another user. -# -# default "" -# -FaxReceiveUser: uucp -FaxReceiveGroup: uucp - - -# Im "LogFile" werden Informationen über den Faxablauf abgespeichert. -# -# Information about the order of events in faxing are saved in the "LogFile". -# -# default "" -# -LogFile: /var/spool/hylafax/log/capi4hylafax - - -# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile -# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles. -# -# The "LogTraceLevel" command indicates the amount of data written in a -# LogFile. The range goes from 0 = nothing to 4 = many. -# -# default 0 -# -LogTraceLevel: 0 - - -# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade -# erwähnte LogFile als auch die LogFiles für HylaFAX angelegt werden. -# -# "LogFileMode" is the mode, on the basis of which both the LogFile just -# mentioned and the LogFiles for HylaFAX are generated. -# -# default 0600 -# -LogFileMode: 0600 - - -# Die geschweiften Klammern geben Anfang und Ende einer Section an. -# Jede Section darf eine oder mehrere SubSections enthalten. -# SubSubSections sind nicht erlaubt. -# Dabei enthält die Section Angaben zu einem virtuellen Device; -# die Subsection die Angaben für die Rufannahme jedes Controllers. -# Es können beliebig viele Sections und, darin enthalten, jeweils beliebig -# viele Subsections erzeugt werden. -# Jede Section muss aber einen anderen HylafaxDeviceName erhalten; -# zusätzlich muss in jeder Subsection innerhalb einer Section ein anderer -# Controller aufgeführt werden. Beim Stand-Alone-Betrieb ist eine Section mit -# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die -# virtuellen DeviceNamen keine Rolle spielen. -# -# The curved brackets indicate the beginning and end of a section. -# Each section may contain one or more subsections. -# SubSubSections are not permitted. -# The section contains information about a virtual device; the subsection the -# call acceptance information for each controller. -# Any number of sections containing any number of subsections may be -# generated, but each section must receive a different HylafaxDeviceName; and -# a different controller must be listed in every subsection within a section. -# For stand-alone operation, it is sufficient to have just one section with -# as many subsections as required, since virtual DeviceNames do not play -# any role in this mode of operation. -# -{ - - # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als - # "virtuelles Modem" anmeldet. Sollen für HylaFAX mehrere dieser "Modems" - # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen - # HylafaxDeviceName an. - # - # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as - # a "virtual modem". If multiple "modems" are to be generated for HylaFAX, - # simply create a new section with another HylafaxDeviceName. - # - # default faxCAPI - # - HylafaxDeviceName: faxCAPI - - - # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert - # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.) - # festgelegt. - # - # "RecvFileMode" is the mode, in which received faxes are saved. User and - # Group of the file are determined by the FaxReceiveUser (see above). - # - # default 0600 - # - RecvFileMode: 0600 - - - # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite - # mitgeteilt (sichtbar z. B. im Fax-Journal). - # - # "FAXNumber" is the fax number of the computer itself and is transmitted - # to the remote site (visible in the Fax Journal). - # - # default "" - # - FAXNumber: +49.00.00000 - - - # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der - # Kopfzeile. Ein leerer Eintrag führt dazu, dass keine Fax-Kopfzeile - # eingefügt wird. - # - # "LocalIdentifier" is the part of the fax header which can be configured - # from CAPI. An empty entry specifies an empty header. - # - # default "" - # - LocalIdentifier: "AVM CAPI4HylaFAX" - - - # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann - # durch "MaxConcurrentRecvs" angepaßt werden. Diese Anzahl wird - # durch die Anzahl der durch die Hardware zur Verfügung - # gestellten B-Kanäle begrenzt. - # - # The maximum number of faxes that can be received at the same - # time can be adjusted using "MaxConcurrentRecvs". This number - # is limited by the number of B channels provided by the hardware. - # - # default 2 - # - MaxConcurrentRecvs: 2 - - - # ----------- outgoing params ----------- - - # "OutgoingController" gibt den Controller an, über den eine externe - # Verbindung aufgebaut werden soll. - # - # "OutgoingController" indicates the controller which is to be used to - # establish an external connection. - # - # default 1 - # - OutgoingController: 1 - - - # Die "OutgoingMSN" ist die MSN, die für ausgehenden Faxe benutzt wird. - # - # The "OutgoingMSN" is the MSN used for outgoing faxes. - # - # default "" - # - OutgoingMSN: - - - # CLIR (Rufnummernunterdrückung) kann über "SuppressMSN" und den Wert (0) - # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden. - # - # CLIR (Calling Line Identification Restriction) can be switched off using - # the value (0) or switched back on by entering the value (1). - # - # default 0 - # - SuppressMSN: 0 - - - # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei - # Nebenstellenanlagen wichtig, bei denen für den Aufbau einer externen - # Verbindung eine Ziffer vorgewählt werden muss. - # - # "NumberPrefix" is set to precede each telephone number. This is - # important for PBX systems which require that a number be dialed to - # obtain an outside line. - # - # default "" - # - NumberPrefix: - - - # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf - # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz - # Audio-Verbindung hergestellt. - # - # When in "UseISDNFaxService" the value is = 1, an outoing call will be - # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz - # audio connection is established. - # - # default 0 - # - UseISDNFaxService: 0 - - - # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die - # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die - # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des - # Wertes 0 nutzt die gesamte Wartezeit. - # - # The duration in seconds you wait for the remote site to accept your - # outgoing call In this way you do not have to use the entire ringing - # duration preset by the telephone company. The default value 0 uses the - # entire ringing duration. - # - # default 0 - # - RingingDuration: 0 - - - # ----------- incoming params ----------- - { - - # Controller, für den diese Subsection gilt. - # - # Controller for which this subsection is valid. - # - # default 1 - # - Controller: 1 - - - # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung - # "Sprache" angenommen. - # - # If "AcceptSpeech" is set to 1, the service indicator "Voice" also - # will be accepted. - # - # default 0 - # - AcceptSpeech: 1 - - - # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen. - # - # If DDI is to be used, "UseDDI" should be set to a value of 1. - # - # default 0 - # - UseDDI: 0 - - - # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen. - # Der Standardwert führt zu keinem korrekten Ergebnis und - # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer - # verändert werden. - # - # "DDIOffset" indicates the DDI offset number which precedes - # extension number. Because the default value can't guarantee - # a correct result, this value should be modified whenever - # "UseDDI" is set to 1. - # - # default "" - # - DDIOffset: "12345" - - - # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern - # werden lediglich als Teil der Empfängernummer mitgeteilt.) Der - # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst - # werden. - # - # "DDILength" indicates the number of digits in the extension. (These - # numbers are only used as a component of the recipient's number.) The - # default value should be adapted whenever DDI is used. - # - # default 0 - # - DDILength: 3 - - - # Bei "IncomingDDIs" können in einer durch Komma getrennten Liste alle - # Durchwahlziffern (DDIs) angegeben werden, für die Rufe angenommen - # werden sollen. Eine Bereichsangabe ist auch möglich (z.B. 100-300), - # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind. - # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert. - # - # In "IncomingDDIs", all extension numbers (DDIs) for which calls are - # to be accepted may be listed, separated by commas. It is also - # possible to specify a range (e.g. 100-300); here no open ranges are - # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the - # parameters for DDILength will be ignored. - # - # default "" - # - IncomingDDIs: - - - # Bei "IncomingMSNs" können in einer durch Komma getrennten Liste alle - # MSNs angegeben werden, für die Rufe angenommen werden sollen. Ist - # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und - # eventuell "Sprache" angenommen. - # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert. - # - # In "IncomingMSNs", all MSNs for which calls are to be accepted may - # be listed, separated by commas. When the list is empty, all calls - # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice". - # When "UseDDI" is set to 1, "IncomingMSNs" is ignored. - # - # default "" - # - IncomingMSNs: - - - # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne - # Zielrufnummer (ohne MSN) angenommen. - # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer - # senden. - # - # If "AcceptGlobalCall" is set to 1, calls without Called Party - # Number also will be accepted. - # Needed on internal ports of some PBX. - # - # default 1 - # - AcceptGlobalCall: 1 - } -} - diff --git a/testing/clamav/PKGBUILD b/testing/clamav/PKGBUILD deleted file mode 100644 index 4646e77a4..000000000 --- a/testing/clamav/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 154473 2012-03-28 23:18:37Z bisson $ -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=clamav -pkgver=0.97.4 -pkgrel=2 -pkgdesc='Anti-virus toolkit for Unix' -url='http://www.clamav.net/' -license=('GPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'conf.d' - 'logrotate' - 'tmpfiles.d' - 'config.patch') -sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' - 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '1c8ef193919b041135115170acd6313f008de808') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../config.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav \ - --disable-clamav \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Make sure conf files get installed, because make install - # doesn't do that if clamav is already installed upon building. - install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf" - install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf" - - install -D -m644 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf" - install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav" - install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav" - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav" - - # Un-distribute databases to require freshclam. - rm "${pkgdir}"/var/lib/clamav/*.cvd -} diff --git a/testing/clamav/conf.d b/testing/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/testing/clamav/conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/testing/clamav/config.patch b/testing/clamav/config.patch deleted file mode 100644 index 0640df2c3..000000000 --- a/testing/clamav/config.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf ---- old/etc/clamd.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf 2010-12-02 19:31:45.873357389 +0100 -@@ -14 +14 @@ --#LogFile /tmp/clamd.log -+LogFile /var/log/clamav/clamd.log -@@ -34 +34 @@ --#LogTime yes -+LogTime yes -@@ -61 +61 @@ --#PidFile /var/run/clamd.pid -+PidFile /run/clamav/clamd.pid -@@ -65 +65 @@ --#TemporaryDirectory /var/tmp -+TemporaryDirectory /tmp -@@ -80 +80 @@ --#LocalSocket /tmp/clamd.socket -+LocalSocket /var/lib/clamav/clamd.sock -@@ -190 +190 @@ --#User clamav -+User clamav -diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf ---- old/etc/freshclam.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf 2010-12-02 19:31:51.190024057 +0100 -@@ -17 +17 @@ --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/clamav/freshclam.log -@@ -121 +121 @@ --#NotifyClamd /path/to/clamd.conf -+NotifyClamd /etc/clamav/clamd.conf diff --git a/testing/clamav/install b/testing/clamav/install deleted file mode 100644 index a2092e815..000000000 --- a/testing/clamav/install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null - getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - - chown -R clamav:clamav /var/lib/clamav - install -o clamav -g clamav -d /run/clamav - install -o clamav -g clamav -d /var/log/clamav -} - -post_remove() { - getent passwd clamav &>/dev/null && userdel clamav >/dev/null - getent group clamav &>/dev/null && groupdel clamav >/dev/null - return 0 -} diff --git a/testing/clamav/logrotate b/testing/clamav/logrotate deleted file mode 100644 index 6a9051bed..000000000 --- a/testing/clamav/logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/testing/clamav/rc.d b/testing/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/testing/clamav/rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav - -PID_FC=$(pidof -o %PPID /usr/bin/freshclam) -PID_CD=$(pidof -o %PPID /usr/sbin/clamd) - -case "$1" in - start) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Starting ClamD" - [[ -z $PID_CD ]] && /usr/sbin/clamd - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - sleep 1 - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Stopping ClamD" - [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Stopping FreshClam" - [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/clamav/tmpfiles.d b/testing/clamav/tmpfiles.d deleted file mode 100644 index 22d29941e..000000000 --- a/testing/clamav/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/clamav 0755 clamav clamav diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD deleted file mode 100644 index b60c4dacc..000000000 --- a/testing/crda/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 150306 2012-02-16 20:41:31Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=crda -pkgver=1.1.2 -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') -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') - -build() { - msg "Compiling crda ..." - 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 -} - -package() { - # Install crda, regdbdump and udev rules - msg "Installing crda ..." - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - # 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}"/lib/udev/rules.d/85-regulatory.rules - - msg "Installing license ..." - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - - msg "Installing boot script ..." - install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom -} diff --git a/testing/crda/crda.install b/testing/crda/crda.install deleted file mode 100644 index c18e15f71..000000000 --- a/testing/crda/crda.install +++ /dev/null @@ -1,18 +0,0 @@ -## 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 -} diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc deleted file mode 100755 index 13dbd870e..000000000 --- a/testing/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/testing/crda/libnl32.patch b/testing/crda/libnl32.patch deleted file mode 100644 index 682b6c5de..000000000 --- a/testing/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) diff --git a/testing/cups-filters/PKGBUILD b/testing/cups-filters/PKGBUILD deleted file mode 100644 index 4822f84e0..000000000 --- a/testing/cups-filters/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 150443 2012-02-17 21:33:59Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.1 -pkgrel=1 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -groups=() -depends=('ghostscript' 'lcms2' 'poppler') -makedepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -#options=(!makeflags) -install= -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('0f158e42798da7da030721f7ec139ece') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make -k check -#} - -package() { - cd "$srcdir/$pkgname-$pkgver" - #make DESTDIR="$pkgdir/" install - make install BUILDROOT="$pkgdir/" - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a -} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD deleted file mode 100644 index 985c4694d..000000000 --- a/testing/curl/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 154088 2012-03-22 23:51:37Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=curl -pkgver=7.25.0 -pkgrel=1 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') -options=('!libtool') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('a56cbe2778b09769f8a5ba17d8f4d92a' - '0e0fd2da19bde6f7be687667e2fac02f' - '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 - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --disable-ldap \ - --disable-ldaps \ - --enable-ipv6 \ - --enable-manual \ - --enable-versioned-symbols \ - --enable-threaded-resolver \ - --without-libidn \ - --with-random=/dev/urandom \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # 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" -} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h deleted file mode 100644 index b48862696..000000000 --- a/testing/curl/curlbuild.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD deleted file mode 100644 index 0bcad68b9..000000000 --- a/testing/dialog/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 151732 2012-03-01 19:24:39Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=dialog -pkgver=1.1_20120215 -pkgrel=1 -pkgdesc="A tool to display dialog boxes from shell scripts" -arch=('i686' 'x86_64') -url="http://invisible-island.net/dialog/" -license=('LGPL2.1') -depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('0d8a07e064c6d4f9cc7d9cb21c4609dc4a19537e') - -build() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ncursesw --enable-nls - make -} - -package() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - make DESTDIR="${pkgdir}" install install-lib -} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index 0dc6893fa..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 151909 2012-03-03 22:30:05Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.0 -_pkgver=9.9.0 -pkgrel=1 - -pkgdesc='DNS utilities: dig host nslookup' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags') -depends=('openssl' 'krb5' 'idnkit') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'remove-bind.patch' - 'trusted-key.key') -sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094' - 'b465ef6160b004838f04de9978fe1be8422af777' - 'ca93da30c89de4365b846325d6ec4674a3e4fc02') - -replaces=('bind-tools' 'host') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-bind.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - # hack to remove unused bloat from the binaries - CFLAGS+=' -fdata-sections -ffunction-sections' - LDFLAGS+=' -Wl,--gc-sections' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-idn \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - cd bin; make DESTDIR="${pkgdir}" install -} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch deleted file mode 100644 index 19d650964..000000000 --- a/testing/dnsutils/remove-bind.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig - TARGETS = - - @BIND9_MAKE_RULES@ -diff -aur old/lib/Makefile.in new/lib/Makefile.in ---- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 -+++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/dnsutils/trusted-key.key b/testing/dnsutils/trusted-key.key deleted file mode 100644 index 866cadda2..000000000 --- a/testing/dnsutils/trusted-key.key +++ /dev/null @@ -1,2 +0,0 @@ -. 172800 IN DNSKEY 256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF -. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0= diff --git a/testing/dovecot/PKGBUILD b/testing/dovecot/PKGBUILD deleted file mode 100644 index 894d24e3b..000000000 --- a/testing/dovecot/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 150923 2012-02-23 17:51:46Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Paul Mattal <paul@mattal.com> -# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> - -pkgname=dovecot -pkgver=2.1.1 -pkgrel=2 -pkgdesc="An IMAP and POP3 server written with security primarily in mind" -arch=('i686' 'x86_64') -url="http://dovecot.org/" -license=("LGPL") -depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' - 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') -makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene') -optdepends=('libldap: ldap plugin' - 'clucene: alternative FTS indexer') -provides=('imap-server' 'pop3-server') -options=('!libtool') -backup=(etc/dovecot/dovecot.conf - etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf - etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf - etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf - etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext - etc/ssl/dovecot-openssl.cnf) -install=$pkgname.install -source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('db41a4de848d2bc834c30af0eb5575fd' - 'e3bf2c4989ccb8a30a5d80ae89b06f76' - '587159e84e2da6f83d70b3c706ba87cc') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ - --disable-static \ - --with-nss \ - --with-pam \ - --with-mysql \ - --with-pgsql \ - --with-sqlite \ - --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \ - --with-gssapi \ - --with-ldap=plugin \ - --with-zlib --with-bzlib \ - --with-libcap \ - --with-solr \ - --with-lucene \ - --with-docs - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # install the launch script - install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname - - # install example conf files and ssl.conf - install -d -m755 ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/ - install -d -m755 ${pkgdir}/etc/ssl - install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ - - rm ${pkgdir}/etc/dovecot/README -} diff --git a/testing/dovecot/dovecot.install b/testing/dovecot/dovecot.install deleted file mode 100644 index 873b82e2f..000000000 --- a/testing/dovecot/dovecot.install +++ /dev/null @@ -1,58 +0,0 @@ -# arg 1: the new package version -post_install() { - - # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values - - # dovecot - if grep -q "^dovecot:" /etc/group &> /dev/null ; then - groupmod -g 76 -n dovecot dovecot &> /dev/null - else - groupadd -g 76 dovecot &> /dev/null - fi - - if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null - fi - - # dovenull - if grep -q "^dovenull:" /etc/group &> /dev/null ; then - groupmod -g 74 -n dovenull dovenull &> /dev/null - else - groupadd -g 74 dovenull &> /dev/null - fi - - if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null - fi -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "`vercmp $2 2.0.0`" -lt 0 ]; then - # important upgrade notice - echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" - echo "> ------------------------------------" - echo "> see http://wiki2.dovecot.org/Upgrading/2.0" - echo "> make sure, you convert the dovecot.conf file" - fi - if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then - # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later - userdel dovecot &> /dev/null - userdel dovenull &> /dev/null - fi - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - userdel dovecot &> /dev/null - userdel dovenull &> /dev/null - groupdel dovecot &> /dev/null || /bin/true - groupdel dovenull &> /dev/null || /bin/true - rm -rf /var/run/dovecot/ &> /dev/null || /bin/true -} diff --git a/testing/dovecot/dovecot.sh b/testing/dovecot/dovecot.sh deleted file mode 100755 index e8966bd55..000000000 --- a/testing/dovecot/dovecot.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -daemon_name=dovecot - -. /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 - [[ -n $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/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD deleted file mode 100644 index 062c0b673..000000000 --- a/testing/ekiga/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 151807 2012-03-03 08:08:47Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=ekiga -pkgver=3.3.2 -pkgrel=3 -pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" -url="http://www.ekiga.org" -license=(GPL) -arch=(i686 x86_64) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') -optdepends=('evolution-data-server: Evolution integration') -options=(!emptydirs) -groups=('gnome-extra') -install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install deleted file mode 100644 index b1d76a4a3..000000000 --- a/testing/ekiga/ekiga.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=ekiga - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD deleted file mode 100644 index eee03d3bb..000000000 --- a/testing/file/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 150825 2012-02-23 08:25:19Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=file -pkgver=5.11 -pkgrel=1 -pkgdesc="File type identification utility" -arch=('i686' 'x86_64') -license=('custom') -groups=('base') -url="http://www.darwinsys.com/file/" -depends=('glibc' 'zlib') -options=('!libtool') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('16a407bd66d6c7a832f3a5c0d609c27b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - - ./configure --prefix=/usr --datadir=/usr/share/file - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/usr/share/misc - ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc - - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/testing/freetype2/PKGBUILD b/testing/freetype2/PKGBUILD deleted file mode 100644 index 7b63249ca..000000000 --- a/testing/freetype2/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 152722 2012-03-09 11:24:37Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=freetype2 -pkgver=2.4.9 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=(i686 x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('77a893dae81fd5b896632715ca041179' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') - -build() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/freetype-${pkgver}" - make -k check -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/freetype2/freetype-2.2.1-enable-valid.patch b/testing/freetype2/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b70f..000000000 --- a/testing/freetype2/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/testing/freetype2/freetype-2.3.0-enable-spr.patch b/testing/freetype2/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28a4..000000000 --- a/testing/freetype2/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/testing/gcc/gcc-4.6.2-cloog-0.17.patch b/testing/gcc/gcc-4.6.2-cloog-0.17.patch deleted file mode 100644 index 0503a05ed..000000000 --- a/testing/gcc/gcc-4.6.2-cloog-0.17.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; -diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c ---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c 2011-03-13 08:05:38.000000000 +1000 -+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c 2012-02-03 17:51:47.943463879 +1000 -@@ -1367,7 +1367,7 @@ - /* Change cloog output language to C. If we do use FORTRAN instead, cloog - will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if - we pass an incomplete program to cloog. */ -- options->language = LANGUAGE_C; -+ options->language = CLOOG_LANGUAGE_C; - - /* Enable complex equality spreading: removes dummy statements - (assignments) in the generated code which repeats the diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/testing/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD deleted file mode 100644 index 43b5a69a0..000000000 --- a/testing/ghc/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 151665 2012-02-29 21:12:37Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. -# Also, due to dependency loop problems, haskell-ghc-paths and haddock -# do not carry version dependencies. You will have to remember to build them too. - -pkgname=ghc -pkgver=7.4.1 -pkgrel=2 -pkgdesc='The Glasgow Haskell Compiler' -arch=('i686' 'x86_64') -url='http://www.haskell.org/ghc/' -license=('custom') -depends=('perl' 'gmp>=5.0' 'gcc' 'libffi') -makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl') -checkdepends=('python2') -install='ghc.install' -groups=('haskell') -provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.0.0' - 'haskell-binary=0.5.1.0' - 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.9.2.1' - 'haskell-containers=0.4.2.1' - 'haskell-deepseq=1.3.0.0' - 'haskell-directory=1.1.0.2' - 'haskell-extensible-exceptions=0.1.1.4' - 'haskell-filepath=1.3.0.0' - 'haskell-ghc-prim=0.2.0.0' - 'haskell-haskell2010=1.1.0.1' - 'haskell-haskell98=2.0.0.1' - 'haskell-hoopl=3.8.7.3' - 'haskell-hpc=0.5.1.1' - 'haskell-integer-gmp=0.4.0.0' - 'haskell-old-locale=1.0.0.4' - 'haskell-old-time=1.1.0.0' - 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.1' - 'haskell-template-haskell=2.7.0.0' - 'haskell-time=1.4' - 'haskell-unix=2.5.1.0' - 'haskell-cabal=1.14.0' - ) -replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.0.0' - 'haskell-binary<0.5.1.0' - 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.9.2.1' - 'haskell-containers<0.4.2.1' - 'haskell-deepseq<1.3.0.0' - 'haskell-directory<1.1.0.2' - 'haskell-extensible-exceptions<0.1.1.4' - 'haskell-filepath<1.3.0.0' - 'haskell-ghc-prim<0.2.0.0' - 'haskell-haskell2010<1.1.0.1' - 'haskell-haskell98<2.0.0.1' - 'haskell-hoopl<3.8.7.3' - 'haskell-hpc<0.5.1.1' - 'haskell-integer-gmp<0.4.0.0' - 'haskell-old-locale<1.0.0.4' - 'haskell-old-time<1.1.0.0' - 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.1' - 'haskell-template-haskell<2.7.0.0' - 'haskell-time<1.4' - 'haskell-unix<2.5.1.0' - 'haskell-cabal<1.14.0' - ) -source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" - "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk') -md5sums=('5d86c420978b49cc60edea9bd4c36703' - '54bc9405c14c3226b6e3de3cd61e2777' - '82b67cdd24a2e434a4399f30f14b21a3') - -build() { - cd ghc-${pkgver} - - cp ${srcdir}/build.mk mk/build.mk - - ./configure \ - --prefix=/usr - - make -j4 -l8 -} - -check() { - cd ghc-${pkgver} - - # python2 rename - sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk - sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - - # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - make THREADS=9 test - # might be some failures - #make fulltest -} - -package() { - cd ghc-${pkgver} - - make DESTDIR=${pkgdir} install - - install -d ${pkgdir}/usr/share/licenses/ghc - install -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/ghc -} diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk deleted file mode 100644 index bc26a21fe..000000000 --- a/testing/ghc/build.mk +++ /dev/null @@ -1,175 +0,0 @@ -# ----------------------------------------------------------------------------- -# A Sample build.mk -# -# Uncomment one of the following BuildFlavour settings to get the desired -# overall build type, and then tweak the options in the relevant section -# below. - -# Uncomment one of these to select a build profile below: - -# Full build with max optimisation and everything enabled (very slow build) -BuildFlavour = perf - -# Fast build with optimised libraries, no profiling (RECOMMENDED): -#BuildFlavour = quick - -# Even faster build. NOT RECOMMENDED: the libraries will be -# completely unoptimised, so any code built with this compiler -# (including stage2) will run very slowly: -#BuildFlavour = quickest - -# Profile the stage2 compiler: -#BuildFlavour = prof - -# A development build, working on the stage 1 compiler: -#BuildFlavour = devel1 - -# A development build, working on the stage 2 compiler: -#BuildFlavour = devel2 - -# An unregisterised, optimised build of ghc, for porting: -#BuildFlavour = unreg - -GhcLibWays = v - -# -------- 1. A Performance/Distribution build-------------------------------- - -ifeq "$(BuildFlavour)" "perf" - -# perf matches the default settings, repeated here for comparison: - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O2 -fasm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# -------- A Fast build ------------------------------------------------------ - -ifeq "$(BuildFlavour)" "quickest" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Fast build with optimised libs ---------------------------------- - -ifeq "$(BuildFlavour)" "quick" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- Profile the stage2 compiler --------------------------------------- - -ifeq "$(BuildFlavour)" "prof" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O -fasm -GhcLibHcOpts = -O -fasm - -GhcLibWays += p -GhcProfiled = YES - -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - - -# -------- A Development build (stage 1) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel1" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO - -endif - -# -------- A Development build (stage 2) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel2" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO -LAX_DEPENDENCIES = NO - -# After stage 1 and the libraries have been built, you can uncomment this line: - -# stage=2 - -# Then stage 1 will not be touched by the build system, until -# you comment the line again. This is a useful trick for when you're -# working on stage 2 and want to freeze stage 1 and the libraries for -# a while. - -endif - -# -------- A Unregisterised build) ------------------------------------------- - -ifeq "$(BuildFlavour)" "unreg" - -GhcUnregisterised = YES -GhcWithNativeCodeGen = NO - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -GhcStage2HcOpts = -O2 -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# ----------------------------------------------------------------------------- -# Other settings that might be useful - -# NoFib settings -NoFibWays = -STRIP_CMD = : diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install deleted file mode 100644 index c0200e4a6..000000000 --- a/testing/ghc/ghc.install +++ /dev/null @@ -1,10 +0,0 @@ -pre_upgrade() { - echo '==> Unregistering cabalized packages...' - [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; - echo '==> Done.' -} - -post_upgrade() { - echo '==> All cabalized packages need to be reinstalled now.' - echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.' -} diff --git a/testing/ghc/print-provides-replaces.sh b/testing/ghc/print-provides-replaces.sh deleted file mode 100755 index 33d1da051..000000000 --- a/testing/ghc/print-provides-replaces.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -if [[ ! -d src/ghc-${pkgver}/libraries ]]; then - echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" - exit 1 -fi - -declare -A exclude -# no Win32 cause we're not building on windows -exclude['Win32']=1 -# no integer-simple because we use integer-gmp -exclude['integer-simple']=1 -# extract excluded libraries from ghc.mk -for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do - exclude[${exclude_pkg}]=1 -done - -cd src/ghc-${pkgver}/libraries - -# $1 is the name of the variable -# $2 is the string for the test, either '=' or '<' -print_var() { - printf "$1=(" - for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do - [[ ${exclude[${pkg}]} ]] && continue - version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal) - printf "'haskell-$pkg$2$version'\n " - done - # also add cabal - version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal) - printf "'haskell-cabal$2$version'\n " - echo -e '\b)' -} - -print_var 'provides' '=' -print_var 'replaces' '<' diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/testing/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/testing/glibc/glibc-2.15-confstr-strdup.patch b/testing/glibc/glibc-2.15-confstr-strdup.patch deleted file mode 100644 index 5ce9cd232..000000000 --- a/testing/glibc/glibc-2.15-confstr-strdup.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/posix/confstr.c b/posix/confstr.c -index 3c9566d..3ba9e5a 100644 ---- a/posix/confstr.c -+++ b/posix/confstr.c -@@ -104,7 +104,7 @@ confstr (name, buf, len) - } - #endif - restenvs[string_len++] = '\0'; -- string = restenvs; -+ string = strdup(restenvs); - } - break; - -@@ -167,7 +167,7 @@ confstr (name, buf, len) - } - #endif - restenvs[string_len++] = '\0'; -- string = restenvs; -+ string = strdup(restenvs); - } - break; - -@@ -230,7 +230,7 @@ confstr (name, buf, len) - } - #endif - restenvs[string_len++] = '\0'; -- string = restenvs; -+ string = strdup(restenvs); - } - break; - diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD deleted file mode 100644 index 9aca50271..000000000 --- a/testing/gnupg/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 154401 2012-03-27 20:04:10Z 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=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') -depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') -source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) -sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' - 'f6e6830610a8629b0aad69d789373bf8ca481733') - -install=install - -conflicts=('gnupg2') -provides=("gnupg2=${pkgver}") -replaces=('gnupg2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz -} diff --git a/testing/gnupg/gnupg.install b/testing/gnupg/gnupg.install deleted file mode 100644 index 0a6f3d518..000000000 --- a/testing/gnupg/gnupg.install +++ /dev/null @@ -1,21 +0,0 @@ -info_dir=/usr/share/info -info_files=(gnupg.info gnupg.info-1 gnupg.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f ${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 - usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null - done -} -# vim:set ts=2 sw=2 et: diff --git a/testing/gnupg/install b/testing/gnupg/install deleted file mode 100644 index 3a5dc9fd6..000000000 --- a/testing/gnupg/install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=/usr/share/info -info_files=(gnupg.info gnupg.info-1 gnupg.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f ${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 - usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD deleted file mode 100644 index 09182b057..000000000 --- a/testing/gpgme/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 154244 2012-03-24 17:10:41Z bisson $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=gpgme -pkgver=1.3.1 -pkgrel=4 -pkgdesc="A C wrapper library for GnuPG" -arch=('i686' 'x86_64') -url="http://www.gnupg.org/related_software/gpgme/" -license=('GPL') -depends=('libgpg-error' 'pth' 'gnupg>=2') -install=${pkgname}.install -options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('90afa8436ce2b2683c001c824bd22601' - 'a032ddc27177ef4ee54e25a231e62da5') -sha1sums=('7d19a95a2239da13764dad7f97541be884ec5a37' - '93316a81a8f903c5b604716b6937884ea7b0917a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install deleted file mode 100644 index b54620d9a..000000000 --- a/testing/gpgme/gpgme.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(gpgme.info gpgme.info-1 gpgme.info-2) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD deleted file mode 100644 index 511e1b119..000000000 --- a/testing/grep/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 153237 2012-03-12 09:51:20Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=grep -pkgver=2.11 -pkgrel=2 -pkgdesc="A string search utility" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" -groups=('base') -depends=('glibc' 'pcre' 'sh') -makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - grep-2.11-exclude-dir-crash.patch) -md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643' - 'e4fea5e355973c951f93f48bc86f92fa' - 'e882644cf8c1a4e37da7ba8c0867e70b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i $srcdir/grep-2.11-exclude-dir-crash.patch - ./configure --prefix=/usr --without-included-regex - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -dm755 ${pkgdir}/bin - ln -s /usr/bin/grep ${pkgdir}/bin/grep -} diff --git a/testing/grep/grep-2.11-exclude-dir-crash.patch b/testing/grep/grep-2.11-exclude-dir-crash.patch deleted file mode 100644 index 6b1731768..000000000 --- a/testing/grep/grep-2.11-exclude-dir-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Mon, 12 Mar 2012 09:28:01 +0100 -Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand - -* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. -* NEWS (Bug fixes): Mention it. ---- - NEWS | 5 +++++ - src/main.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index d0a63d5..d4d70f5 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug fixes -+ -+ grep no longer segfaults with -r --exclude-dir and no file operand. -+ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. -+ - - * Noteworthy changes in release 2.11 (2012-03-02) [stable] - -diff --git a/src/main.c b/src/main.c -index 2f6c761..f4f1235 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) - struct stats const *ancestor; - char *name_space; - int status = 1; -- if (excluded_directory_patterns -+ if (dir && excluded_directory_patterns - && excluded_file_name (excluded_directory_patterns, dir)) - return 1; - --- -1.7.9.3 - diff --git a/testing/grep/grep.install b/testing/grep/grep.install deleted file mode 100644 index 7cd31301f..000000000 --- a/testing/grep/grep.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(grep.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/happy/PKGBUILD b/testing/happy/PKGBUILD deleted file mode 100644 index 4c17ba500..000000000 --- a/testing/happy/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 151667 2012-02-29 21:12:39Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: simo <simo@archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=happy -pkgver=1.18.9 -pkgrel=4 -pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" -arch=('i686' 'x86_64') -license=("custom:BSD3") -depends=('gmp') -makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('aeb565fe572f979f15a24db0df2de37d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup.lhs configure -O --prefix=/usr - runhaskell Setup.lhs build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup.lhs copy --destdir="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD deleted file mode 100644 index 44a3ea50b..000000000 --- a/testing/haskell-html/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=html -pkgname=haskell-html -pkgver=1.0.1.2 -pkgrel=10 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-html/haskell-html.install b/testing/haskell-html/haskell-html.install deleted file mode 100644 index 768297e0a..000000000 --- a/testing/haskell-html/haskell-html.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-html -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD deleted file mode 100644 index 79de205cc..000000000 --- a/testing/haskell-http/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=HTTP -pkgname=haskell-http -pkgver=4000.2.2 -pkgrel=1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('b61ff88ef8d699f73a6ed27c6abf6600') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install deleted file mode 100644 index fdebb1cb8..000000000 --- a/testing/haskell-http/haskell-http.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD deleted file mode 100644 index 315d81a73..000000000 --- a/testing/haskell-mtl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=mtl -pkgname=haskell-mtl -pkgver=2.0.1.0 -pkgrel=4 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('934fa813625ef7e88a6a96a09815ff95') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install deleted file mode 100644 index 9325811e8..000000000 --- a/testing/haskell-mtl/haskell-mtl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD deleted file mode 100644 index 59dc9334b..000000000 --- a/testing/haskell-network/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=network -pkgname=haskell-network -pkgver=2.3.0.11 -pkgrel=1 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('cfe4922ac85685be9f86d4d34654f481') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install deleted file mode 100644 index a56c31d0a..000000000 --- a/testing/haskell-network/haskell-network.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD deleted file mode 100644 index e4f7da1e6..000000000 --- a/testing/haskell-parsec/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 - -_hkgname=parsec -pkgname=haskell-parsec -pkgver=3.1.2 -pkgrel=1 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c2a75dfd247ae4839e2602b62dc87487') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install deleted file mode 100644 index dfa0701b9..000000000 --- a/testing/haskell-parsec/haskell-parsec.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD deleted file mode 100644 index 7b27cfb0c..000000000 --- a/testing/haskell-quickcheck/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 - -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.4.2 -pkgrel=1 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-quickcheck/haskell-quickcheck.install b/testing/haskell-quickcheck/haskell-quickcheck.install deleted file mode 100644 index c9e12fadc..000000000 --- a/testing/haskell-quickcheck/haskell-quickcheck.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-quickcheck -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD deleted file mode 100644 index 3b929c3d6..000000000 --- a/testing/haskell-random/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> - -_hkgname=random -pkgname=haskell-random -pkgver=1.0.1.1 -pkgrel=1 -pkgdesc="A basic random number generation library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-random/haskell-random.install b/testing/haskell-random/haskell-random.install deleted file mode 100644 index b6d807e1a..000000000 --- a/testing/haskell-random/haskell-random.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-random -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD deleted file mode 100644 index 3b8ecb4bb..000000000 --- a/testing/haskell-regex-base/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-base -pkgname=haskell-regex-base -pkgver=0.93.2 -pkgrel=5 -pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-base/haskell-regex-base.install b/testing/haskell-regex-base/haskell-regex-base.install deleted file mode 100644 index 3ad2fea28..000000000 --- a/testing/haskell-regex-base/haskell-regex-base.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-base -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD deleted file mode 100644 index c880ff4f2..000000000 --- a/testing/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.95.1 -pkgrel=1 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d0573ab4e2f3de5faa61380b67333320') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-compat/haskell-regex-compat.install b/testing/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/testing/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 1bed15490..000000000 --- a/testing/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.95.1 -pkgrel=1 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('41cbc6d2b99837b64e0cc457c2737cc8') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-posix/haskell-regex-posix.install b/testing/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/testing/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD deleted file mode 100644 index c4c9664f7..000000000 --- a/testing/haskell-text/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=text -pkgname=haskell-text -pkgver=0.11.1.13 -pkgrel=1 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install deleted file mode 100644 index 620db3921..000000000 --- a/testing/haskell-text/haskell-text.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD deleted file mode 100644 index 078bde867..000000000 --- a/testing/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 151687 2012-02-29 21:13:06Z tdziedzic $ - -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Rémy Oudompheng <remy@archlinux.org> - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=4 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'sh') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") -install=${pkgname}.install -md5sums=('3470ac66116900cd1ba84d3744474e49') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install deleted file mode 100644 index eec2af6e1..000000000 --- a/testing/haskell-transformers/haskell-transformers.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD deleted file mode 100644 index d47562b9d..000000000 --- a/testing/haskell-zlib/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 - -_hkgname=zlib -pkgname=haskell-zlib -pkgver=0.5.3.3 -pkgrel=3 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.1' 'zlib' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1649e56d13ce2c6a6a9210227401dbbc') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install deleted file mode 100644 index d387b7b65..000000000 --- a/testing/haskell-zlib/haskell-zlib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD deleted file mode 100644 index d5f04fc5c..000000000 --- a/testing/hugin/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 151809 2012-03-03 08:08:49Z ibiru $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2011.4.0 -pkgrel=2 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('GPL') -depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap') -install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - make -} - -package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/testing/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/testing/icedtea-web-java7/PKGBUILD b/testing/icedtea-web-java7/PKGBUILD deleted file mode 100644 index b12233bbb..000000000 --- a/testing/icedtea-web-java7/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=icedtea-web-java7 -pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.2 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org/wiki/IcedTea-Web" -license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d') - -_javaver=7 -_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - -build() { - cd "${srcdir}"/icedtea-web* - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - - ./configure --prefix=${_jvmdir} \ - --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} - make -} - -check() { - cd "${srcdir}"/icedtea-web* - # as more tests have been added some are expectged to fail - # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html - make -k check || /bin/true -} - - -package_icedtea-web-java7() { - - pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') - install=${pkgname}.install - - cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="${pkgdir}" install-exec-local install-data-local - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} - install -m644 javaws.png ${pkgdir}/usr/share/pixmaps - install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications - # remove splitted doc files - rm -rf ${pkgdir}/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m755 -d ${pkgdir}/usr/bin - install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-java7-doc() { - - pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - - cd "${srcdir}"/icedtea-web* - make DESTDIR="${pkgdir}" install-data-local - # remove javaws about and man page - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/man - rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems -} diff --git a/testing/icedtea-web-java7/icedtea-web-java7.install b/testing/icedtea-web-java7/icedtea-web-java7.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/icedtea-web-java7/icedtea-web-java7.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/icedtea-web/PKGBUILD b/testing/icedtea-web/PKGBUILD deleted file mode 100644 index 55be91977..000000000 --- a/testing/icedtea-web/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 152425 2012-03-06 19:33:01Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=icedtea-web -pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.2 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://icedtea.classpath.org/wiki/IcedTea-Web" -license=('GPL2') -makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d') - - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ - --datarootdir=/usr/share - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - # as more tests have been added some are expectged to fail - # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html - make -k check || /bin/true -} - - -package_icedtea-web() { - - pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('openjdk6' 'gtk2' 'desktop-file-utils') - install=$pkgname.install - - cd "$srcdir/$pkgname-$pkgver" - # possible make target (see bottom of Makefile.am: install-exec-local install-data-local - make DESTDIR="$pkgdir" install-exec-local install-data-local - - # Install desktop files. - install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} - install -m644 javaws.png ${pkgdir}/usr/share/pixmaps - install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications - # remove splitted doc files - rm -rf ${pkgdir}/usr/share/doc - - # link binaries into /usr/bin + jre/bin - install -m755 -d ${pkgdir}/usr/bin - install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin - pushd ${pkgdir}/${_jvmdir}/bin - for file in *; do - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin - ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin - done - popd - - # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml - install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ -} - -package_icedtea-web-doc() { - - pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" - - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install-data-local - # remove javaws about and man page - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/man - rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems -} diff --git a/testing/icedtea-web/icedtea-web.install b/testing/icedtea-web/icedtea-web.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/icedtea-web/icedtea-web.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/iproute2/fix-ip-l.patch b/testing/iproute2/fix-ip-l.patch deleted file mode 100644 index 7f1749cbb..000000000 --- a/testing/iproute2/fix-ip-l.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Fri, 20 Jan 2012 08:16:02 -0800 -Subject: [PATCH] ip: make 'ip l' be 'ip link' - -Restore compatiablity for those lazy typists. ---- - ip/ip.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ip/ip.c b/ip/ip.c -index 7b4bacb..20dc3b5 100644 ---- a/ip/ip.c -+++ b/ip/ip.c -@@ -72,8 +72,8 @@ static const struct cmd { - { "neighbour", do_ipneigh }, - { "ntable", do_ipntable }, - { "ntbl", do_ipntable }, -- { "l2tp", do_ipl2tp }, - { "link", do_iplink }, -+ { "l2tp", do_ipl2tp }, - { "tunnel", do_iptunnel }, - { "tunl", do_iptunnel }, - { "tuntap", do_iptuntap }, --- -1.7.6.5 - diff --git a/testing/iproute2/remove-libnl-headers.patch b/testing/iproute2/remove-libnl-headers.patch deleted file mode 100644 index 921e1fa82..000000000 --- a/testing/iproute2/remove-libnl-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Tue, 10 Jan 2012 08:50:49 -0800 -Subject: [PATCH] iplt2p: remove unused libnl headers - -Leftover from change to original code. ---- - ip/ipl2tp.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c -index 042ddb4..97f98b6 100644 ---- a/ip/ipl2tp.c -+++ b/ip/ipl2tp.c -@@ -23,13 +23,6 @@ - #include <linux/if_arp.h> - #include <linux/ip.h> - --#include <netlink/netlink.h> --#include <netlink/genl/genl.h> --#include <netlink/genl/family.h> --#include <netlink/genl/mngt.h> --#include <netlink/genl/ctrl.h> --#include <netlink/utils.h> -- - #include <linux/genetlink.h> - #include <linux/l2tp.h> - --- -1.7.6.5 - diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD deleted file mode 100644 index c98a92afc..000000000 --- a/testing/iw/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 150308 2012-02-16 20:41:33Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=iw -pkgver=3.3 -pkgrel=2 -pkgdesc="nl80211 based CLI configuration utility for wireless devices" -arch=("i686" "x86_64") -url="http://wireless.kernel.org/en/users/Documentation/iw" -license=("GPL") -depends=("libnl") -makedepends=("kernel-headers") -source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/testing/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD deleted file mode 100644 index fb683380f..000000000 --- a/testing/kdeedu-kig/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 152071 2012-03-04 14:42:26Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kig -pkgver=4.8.0 -pkgrel=2 -pkgdesc="Interactive Geometry" -url="http://kde.org/applications/education/kig/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kig-${pkgver}.tar.xz") -sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kig-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py -} diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/testing/kdeedu-kig/kdeedu-kig.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD deleted file mode 100644 index b8ac2c3e5..000000000 --- a/testing/kdeedu-rocs/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 152080 2012-03-04 14:47:21Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-rocs -pkgver=4.8.0 -pkgrel=2 -pkgdesc="Rocs Graph Theory" -url="http://kde.org/applications/education/rocs/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'boost-libs') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/xz/rocs-${pkgver}.tar.xz") -sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969') -options=('!makeflags') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../rocs-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD deleted file mode 100644 index 2f43c009e..000000000 --- a/testing/kismet/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 150310 2012-02-16 20:41:36Z heftig $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Juergen Hoetzel <jason@archlinux.org> - -pkgname=kismet -pkgver=2011_03_R2 -_realver="${pkgver//_/-}" -pkgrel=4 -pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -arch=('i686' 'x86_64') -url="http://www.kismetwireless.net/" -license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') -makedepends=() # already in core: ('grep' 'gcc-libs') -optdepends=('gpsd: log coordinates of detected networks' - 'wireshark-cli: provide OUI files used to determine device manufacturer' - 'wireshark-cli: mergecap, to merge multiple capture files' - 'sox: provide the default kismet sound playback binary' - 'festival: text-to-speech support' - 'flite: alternative/lightweight text-to-speech support' - 'mac80211-driver: full rfmon support' - 'ruby: ruby interface') -backup=('etc/kismet.conf' 'etc/kismet_drone.conf') -install=kismet.install -changelog=kismet.changelog -source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') - -build() { - cd "${srcdir}/${pkgname}-${_realver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make dep - make - - # Include plugins bundled with kismet - make plugins -} - -package() { - cd "${srcdir}/${pkgname}-${_realver}" - - # Install kismet - make DESTDIR="$pkgdir" install - - # Install plugins - make plugins-install DESTDIR="$pkgdir" - - # the README is very comprehensive, a good idea to include it - install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README" - - # Our own suid-install, first half (see kismet.install) - install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" -} diff --git a/testing/kismet/kismet.changelog b/testing/kismet/kismet.changelog deleted file mode 100644 index 3078d0625..000000000 --- a/testing/kismet/kismet.changelog +++ /dev/null @@ -1,29 +0,0 @@ -2012-02-10 Eric Bélanger <eric@archlinux.org> - * Change libnl depends to libnl1 - -2010-05-07 Angel Velasquez <angvp@archlinux.org> - * ChangeLog added - - * Removed old patches from SVN - - * Applied changes from FS#15746 thanks to people who worked on it. - - * Files that are no longer shipped and so should not be backed up: - backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf') - - * No longer needed; gpsmap is deprecated and being replaced with a tile-based - mapper, as of yet incomplete - optdepends=('perl-libwww: fetch maps for gpsmap') - - * Configuration has completely changed, no longer containing - references to either prism2 or wlanng - sed -i 's/prism2/wlanng/g' conf/kismet.conf - - * Ownership of man pages now defaults to "root" if the group "man" does not exist - chown root:root "$pkgdir"/usr/share/man/man{1,5}/* - - * Dependencies no longer needed - depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7') - - * Options no longer needed - options=('!makeflags') diff --git a/testing/kismet/kismet.install b/testing/kismet/kismet.install deleted file mode 100644 index 0bc806034..000000000 --- a/testing/kismet/kismet.install +++ /dev/null @@ -1,34 +0,0 @@ -## arg 1: the new package version -post_install() { - post_upgrade - - cat << EOP - If you have not done so already, read the README file and the FAQ file. - You MUST edit /etc/kismet.conf and configure Kismet for your system, or - it will NOT run properly!" - - Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by - users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP - TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running - all of Kismet as root. ONLY users in this group will be able to - run Kismet and capture from physical network devices. -EOP -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # Add the group needed to use the limited-functionality binary "kismet_capture" - # Change group ownership of "kismet_capture" to this new group - # Preserve the file mode bits of "kismet_capture" - getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null - chown root:kismet "/usr/bin/kismet_capture" - chmod 4550 "/usr/bin/kismet_capture" -} - -## arg 1: the old package version -post_remove() { - getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch deleted file mode 100644 index 63bc439d9..000000000 --- a/testing/libarchive/interpret-non-posix-zips.patch +++ /dev/null @@ -1,165 +0,0 @@ -Index: libarchive/archive_read_support_format_zip.c -=================================================================== ---- libarchive/archive_read_support_format_zip.c (revision 4189) -+++ libarchive/archive_read_support_format_zip.c (revision 4190) -@@ -217,14 +217,13 @@ - } - - /* -- * TODO: This is a performance sink because it forces -- * the read core to drop buffered data from the start -- * of file, which will then have to be re-read again -- * if this bidder loses. -+ * TODO: This is a performance sink because it forces the read core to -+ * drop buffered data from the start of file, which will then have to -+ * be re-read again if this bidder loses. - * -- * Consider passing in the winning bid value to subsequent -- * bidders so that this bidder in particular can avoid -- * seeking if it knows it's going to lose anyway. -+ * We workaround this a little by passing in the best bid so far so -+ * that later bidders can do nothing if they know they'll never -+ * outbid. But we can certainly do better... - */ - static int - archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) -@@ -311,19 +310,29 @@ - external_attributes = archive_le32dec(p + 38); - zip_entry->local_header_offset = archive_le32dec(p + 42); - -+ /* If we can't guess the mode, leave it zero here; -+ when we read the local file header we might get -+ more information. */ -+ zip_entry->mode = 0; - if (zip_entry->system == 3) { - zip_entry->mode = external_attributes >> 16; -- } else { -- zip_entry->mode = AE_IFREG | 0777; - } - -- /* Do we need to parse filename here? */ -- /* Or can we wait until we read the local header? */ -+ /* We don't read the filename until we get to the -+ local file header. Reading it here would speed up -+ table-of-contents operations (removing the need to -+ find and read local file header to get the -+ filename) at the cost of requiring a lot of extra -+ space. */ -+ /* We don't read the extra block here. We assume it -+ will be duplicated at the local file header. */ - __archive_read_consume(a, - 46 + filename_length + extra_length + comment_length); - } - -- /* TODO: Sort zip entries. */ -+ /* TODO: Sort zip entries by file offset so that we -+ can optimize get_next_header() to use skip instead of -+ seek. */ - - return ARCHIVE_OK; - } -@@ -434,6 +443,11 @@ - return (30); - } - -+ /* TODO: It's worth looking ahead a little bit for a valid -+ * PK signature. In particular, that would make it possible -+ * to read some UUEncoded SFX files or SFX files coming from -+ * a network socket. */ -+ - return (0); - } - -Index: libarchive/test/test_compat_zip_6.zip.uu -=================================================================== ---- libarchive/test/test_compat_zip_6.zip.uu (revision 0) -+++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) -@@ -0,0 +1,10 @@ -+begin 755 test_compat_zip_6.zip -+M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@ -+M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD -+M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0- -+M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` -+M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ -+M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E -+M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B``````` -+` -+end -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4189) -+++ libarchive/test/test_compat_zip.c (revision 4190) -@@ -348,6 +348,53 @@ - free(p); - } - -+/* -+ * Issue 225: Errors extracting MSDOS Zip archives with directories. -+ */ -+static void -+compat_zip_6_verify(struct archive *a) -+{ -+ struct archive_entry *ae; -+ -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -+ assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ assertEqualInt(0, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -+ assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ assertEqualInt(11, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); -+} -+ -+static void -+test_compat_zip_6(void) -+{ -+ const char *refname = "test_compat_zip_6.zip"; -+ struct archive *a; -+ void *p; -+ size_t s; -+ -+ extract_reference_file(refname); -+ p = slurpfile(&s, refname); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+} -+ - DEFINE_TEST(test_compat_zip) - { - test_compat_zip_1(); -@@ -355,6 +402,7 @@ - test_compat_zip_3(); - test_compat_zip_4(); - test_compat_zip_5(); -+ test_compat_zip_6(); - } - - -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 4189) -+++ Makefile.am (revision 4190) -@@ -462,6 +462,7 @@ - libarchive/test/test_compat_zip_3.zip.uu \ - libarchive/test/test_compat_zip_4.zip.uu \ - libarchive/test/test_compat_zip_5.zip.uu \ -+ libarchive/test/test_compat_zip_6.zip.uu \ - libarchive/test/test_fuzz_1.iso.Z.uu \ - libarchive/test/test_fuzz.cab.uu \ - libarchive/test/test_fuzz.lzh.uu \ diff --git a/testing/libarchive/skip-fiemap-on-unavail.patch b/testing/libarchive/skip-fiemap-on-unavail.patch deleted file mode 100644 index d054aea4e..000000000 --- a/testing/libarchive/skip-fiemap-on-unavail.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 293687358e2c52213a3f077bb3d8f860ea5bfda9 Mon Sep 17 00:00:00 2001 -From: Michihiro NAKAJIMA <ggcueroad@gmail.com> -Date: Mon, 6 Feb 2012 04:51:16 +0900 -Subject: [PATCH] Fix issue 238. Skip the setup sparse on linux without a - check of errno if ioctl(,FS_IOC_FIEMAP,) failed because the - errno is not fixed , for example, some file system returns - ENOTTY, another returns EOPNOTSUPP, or EINVAL and so on. We - cannot decide what errno exactly indicates an unsupported - error. - ---- - libarchive/archive_read_disk_entry_from_file.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c -index eef42ef74..6415008 100644 ---- a/libarchive/archive_read_disk_entry_from_file.c -+++ b/libarchive/archive_read_disk_entry_from_file.c -@@ -859,16 +859,9 @@ setup_sparse(struct archive_read_disk *a, - - r = ioctl(fd, FS_IOC_FIEMAP, fm); - if (r < 0) { -- /* When errno is ENOTTY, it is better we should -- * return ARCHIVE_OK because an earlier version -- *(<2.6.28) cannot perfom FS_IOC_FIEMAP. -- * We should also check if errno is EOPNOTSUPP, -- * it means "Operation not supported". */ -- if (errno != ENOTTY && errno != EOPNOTSUPP) { -- archive_set_error(&a->archive, errno, -- "FIEMAP failed"); -- exit_sts = ARCHIVE_FAILED; -- } -+ /* When something error happens, it is better we -+ * should return ARCHIVE_OK because an earlier -+ * version(<2.6.28) cannot perfom FS_IOC_FIEMAP. */ - goto exit_setup_sparse; - } - if (fm->fm_mapped_extents == 0) --- -1.7.9.2 - diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch deleted file mode 100644 index 79e2f3c7e..000000000 --- a/testing/libarchive/test-with-zip-mtime.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4197) -+++ libarchive/test/test_compat_zip.c (revision 4198) -@@ -359,12 +359,16 @@ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); - assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -- assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* TODO: A more complex assert would work here; we could -+ verify that it's within +/- 24 hours of a particular value. */ -+ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ - assertEqualInt(0, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); - assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -- assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ - assertEqualInt(11, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - } diff --git a/testing/libdrm/COPYING b/testing/libdrm/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/testing/libdrm/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - 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 on the rights to use, copy, modify, merge, - publish, distribute, sub license, 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 - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON 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. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - 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 (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 PRECISION INSIGHT AND/OR ITS - SUPPLIERS 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. diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD deleted file mode 100644 index bfd29c1ca..000000000 --- a/testing/libdrm/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 153651 2012-03-17 08:41:21Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libdrm -pkgver=2.4.32 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services" -arch=(i686 x86_64) -license=('custom') -depends=('glibc' 'libpciaccess') -makedepends=('cairo' 'valgrind') -options=('!libtool') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - no-pthread-stubs.patch - COPYING -# git_fixes.diff -) -sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842' - '825ff5e0c4238b31bdea52f104bfec8949270e25' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - - # git fixes - currently none -# patch -Np1 -i ${srcdir}/git_fixes.diff - - #libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr \ - --enable-udev \ - --enable-intel \ - --enable-radeon \ - --enable-vmwgfx-experimental-api \ - --enable-nouveau-experimental-api - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -k check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff deleted file mode 100644 index dc80155f2..000000000 --- a/testing/libdrm/git_fixes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 19441f3..eb9dd32 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) - bufmgr_gem->vma_cache.next, - vma_list); - assert(bo_gem->map_count == 0); -- DRMLISTDEL(&bo_gem->vma_list); -+ DRMLISTDELINIT(&bo_gem->vma_list); - - if (bo_gem->mem_virtual) { - munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch deleted file mode 100644 index 5430244f9..000000000 --- a/testing/libdrm/no-pthread-stubs.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -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], ---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,7 +26,6 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - -I$(top_srcdir)/include/drm - -@@ -34,7 +33,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@ - ---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +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:0 -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.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD deleted file mode 100644 index a1de65d9f..000000000 --- a/testing/libedit/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 153246 2012-03-12 13:49:58Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Roman Cheplyaka <roma@ro-che.info> - -pkgname=libedit -pkgver=20120311_3.0 -pkgrel=1 -pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' -url='http://www.thrysoee.dk/editline/' -arch=('i686' 'x86_64') -license=('BSD') -depends=('ncurses') -options=('!libtool') -source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('2a4be10c33af5e3b09c1d3c8829b02fe5b41796b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver/_/-}" - ./configure --prefix=/usr --enable-widec --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver/_/-}" - make prefix="${pkgdir}"/usr install - - cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3 - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE -} diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD deleted file mode 100644 index fd436f152..000000000 --- a/testing/libevent/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 150654 2012-02-19 12:52:52Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=libevent -pkgver=2.0.17 -pkgrel=1 -pkgdesc="An event notification library" -arch=('i686' 'x86_64') -url="http://www.monkey.org/~provos/libevent/" -license=('GPL2') -depends=('openssl') -optdepends=('python2: to use event_rpcgen.py') -options=('!libtool') -source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc}) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - sed -i 's#python#python2#' event_rpcgen.py - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make DESTDIR="${pkgdir}" install -} -md5sums=('dad64aaaaff16b5fbec25160c06fee9a' - 'ef4a32a96df3941fed58fbe39b4eab9d') diff --git a/testing/libgphoto2/PKGBUILD b/testing/libgphoto2/PKGBUILD deleted file mode 100644 index 323b863db..000000000 --- a/testing/libgphoto2/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 152700 2012-03-08 23:18:37Z tomegun $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=libgphoto2 -pkgver=2.4.13 -pkgrel=1 -pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." -arch=(i686 x86_64) -url="http://www.gphoto.org" -license=(LGPL) -depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') -install=libgphoto2.install -options=('libtool') -source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --disable-rpath - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Remove unused udev helper - rm -rf "${pkgdir}/usr/lib/udev" - - install -m755 -d "${pkgdir}/lib/udev/rules.d" - LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ - CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ - "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ - "${pkgdir}/lib/udev/rules.d/40-gphoto.rules" - - # Remove recursive symlink - rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" -} -md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15') diff --git a/testing/libgphoto2/libgphoto2.install b/testing/libgphoto2/libgphoto2.install deleted file mode 100644 index c7944414f..000000000 --- a/testing/libgphoto2/libgphoto2.install +++ /dev/null @@ -1,6 +0,0 @@ -post_upgrade() { -if [ "$(vercmp $2 2.14.13)" -lt 0 ]; then - groupdel camera &>/dev/null - echo "Users no longer need to be in the 'camera' group to use camera devices" -fi -} diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD deleted file mode 100644 index 3b4249cbe..000000000 --- a/testing/libnl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 150314 2012-02-16 20:41:42Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libnl -pkgver=3.2.7 -pkgrel=1 -pkgdesc="Library for applications dealing with netlink sockets" -arch=(i686 x86_64) -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") -md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/libnl1/PKGBUILD b/testing/libnl1/PKGBUILD deleted file mode 100644 index 2a7fe05fa..000000000 --- a/testing/libnl1/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 150312 2012-02-16 20:41:40Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libnl1 -pkgver=1.1 -pkgrel=1 -pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" -arch=('i686' 'x86_64') -url="http://www.infradead.org/~tgr/libnl/" -license=('GPL') -depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') - -build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/libnl1/fix-compilation.patch b/testing/libnl1/fix-compilation.patch deleted file mode 100644 index 891562a39..000000000 --- a/testing/libnl1/fix-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 -@@ -26,6 +26,7 @@ - #include <sys/socket.h> - #include <inttypes.h> - #include <assert.h> -+#include <limits.h> - - #include <arpa/inet.h> - #include <netdb.h> diff --git a/testing/liborigin2/PKGBUILD b/testing/liborigin2/PKGBUILD deleted file mode 100644 index 1e4edb312..000000000 --- a/testing/liborigin2/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 151815 2012-03-03 08:08:57Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgbase=liborigin2 -pkgname=('liborigin2' 'liborigin2-docs') -pkgver=20110829 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://soft.proindependent.com/liborigin2/" -license=('GPL3') -makedepends=('doxygen' 'qt' 'boost') -replaces=('liborigin') -provides=('liborigin') -source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip - liborigin.pro.archlinux - http://tree.phi-sci.com/tree.hh) -sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be' - '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d' - '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86') - -build() { - cd "${srcdir}/${pkgbase}" - - install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro - install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases - qmake liborigin2.pro QMAKESPEC=linux-g++ - make QTDIR=/usr/ QMAKESPEC=linux-g++ - - # create documentation - cd doc - doxygen -} - -package_liborigin2() { - pkgdesc="A library for reading OriginLab OPJ project files" - depends=('boost-libs') - - cd "${srcdir}/${pkgbase}" - - INSTALL_ROOT="${pkgdir}" make install - - # install missing includes - install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh" - for i in *.h; do - install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}" - done -} -package_liborigin2-docs() { - pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files" - - cd "${srcdir}/${pkgbase}/doc" - install -d "${pkgdir}/usr/share/doc/${pkgbase}" - cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}" - chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images" - chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png" -} diff --git a/testing/liborigin2/liborigin.pro.archlinux b/testing/liborigin2/liborigin.pro.archlinux deleted file mode 100644 index f0eef7293..000000000 --- a/testing/liborigin2/liborigin.pro.archlinux +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = origin2
-TEMPLATE = lib
-CONFIG += warn_on release thread
-#CONFIG += staticlib
-MOC_DIR = ./tmp
-OBJECTS_DIR = ./tmp
-
-DESTDIR = ./
-
-#INCLUDEPATH += boost_1_33_0
-LIBS += -lboost_date_time
-LIBS += -lboost_thread
-
-headers.files = \$\$HEADERS
-headers.path = /usr/include/liborigin2
-target.path = /usr/lib
-INSTALLS = target headers
-
-include(liborigin2.pri)
-
diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD deleted file mode 100644 index 9d62dd421..000000000 --- a/testing/libpcap/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 150316 2012-02-16 20:41:44Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=libpcap -pkgver=1.2.1 -pkgrel=2 -pkgdesc="A system-independent interface for user-level packet capture" -arch=('i686' 'x86_64') -url="http://www.tcpdump.org/" -license=('BSD') -depends=('glibc' 'libnl' 'sh') -makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} - libnl32.patch) -sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' - '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/libnl32.patch" - autoreconf -f -i - ./configure --prefix=/usr --enable-ipv6 --with-libnl - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -d -m755 ${pkgdir}/usr/bin - make DESTDIR=${pkgdir} install - # remove static library - rm -rf ${pkgdir}/usr/lib/libpcap.a - - # backwards compatibility, programs often look for net/bpf.h - mkdir -p ${pkgdir}/usr/include/net - cd ${pkgdir}/usr/include/net - ln -s ../pcap-bpf.h bpf.h - - #install the license - install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/testing/libpcap/libnl32.patch b/testing/libpcap/libnl32.patch deleted file mode 100644 index 633fd003e..000000000 --- a/testing/libpcap/libnl32.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in ---- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 -+++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 -@@ -433,12 +433,13 @@ - # - # Try libnl 2.x first. - # -- AC_CHECK_LIB(nl, nl_socket_alloc, -+ AC_CHECK_LIB(nl-3, nl_socket_alloc, - [ - # - # Yes, we have libnl 2.x. - # -- LIBS="-lnl-genl -lnl $LIBS" -+ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" -+ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" - AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) - AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) - ], diff --git a/testing/libpciaccess/PKGBUILD b/testing/libpciaccess/PKGBUILD deleted file mode 100644 index 3d396d2bb..000000000 --- a/testing/libpciaccess/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=libpciaccess -pkgver=0.13 -pkgrel=1 -pkgdesc="X11 PCI access library" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('pkgconfig' 'xorg-util-macros') -options=('!libtool') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} -package() { - cd "${srcdir}/${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/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD deleted file mode 100644 index df08f1f9c..000000000 --- a/testing/libpst/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 151817 2012-03-03 08:09:00Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libpst -pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.five-ten-sg.com/libpst/" -license=('GPL') -makedepends=('python2' 'boost') -source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 - make -} - -package_libpst() { - pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') - optdepends=('boost-libs: for libpst python interface') - options=('!libtool' '!docs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_libpst-docs() { - pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install-htmlDATA - cd "${srcdir}/${pkgbase}-${pkgver}/html" - make DESTDIR="${pkgdir}" install-htmldevelDATA -} diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD deleted file mode 100644 index 0ba44063e..000000000 --- a/testing/libreoffice/PKGBUILD +++ /dev/null @@ -1,662 +0,0 @@ -# $Id: PKGBUILD 153539 2012-03-15 18:08:35Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder') -_LOver=3.5.1.2 -pkgver=3.5.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' - #'saxon' - currently broken - # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors - -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a) -noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' - '607b544cd7b38f9e6db6fe7da25007a7' - 'a3fa7818bfab14a6cccec645193e9982' - '18f577b374d60b3c760a3a3350407632' - 'd28864eb2b59bb57b034c0d4662a3cee' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' - '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '15fe8b5d79fbdc0b6bc2b454086671e7') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - # python2 fix - export PYTHON=python2 - -# autoconf -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun - ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-sampleicc \ - --without-system-libexttextcat \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ - --with-java-target-version=1.5 \ - $EXTRAOPTS - -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=${pkgbase}.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' - optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' - 'libcups: adds printing support' - 'gconf: adds additional gnome support' - 'nss: adds support for signed files/macros' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'poppler: for shipped pdfimport extension' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping /macros' - 'vigra: C++ computer vision library, usable in Basebmp' - 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'lucene: full-text search engine library for Java needed in the help section' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; -} - -package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry - -# # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done -# # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix ArchLinux LibreOffice installation paths - sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ - -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ - -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} diff --git a/testing/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff deleted file mode 100644 index d8608d0d4..000000000 --- a/testing/libreoffice/buildfix_boost.diff +++ /dev/null @@ -1,40 +0,0 @@ -From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 05 Apr 2011 14:07:02 +0000 -Subject: silence some more of that annoying gcc#47679 - ---- -diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch -index 1c804aa..9b33a5f 100644 ---- a/boost/boost.gcc47679.patch -+++ b/boost/boost.gcc47679.patch -@@ -36,3 +36,26 @@ - template <int MaxDigits> - inline bool allow_more_digits(std::size_t i) - { -+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -+@@ -31,6 +31,8 @@ -+ -+ #include "boost/optional/optional_fwd.hpp" -+ -++#include <string.h> -++ -+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) -+ // VC6.0 has the following bug: -+ // When a templated assignment operator exist, an implicit conversion -+@@ -114,6 +116,11 @@ -+ -+ public: -+ -++ aligned_storage() -++ { -++ memset(&dummy_, 0, sizeof(dummy_)); -++ } -++ -+ void const* address() const { return &dummy_.data[0]; } -+ void * address() { return &dummy_.data[0]; } -+ } ; --- -cgit v0.8.3-6-g21f6 - diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff deleted file mode 100644 index 979587f79..000000000 --- a/testing/libreoffice/buildfix_ct2n.diff +++ /dev/null @@ -1,17 +0,0 @@ -From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 12 Apr 2011 19:35:51 +0000 -Subject: duplicate NULLs - ---- -diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst -index 91f44b7..714d926 100644 ---- a/ct2n/prj/build.lst -+++ b/ct2n/prj/build.lst -@@ -1,3 +1,3 @@ --ct2n ct2n : solenv NULL NULL -+ct2n ct2n : solenv NULL - ct2n ct2n usr1 - all ct2n_mkout NULL - ct2n ct2n nmake - all ct2n_ct2n NULL --- -cgit v0.8.3-6-g21f6 diff --git a/testing/libreoffice/gcc462_buildfix.diff b/testing/libreoffice/gcc462_buildfix.diff deleted file mode 100644 index c19e520dc..000000000 --- a/testing/libreoffice/gcc462_buildfix.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200 -+++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200 -@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache() - AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) - : ThreadHelpBase(&Application::GetSolarMutex()) - { -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - } - -@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac - // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); - -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - - aWriteLock.unlock(); ---- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200 -+++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200 -@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const :: - // take over all new parameters. - m_xTargetFrame.clear(); - m_xBaseFrame = xBaseFrame ; -- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ m_lMediaDescriptor = tmp; - m_sTarget = sTarget ; - m_nSearchFlags = nSearchFlags ; - m_eFeature = eFeature ; ---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200 -+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200 -@@ -175,6 +175,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000 -+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000 -@@ -185,6 +185,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000 -+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000 -@@ -171,6 +171,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; - ---- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200 -+++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200 -@@ -813,7 +813,7 @@ extern "C" { - - if( aDialog.Execute() ) - { -- rJobData = aDialog.getSetup(); -+ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() ); - nRet = 1; - } - ---- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200 -+++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200 -@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co - if ( aFilterName.getLength() ) - m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; - -- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); -+ aFiltPropsHM << aFilterProps; - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); - } - ---- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000 -+++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000 -@@ -230,7 +230,7 @@ - { - bPreferred = rCopy.bPreferred ; - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sMediaType = rCopy.sMediaType ; - sClipboardFormat = rCopy.sClipboardFormat; - nDocumentIconID = rCopy.nDocumentIconID ; -@@ -298,7 +298,7 @@ - nOrder = rCopy.nOrder ; - sName = rCopy.sName ; - sType = rCopy.sType ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sDocumentService = rCopy.sDocumentService ; - sFilterService = rCopy.sFilterService ; - sUIComponent = rCopy.sUIComponent ; -@@ -405,7 +405,7 @@ - inline Loader& impl_copy( const Loader& rCopy ) - { - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - lTypes = rCopy.lTypes ; - return (*this); - } diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install deleted file mode 100644 index e66b66f3d..000000000 --- a/testing/libreoffice/libreoffice.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff deleted file mode 100644 index fd61cb4ca..000000000 --- a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 -+++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 -@@ -92,10 +92,10 @@ - #endif - - #define BIN_FILE_BODY \ -- UnixRights = 555 -+ UnixRights = 755 - - #define TXT_FILE_BODY \ -- UnixRights = 444 -+ UnixRights = 644 - - #define USER_FILE_BODY \ - UnixRights = 644 diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch deleted file mode 100644 index 5739100d0..000000000 --- a/testing/libreoffice/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ diff --git a/testing/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD deleted file mode 100644 index 945acefaa..000000000 --- a/testing/libtorrent-rasterbar/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151819 2012-03-03 08:09:02Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libtorrent-rasterbar -pkgver=0.15.10 -pkgrel=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=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -fvisibility=hidden" - export CXXFLAGS+=" -fvisibility=hidden" - ./configure --prefix=/usr \ - --enable-python-binding \ - --with-libgeoip=system - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/testing/libx11/PKGBUILD b/testing/libx11/PKGBUILD deleted file mode 100644 index 3e1d87dc0..000000000 --- a/testing/libx11/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 149995 2012-02-12 09:43:51Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libx11 -pkgver=1.4.99.1 -pkgrel=1 -pkgdesc="X11 client-side library" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -depends=('libxcb' 'xproto' 'kbproto') -makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') -options=('!libtool') -license=('custom') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh - xorg.csh) -sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d ' - '4b756387426afb2a5bb7a155631ec42348abf5c1' - '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') - -build() { - cd "${srcdir}/libX11-${pkgver}" - ./configure --prefix=/usr --disable-static --disable-xf86bigfont - make -} - -package() { - cd "${srcdir}/libX11-${pkgver}" - make check -} - -package() { - cd "${srcdir}/libX11-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" - - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/libx11/xorg.csh b/testing/libx11/xorg.csh deleted file mode 100644 index 26c49a222..000000000 --- a/testing/libx11/xorg.csh +++ /dev/null @@ -1,15 +0,0 @@ -setenv XDG_DATA_HOME ${HOME}/.local/share -setenv XDG_CONFIG_HOME ${HOME}/.config -setenv XDG_CACHE_HOME ${HOME}/.cache - -if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ -else - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} -endif - -if (! ($?XDG_CONFIG_DIRS) ) then - setenv XDG_CONFIG_DIRS /etc/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} -endif diff --git a/testing/libx11/xorg.sh b/testing/libx11/xorg.sh deleted file mode 100644 index e1de6866c..000000000 --- a/testing/libx11/xorg.sh +++ /dev/null @@ -1,15 +0,0 @@ -export XDG_DATA_HOME=$HOME/.local/share -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache - -if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ -else - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS -fi - -if [ -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=/etc/xdg -else - export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS -fi diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD deleted file mode 100644 index 208856a72..000000000 --- a/testing/libxcb/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 152764 2012-03-09 15:54:53Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=libxcb -pkgver=1.8.1 -pkgrel=1 -pkgdesc="X11 client-side library" -arch=(i686 x86_64) -url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.7' '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=('98199b6054750a06cddd4e77baa4354af547ce6f' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput - make -} - -package() { - cd "$srcdir/$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/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index 8e8162f0a..000000000 --- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/testing/libxi/PKGBUILD b/testing/libxi/PKGBUILD deleted file mode 100644 index 200a2b96d..000000000 --- a/testing/libxi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 152807 2012-03-09 17:09:29Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libxi -pkgver=1.6.0 -pkgrel=1 -pkgdesc="X11 Input extension library" -arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org" -depends=('libxext' 'inputproto') -makedepends=('pkgconfig' 'xorg-util-macros') -options=(!libtool) -license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('b7edf48f93e8abd13ca688fa7f597452c4b74346') - -build() { - cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make -} - -package() { - cd "${srcdir}/libXi-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/licq/PKGBUILD b/testing/licq/PKGBUILD deleted file mode 100644 index d75786518..000000000 --- a/testing/licq/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 151866 2012-03-03 15:34:37Z giovanni $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=licq -pkgver=1.6.0 -pkgrel=4 -pkgdesc="Advanced graphical ICQ clone and more for Unix" -arch=('i686' 'x86_64') -url="http://www.licq.org" -license=('GPL') -depends=('boost-libs' 'gpgme' 'libxss' 'qt') -makedepends=('cmake' 'boost') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('383153697e281a0b1b4ff008936731b8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # licq - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make - - # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd ../plugins/qt4-gui/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/testing/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index 6f73b9a38..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 153478 2012-03-14 22:43:14Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} - lvm2_install - lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '7f108b2f2056eb050fc898bf5190ecf9145aed8a' - '7d63aa838703c9f986531a78164b556f765f5cce' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${pkgver}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/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}/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index efb104998..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,25 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - local major minor - IFS=: read major minor < /sys/class/misc/device-mapper/dev - mkdir /dev/mapper - mknod "/dev/mapper/control" c ${major} ${minor} - fi - - # 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 - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET - fi -} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 94175b523..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,29 +0,0 @@ -# vim: set ft=sh: - -build() -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" -} - -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. -HELPEOF -} diff --git a/testing/lyx/PKGBUILD b/testing/lyx/PKGBUILD deleted file mode 100644 index 618a89fc7..000000000 --- a/testing/lyx/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 151823 2012-03-03 08:09:08Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=lyx -pkgver=2.0.3 -pkgrel=2 -pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" -arch=('i686' 'x86_64') -url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') -makedepends=('boost') -optdepends=('rcs: built-in version control system' - 'texlive-latexextra: float wrap support') -license=('GPL') -source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz - lyx.desktop lyxrc.dist) -backup=('etc/lyx/lyxrc.dist') -install=lyx.install -options=('emptydirs') -sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' - 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' - '56416642cc3da2a13b87b84e6b87c1a239f3d09a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + - sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp - export CXXFLAGS="$CXXFLAGS -fpermissive" - ./configure --prefix=/usr \ - --with-frontend=qt4 --without-included-boost \ - --without-included-mythes - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # install desktop entry - install -Dm644 "${srcdir}/lyx.desktop" \ - "${pkgdir}/usr/share/applications/lyx.desktop" - install -Dm644 "lib/images/lyx.png" \ - "${pkgdir}/usr/share/pixmaps/lyx.png" - - # install default config file - install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist" - ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist" -} diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop deleted file mode 100644 index 649b30c98..000000000 --- a/testing/lyx/lyx.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=LyX Document Processor -GenericName=Document Processor -Comment=High level LaTeX frontend -Exec=lyx %F -TryExec=lyx -Icon=lyx -StartupNotify=false -StartupWMClass=Lyx -Terminal=false -Categories=Office;WordProcessor;Qt; -MimeType=text/x-lyx;application/x-lyx; diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install deleted file mode 100644 index c15c17b3a..000000000 --- a/testing/lyx/lyx.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove () { - post_install -} - - - diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist deleted file mode 100644 index dd18694f9..000000000 --- a/testing/lyx/lyxrc.dist +++ /dev/null @@ -1,14 +0,0 @@ -### This file is part of -### ======================================================== -### LyX, The Document Processor -### -### Copyright 1995 Matthias Ettrich -### Copyright 1995-2011 The LyX Team. -### -### ======================================================== - -# The file lyxrc.dist gives initial global options for all LyX users. -# Almost all settings here can be overridden through the preferences in LyX. - -\thesaurusdir_path "/usr/share/mythes" -\hunspelldir_path "/usr/share/myspell" diff --git a/testing/mailman/PKGBUILD b/testing/mailman/PKGBUILD deleted file mode 100644 index 7acce6dfb..000000000 --- a/testing/mailman/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 150587 2012-02-18 15:53:57Z pierre $ -# Maintainer: Paul Mattal <paul@archlinux.org> - -pkgname=mailman -pkgver=2.1.14 -pkgrel=2 -pkgdesc="Mailing list manager with built in web access" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.list.org/" -depends=('python2' 'smtp-server') -# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead. -backup=('usr/lib/mailman/Mailman/mm_cfg.py') -install=$pkgname.install -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz" - 'mailman-2.1-build.patch' - 'rc.mailman') -md5sums=('9ea163871ceccbd33fee4c9e335fcf7b' - 'ed04d062379eb21e39ce1e70e6b1ade2' - '3d83d06d0ec3319bf3c7d9df5d18e89f') - -build() { - cd $srcdir/$pkgname-$pkgver - - # fix calls to /usr/bin/python - find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} + - # fix directory permissions to satisfy check_perms - patch -Np1 -i ${srcdir}/mailman-2.1-build.patch - - ./configure --without-permcheck \ - --prefix=/usr/lib/mailman \ - --with-var-prefix=/var/lib/mailman \ - --with-mail-gid=80 \ - --with-username=80 --with-groupname=80 \ - --with-cgi-gid=http --with-python=/usr/bin/python2 - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - # let's follow Fedora FHS way; Gentoo does it the other way round - - # Create a link so that the config file mm_cfg.py appears in config - # directory /etc/mailman. We don't put mm_cfg.py in the config directory - # because its executable code (python file) and the security policy wants - # to keep executable code out of /etc and inside of a lib directory instead, - # and because traditionally mm_cfg.py was in the Mailman subdirectory and - # experienced mailman admins will expect to find it there. But having it - # "appear" in the config directory is good practice and heading in the - # right direction for FHS compliance. - install -d -m755 ${pkgdir}/etc/${pkgname} - ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py - - # fix some permissions to satisfy check_perms - chown -R 80:80 $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*} - chown http:80 ${pkgdir}/var/lib/mailman/archives/private - chmod 2770 ${pkgdir}/var/lib/mailman/archives/private - chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* - chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman - - # install the launch script - install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman -} diff --git a/testing/mailman/mailman-2.1-build.patch b/testing/mailman/mailman-2.1-build.patch deleted file mode 100644 index d00613ad7..000000000 --- a/testing/mailman/mailman-2.1-build.patch +++ /dev/null @@ -1,694 +0,0 @@ -diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in ---- mailman-2.1.12-a/bin/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/bin/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -56,7 +55,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -72,8 +71,6 @@ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in ---- mailman-2.1.12-a/cron/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/cron/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -68,8 +67,6 @@ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in ---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -47,7 +46,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -63,8 +62,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in ---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in ---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -47,7 +46,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -63,8 +62,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in ---- mailman-2.1.12-a/Mailman/Commands/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in ---- mailman-2.1.12-a/Mailman/Gui/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in ---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in ---- mailman-2.1.12-a/Mailman/Logging/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in ---- mailman-2.1.12-a/Mailman/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -20,8 +20,6 @@ - - # Variables set by configure - --VERSION= @VERSION@ -- - VPATH= @srcdir@ - srcdir= @srcdir@ - bindir= @bindir@ -@@ -30,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -48,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -79,12 +76,6 @@ - (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ - done - --finish: -- @for d in $(SUBDIRS); \ -- do \ -- (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \ -- done -- - clean: - for d in $(SUBDIRS); \ - do \ -diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in ---- mailman-2.1.12-a/Mailman/MTA/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in ---- mailman-2.1.12-a/Mailman/Queue/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in ---- mailman-2.1.12-a/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -61,11 +61,10 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) --DIRSETGID= chmod g+s - - DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),') - LANGPACK = README-I18N.en templates messages -@@ -85,14 +84,24 @@ - - doinstall: $(SUBDIRS) - @echo "Creating architecture independent directories..." -+ dir=$(DESTDIR)$(prefix); \ -+ if test ! -d $$dir; then \ -+ echo "Creating directory hierarchy $$dir"; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ -+ else true; \ -+ fi; -+ dir=$(DESTDIR)$(var_prefix); \ -+ if test ! -d $$dir; then \ -+ echo "Creating directory hierarchy $$dir"; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ -+ else true; \ -+ fi; - @for d in $(VAR_DIRS); \ - do \ - dir=$(DESTDIR)$(var_prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -@@ -102,9 +111,7 @@ - dir=$(DESTDIR)$(prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -@@ -114,9 +121,7 @@ - dir=$(DESTDIR)$(exec_prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in ---- mailman-2.1.12-a/messages/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/messages/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -32,7 +32,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -43,7 +42,6 @@ - CFLAGS= $(OPT) $(DEFS) - PACKAGEDIR= $(prefix)/messages - SHELL= /bin/sh --DIRSETGID= chmod g+s - MSGFMT= @PYTHON@ ../build/bin/msgfmt.py - MSGMERGE= msgmerge - -@@ -60,7 +58,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -90,9 +88,8 @@ - do \ - dir=$(DESTDIR)$(prefix)/$$d; \ - echo "Creating language directory $$dir"; \ -- $(srcdir)/../mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - done - @for d in $(LANGUAGES); \ - do \ -@@ -113,8 +110,6 @@ - - mofiles: $(MOFILES) - --finish: -- - clean: - -rm -f */LC_MESSAGES/mailman.mo - -diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in ---- mailman-2.1.12-a/misc/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -30,7 +30,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - PYTHON= @PYTHON@ - -@@ -62,7 +61,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - DATAMODE= 664 -@@ -101,8 +100,6 @@ - (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in ---- mailman-2.1.12-a/scripts/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/scripts/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -49,7 +48,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -68,8 +67,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe - $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in ---- mailman-2.1.12-a/src/Makefile.in 2009-07-28 12:19:47.000000000 +0200 -+++ mailman-2.1.12-b/src/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - PYTHON= @PYTHON@ - -@@ -63,10 +62,9 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 --EXEMODE= 755 -+DIRMODE= 2775 -+EXEMODE= 2755 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) --DIRSETGID= chmod g+s - - # Fixed definitions - -@@ -110,20 +108,10 @@ - do \ - exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ - $(INSTALL_PROGRAM) $$f $$exe; \ -- $(DIRSETGID) $$exe; \ - done - for f in $(MAIL_PROGS); \ - do \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \ -- $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \ -- done -- --finish: -- -for f in $(SUID_CGI_PROGS); \ -- do \ -- exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ -- chown $(MAILMAN_USER) $$exe; \ -- chmod u+s $$exe; \ - done - - clean: -diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in ---- mailman-2.1.12-a/templates/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/templates/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - TRUE= @TRUE@ - -@@ -48,7 +47,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,15 +60,13 @@ - install: - for d in $(LANGUAGES); \ - do \ -- $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \ -+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \ - for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \ - do \ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \ - done; \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in ---- mailman-2.1.12-a/tests/bounces/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/bounces/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -60,8 +59,6 @@ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in ---- mailman-2.1.12-a/tests/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -71,8 +70,6 @@ - (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in ---- mailman-2.1.12-a/tests/msgs/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/msgs/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -60,8 +59,6 @@ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \ - done - --finish: -- - clean: - - distclean: diff --git a/testing/mailman/mailman.install b/testing/mailman/mailman.install deleted file mode 100644 index ec85260a5..000000000 --- a/testing/mailman/mailman.install +++ /dev/null @@ -1,31 +0,0 @@ -## arg 1: the new package version -post_install() { - # Make sure the group and user "mailman" exists on this system and has the correct values - if grep -q "^mailman:" /etc/group &> /dev/null ; then - groupmod -g 80 -n mailman mailman &> /dev/null - else - groupadd -g 80 mailman &> /dev/null - fi - - if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null - else - useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null - fi - - # check file permissions -# cd /usr/lib/mailman && bin/check_perms -f > /dev/null 2>&1 # -f applies fixes we should solve in the PKGBUILD - cd /usr/lib/mailman && bin/check_perms > /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 -pre_remove() { - userdel mailman &>/dev/null - groupdel mailman &>/dev/null || /bin/true -} diff --git a/testing/mailman/rc.mailman b/testing/mailman/rc.mailman deleted file mode 100644 index 07660e530..000000000 --- a/testing/mailman/rc.mailman +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting mailman Daemon" - /usr/lib/mailman/bin/mailmanctl start &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mailman - stat_done - fi - ;; - stop) - stat_busy "Stopping mailman Daemon" - /usr/lib/mailman/bin/mailmanctl stop &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mailman - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD deleted file mode 100644 index 7d8abc692..000000000 --- a/testing/man-db/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 150437 2012-02-17 18:38:58Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> - -pkgname=man-db -pkgver=2.6.1 -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') -backup=('etc/man_db.conf' - '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.gz - convert-mans man-db.cron.daily) -options=('!libtool') -md5sums=('79658e8695c7b9b3be1ee340d78a4692' - '2b7662a7d5b33fe91f9f3e034361a2f6' - 'd30c39ae47560304471b5461719e0f03') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --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 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # part of groff pkg - rm -f ${pkgdir}/usr/bin/zsoelim - - # script from LFS to convert manpages, see - # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html - install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans - - #install whatis cron script - install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db -} - diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans deleted file mode 100644 index 58a0224b0..000000000 --- a/testing/man-db/convert-mans +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -e -FROM="$1" -TO="$2" -shift ; shift -while [ $# -gt 0 ] -do - FILE="$1" - shift - iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv - mv .tmp.iconv "$FILE" -done diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily deleted file mode 100755 index 53e66e1e9..000000000 --- a/testing/man-db/man-db.cron.daily +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) -NICE=19 - -# 0 for none, 1 for real time, 2 for best-effort, 3 for idle -IONICE_CLASS=2 - -# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest -IONICE_PRIORITY=7 - -UPDATEMANDB="/usr/bin/mandb --quiet" - -# Update the "whatis" database -#/usr/sbin/makewhatis -u -w - -# taken from Debian -# man-db cron daily -set -e - -if ! [ -d /var/cache/man ]; then - # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chmod 755 /var/cache/man -fi - -# regenerate man database - -if [ -x /usr/bin/nice ]; then - UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}" -fi - -if [ -x /usr/bin/ionice ]; then - UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}" -fi - -${UPDATEMANDB} - -exit 0 diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install deleted file mode 100644 index f6f0f27a6..000000000 --- a/testing/man-db/man-db.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - echo "it's recommended to create an initial" - echo "database running as root:" - echo "\"/usr/bin/mandb --quiet\"" -} - -post_upgrade() { - if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then - echo "systemuser \"man\" is no more required" - echo "run \"userdel man\". please also" - echo "chown root:root /var/cache/man" - fi - # force database rebuild to get rid off badly imported pages - if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then - echo "(re)building database..." - mandb -c --quiet - fi -} - -post_remove() { - rm -rf /var/cache/man -} diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/testing/mesa/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/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD deleted file mode 100644 index e3bd1f687..000000000 --- a/testing/mesa/PKGBUILD +++ /dev/null @@ -1,245 +0,0 @@ -# $Id: PKGBUILD 152845 2012-03-09 20:43:02Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') - -#_git=true -_gitdate=20111031 -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110709 - #pkgver=7.11 - else - pkgver=8.0.1 -fi -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') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE) -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/${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 -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '24eeebf66971809d8f40775a379b36c9') - -build() { - cd ${srcdir}/?esa-* - -if [ "${_git}" = "true" ]; then - autoreconf -vfi - ./autogen.sh --prefix=/usr \ - --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-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore - - # --enable-gallium-svga \ - - else - autoreconf -vfi - ./configure --prefix=/usr \ - --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-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore -fi - - 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 -} - -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_libgles() { - depends=('libglapi' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - 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/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - 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/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" -} - -package_khrplatform-devel() { - #depends=('') - pkgdesc="Khronos platform development package" - - 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/share/licenses/khrplatform-devel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" -} - -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 - 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 - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libglapi.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} - 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} - - 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" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - - # 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 -} - -package_svga-dri() { - depends=("mesa=${pkgver}") - pkgdesc="Gallium3D VMware guest GL driver" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install -} diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index fe79e7f67..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 152129 2012-03-04 23:31:59Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=mkinitcpio-busybox -pkgver=1.19.4 -pkgrel=2 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -options=('!buildflags') -source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" - 'config') -sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee' - '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a') - -build() { - cd "$srcdir/busybox-$pkgver" - - local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" - - sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ - "$srcdir/config" > .config - - make -} - -package() { - install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index 3cd776e03..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,1013 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.19.2 -# Sun Oct 16 15:24:19 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -# CONFIG_FEATURE_SYSTEMD is not set -# CONFIG_FEATURE_RTMINMAX is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -# CONFIG_FEATURE_REVERSE_SEARCH is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -# CONFIG_ID is not set -# CONFIG_GROUPS is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_WHO is not set -# CONFIG_USERS is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set -# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -# CONFIG_DEFAULT_MODULES_DIR is not set -# CONFIG_DEFAULT_DEPMOD_FILE is not set - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -# CONFIG_MOUNT is not set -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_FEATURE_MOUNT_CIFS is not set -# CONFIG_FEATURE_MOUNT_FLAGS is not set -# CONFIG_FEATURE_MOUNT_FSTAB is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_SETSERIAL is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_WHOIS is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -# CONFIG_SMEMCAP is not set -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_IDLE_TIMEOUT is not set -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD deleted file mode 100644 index 4e0998e89..000000000 --- a/testing/mkvtoolnix/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 151825 2012-03-03 08:09:10Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: xduugu <xduugu@gmx.com> - -pkgbase=mkvtoolnix -pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.3.0 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' - 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('2cd84ff24e1d9217dd3caf170f34e758') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Disable automagic curl dep used for online update checking - sed -i -e '/curl/d' configure.in - export CURL_CFLAGS="" CURL_LIBS="" - - export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - - autoreconf - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui - rake - - mv src/mkvinfo{,-cli} - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib - rake -} - -package_mkvtoolnix-cli() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" - depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') - provides=('mkvtoolnix') - conflicts=('mkvtoolnix') - replaces=('mkvtoolnix') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkvinfo - install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo - - rm -rf "${pkgdir}"/usr/bin/mmg - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/applications - rm -rf "${pkgdir}"/usr/share/icons - rm -rf "${pkgdir}"/usr/share/mime -} - -package_mkvtoolnix-gtk() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" - depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') - install=mkvtoolnix.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkv* - install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk - sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop - - rm -rf "${pkgdir}"/usr/share/doc - rm -rf "${pkgdir}"/usr/share/locale - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv* -} diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install deleted file mode 100644 index 74d9eb2ef..000000000 --- a/testing/mkvtoolnix/mkvtoolnix.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - if [ -f usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime &> /dev/null - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - post_install -} diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD deleted file mode 100644 index ecc508bc3..000000000 --- a/testing/mlocate/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 151799 2012-03-03 05:54:38Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: lydgate - -pkgname=mlocate -pkgver=0.25 -pkgrel=1 -pkgdesc="Faster merging drop-in for slocate" -arch=('i686' 'x86_64') -url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" -license=('GPL') -conflicts=('slocate') -provides=('slocate') -replaces=('slocate') -depends=('glibc' 'coreutils' 'sh') -backup=('etc/updatedb.conf' - 'etc/cron.daily/updatedb') -install=mlocate.install -source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz - updatedb.conf - updatedb.cron.daily) -md5sums=('c6d043b170613b0e327a815b497f680a' - 'c374ff223f2e07b5e602ba22359f2335' - 'cde5da81bebad2de556ef2e43d895e13') - -build() { - cd $srcdir/$pkgname-$pkgver - - sed -i '/^groupname /s/mlocate/locate/' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib - make - -} - -check() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - - # Set up a default updatedb.conf and a daily cronjob - install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf - install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb - - # Install Mlocate - make DESTDIR=$pkgdir install - - ln -sv locate $pkgdir/usr/bin/slocate - chgrp -v 21 $pkgdir/usr/bin/locate - chmod -v 2755 $pkgdir/usr/bin/locate - - install -dm755 $pkgdir/var/lib - install -d -m750 -g21 $pkgdir/var/lib/locate -} diff --git a/testing/mlocate/mlocate.install b/testing/mlocate/mlocate.install deleted file mode 100644 index c7b7f9cf7..000000000 --- a/testing/mlocate/mlocate.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - post_upgrade "$1" "$1" - echo "mlocate command is technically locate, but slocate is symlinked and still works." - echo "You should run updatedb as root." -} - -post_upgrade() { - # This can be removed after {m,x}locate have both been updated - getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null - getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null - - getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null - chown -R root:locate var/lib/mlocate -} - -pre_remove() { - getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null -} diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf deleted file mode 100644 index 722b04205..000000000 --- a/testing/mlocate/updatedb.conf +++ /dev/null @@ -1,5 +0,0 @@ -# directories to exclude from the slocate database: -PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool" - -# filesystems to exclude from the slocate database: -PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf" diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily deleted file mode 100755 index cac9bb063..000000000 --- a/testing/mlocate/updatedb.cron.daily +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) -NICE=19 - -# 0 for none, 1 for real time, 2 for best-effort, 3 for idle -IONICE_CLASS=2 - -# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest -IONICE_PRIORITY=7 - -UPDATEDB="/usr/bin/updatedb" - -if [ -x /usr/bin/nice ]; then - UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}" -fi - -if [ -x /usr/bin/ionice ]; then - UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}" -fi - -# Update the "locate" database -if [ -x /usr/bin/updatedb ]; then - if [ -f /etc/updatedb.conf ]; then - ${UPDATEDB} - else - ${UPDATEDB} -f proc - fi -fi diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD deleted file mode 100644 index 3452276cc..000000000 --- a/testing/mpd/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 154008 2012-03-21 11:58:11Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Ben <ben@benmazer.net> - -pkgname=mpd -pkgver=0.16.7 -pkgrel=2 -pkgdesc='Flexible, powerful, server-side application for playing music' -url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' -license=('GPL') -arch=('i686' 'x86_64') -depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' - 'libpulse') -makedepends=('doxygen') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'rc.d') -sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a' - '3777bdb4fff4b7911be3b1242aabae9d2912ef18') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-lastfm \ - --enable-jack \ - --enable-pulse \ - --enable-documentation \ - --disable-libwrap \ - --disable-cue \ - --disable-sidplay \ - --with-systemdsystemunitdir=/lib/systemd/system - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed \ - -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ - -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ - -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ - -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ - -e '/^#user/c user "mpd"' \ - -i doc/mpdconf.example - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example - - cd "${pkgdir}"/usr/share/doc/mpd - tar cfJ api.tar.xz --remove-files api - rmdir developer protocol user -} diff --git a/testing/mpd/install b/testing/mpd/install deleted file mode 100644 index 655645716..000000000 --- a/testing/mpd/install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null - echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example' -} - -post_remove() { - getent passwd mpd &>/dev/null && userdel mpd >/dev/null - getent group mpd &>/dev/null && groupdel mpd >/dev/null -} diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d deleted file mode 100755 index 86f77419f..000000000 --- a/testing/mpd/rc.d +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd - -case "$1" in - start) - stat_busy 'Starting Music Player Daemon' - /usr/bin/mpd /etc/mpd.conf &> /dev/null && - { add_daemon mpd; stat_done; } || stat_fail - ;; - stop) - stat_busy 'Stopping Music Player Daemon' - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && - { rm_daemon mpd; stat_done; } || stat_fail - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index ef8e56403..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 152748 2012-03-09 13:54:49Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpfr -_pkgver=3.1.0 -_patchlevel=p7 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=1 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} - mpfr-${_pkgver}.${_patchlevel}.patch) -md5sums=('6e495841bb026481567006cec0f821c3' - '293374ee4b01527f8f7889fdfa9016f8' - 'fb1bf603a2ad5e6ecc1903c3c53f5e13') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr-3.1.0.p7.patch b/testing/mpfr/mpfr-3.1.0.p7.patch deleted file mode 100644 index f3de639bc..000000000 --- a/testing/mpfr/mpfr-3.1.0.p7.patch +++ /dev/null @@ -1,1236 +0,0 @@ -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_unlikely -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 -@@ -1 +1 @@ --3.1.0 -+3.1.0-p1 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -@@ -988,10 +988,11 @@ - ******************************************************/ - - /* Theses macros help the compiler to determine if a test is -- * likely or unlikely. */ -+ likely or unlikely. The !! is necessary in case x is larger -+ than a long. */ - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) - #else - # define MPFR_LIKELY(x) (x) - # define MPFR_UNLIKELY(x) (x) -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0" -+#define MPFR_VERSION_STRING "3.1.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0"; -+ return "3.1.0-p1"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 -@@ -0,0 +1 @@ -+lib-search-path -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p1 -+3.1.0-p2 -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p1" -+#define MPFR_VERSION_STRING "3.1.0-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p1"; -+ return "3.1.0-p2"; - } -diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am ---- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 -@@ -65,8 +65,24 @@ - TESTS = $(check_PROGRAMS) - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) - --# Option to prevent libtool from generating wrapper scripts for the tests. -+# The -no-install option prevents libtool from generating wrapper scripts -+# for the tests. - # This is useful to easily run the test scripts under valgrind or gdb. - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. --AM_LDFLAGS = -no-install -+# -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR -+# library is already installed in the corresponding lib directory: its -+# purpose is to make sure that the local .libs comes first in the library -+# search path (otherwise the tests are linked against the old MPFR library -+# by the LINK command -- see the generated Makefile). See: -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html -+# and -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 -+# -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs -diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in ---- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 -+++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 -@@ -1124,11 +1124,27 @@ - TESTS = $(check_PROGRAMS) - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) - --# Option to prevent libtool from generating wrapper scripts for the tests. -+# The -no-install option prevents libtool from generating wrapper scripts -+# for the tests. - # This is useful to easily run the test scripts under valgrind or gdb. - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. --AM_LDFLAGS = -no-install -+# -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR -+# library is already installed in the corresponding lib directory: its -+# purpose is to make sure that the local .libs comes first in the library -+# search path (otherwise the tests are linked against the old MPFR library -+# by the LINK command -- see the generated Makefile). See: -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html -+# and -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 -+# -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs - all: all-am - - .SUFFIXES: -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 -@@ -0,0 +1 @@ -+vasprintf -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p2 -+3.1.0-p3 -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p2" -+#define MPFR_VERSION_STRING "3.1.0-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c ---- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 -@@ -1178,7 +1178,7 @@ - mpfr_exp_t exp; - char * str; - const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); -- const int keep_trailing_zeros = spec_g && spec.alt; -+ const int keep_trailing_zeros = !spec_g || spec.alt; - - /* WARNING: an empty precision field is forbidden (it means precision = 6 - and it should have been changed to 6 before the function call) */ -@@ -1356,7 +1356,7 @@ - else - /* 1 <= |p| */ - { -- size_t nsd; /* Number of significant digits */ -+ size_t str_len; - - /* Determine the position of the most significant decimal digit. */ - exp = floor_log10 (p); -@@ -1365,12 +1365,10 @@ - /* P is too large to print all its integral part digits */ - return -1; - -- np->ip_size = exp + 1; -- -- nsd = spec.prec + np->ip_size; - if (dec_info == NULL) -- { -- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); -+ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ -+ str = -+ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); - register_string (np->sl, str); - } - else -@@ -1379,81 +1377,60 @@ - str = dec_info->str; - } - np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ -+ str_len = strlen (str); -+ -+ /* integral part */ -+ if (exp > str_len) -+ /* mpfr_get_str gives no trailing zero when p is rounded up to the next -+ power of 10 (p integer, so no fractional part) */ -+ { -+ np->ip_trailing_zeros = exp - str_len; -+ np->ip_size = str_len; -+ } -+ else -+ np->ip_size = exp; - - if (spec.group) - /* thousands separator in integral part */ - np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; - -- if (nsd == 0 || (spec_g && !spec.alt)) -- /* compute how much non-zero digits in integral and fractional -- parts */ -+ /* fractional part */ -+ str += np->ip_size; -+ str_len -= np->ip_size; -+ if (!keep_trailing_zeros) -+ /* remove trailing zeros, if any */ - { -- size_t str_len; -- str_len = strlen (str); /* note: the sign has been skipped */ -- -- if (exp > str_len) -- /* mpfr_get_str doesn't give the trailing zeros when p is a -- multiple of 10 (p integer, so no fractional part) */ -- { -- np->ip_trailing_zeros = exp - str_len; -- np->ip_size = str_len; -- if (spec.alt) -- np->point = MPFR_DECIMAL_POINT; -- } -- else -- /* str may contain some digits which are in fractional part */ -+ char *ptr = str + str_len - 1; /* pointer to the last digit of -+ str */ -+ while ((*ptr == '0') && (str_len != 0)) - { -- char *ptr; -- -- ptr = str + str_len - 1; /* points to the end of str */ -- str_len -= np->ip_size; /* number of digits in fractional -- part */ -- -- if (!keep_trailing_zeros) -- /* remove trailing zeros, if any */ -- { -- while ((*ptr == '0') && (str_len != 0)) -- { -- --ptr; -- --str_len; -- } -- } -- -- if (str_len > INT_MAX) -- /* too many digits in fractional part */ -- return -1; -- -- if (str_len != 0) -- /* some digits in fractional part */ -- { -- np->point = MPFR_DECIMAL_POINT; -- np->fp_ptr = str + np->ip_size; -- np->fp_size = str_len; -- } -+ --ptr; -+ --str_len; - } - } -- else -- /* spec.prec digits in fractional part */ -+ -+ if (str_len > 0) -+ /* some nonzero digits in fractional part */ - { -- if (np->ip_size == exp - 1) -- /* the absolute value of the number has been rounded up to a power -- of ten. -- Insert an additional zero in integral part and put the rest of -- them in fractional part. */ -- np->ip_trailing_zeros = 1; -+ if (str_len > INT_MAX) -+ /* too many digits in fractional part */ -+ return -1; - -- if (spec.prec != 0) -- { -- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); -- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); -+ np->point = MPFR_DECIMAL_POINT; -+ np->fp_ptr = str; -+ np->fp_size = str_len; -+ } - -- np->point = MPFR_DECIMAL_POINT; -- np->fp_ptr = str + np->ip_size; -- np->fp_size = spec.prec; -- } -- else if (spec.alt) -- np->point = MPFR_DECIMAL_POINT; -+ if (keep_trailing_zeros && str_len < spec.prec) -+ /* add missing trailing zeros */ -+ { -+ np->point = MPFR_DECIMAL_POINT; -+ np->fp_trailing_zeros = spec.prec - np->fp_size; - } -+ -+ if (spec.alt) -+ /* add decimal point even if no digits follow it */ -+ np->point = MPFR_DECIMAL_POINT; - } - - return 0; -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p2"; -+ return "3.1.0-p3"; - } -diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c ---- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 -@@ -475,6 +475,18 @@ - check_sprintf ("-1.", "%- #0.1RG", x); - - /* precision zero */ -+ mpfr_set_d (x, 9.5, MPFR_RNDN); -+ check_sprintf ("9", "%.0RDf", x); -+ check_sprintf ("10", "%.0RUf", x); -+ -+ mpfr_set_d (x, 19.5, MPFR_RNDN); -+ check_sprintf ("19", "%.0RDf", x); -+ check_sprintf ("20", "%.0RUf", x); -+ -+ mpfr_set_d (x, 99.5, MPFR_RNDN); -+ check_sprintf ("99", "%.0RDf", x); -+ check_sprintf ("100", "%.0RUf", x); -+ - mpfr_set_d (x, -9.5, MPFR_RNDN); - check_sprintf ("-10", "%.0RDf", x); - check_sprintf ("-10", "%.0RYf", x); -@@ -1078,6 +1090,23 @@ - mpfr_clear (x); - } - -+static void -+bug20111102 (void) -+{ -+ mpfr_t t; -+ char s[100]; -+ -+ mpfr_init2 (t, 84); -+ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); -+ mpfr_sprintf (s, "%.20RNg", t); -+ if (strcmp (s, "1000") != 0) -+ { -+ printf ("Error in bug20111102, expected 1000, got %s\n", s); -+ exit (1); -+ } -+ mpfr_clear (t); -+} -+ - /* In particular, the following test makes sure that the rounding - * for %Ra and %Rb is not done on the MPFR number itself (as it - * would overflow). Note: it has been reported on comp.std.c that -@@ -1161,6 +1190,7 @@ - locale = setlocale (LC_ALL, "C"); - #endif - -+ bug20111102 (); - native_types (); - hexadecimal (); - binary (); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 -@@ -0,0 +1 @@ -+gmp41compat -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p3 -+3.1.0-p4 -diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info ---- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 -@@ -2994,11 +2994,12 @@ - - * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their - behavior no longer depends on the platform (assuming this is also -- true for GMP's random generator). As a consequence, the returned -- values can be different between MPFR 3.1 and previous MPFR -- versions. Note: as the reproducibility of these functions was not -- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded -- as backward incompatible with previous versions. -+ true for GMP's random generator, which is not the case between GMP -+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, -+ the returned values can be different between MPFR 3.1 and previous -+ MPFR versions. Note: as the reproducibility of these functions -+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ -+ regarded as backward incompatible with previous versions. - - - -@@ -4239,13 +4240,13 @@ - Node: Type and Macro Changes129308 - Node: Added Functions132029 - Node: Changed Functions134972 --Node: Removed Functions139167 --Node: Other Changes139579 --Node: Contributors141108 --Node: References143574 --Node: GNU Free Documentation License145315 --Node: Concept Index167758 --Node: Function and Type Index173677 -+Node: Removed Functions139253 -+Node: Other Changes139665 -+Node: Contributors141194 -+Node: References143660 -+Node: GNU Free Documentation License145401 -+Node: Concept Index167844 -+Node: Function and Type Index173763 - - End Tag Table - -diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi ---- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 -@@ -3466,8 +3466,9 @@ - a lack of specification. - - @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. --Their behavior no longer depends on the platform (assuming this is also --true for GMP's random generator). As a consequence, the returned values -+Their behavior no longer depends on the platform (assuming this is also true -+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if -+@code{gmp_randinit_default} is used). As a consequence, the returned values - can be different between MPFR 3.1 and previous MPFR versions. - Note: as the reproducibility of these functions was not specified - before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p3" -+#define MPFR_VERSION_STRING "3.1.0-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p3"; -+ return "3.1.0-p4"; - } -diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c ---- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -114,21 +114,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.895943" -+# define C2 "0.848824" -+#else -+# define C1 "0.479652" -+# define C2 "0.648529" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.895943") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.895943, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.848824") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.848824, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c ---- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -160,23 +160,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.8488312" -+# define C2 "0.8156509" -+#else -+# define C1 "0.6485367" -+# define C2 "0.9362717" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandom (x, s, MPFR_RNDN); -- /* the following values are obtained on a 32-bit computer, we should get -- the same values on a 64-bit computer */ -- if (mpfr_cmp_str1 (x, "0.8488312") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.8488312, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandom (x, s, MPFR_RNDN); -- if (mpfr_cmp_str1 (x, "0.8156509") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.8156509, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 -@@ -0,0 +1 @@ -+logging-freeze -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p4 -+3.1.0-p5 -diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c ---- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c ---- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 -@@ -29,7 +29,7 @@ - MPFR_LOG_FUNC - (("x[%Pu]=%.*Rg u=%d rnd=%d", - mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), -- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); -+ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); - - if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ - { -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p4" -+#define MPFR_VERSION_STRING "3.1.0-p5" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c ---- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p4"; -+ return "3.1.0-p5"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 -@@ -0,0 +1 @@ -+logging-varfmt -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p5 -+3.1.0-p6 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -@@ -1592,7 +1592,7 @@ - do \ - if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ - (mpfr_log_current <= mpfr_log_level)) \ -- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ -+ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ - #x, mpfr_get_prec (x), mpfr_log_prec, x); \ - while (0) - -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p5" -+#define MPFR_VERSION_STRING "3.1.0-p6" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p5"; -+ return "3.1.0-p6"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 -@@ -0,0 +1 @@ -+large-prec -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p6 -+3.1.0-p7 -diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c ---- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 -@@ -44,12 +44,12 @@ - bq = MPFR_PREC(b); - cq = MPFR_PREC(c); - -- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ -+ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ - aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; - sh = aq2 - aq; /* non-significant bits in low limb */ - -- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ -- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - - ap = MPFR_MANT(a); - bp = MPFR_MANT(b); -@@ -124,7 +124,7 @@ - dif = aq2 - diff_exp; - /* dif is the number of bits of c which overlap with a' */ - -- difn = (dif-1)/GMP_NUMB_BITS + 1; -+ difn = MPFR_PREC2LIMBS (dif); - /* only the highest difn limbs from c have to be considered */ - if (MPFR_UNLIKELY(difn > cn)) - { -diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c ---- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -107,7 +107,7 @@ - - /* Read prec and num of limbs */ - p = MPFR_PREC(b); -- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (p); - MPFR_UNSIGNED_MINUS_MODULO(sh, p); - bx = MPFR_GET_EXP(b); - d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); -diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c ---- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 -@@ -91,7 +91,7 @@ - q = MPFR_PREC(r); - p = q + MPFR_INT_CEIL_LOG2(q) + 15; - MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - - /* b (op2) and a (op1) are the 2 operands but we want b >= a */ - compare = mpfr_cmp (op1, op2); -@@ -285,7 +285,7 @@ - - /* Next iteration */ - MPFR_ZIV_NEXT (loop, p); -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - } - MPFR_ZIV_FREE (loop); - -diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c ---- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,8 +56,8 @@ - if (uexp != vexp) - return 0; /* no bit agree */ - -- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; -- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; -+ usize = MPFR_LIMB_SIZE (u); -+ vsize = MPFR_LIMB_SIZE (v); - - if (vsize > usize) /* exchange u and v */ - { -diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c ---- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -133,7 +133,7 @@ - mp_size_t yn; - int sh; - -- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ yn = MPFR_LIMB_SIZE (y); - sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); - MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; - inexact = 1; -diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c ---- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 -@@ -100,7 +100,7 @@ - nbits += (1021 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c ---- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 -@@ -92,7 +92,7 @@ - nbits += (125 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c ---- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 -@@ -2351,7 +2351,7 @@ - - /* the first digit will contain only r bits */ - prec = (m - 1) * pow2 + r; /* total number of bits */ -- n = (prec - 1) / GMP_NUMB_BITS + 1; -+ n = MPFR_PREC2LIMBS (prec); - - MPFR_TMP_MARK (marker); - x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); -@@ -2417,12 +2417,12 @@ - exact = 1; - - /* number of limbs */ -- n = 1 + (prec - 1) / GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (prec); - - /* a will contain the approximation of the mantissa */ - a = MPFR_TMP_LIMBS_ALLOC (n); - -- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ nx = MPFR_LIMB_SIZE (x); - - if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or - division to perform */ -diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c ---- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 -@@ -51,7 +51,7 @@ - which both have an odd mantissa */ - MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - -- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; -+ xsize = MPFR_PREC2LIMBS (p); - tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); - - MPFR_PREC(x) = p; /* Set prec */ -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -@@ -67,7 +67,7 @@ - - /* Now, the unit bit is represented. */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of represented fractional bits (including the trailing 0's) */ - - x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-08 15:17:03.000000000 +0000 -@@ -646,10 +646,15 @@ - **************** mpfr_t properties ******************* - ******************************************************/ - -+/* In the following macro, p is usually a mpfr_prec_t, but this macro -+ works with other integer types (without integer overflow). */ -+#define MPFR_PREC2LIMBS(p) \ -+ (MPFR_ASSERTD (p >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) -+ - #define MPFR_PREC(x) ((x)->_mpfr_prec) - #define MPFR_EXP(x) ((x)->_mpfr_exp) - #define MPFR_MANT(x) ((x)->_mpfr_d) --#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) -+#define MPFR_LIMB_SIZE(x) (MPFR_PREC2LIMBS (MPFR_PREC ((x)))) - - - /****************************************************** -@@ -1213,8 +1218,8 @@ - _destp = MPFR_MANT (dest); \ - if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ - { \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ - MPN_COPY (_destp + _dests, srcp, _srcs); \ - MPN_ZERO (_destp, _dests); \ - inexact = 0; \ -@@ -1227,8 +1232,8 @@ - mp_limb_t _rb, _sb, _ulp; \ - \ - /* Compute Position and shift */ \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec); \ - MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ - _sp = (srcp) + _srcs - _dests; \ - \ -@@ -1372,7 +1377,7 @@ - if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ - { \ - MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ -- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ -+ MPFR_LIMB_SIZE (src)); \ - inexact = 0; \ - } \ - else \ -@@ -1682,7 +1687,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ - { \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ -@@ -1733,7 +1738,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ - if (MPFR_LIKELY (_oalloc == 0)) \ - (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ -@@ -1886,7 +1891,7 @@ - MPFR_NORETURN_ATTR; - - __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, -- unsigned long)); -+ mpfr_prec_t)); - - __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, - unsigned long)); -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p6" -+#define MPFR_VERSION_STRING "3.1.0-p7" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c ---- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 -@@ -93,15 +93,15 @@ - - ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); - -- bq = MPFR_PREC(b); -- cq = MPFR_PREC(c); -+ bq = MPFR_PREC (b); -+ cq = MPFR_PREC (c); - -- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - /* <= k, thus no int overflow */ - MPFR_ASSERTD(tn <= k); - -@@ -292,12 +292,12 @@ - bq = MPFR_PREC (b); - cq = MPFR_PREC (c); - -- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ - - /* Check for no size_t overflow*/ -diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c ---- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 -@@ -136,7 +136,7 @@ - (b) all the 'z' bits are zero - */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of z+0 bits */ - - yn = prec / GMP_NUMB_BITS; -diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c ---- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 -@@ -84,7 +84,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - printf("%s ", str); - for(n-- ; n>=0 ; n--) -@@ -109,7 +109,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - for(n-- ; n>=0 ; n--) - { -diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c ---- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -55,12 +55,12 @@ - - MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); - -- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ -+ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ - - /* check if x has enough allocated space for the significand */ - /* Get the number of limbs from the precision. - (Compatible with all allocation methods) */ -- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ ow = MPFR_LIMB_SIZE (x); - if (nw > ow) - { - /* FIXME: Variable can't be created using custom allocation, -diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c ---- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 -@@ -80,7 +80,7 @@ - (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) - return 0; - -- xsize = (xprec-1)/GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (xprec); - nw = yprec / GMP_NUMB_BITS; - rw = yprec & (GMP_NUMB_BITS - 1); - -diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c ---- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 -@@ -48,8 +48,7 @@ - /* Same precision and b is not singular: - * just copy the mantissa, and set the exponent and the sign - * The result is exact. */ -- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), -- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); -+ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); - MPFR_RET (0); - } - else -diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c ---- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 -@@ -43,7 +43,7 @@ - if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) - MPFR_CHANGE_SIGN (y); - -- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ sy = MPFR_LIMB_SIZE (y); - my = MPFR_MANT(y); - mx = PTR(x); - -diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c ---- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - - /* Calculate the new number of limbs */ -- xsize = (p - 1) / GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (p); - - /* Realloc only if the new size is greater than the old */ - xoldsize = MPFR_GET_ALLOC_SIZE (x); -diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c ---- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - mp_limb_t *xp; - - MPFR_SET_EXP (x, e); -- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ xn = MPFR_LIMB_SIZE (x); - sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); - xp = MPFR_MANT(x); - xp[0] = MP_LIMB_T_MAX << sh; -diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c ---- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,11 +56,11 @@ - ax = 2 * MPFR_GET_EXP (b); - bq = MPFR_PREC(b); - -- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); - -- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ -- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, -- 2*bn or 2*bn-1 */ -+ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ -+ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, -+ 2*bn or 2*bn-1 */ - - if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) - return mpfr_mul (a, b, b, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c ---- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 -@@ -26,7 +26,7 @@ - size_t - mpfr_custom_get_size (mpfr_prec_t prec) - { -- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; -+ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; - } - - #undef mpfr_custom_init -diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c ---- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -467,7 +467,7 @@ - /* Set y to the value of the ~prec most significant bits of pstr->mant - (as long as we guarantee correct rounding, we don't need to get - exactly prec bits). */ -- ysize = (prec - 1) / GMP_NUMB_BITS + 1; -+ ysize = MPFR_PREC2LIMBS (prec); - /* prec bits corresponds to ysize limbs */ - ysize_bits = ysize * GMP_NUMB_BITS; - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ -diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c ---- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -155,8 +155,8 @@ - MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); - - /* Read prec and num of limbs */ -- p = MPFR_PREC(b); -- n = (p-1)/GMP_NUMB_BITS+1; -+ p = MPFR_PREC (b); -+ n = MPFR_PREC2LIMBS (p); - - /* Fast cmp of |b| and |c|*/ - bx = MPFR_GET_EXP (b); -diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c ---- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 -@@ -31,13 +31,20 @@ - a sufficient number of limbs */ - void - mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, -- unsigned long int nbits) -+ mpfr_prec_t nbits) - { - mpz_t z; - -+ MPFR_ASSERTN (nbits >= 1); - /* To be sure to avoid the potential allocation of mpz_urandomb */ -- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; -+ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); - PTR(z) = mp; -+#if __MPFR_GMP(5,0,0) -+ /* Check for integer overflow (unless mp_bitcnt_t is signed, -+ but according to the GMP manual, this shouldn't happen). -+ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ -+ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); -+#endif - mpz_urandomb (z, rstate, nbits); - } - -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p6"; -+ return "3.1.0-p7"; - } -diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c ---- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 -@@ -1,4 +1,4 @@ --/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. -+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. - - Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - Contributed by the Arenaire and Caramel projects, INRIA. -@@ -20,18 +20,43 @@ - http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include <stdlib.h> -+ - #include "mpfr-test.h" - - int - main (void) - { - mpfr_t a, b, c; -+ long large_prec; - - tests_start_mpfr (); -+ - mpfr_inits (a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); - mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); -+ -+ /* test for precision 2^31-1, see -+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ -+ large_prec = 2147483647; -+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ { -+ /* We assume that the precision won't be increased internally. */ -+ if (large_prec > MPFR_PREC_MAX) -+ large_prec = MPFR_PREC_MAX; -+ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); -+ mpfr_set_ui (a, 17, MPFR_RNDN); -+ mpfr_set (b, a, MPFR_RNDN); -+ if (mpfr_get_ui (a, MPFR_RNDN) != 17) -+ { -+ printf ("Error in mpfr_init2 with precision 2^31-1\n"); -+ exit (1); -+ } -+ mpfr_clears (a, b, (mpfr_ptr) 0); -+ } -+ - tests_end_mpfr (); -+ - return 0; - } diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.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 $1 -} - -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/testing/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD deleted file mode 100644 index 14ab7906d..000000000 --- a/testing/msmtp/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 153973 2012-03-21 06:27:24Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Ben Mazer <blm@groknil.org> - -pkgbase=msmtp -pkgname=('msmtp' 'msmtp-mta') -pkgver=1.4.27 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL3') -url="http://msmtp.sourceforge.net" -makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') -source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls - make - make -C doc html pdf -} - -package_msmtp() { - pkgdesc="A mini smtp client" - depends=('gsasl' 'libgnome-keyring') - install=msmtp.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" -C doc install-html install-pdf - -# Installing example configs and scripts to /usr/share/doc/msmtp -# as they are not installed by default (Debian and Gentoo do it this way) - install -d "${pkgdir}/usr/share/doc/msmtp" - cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" - install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" - - install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" -} - -package_msmtp-mta() { - pkgdesc="A mini smtp client - the regular MTA" - depends=('msmtp') - provides=('smtp-forwarder') - - install -d "${pkgdir}/usr/sbin" - ln -s /usr/bin/msmtp "${pkgdir}/usr/sbin/sendmail" -} diff --git a/testing/msmtp/msmtp.install b/testing/msmtp/msmtp.install deleted file mode 100644 index c4dd76476..000000000 --- a/testing/msmtp/msmtp.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(msmtp.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 -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD deleted file mode 100644 index 7fa3af41d..000000000 --- a/testing/neon/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 153541 2012-03-15 18:19:26Z pierre $ -# Maintainer: -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=neon -pkgver=0.29.6 -pkgrel=4 -pkgdesc="HTTP and WebDAV client library with a C interface" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('krb5' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('591e0c82e6979e7e615211b386b8f6bc') -options=('libtool') # FS#16067 - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-expat \ - --enable-shared \ - --disable-static \ - --with-ssl=openssl \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make - - # fix invalid .so links in man pages (FS#24902) - sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD deleted file mode 100644 index 7d77857bf..000000000 --- a/testing/net-snmp/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 150318 2012-02-16 20:41:47Z heftig $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=net-snmp -pkgver=5.7.1 -pkgrel=2 -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' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' - 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') - -build() { - cd "${srcdir}/${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 - PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility \ - --enable-ipv6 \ - --with-python-modules \ - --with-default-snmp-version="3" \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-logfile="/var/log/snmpd.log" \ - --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static - make NETSNMP_DONT_CHECK_VERSION=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - 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 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch deleted file mode 100644 index d93d7ef67..000000000 --- a/testing/net-snmp/libnl32.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 -@@ -566,8 +566,9 @@ - static int - tcpTable_load_netlink(void) - { -+ int err; - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -575,10 +576,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -590,10 +591,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -604,9 +605,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -655,7 +656,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); -diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 ---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 -@@ -224,8 +224,9 @@ - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" - NETSNMP_SEARCH_LIBS( -- nl_connect, nl, -+ nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) - ;; - esac diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd deleted file mode 100644 index 926b09bbf..000000000 --- a/testing/net-snmp/snmpd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to snmpd -# -SNMPD_ARGS="" - diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc deleted file mode 100644 index b00c09f4f..000000000 --- a/testing/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/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD deleted file mode 100644 index f00fe4ebe..000000000 --- a/testing/nfs-utils/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 151758 2012-03-02 09:09:32Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> -# Contributor: abelstr <abel@pinklf.eu> -# Contributor: Marco Lima <cipparello gmail com> - -pkgname=nfs-utils -pkgver=1.2.5 -pkgrel=2 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') -url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.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') -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-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch) -install=nfs-utils.install -md5sums=('8395ac770720b83c5c469f88306d7765' - 'dd0d65fc6e8f422fa12520813098264b' - 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' - '9cef69bc686cc5dcac23fbb51450747d' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e9144277a89a620d9bc80413158a7d27' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') - -build() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.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-nfsv3 --enable-nfsv4 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs \ - --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount - - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install - - # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{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 - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - # directories - mkdir "$pkgdir/"etc/exports.d - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery -} diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports deleted file mode 100644 index 8f4aac598..000000000 --- a/testing/nfs-utils/exports +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. -# -# Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# -# Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) -# /srv/nfs4/home hostname1(rw,sync,nohide) -# Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) -# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23afe9..000000000 --- a/testing/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch deleted file mode 100644 index 3dba94a05..000000000 --- a/testing/nfs-utils/kernel-3.0-segfault.patch +++ /dev/null @@ -1,53 +0,0 @@ -mount.nfs segfaults if kernel version number does not contain -at least 3 components delimited with a dot. - -Avoid this by matching up to three unsigned integers inialised -to zero, separated by dots. - -A version that does not start with an integer is probably a future -version where the versioning evolved to another scheme. -Return UINT_MAX which is guaranteed to be higher than existing -versions. This would also make it possible to easily identify -versions that do not start with an integer. - -Signed-off-by: Luk Claes <luk@...> ---- - utils/mount/version.h | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/utils/mount/version.h b/utils/mount/version.h -index af61a6f..531cf68 100644 ---- a/utils/mount/version.h -+++ b/utils/mount/version.h -@@ -23,8 +23,8 @@ - #ifndef _NFS_UTILS_MOUNT_VERSION_H - #define _NFS_UTILS_MOUNT_VERSION_H - --#include <stdlib.h> --#include <string.h> -+#include <stdio.h> -+#include <limits.h> - - #include <sys/utsname.h> - -@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q, - static inline unsigned int linux_version_code(void) - { - struct utsname my_utsname; -- unsigned int p, q, r; -+ unsigned int p, q = 0, r = 0; - -+ /* UINT_MAX as backward compatibility code should not be run */ - if (uname(&my_utsname)) -- return 0; -+ return UINT_MAX; - -- p = (unsigned int)atoi(strtok(my_utsname.release, ".")); -- q = (unsigned int)atoi(strtok(NULL, ".")); -- r = (unsigned int)atoi(strtok(NULL, ".")); -+ /* UINT_MAX as future versions might not start with an integer */ -+ if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1) -+ return UINT_MAX; -+ - return MAKE_VERSION(p, q, r); - } diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b3c..000000000 --- a/testing/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/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3e5..000000000 --- a/testing/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d8c..000000000 --- a/testing/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/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf deleted file mode 100644 index 581e26350..000000000 --- a/testing/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21d8..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install deleted file mode 100644 index 7dcdf9575..000000000 --- a/testing/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> 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 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch deleted file mode 100644 index 5d73b6e35..000000000 --- a/testing/nfs-utils/start-statd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 - # /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 - diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD deleted file mode 100644 index 61895f9fa..000000000 --- a/testing/nspr/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 150956 2012-02-24 10:04:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=nspr -pkgver=4.9 -pkgrel=1 -pkgdesc="Netscape Portable Runtime" -arch=(i686 x86_64) -url="http://www.mozilla.org/projects/nspr/" -license=('MPL' 'GPL') -depends=('glibc') -makedepends=('zip') -options=(!emptydirs) -source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz - nspr.pc.in) -md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a' - 'bce1611f3117b53fc904cab549c09967') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - if [ "$CARCH" = "x86_64" ]; then - confflags="--enable-64bit" - else - confflags="" - fi - - sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - -i mozilla/nsprpub/config/rules.mk - - ./mozilla/nsprpub/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --includedir=/usr/include/nspr \ - --enable-optimize \ - --disable-debug ${confflags} - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib/*.a - - rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ - "${pkgdir}/usr/bin/prerr.properties" \ - "${pkgdir}/usr/share/aclocal/nspr.m4" \ - "${pkgdir}/usr/include/nspr/md" -} diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0ca..000000000 --- a/testing/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD deleted file mode 100644 index d24c3c91c..000000000 --- a/testing/nss/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 150999 2012-02-24 13:00:04Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nss -pkgver=3.13.3 -pkgrel=1 -pkgdesc="Mozilla Network Security Services" -arch=(i686 x86_64) -url="http://www.mozilla.org/projects/security/pki/nss/" -license=('MPL' 'GPL') -_nsprver=4.9 -depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') -makedepends=('perl') -options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz - nss-no-rpath.patch - nss.pc.in - nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6' - 'c8fcdb153af9d39689243119adb475905a657284' - 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' - 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' - '3d89f29e321d7df7269b7ae6d219654543feaa6a' - '8a964a744ba098711b80c0d279a2993524e8eb92') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only - patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" - # Adds transitional SSL renegotiate support - patch from Debian - patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np2 -i "${srcdir}/nss-no-rpath.patch" - - # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i security/coreconf/rules.mk - - # Generate certdata.c from certdata.txt - cd security/nss/lib/ckfw/builtins - make generate - - cd "${srcdir}/${pkgname}-${pkgver}" - export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` - export XCFLAGS="${CFLAGS}" - - [ "$CARCH" = "x86_64" ] && export USE_64=1 - - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${pkgver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${pkgdir}/usr/lib/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" -} diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index bf7e2ca16..000000000 --- a/testing/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,568 +0,0 @@ -## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds the SPI Inc. and CAcert.org CA certificates - -Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100 -@@ -23475,3 +23475,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+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 Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+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\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\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\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\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\201\277\060\201\274\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\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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 -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+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\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+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, Inc. Root CA (2008)" -+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 Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_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, Inc. Root CA (2008)" -+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_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in deleted file mode 100644 index f8f893e71..000000000 --- a/testing/nss/nss-config.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <<EOF -Usage: nss-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--includedir[=DIR]] - [--libdir[=DIR]] - [--version] - [--libs] - [--cflags] -Dynamic Libraries: - nss - nssutil - ssl - smime -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -lib_ssl=yes -lib_smime=yes -lib_nss=yes -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - ssl) - lib_ssl=yes - ;; - smime) - lib_smime=yes - ;; - nss) - lib_nss=yes - ;; - nssutil) - lib_nssutil=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea57315..000000000 --- a/testing/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in deleted file mode 100644 index d47b9e146..000000000 --- a/testing/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c5551..000000000 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - diff --git a/testing/ntrack/PKGBUILD b/testing/ntrack/PKGBUILD deleted file mode 100644 index 858f396f6..000000000 --- a/testing/ntrack/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150322 2012-02-16 20:41:52Z heftig $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=ntrack -pkgver=16 -pkgrel=2 -epoch=1 -pkgdesc="A network connectivity tracking library" -arch=('i686' 'x86_64') -url="http://launchpad.net/ntrack/" -license=('LGPL') -depends=('qt' 'libnl') -makedepends=('python2') -options=('!libtool' '!emptydirs') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" - 'libnl3.patch') -md5sums=('21691dac43460a6791cba3decbc68242' - '0a1f6b7f9a01c323e81d6da95cad93cd') - -build() { - cd "${srcdir}/${pkgname}-0${pkgver}" - patch -p1 -i "${srcdir}"/libnl3.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-0${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/ntrack/libnl3.patch b/testing/ntrack/libnl3.patch deleted file mode 100644 index 879b52c8c..000000000 --- a/testing/ntrack/libnl3.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> -Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib. - -Index: ntrack/glib/Makefile.am -=================================================================== ---- ntrack.orig/glib/Makefile.am 2011-12-22 19:25:13.137470000 -0500 -+++ ntrack/glib/Makefile.am 2011-12-22 20:07:10.243344976 -0500 -@@ -26,7 +26,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ - - AM_LDFLAGS = -Index: ntrack/glib/Makefile.in -=================================================================== ---- ntrack.orig/glib/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/glib/Makefile.in 2011-12-22 20:07:14.871344769 -0500 -@@ -325,7 +325,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ - - AM_LDFLAGS = -Index: ntrack/glib/test/Makefile.am -=================================================================== ---- ntrack.orig/glib/test/Makefile.am 2011-12-22 19:25:13.137470000 -0500 -+++ ntrack/glib/test/Makefile.am 2011-12-22 20:07:19.451344565 -0500 -@@ -27,7 +27,6 @@ - ../../common/libntrack.la - - AM_CFLAGS = \ -- -pedantic \ - -Wall \ - -Werror \ - -I$(srcdir)/.. \ -Index: ntrack/glib/test/Makefile.in -=================================================================== ---- ntrack.orig/glib/test/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/glib/test/Makefile.in 2011-12-22 20:07:23.903344367 -0500 -@@ -260,7 +260,6 @@ - ../../common/libntrack.la - - AM_CFLAGS = \ -- -pedantic \ - -Wall \ - -Werror \ - -I$(srcdir)/.. \ -Index: ntrack/gobject/Makefile.am -=================================================================== ---- ntrack.orig/gobject/Makefile.am 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/gobject/Makefile.am 2011-12-22 20:07:27.515344206 -0500 -@@ -26,7 +26,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ \ - -I$(srcdir)/../glib/ - -Index: ntrack/gobject/Makefile.in -=================================================================== ---- ntrack.orig/gobject/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/gobject/Makefile.in 2011-12-22 20:07:31.519344028 -0500 -@@ -347,7 +347,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ \ - -I$(srcdir)/../glib/ - -Index: ntrack/modules/Makefile.am -=================================================================== ---- ntrack.orig/modules/Makefile.am 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/modules/Makefile.am 2011-12-22 20:07:35.519343851 -0500 -@@ -26,7 +26,6 @@ - -Wall \ - -Werror \ - -Wno-variadic-macros \ -- -pedantic \ - -I$(top_srcdir)/common/ - - AM_LDFLAGS = -Index: ntrack/modules/Makefile.in -=================================================================== ---- ntrack.orig/modules/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/modules/Makefile.in 2011-12-22 20:07:39.391343676 -0500 -@@ -352,7 +352,6 @@ - -Wall \ - -Werror \ - -Wno-variadic-macros \ -- -pedantic \ - -I$(top_srcdir)/common/ - - AM_LDFLAGS = diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/testing/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD deleted file mode 100644 index 8de3917c8..000000000 --- a/testing/nx-common/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 153543 2012-03-15 18:23:51Z pierre $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=4 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash') -makedepends=('xorg-server-devel') -source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch - nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('ad8c0f133122c6d07732ca69c8759410' - '84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - - ./configure --prefix=/opt/NX - make - # nxssh - cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcomp - cd ${srcdir}/nxcomp - cp -a libXcomp.so* ${pkgdir}/opt/NX/lib - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh -} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/testing/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/testing/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD deleted file mode 100644 index 4b9f1ca54..000000000 --- a/testing/openldap/PKGBUILD +++ /dev/null @@ -1,102 +0,0 @@ -# $Id: PKGBUILD 153670 2012-03-17 18:34:49Z eric $ -# Maintainer: - -pkgbase=openldap -pkgname=('libldap' 'openldap') -pkgver=2.4.30 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.openldap.org/" -license=('custom') -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') -source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default - ntlm.patch - mutex-end-of-struct-sigsegv.patch) -sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9' - 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' - 'd89b8a533045123f1ab46c9c430cf132d58a20a4' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' - '694269dad78c7a806649c2d7f57bb7e503df3af1') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.patch - patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.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|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in - - LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" - ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ - --enable-ipv6 --enable-syslog --enable-local \ - --enable-bdb --enable-hdb \ - --enable-crypt --enable-dynamic \ - --with-threads --disable-wrappers \ - --without-fetch \ - --enable-spasswd --with-cyrus-sasl \ - --enable-overlays=mod --enable-modules=yes - make -} - -check() { - cd "${srcdir}"/${pkgbase}-${pkgver} - make test -} - -package_libldap() { - pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" - depends=('libsasl' 'e2fsprogs') - backup=('etc/openldap/ldap.conf') - options=('!libtool') - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in include libraries doc/man/man3 ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 - -# get rid of duplicate default conf files - rm "${pkgdir}"/etc/openldap/*.default - - ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 - ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -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') - install=openldap.install - - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in clients servers doc/man/man{1,5,8} ; do - pushd ${dir} - make DESTDIR="${pkgdir}" install - popd - done - 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 - - chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,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 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch deleted file mode 100644 index e8996386a..000000000 --- a/testing/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/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/testing/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/testing/openldap/openldap.install b/testing/openldap/openldap.install deleted file mode 100644 index cf3cb9f25..000000000 --- a/testing/openldap/openldap.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install(){ - 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 -} - -post_upgrade(){ - getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null - getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null - chown -R ldap:ldap var/lib/openldap &>/dev/null -} - -post_remove(){ - if getent passwd ldap >/dev/null 2>&1; then - userdel ldap - fi - if getent group ldap >/dev/null 2>&1; then - groupdel ldap - fi -} diff --git a/testing/openldap/slapd b/testing/openldap/slapd deleted file mode 100755 index 4f212da66..000000000 --- a/testing/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/testing/openldap/slapd.default b/testing/openldap/slapd.default deleted file mode 100644 index 72ae2a6a7..000000000 --- a/testing/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/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD deleted file mode 100644 index 6203ac45c..000000000 --- a/testing/openssh/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 153863 2012-03-20 07:01:42Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=openssh -pkgver=5.9p1 -pkgrel=8 -pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64') -license=('custom:BSD') -url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('krb5' 'openssl' 'libedit') -optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' - '954bf1660aa32620c37034320877f4511b767ccb' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '3413909fd45a28701c92e6e5b59c6b65346ddb0f' - '21fa88de6cc1c7912e71655f50896ba17991a1c2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords \ - --with-pam \ - --with-mantype=man \ - --with-xauth=/usr/bin/xauth \ - --with-kerberos5=/usr \ - --with-ssl-engine \ - --with-libedit=/usr/lib \ - --disable-strip # stripping is done by makepkg - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} diff --git a/testing/openssh/sshd b/testing/openssh/sshd deleted file mode 100755 index 1d68fb877..000000000 --- a/testing/openssh/sshd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/var/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/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/testing/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/testing/openssh/sshd.confd b/testing/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/testing/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam deleted file mode 100644 index c7b91cdfb..000000000 --- a/testing/openssh/sshd.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%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_ck_connector.so nox11 --session optional pam_systemd.so diff --git a/testing/openssl/PKGBUILD b/testing/openssl/PKGBUILD deleted file mode 100644 index 4dc7bc248..000000000 --- a/testing/openssl/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 154554 2012-03-30 08:24:50Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=openssl -_ver=1.0.1 -# use a pacman compatible version scheme -# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgver=$_ver -pkgrel=2 -pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' -arch=('i686' 'x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -depends=('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' - 'disable-tls12-client.patch') -md5sums=('134f168bc2a8333f19f81d684841710b' - 'efbe93c11747fed52e60567819409d8a' - '5bbc0655bda2af95bc8eb568963ce8ba' - 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90' - '26432b9d7af63c63828b6405c9185400') - -build() { - cd $srcdir/$pkgname-$_ver - - if [ "${CARCH}" == 'x86_64' ]; then - openssltarget='linux-x86_64' - optflags='enable-ec_nistp_64_gcc_128' - elif [ "${CARCH}" == 'i686' ]; then - openssltarget='linux-elf' - 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 - # workaround for PR#2771 - patch -p1 -i $srcdir/disable-tls12-client.patch - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 ${optflags} \ - "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ - -DOPENSSL_NO_TLS1_2_CLIENT - - make depend - make -} - -check() { - cd $srcdir/$pkgname-$_ver - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - patch -p0 -R -i $srcdir/ca-dir.patch - make test - patch -p0 -i $srcdir/ca-dir.patch -} - -package() { - cd $srcdir/$pkgname-$_ver - make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/testing/openssl/ca-dir.patch b/testing/openssl/ca-dir.patch deleted file mode 100644 index 41d1386d3..000000000 --- a/testing/openssl/ca-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/testing/openssl/disable-tls12-client.patch b/testing/openssl/disable-tls12-client.patch deleted file mode 100644 index edb87e77f..000000000 --- a/testing/openssl/disable-tls12-client.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: openssl/ssl/t1_lib.c -RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v -rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null ---- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31 -+++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32 -@@ -544,7 +544,7 @@ - } - skip_ext: - -- if (TLS1_get_version(s) >= TLS1_2_VERSION) -+ if (TLS1_get_client_version(s) >= TLS1_2_VERSION) - { - if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6) - return NULL; -Index: openssl/ssl/s23_clnt.c -RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v -rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null ---- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5 -+++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6 -@@ -287,12 +287,14 @@ - - if (ssl2_compat && ssl23_no_ssl2_ciphers(s)) - ssl2_compat = 0; -- -+#ifndef OPENSSL_NO_TLS1_2_CLIENT - if (!(s->options & SSL_OP_NO_TLSv1_2)) - { - version = TLS1_2_VERSION; - } -- else if (!(s->options & SSL_OP_NO_TLSv1_1)) -+ else -+#endif -+ if (!(s->options & SSL_OP_NO_TLSv1_1)) - { - version = TLS1_1_VERSION; - } diff --git a/testing/openssl/fix-manpages.patch b/testing/openssl/fix-manpages.patch deleted file mode 100644 index 0a300f3b9..000000000 --- a/testing/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/testing/openssl/no-rpath.patch b/testing/openssl/no-rpath.patch deleted file mode 100644 index ebd95e23d..000000000 --- a/testing/openssl/no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD deleted file mode 100644 index b8a21419c..000000000 --- a/testing/ppl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 151630 2012-02-28 23:12:18Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=ppl -pkgver=0.12 -pkgrel=1 -pkgdesc="A modern library for convex polyhedra and other numerical abstractions." -arch=('i686' 'x86_64') -url="http://bugseng.com/products/ppl" -license=('GPL3') -depends=('gmp>=5.0') -options=('!docs' '!libtool') -source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) -md5sums=('47a5548d4e3d98cf6b97e4fd3e5db513' - '41869f374e70d0a4d2faa61566365b9d') - -build() { - cd $srcdir/ppl-$pkgver - ./configure --prefix=/usr --enable-interfaces="c,cxx" - make -} - -check() { - cd $srcdir/ppl-$pkgver - make check -} - -package() { - cd $srcdir/ppl-$pkgver - make DESTDIR=$pkgdir install -} - diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD deleted file mode 100644 index 6dfb27d2c..000000000 --- a/testing/proftpd/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 153556 2012-03-16 00:18:26Z eric $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4a -pkgrel=4 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org" -license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' - '195b06e28e503f5e5ef355c3332884cc5e7954a9' - 'b7819d725817e55b69c73e2572c21a05db48cc86' - '83c38ec40efb7cc09d9824b98e65cd948a195cc6' - 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/var/run \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" -} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd deleted file mode 100755 index 357a7663d..000000000 --- a/testing/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/testing/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/testing/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD deleted file mode 100644 index 911e2c403..000000000 --- a/testing/psmisc/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 153643 2012-03-17 02:47:43Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=psmisc -pkgver=22.16 -pkgrel=1 -pkgdesc="Miscellaneous procfs tools" -arch=('i686' 'x86_64') -url="http://psmisc.sourceforge.net/index.html" -license=('GPL') -groups=('base') -depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD deleted file mode 100644 index 0fb507a08..000000000 --- a/testing/r/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 150251 2012-02-15 21:44:40Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: K. Piche <kpiche@rogers.com> - -pkgname=r -pkgver=2.14.1 -pkgrel=3 -pkgdesc="Language and environment for statistical computing and graphics" -arch=('i686' 'x86_64') -license=('GPL') -url=('http://www.r-project.org/') -depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' - 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango' 'xz') -makedepends=('openjdk6' 'gcc-fortran') -backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') -options=('!makeflags') -source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" - 'r.desktop' - 'r.png') -install=r.install -sha1sums=('5803a213480a749e36bccc155aecb13070ade096' - '13aa29219bcaa102e575de8c1c8e0833d233e836' - 'a69a07ec363440efc18ce0a7f2af103375dea978') -build() { - cd "${srcdir}/R-${pkgver}" - sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --sysconfdir=/etc/R \ - --datarootdir=/usr/share \ - rsharedir=/usr/share/R/ \ - rincludedir=/usr/include/R/ \ - rdocdir=/usr/share/doc/R/ \ - --with-x \ - --enable-R-shlib \ - --with-lapack \ - --with-blas \ - F77=gfortran \ - LIBnn=lib - make -} - -package() { - cd "${srcdir}/R-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install - - # Fixup R wrapper scripts. - sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" - rm "${pkgdir}/usr/lib/R/bin/R" - cd "${pkgdir}/usr/lib/R/bin" - ln -s ../../../bin/R - - # install some freedesktop.org compatibility - install -Dm644 "${srcdir}/r.desktop" \ - "${pkgdir}/usr/share/applications/r.desktop" - install -Dm644 "${srcdir}/r.png" \ - "${pkgdir}/usr/share/pixmaps/r.png" - - # move the config directory to /etc and create symlinks - install -d "${pkgdir}/etc/R" - cd "${pkgdir}/usr/lib/R/etc" - for i in *; do - mv -f ${i} "${pkgdir}/etc/R" - ln -s /etc/R/${i} ${i} - done -} diff --git a/testing/r/r.desktop b/testing/r/r.desktop deleted file mode 100644 index 68b49c447..000000000 --- a/testing/r/r.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=R -GenericName=environment for statistical computing -Comment=language and environment for statistical computing and graphics -Exec=R -Icon=/usr/share/pixmaps/r.png -DocPath=/usr/lib/R/doc/html/index.html -StartupNotify=true -Terminal=true -Type=Application -Categories=Education;Science;Math; diff --git a/testing/r/r.install b/testing/r/r.install deleted file mode 100644 index d3289ab64..000000000 --- a/testing/r/r.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/testing/r/r.png b/testing/r/r.png Binary files differdeleted file mode 100644 index 1303ccdb9..000000000 --- a/testing/r/r.png +++ /dev/null diff --git a/testing/raptor/PKGBUILD b/testing/raptor/PKGBUILD deleted file mode 100644 index 847fff43b..000000000 --- a/testing/raptor/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 154298 2012-03-25 15:22:16Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: eric <eric@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=raptor -pkgver=2.0.7 -pkgrel=1 -pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" -arch=('i686' 'x86_64') -url="http://librdf.org/raptor" -depends=('curl' 'libxslt' 'icu') -license=('LGPL') -options=('!libtool') -source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") - -build() { - cd "${srcdir}"/raptor2-${pkgver} - - ./configure --prefix=/usr \ - --disable-static \ - --with-yajl=no \ - --with-icu-config=/usr/bin/icu-config - make -} - -#check() { -# make -C "raptor2-$pkgver" check // currently does not work -#} - -package() { - cd "${srcdir}"/raptor2-${pkgver} - make prefix="${pkgdir}"/usr install -} -md5sums=('699073463467dc8eded2ca89de2ab2ea') diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD deleted file mode 100644 index d2470708d..000000000 --- a/testing/samba/PKGBUILD +++ /dev/null @@ -1,153 +0,0 @@ -# $Id: PKGBUILD 152742 2012-03-09 13:35:22Z heftig $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -pkgbase=samba -pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.3 -# 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.3 -pkgrel=4 -arch=(i686 x86_64) -url="http://www.samba.org" -license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') -source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - samba samba.logrotate - swat.xinetd - samba.pam - samba.conf.d) -### UNINSTALL dmapi package before building!!! - -build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --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=/lib/security \ - --with-dnsupdate \ - --with-automount \ - --with-quotas \ - --with-ads \ - --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 - make -} - -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 -} - -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/ -} - -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -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' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') - cd ${srcdir}/samba-${_realver}/source3 - 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}/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so - ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2 - # 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 - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema -} -md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1' - 'dfc6f9018c556b9783c7140de183727f' - '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' - '96f82c38f3f540b53f3e5144900acf17' - 'f2f2e348acd1ccb566e95fa8a561b828') diff --git a/testing/samba/samba b/testing/samba/samba deleted file mode 100755 index 2a04bfec4..000000000 --- a/testing/samba/samba +++ /dev/null @@ -1,57 +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/run/samba ] ; then - install -m755 -d /var/run/samba - fi - 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 /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/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/testing/samba/samba.conf.d b/testing/samba/samba.conf.d deleted file mode 100644 index 8721f956a..000000000 --- a/testing/samba/samba.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate deleted file mode 100644 index 581f4c33b..000000000 --- a/testing/samba/samba.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/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 -} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/samba/samba.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd deleted file mode 100644 index 2e62a82b2..000000000 --- a/testing/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/testing/shadow/LICENSE b/testing/shadow/LICENSE deleted file mode 100644 index c5ab15a56..000000000 --- a/testing/shadow/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 1990 - 1994, Julianne Frances Haugh - * Copyright (c) 1996 - 2000, Marek Michałkiewicz - * Copyright (c) 2001 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2009, Nicolas François - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * 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. - */ diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD deleted file mode 100644 index 5757df664..000000000 --- a/testing/shadow/PKGBUILD +++ /dev/null @@ -1,132 +0,0 @@ -# $Id: PKGBUILD 151351 2012-02-25 15:53:24Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=shadow -pkgver=4.1.5 -pkgrel=4 -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/' -license=('BSD') -groups=('base') -depends=('bash' 'pam' 'acl') -backup=(etc/login.defs - etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} - etc/default/useradd) -options=('!libtool') -install='shadow.install' -source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} - LICENSE - adduser - chgpasswd - chpasswd - defaults.pam - login - login.defs - newusers - passwd - shadow.cron.daily - useradd.defaults - nscd-error-reporting.patch - xstrdup.patch - shadow-strncpy-usage.patch - shadow-add-missing-include.patch - userdel-avoid-bad-mem-access.patch - write-utmp-wtmp-entries.patch) -sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41' - '0a31aafceb948a91fe7370a6378cafd6fd883145' - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '895aad07c192b288b457e19dd7b8c55841b4ad22' - 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - 'ae6eebb842c433ac4022c493294a13ed68e06acc' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16' - '0697a21f7519de30821da7772677035652df4ad2' - 'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b' - 'bcef8558c9123b396d2d4df26c815a951f97a91a') - -build() { - cd "$pkgname-$pkgver" - - # avoid transitive linking issues with binutils 2.22 - sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - - # link to glibc's crypt(3) - LDFLAGS+=" -lcrypt" - - # need to offer these upstream - patch -Np1 <"$srcdir/xstrdup.patch" - patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" - - # backports queued for 4.1.5.1 - patch -Np1 <"$srcdir/shadow-add-missing-include.patch" - patch -Np1 <"$srcdir/nscd-error-reporting.patch" - - # sent to ML - patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch" - - # revert to fix FS#28543 - patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch" - - # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in - - ./configure \ - --prefix=/usr \ - --libdir=/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-libpam \ - --without-selinux - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # 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" - - # cron job - install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - install -dm755 "$pkgdir/etc/pam.d" - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers} - - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage chfn chsh groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # Remove su - using su from coreutils instead - rm "$pkgdir/bin/su" - find "$pkgdir/usr/share/man" -name 'su.1' -delete -} diff --git a/testing/shadow/adduser b/testing/shadow/adduser deleted file mode 100644 index a5d7fd4fa..000000000 --- a/testing/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/testing/shadow/chgpasswd b/testing/shadow/chgpasswd deleted file mode 100644 index 8f49f5cc8..000000000 --- a/testing/shadow/chgpasswd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam deleted file mode 100644 index a7bf8a4a5..000000000 --- a/testing/shadow/defaults.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/testing/shadow/login b/testing/shadow/login deleted file mode 100644 index b8555f89c..000000000 --- a/testing/shadow/login +++ /dev/null @@ -1,21 +0,0 @@ -#%PAM-1.0 -auth required pam_securetty.so -auth requisite pam_nologin.so -auth required pam_unix.so nullok -auth required pam_tally.so onerr=succeed file=/var/log/faillog -# use this to lockout accounts for 10 minutes after 3 failed attempts -#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog -account required pam_access.so -account required pam_time.so -account required pam_unix.so -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -session required pam_unix.so -session required pam_env.so -session required pam_motd.so -session required pam_limits.so -session optional pam_mail.so dir=/var/spool/mail standard -session optional pam_lastlog.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_systemd.so diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs deleted file mode 100644 index 2500ee447..000000000 --- a/testing/shadow/login.defs +++ /dev/null @@ -1,197 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *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 - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 077 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 500 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 500 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/testing/shadow/newusers b/testing/shadow/newusers deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/newusers +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch deleted file mode 100644 index a4075756e..000000000 --- a/testing/shadow/nscd-error-reporting.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c -index 227c205..7adb58f 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service) - /* nscd is not installed, or it is installed but uses an - interpreter that is missing. Probably the former. */ - return 0; -+ } else if (code == 1) { -+ /* nscd is installed, but it isn't active. */ -+ return 0; - } else if (code != 0) { -- (void) fprintf (stderr, _("%s: nscd exited with status %d"), -+ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); - (void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); - return -1; diff --git a/testing/shadow/passwd b/testing/shadow/passwd deleted file mode 100644 index ab56da496..000000000 --- a/testing/shadow/passwd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -password required pam_unix.so sha512 shadow nullok diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch deleted file mode 100644 index 5c9e946ef..000000000 --- a/testing/shadow/shadow-add-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c ---- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400 -+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400 -@@ -34,6 +34,7 @@ - - #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $" - -+#include <stdarg.h> - #include <assert.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch deleted file mode 100644 index 5aba8fa01..000000000 --- a/testing/shadow/shadow-strncpy-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c ---- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 -+++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 -@@ -182,7 +182,7 @@ - struct tm *tp; - - if (date < 0) { -- strncpy (buf, "never", maxsize); -+ strncpy (buf, "never", maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); -diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c ---- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 -+++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 -@@ -752,7 +752,8 @@ - _("%s login: "), hostn); - } else { - strncpy (loginprompt, _("login: "), -- sizeof (loginprompt)); -+ sizeof (loginprompt) - 1); -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; - } - - retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily deleted file mode 100755 index 1931a793e..000000000 --- a/testing/shadow/shadow.cron.daily +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r - diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install deleted file mode 100644 index 14384c333..000000000 --- a/testing/shadow/shadow.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - grpck -r >/dev/null 2>&1 - if [ $? -eq 2 ]; then - printf '%s\n' \ - "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ - " Run 'grpck' to correct this." - fi - return 0 -} diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults deleted file mode 100644 index b800b1777..000000000 --- a/testing/shadow/useradd.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file for ArchLinux -# original changes by TomK -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/testing/shadow/userdel-avoid-bad-mem-access.patch b/testing/shadow/userdel-avoid-bad-mem-access.patch deleted file mode 100644 index 1d36562b2..000000000 --- a/testing/shadow/userdel-avoid-bad-mem-access.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: src/userdel.c -=================================================================== ---- src/userdel.c (revision 3713) -+++ src/userdel.c (working copy) -@@ -329,26 +329,33 @@ - } - - if (NULL == pwd) { -+ char gr_name[GROUP_NAME_MAX_LENGTH + 1]; -+ -+ /* make a copy of the group name before we delete it. -+ * we can't use ->gr_name after the group is deleted -+ * for logging purposes */ -+ snprintf(gr_name, GROUP_NAME_MAX_LENGTH, "%s", grp->gr_name); -+ - /* - * We can remove this group, it is not the primary - * group of any remaining user. - */ -- if (gr_remove (grp->gr_name) == 0) { -+ if (gr_remove (gr_name) == 0) { - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), -- Prog, grp->gr_name, gr_dbname ()); -+ Prog, gr_name, gr_dbname ()); - fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting group", -- grp->gr_name, AUDIT_NO_ID, -+ gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ gr_name, user_name)); - - #ifdef SHADOWGRP - if (sgr_locate (user_name) != NULL) { -@@ -361,12 +368,12 @@ - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting shadow group", -- grp->gr_name, AUDIT_NO_ID, -+ gr_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed shadow group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ gr_name, user_name)); - - } - #endif /* SHADOWGRP */ diff --git a/testing/shadow/write-utmp-wtmp-entries.patch b/testing/shadow/write-utmp-wtmp-entries.patch deleted file mode 100644 index b4272ca61..000000000 --- a/testing/shadow/write-utmp-wtmp-entries.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: upstream/trunk/src/login.c -=================================================================== ---- a/src/login.c (revision 3437) -+++ b/src/login.c (revision 3438) -@@ -126,10 +126,12 @@ - static void setup_tty (void); - static void process_flags (int argc, char *const *argv); - static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user); -+#ifndef USE_PAM - static void update_utmp (const char *user, - const char *tty, - const char *host, - /*@null@*/const struct utmp *utent); -+#endif /* ! USE_PAM */ - - #ifndef USE_PAM - static struct faillog faillog; -@@ -471,6 +473,7 @@ - return failent_user; - } - -+#ifndef USE_PAM - /* - * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and - * wtmpx -@@ -496,6 +499,7 @@ - free (utx); - #endif /* USE_UTMPX */ - } -+#endif /* ! USE_PAM */ - - /* - * login - create a new login session for a user -@@ -1208,11 +1212,13 @@ - } - } - -+#ifndef USE_PAM - /* - * The utmp entry needs to be updated to indicate the new status - * of the session, the new PID and SID. - */ - update_utmp (username, tty, hostname, utent); -+#endif /* ! USE_PAM */ - - /* The pwd and spwd entries for the user have been copied. - * diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch deleted file mode 100644 index bce434264..000000000 --- a/testing/shadow/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD deleted file mode 100644 index 32c6d6a76..000000000 --- a/testing/source-highlight/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 151827 2012-03-03 08:09:13Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=source-highlight -pkgver=3.1.6 -pkgrel=2 -pkgdesc="Convert source code to syntax highlighted document" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/src-highlite/" -license=('GPL') -depends=('gcc-libs' 'bash' 'boost-libs') -makedepends=('ctags' 'boost') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") -md5sums=('44856c15a5dc8694e30d92f640ed348f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-bash-completion=${pkgdir}/etc/bash_completion.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install deleted file mode 100644 index 4fd1b3005..000000000 --- a/testing/source-highlight/source-highlight.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=usr/share/info -info_files=(source-highlight.info source-highlight-lib.info) - -post_install() { - 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() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD deleted file mode 100644 index 85996bf3c..000000000 --- a/testing/sqlite3/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 154034 2012-03-21 19:28:02Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgbase="sqlite3" -pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') -_amalgamationver=3071100 -_amalgamationver2=${_amalgamationver/00/} -_docver=${_amalgamationver} #3070700 -#pkgver=${_amalgamationver2//0/.} -pkgver=3.7.11 -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.sqlite.org/" -makedepends=('tcl' 'readline>=6.0.00') -source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) - http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz - #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip - http://www.sqlite.org/sqlite-doc-${_docver}.zip - license.txt) -options=('!libtool' '!emptydirs') -md5sums=('0552d71bda98ebdcaea305cd6058221b' - 'c1fb48beff33612b2c7f5ae6ab17a601' - 'c1cdbc5544034d9012e421e75a5e4890') - -build() { - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - - # build sqlite - cd "$srcdir"/sqlite-autoconf-$_amalgamationver - ./configure --prefix=/usr \ - --disable-static - make - - # build the tcl extension - cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea - ./configure --prefix=/usr \ - --with-system-sqlite - make - -} - -package_sqlite3() { - - pkgdesc="A C library that implements an SQL database engine" - depends=('readline>=6.0.00') - conflicts=('sqlite') - replaces=('sqlite') - - cd ${srcdir}/sqlite-autoconf-$_amalgamationver - make DESTDIR=${pkgdir} install - - # license - install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt -} - -package_sqlite3-tcl() { - - pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" - depends=('sqlite3>=3.7.5') - - cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea - make DESTDIR=${pkgdir} install -} - -package_sqlite3-doc() { - pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" - #arch=('any') - not yet supported - - #cd ${srcdir}/sqlite-doc-${_amalgamationver} - cd ${srcdir}/sqlite-doc-${_docver} - mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} - cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ - - # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605 - find ${pkgdir} -type f -perm 755 -exec ls -lha {} \; - find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \; - - find ${pkgdir} -type f -name '*~' -exec ls -lha {} \; - find ${pkgdir} -type d -name '*~' -exec ls -lha {} \; - find ${pkgdir} -name '*~' -exec rm -f {} \; - - find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg# - find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \; - find ${pkgdir} -name '.~*' -exec rm -f {} \; -} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt deleted file mode 100644 index 118c5d5e6..000000000 --- a/testing/sqlite3/license.txt +++ /dev/null @@ -1,33 +0,0 @@ -SQLite Copyright -SQLite is in the -Public Domain - - -All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. - -The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. - -All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. -Obtaining An Explicit License To Use SQLite - -Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: -You are using SQLite in a jurisdiction that does not recognize the public domain. -You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. -You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. -Your legal department tells you that you have to purchase a license. - -If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. -Contributed Code - -In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: -The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. - -We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: -Hwaci -6200 Maple Cove Lane -Charlotte, NC 28269 -USA - -A template copyright release is available in PDF or HTML. You can use this release to make future changes. - -see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD deleted file mode 100644 index 8eccbbaf7..000000000 --- a/testing/subversion/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 152716 2012-03-09 01:48:25Z stephane $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.7.4 -pkgrel=1 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite3' 'file') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool') -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527' - 'eebe0be6d539bf7dc37cf01b3c738072f1d9197b' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -p0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all - make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb - - install -d "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -rf "${pkgdir}"/usr/lib/perl5/core_perl - - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - # bash completion - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/etc/bash_completion.d/subversion -} diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/testing/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/svn b/testing/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/testing/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/testing/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/testing/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index 1eb0a1b55..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 153416 2012-03-13 05:01:37Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.4p4 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -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') -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} - sudo.pam) -md5sums=('b9be6df7ecefedff2263052ed9fc5e93' - '24da0bf96506b81678726778aad9ea4c' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -check() { - cd "$srcdir/$pkgname-$_ver" - make check -} - -package() { - cd "$srcdir/$pkgname-$_ver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch deleted file mode 100644 index e88f9d907..000000000 --- a/testing/tzdata/Makefile.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile ---- src/Makefile 2007-08-20 16:47:41.000000000 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the "CFLAGS=" line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -367,7 +369,7 @@ - <$? >$@ - chmod +x $@ - --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Naur src/tzselect.ksh src-p/tzselect.ksh ---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 -+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - # '@(#)tzselect.ksh 8.1' - diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD deleted file mode 100644 index d51cfa78d..000000000 --- a/testing/tzdata/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 151775 2012-03-02 14:25:01Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=tzdata -pkgver=2012b -pkgrel=1 -_tzcode=2012b -_tzdata=2012b -pkgdesc="Sources for time zone and daylight saving time data" -arch=('i686' 'x86_64') -url="http://www.iana.org/time-zones" -license=('GPL') -depends=() -makedepends=() -optdepends=('bash: required by tzselect') -options=('!emptydirs') -source=(#http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz - ftp://munnari.oz.au/pub/tzcode${_tzcode}.tar.gz - #http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz - ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz - Makefile.patch) -md5sums=('6137322ffd36e1fd5128885be1c57008' - '0615fd29def380a917e528433c820368' - 'a64ed97d1fc03c66ee8612c0d9f40507') - -build() { - cd ${srcdir} - - tar -xf tzcode${_tzcode}.tar.gz - tar -xf ${pkgname}${_tzdata}.tar.gz - - patch -Np1 -i "${srcdir}/Makefile.patch" - - make -} - -check() { - cd ${srcdir} - make -k check # || /bin/true -} - -package() { - cd ${srcdir} - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}/usr/share/zoneinfo/localtime" -} diff --git a/testing/udev/0001-reinstate-TIMEOUT-handling.patch b/testing/udev/0001-reinstate-TIMEOUT-handling.patch deleted file mode 100644 index 9b251b283..000000000 --- a/testing/udev/0001-reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Thu, 15 Mar 2012 02:12:43 +0100 -Subject: [PATCH] reinstate TIMEOUT= handling - -This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and -57c6f8ae5f52a6e8ffc66a54966346f733dded39. - -Signed-off-by: Tom Gundersen <teg@jklm.no> ---- - src/libudev-device.c | 19 +++++++++++++++++++ - src/libudev-private.h | 1 + - src/udevd.c | 13 ++++++++++--- - 3 files changed, 30 insertions(+), 3 deletions(-) - -diff --git a/src/libudev-device.c b/src/libudev-device.c -index 10f28b8..639c367 100644 ---- a/src/libudev-device.c -+++ b/src/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; -@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) - return 0; - } - -+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; -+} -+ - const char *udev_device_get_devpath_old(struct udev_device *udev_device) - { - return udev_device->devpath_old; -@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, - udev_device_set_devpath_old(udev_device, &property[12]); - } else if (strncmp(property, "SEQNUM=", 7) == 0) { - udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); -+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { -+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "IFINDEX=", 8) == 0) { - udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "DEVMODE=", 8) == 0) { -@@ -599,6 +617,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-private.h b/src/libudev-private.h -index 5f5c64a..ec63b67 100644 ---- a/src/libudev-private.h -+++ b/src/libudev-private.h -@@ -87,6 +87,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/udevd.c b/src/udevd.c -index 1702217..88e9272 100644 ---- a/src/udevd.c -+++ b/src/udevd.c -@@ -401,7 +401,7 @@ out: - } - } - --static void event_run(struct event *event) -+static void event_run(struct event *event, bool force) - { - struct udev_list_node *loop; - -@@ -427,7 +427,7 @@ static void event_run(struct event *event) - return; - } - -- if (children >= children_max) { -+ if (!force && children >= children_max) { - if (children_max > 1) - info(event->udev, "maximum number (%i) of children reached\n", children); - return; -@@ -461,6 +461,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; - } - -@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) - continue; - } - -- event_run(event); -+ event_run(event, false); - } - } - --- -1.7.9.4 - diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD deleted file mode 100644 index 0fc3645c1..000000000 --- a/testing/usbutils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 153397 2012-03-12 21:43:35Z tomegun $ -# 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=005 -pkgrel=1 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -depends=('libusb') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage' - 'wget: for update-usbids.sh usage') -url="http://linux-usb.sourceforge.net/" -# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - fix-python2.patch) - -build() { - cd $srcdir/$pkgname-$pkgver - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} -md5sums=('6a21f7b6c02b76df5e8a7c208d746654' - '45766196895b4cc50b53cd56e1bbf3d1') diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/testing/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch b/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch deleted file mode 100644 index 3b830a2ad..000000000 --- a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 28074a0952469aebf021821d95238cfb964d13ff Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 21:26:11 +0100 -Subject: [PATCH 09/12] lib/canonicalize: always remove tailing slash - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - lib/canonicalize.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/lib/canonicalize.c b/lib/canonicalize.c -index ab32c10..fd18af4 100644 ---- a/lib/canonicalize.c -+++ b/lib/canonicalize.c -@@ -174,9 +174,16 @@ canonicalize_path(const char *path) - if (path == NULL) - return NULL; - -- if (!myrealpath(path, canonical, PATH_MAX+1)) -- return strdup(path); -- -+ if (!myrealpath(path, canonical, PATH_MAX+1)) { -+ char *res = strdup(path); -+ if (res) { -+ p = strrchr(res, '/'); -+ /* delete trailing slash */ -+ if (p && p > res && *(p + 1) == '\0') -+ *p = '\0'; -+ } -+ return res; -+ } - - p = strrchr(canonical, '/'); - if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) { --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch b/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch deleted file mode 100644 index 97f5dc925..000000000 --- a/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 772cce373f693096c2ae6f156306acf9e20c09e8 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 28 Feb 2012 00:02:30 +0100 -Subject: [PATCH] libmount: allow empty source for mount(2) syscall - -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797438 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/context_mount.c | 4 +++- - sys-utils/mount.c | 6 +++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index a0c5951..098243b 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -451,8 +451,10 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) - src = mnt_fs_get_srcpath(cxt->fs); - target = mnt_fs_get_target(cxt->fs); - -- if (!src || !target) -+ if (!target) - return -EINVAL; -+ if (!src) -+ src = "none"; - - type = try_type ? : mnt_fs_get_fstype(cxt->fs); - -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 3fbac04..23abc91 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -347,7 +347,11 @@ try_readonly: - return MOUNT_EX_USAGE; - } - -- if (src == NULL || tgt == NULL) { -+ /* -+ * TODO: add mnt_context_fstab_applied() to check if we found -+ * target/source in the file. -+ */ -+ if (!tgt) { - if (mflags & MS_REMOUNT) - warnx(_("%s not mounted"), src ? src : tgt); - else --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch b/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch deleted file mode 100644 index 05961aa35..000000000 --- a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 59e32a1f240c5f6a1d64d5e71a4a357245c34eaf Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 20:25:43 +0100 -Subject: [PATCH 07/12] libmount: canonicalize all paths from (fs)tab - -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797216 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/tab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 37f47bd..f10c1de 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -456,7 +456,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { - char *p; - -- if (!fs->target || !mnt_fs_is_swaparea(fs) || -+ if (!fs->target || mnt_fs_is_swaparea(fs) || - (*fs->target == '/' && *(fs->target + 1) == '\0')) - continue; - --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch b/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch deleted file mode 100644 index 46ff55260..000000000 --- a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6eba938376c2c870d9258ef9d7b6a3690cfa78dd Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 22:52:45 +0100 -Subject: [PATCH 11/12] libmount: canonicalize targets from fstab on mount -a - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/tab.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 66a9e4d..21b05c7 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -830,8 +830,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - { - char *root = NULL; - struct libmnt_fs *src_fs; -- const char *src, *tgt; -- char *xsrc = NULL; -+ const char *src; -+ char *xsrc = NULL, *tgt; - int flags = 0, rc = 0; - - assert(tb); -@@ -852,7 +852,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs), - tb->cache); - -- tgt = mnt_fs_get_target(fstab_fs); -+ tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache); - - if (tgt && src && root) { - struct libmnt_iter itr; -@@ -870,7 +870,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - * network filesystem source paths. - */ - if (t && s && r && -- strcmp(t, tgt) == 0 && -+ streq_except_trailing_slash(t, tgt) && - streq_except_trailing_slash(s, src) && - strcmp(r, root) == 0) - break; -@@ -881,6 +881,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - - if (xsrc && !tb->cache) - free(xsrc); -+ if (!tb->cache) -+ free(tgt); - - free(root); - return rc; --- -1.7.9.2 - diff --git a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch deleted file mode 100644 index 9041ab742..000000000 --- a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 27 Feb 2012 16:43:12 +0100 -Subject: [PATCH] libmount: use mount.<type> -s for NFS only - -Unfortunately, it seems that for example mount.cifs don't care about -the API, so we need exception like the original mount(8). - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libmount/src/context_mount.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index 8cbc25b..a0c5951 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt) - args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */ - args[i++] = mnt_fs_get_target(cxt->fs); /* 3 */ - -- if (mnt_context_is_sloppy(cxt)) -+ /* -+ * TODO: remove the exception for "nfs", -s is documented -+ * for years should be usable everywhere. -+ */ -+ if (mnt_context_is_sloppy(cxt) && -+ type && startswith(type, "nfs")) - args[i++] = "-s"; /* 4 */ - if (mnt_context_is_fake(cxt)) - args[i++] = "-f"; /* 5 */ --- -1.7.9.2 - diff --git a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch b/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch deleted file mode 100644 index 274246416..000000000 --- a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 16b73aae8cb73df2974fd75c2a42ec3b92535851 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 24 Feb 2012 23:03:22 +0100 -Subject: [PATCH 12/12] mount: (new) cleanup mount -a return codes - -New return codes: - - 0 : all mounted (or all ignored) - 64 : some mounted, some failed - 32 : all failed - -Note that already mounted or ignored (filtered out by -t or -O) -filesystems don't affect the final return code. - -The original mount(8) returns 0 instead of 64, so the situation -"some mounted, some failed" cannot be detected. - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/mount.8 | 4 ++++ - sys-utils/mount.c | 23 +++++++++++++++++------ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 -index f1cff74..d18881b 100644 ---- a/sys-utils/mount.8 -+++ b/sys-utils/mount.8 -@@ -2759,6 +2759,10 @@ mount failure - .TP - .BR 64 - some mount succeeded -+.RE -+ -+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some -+failed, some success). - - .SH NOTES - The syntax of external mount helpers is: -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 17991b0..3fbac04 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt) - struct libmnt_fs *fs; - int mntrc, ignored, rc = MOUNT_EX_SUCCESS; - -+ int nsucc = 0, nerrs = 0; -+ - itr = mnt_new_iter(MNT_ITER_FORWARD); - if (!itr) { - warn(_("failed to initialize libmount iterator")); -@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt) - printf(ignored == 1 ? _("%-25s: ignored\n") : - _("%-25s: already mounted\n"), - tgt); -- - } else if (mnt_context_is_fork(cxt)) { - if (mnt_context_is_verbose(cxt)) - printf("%-25s: mount successfully forked\n", tgt); - } else { -- rc |= mk_exit_code(cxt, mntrc); -+ mk_exit_code(cxt, mntrc); /* to print warnings */ - - if (mnt_context_get_status(cxt)) { -- rc |= MOUNT_EX_SOMEOK; -+ nsucc++; - - if (mnt_context_is_verbose(cxt)) - printf("%-25s: successfully mounted\n", tgt); -- } -+ } else -+ nerrs++; - } - } - - if (mnt_context_is_parent(cxt)) { - /* wait for mount --fork children */ -- int nerrs = 0, nchildren = 0; -+ int nchildren = 0; -+ -+ nerrs = 0, nsucc = 0; - - rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs); - if (!rc && nchildren) -- rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK; -+ nsucc = nchildren - nerrs; - } - -+ if (nerrs == 0) -+ rc = MOUNT_EX_SUCCESS; /* all success */ -+ else if (nsucc == 0) -+ rc = MOUNT_EX_FAIL; /* all failed */ -+ else -+ rc = MOUNT_EX_SOMEOK; /* some success, some failed */ -+ - mnt_free_iter(itr); - return rc; - } --- -1.7.9.2 - diff --git a/testing/util-linux/stable-fixes-2.21.patch b/testing/util-linux/stable-fixes-2.21.patch deleted file mode 100644 index 3c6c32483..000000000 --- a/testing/util-linux/stable-fixes-2.21.patch +++ /dev/null @@ -1,1516 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d3b298c..9da5b24 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -387,6 +387,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier], - [scanf_cv_alloc_modifier=as], - [scanf_cv_alloc_modifier=no] - ) -+ , -+ [scanf_cv_alloc_modifier=no] - ) - ) - -@@ -833,6 +835,8 @@ AC_ARG_ENABLE([ddate], - ) - UL_BUILD_INIT([ddate]) - AM_CONDITIONAL(BUILD_DDATE, test "x$build_ddate" = xyes) -+ruman1dir='${mandir}/ru/man1' -+AC_SUBST([ruman1dir]) - - - AC_ARG_ENABLE([agetty], -diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h -index 9f9e091..e58e2ff 100644 ---- a/fdisk/fdiskbsdlabel.h -+++ b/fdisk/fdiskbsdlabel.h -@@ -46,7 +46,7 @@ - - #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" - --#if defined (i386) || defined (__sparc__) || defined (__arm__) || \ -+#if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \ - defined (__mips__) || defined (__s390__) || defined (__sh__) || \ - defined(__x86_64__) || defined (__avr32__) || defined(__cris__) - #define BSD_LABELSECTOR 1 -diff --git a/include/list.h b/include/list.h -index 3ce46ca..d8c3bf0 100644 ---- a/include/list.h -+++ b/include/list.h -@@ -166,6 +166,10 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head) - #define list_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) - -+ -+#define list_first_entry(head, type, member) \ -+ ((head) && (head)->next != (head) ? list_entry((head)->next, type, member) : NULL) -+ - /** - * list_for_each - iterate over elements in a list - * @pos: the &struct list_head to use as a loop counter. -diff --git a/lib/canonicalize.c b/lib/canonicalize.c -index ab32c10..fd18af4 100644 ---- a/lib/canonicalize.c -+++ b/lib/canonicalize.c -@@ -174,9 +174,16 @@ canonicalize_path(const char *path) - if (path == NULL) - return NULL; - -- if (!myrealpath(path, canonical, PATH_MAX+1)) -- return strdup(path); -- -+ if (!myrealpath(path, canonical, PATH_MAX+1)) { -+ char *res = strdup(path); -+ if (res) { -+ p = strrchr(res, '/'); -+ /* delete trailing slash */ -+ if (p && p > res && *(p + 1) == '\0') -+ *p = '\0'; -+ } -+ return res; -+ } - - p = strrchr(canonical, '/'); - if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) { -diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c -index 763f75c..6bd69d3 100644 ---- a/libblkid/src/probe.c -+++ b/libblkid/src/probe.c -@@ -388,6 +388,7 @@ void blkid_reset_probe(blkid_probe pr) - return; - - blkid_probe_reset_vals(pr); -+ blkid_probe_set_wiper(pr, 0, 0); - - pr->cur_chain = NULL; - -@@ -989,7 +990,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) - len = sizeof(buf); - - DBG(DEBUG_LOWPROBE, printf( -- "wiping [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n", -+ "do_wipe [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n", - offset, len, chn->driver->name, chn->idx, dryrun ? "yes" : "not")); - - l = lseek(fd, offset, SEEK_SET); -@@ -1008,10 +1009,23 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) - if (chn->idx >= 0) { - chn->idx--; - DBG(DEBUG_LOWPROBE, -- printf("wipe: moving %s chain index to %d\n", -+ printf("do_wipe: moving %s chain index to %d\n", - chn->driver->name, - chn->idx)); - } -+ if (chn->idx == -1) { -+ /* blkid_do_probe() goes to the next chain if the index -+ * of the current chain is -1, so we have to set the -+ * chain pointer to the previos chain. -+ */ -+ size_t idx = chn->driver->id > 0 ? -+ chn->driver->id - 1 : 0; -+ -+ if (idx > 0) -+ pr->cur_chain = &pr->chains[idx]; -+ else if (idx == 0) -+ pr->cur_chain = NULL; -+ } - } - return 0; - } -@@ -1579,8 +1593,9 @@ size_t blkid_rtrim_whitespace(unsigned char *str) - * for later resolution to conflicts between superblocks. - * - * For example we found valid LVM superblock, LVM wipes 8KiB at the begin of -- * the device. If we found another signature (for example MBR) this wiped area -- * then the signature has been added later and LVM superblock should be ignore. -+ * the device. If we found another signature (for example MBR) within the -+ * wiped area then the signature has been added later and LVM superblock -+ * should be ignore. - * - * Note that this heuristic is not 100% reliable, for example "pvcreate --zero - * n" allows to keep the begin of the device unmodified. It's probably better -@@ -1588,6 +1603,16 @@ size_t blkid_rtrim_whitespace(unsigned char *str) - * than for conflicts between filesystem superblocks -- existence of unwanted - * partition table is very unusual, because PT is pretty visible (parsed and - * interpreted by kernel). -+ * -+ * Note that we usually expect only one signature on the device, it means that -+ * we have to remember only one wiped area from previously successfully -+ * detected signature. -+ * -+ * blkid_probe_set_wiper() -- defines wiped area (e.g. LVM) -+ * blkid_probe_use_wiper() -- try to use area (e.g. MBR) -+ * -+ * Note that there is not relation between _wiper and blkid_to_wipe(). -+ * - */ - void blkid_probe_set_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size) - { -@@ -1638,12 +1663,17 @@ int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn, - return 0; - } - -+/* -+ * Try to use any area -- if the area has been previously wiped then the -+ * previous probing result should be ignored (reseted). -+ */ - void blkid_probe_use_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size) - { - struct blkid_chain *chn = NULL; - - if (blkid_probe_is_wiped(pr, &chn, off, size) && chn) { -- DBG(DEBUG_LOWPROBE, printf("wiped area detected -- ignore previous results\n")); -+ DBG(DEBUG_LOWPROBE, printf("previously wiped area modified " -+ " -- ignore previous results\n")); - blkid_probe_set_wiper(pr, 0, 0); - blkid_probe_chain_reset_vals(pr, chn); - } -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 1f30292..f97dd36 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -1165,6 +1165,10 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt) - - src = mnt_fs_get_source(cxt->fs); - -+ if (!src && (cxt->mountflags & MS_PROPAGATION)) -+ /* mount --make-{shared,private,...} */ -+ return mnt_fs_set_source(cxt->fs, "none"); -+ - /* ignore filesystems without source or filesystems - * where the source is quasi-path (//foo/bar) - */ -@@ -1203,7 +1207,7 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt) - - if ((cxt->mountflags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) || - mnt_fs_is_pseudofs(cxt->fs)) { -- DBG(CXT, mnt_debug_h(cxt, "PROPAGATION/pseudo FS source: %s", path)); -+ DBG(CXT, mnt_debug_h(cxt, "BIND/MOVE/pseudo FS source: %s", path)); - return rc; - } - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index 8cbc25b..c56ffd4 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt) - args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */ - args[i++] = mnt_fs_get_target(cxt->fs); /* 3 */ - -- if (mnt_context_is_sloppy(cxt)) -+ /* -+ * TODO: remove the exception for "nfs", -s is documented -+ * for years should be usable everywhere. -+ */ -+ if (mnt_context_is_sloppy(cxt) && -+ type && startswith(type, "nfs")) - args[i++] = "-s"; /* 4 */ - if (mnt_context_is_fake(cxt)) - args[i++] = "-f"; /* 5 */ -@@ -446,9 +451,14 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) - src = mnt_fs_get_srcpath(cxt->fs); - target = mnt_fs_get_target(cxt->fs); - -- if (!src || !target) -+ if (!target) - return -EINVAL; -- -+ if (!src) { -+ /* unnecessary, should be already resolved in -+ * mnt_context_prepare_srcpath(), but for sure... */ -+ DBG(CXT, mnt_debug_h(cxt, "WARNING: source is NULL -- using \"none\"!")); -+ src = "none"; -+ } - type = try_type ? : mnt_fs_get_fstype(cxt->fs); - - if (!(flags & MS_MGC_MSK)) -diff --git a/libmount/src/fs.c b/libmount/src/fs.c -index a28e66c..19650cb 100644 ---- a/libmount/src/fs.c -+++ b/libmount/src/fs.c -@@ -304,11 +304,7 @@ int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source) - - assert(fs); - -- if (source && !strcmp(source, "none")) { -- free(source); -- source = NULL; -- -- } else if (source && strchr(source, '=')) { -+ if (source && strchr(source, '=')) { - if (blkid_parse_tag_string(source, &t, &v) != 0) - return -1; - } -@@ -341,6 +337,7 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source) - - if (!fs) - return -EINVAL; -+ - if (source) { - p = strdup(source); - if (!p) -@@ -353,6 +350,41 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source) - return rc; - } - -+/* -+ * Compares @fs source path with @path. The tailing slash is ignored. -+ * See also mnt_fs_match_source(). -+ * -+ * Returns: 1 if @fs source path equal to @path, otherwise 0. -+ */ -+int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path) -+{ -+ const char *p; -+ -+ if (!fs) -+ return 0; -+ -+ p = mnt_fs_get_srcpath(fs); -+ -+ if (!mnt_fs_is_pseudofs(fs)) -+ return streq_except_trailing_slash(p, path); -+ -+ if (!p && !path) -+ return 1; -+ -+ return p && path && strcmp(p, path) == 0; -+} -+ -+/* -+ * Compares @fs target path with @path. The tailing slash is ignored. -+ * See also mnt_fs_match_target(). -+ * -+ * Returns: 1 if @fs target path equal to @path, otherwise 0. -+ */ -+int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path) -+{ -+ return fs && streq_except_trailing_slash(mnt_fs_get_target(fs), path); -+} -+ - /** - * mnt_fs_get_tag: - * @fs: fs -@@ -1114,7 +1146,7 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target, - return 0; - - /* 1) native paths */ -- rc = !strcmp(target, fs->target); -+ rc = mnt_fs_streq_target(fs, target); - - if (!rc && cache) { - /* 2) - canonicalized and non-canonicalized */ -@@ -1146,10 +1178,6 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target, - * The 2nd, 3rd and 4th attempts are not performed when @cache is NULL. The - * 2nd and 3rd attempts are not performed if @fs->source is tag. - * -- * Note that valid source path is NULL; the libmount uses NULL instead of -- * "none". The "none" is used in /proc/{mounts,self/mountninfo} for pseudo -- * filesystems. -- * - * Returns: 1 if @fs source is equal to @source else 0. - */ - int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, -@@ -1161,15 +1189,15 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, - if (!fs) - return 0; - -- /* undefined source -- "none" in /proc */ -- if (source == NULL && fs->source == NULL) -+ /* 1) native paths... */ -+ if (mnt_fs_streq_srcpath(fs, source) == 1) - return 1; - -- if (source == NULL || fs->source == NULL) -+ if (!source || !fs->source) - return 0; - -- /* 1) native paths/tags */ -- if (streq_except_trailing_slash(source, fs->source)) -+ /* ... and tags */ -+ if (fs->tagname && strcmp(source, fs->source) == 0) - return 1; - - if (!cache) -@@ -1183,7 +1211,7 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, - - /* 2) canonicalized and native */ - src = mnt_fs_get_srcpath(fs); -- if (src && streq_except_trailing_slash(cn, src)) -+ if (src && mnt_fs_streq_srcpath(fs, cn)) - return 1; - - /* 3) canonicalized and canonicalized */ -diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h -index fa0edf5..a7b5c0d 100644 ---- a/libmount/src/mountP.h -+++ b/libmount/src/mountP.h -@@ -367,6 +367,11 @@ extern struct libmnt_fs *mnt_copy_mtab_fs(const struct libmnt_fs *fs); - extern int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source); - extern int __mnt_fs_set_fstype_ptr(struct libmnt_fs *fs, char *fstype); - -+/* exported in v2.22 */ -+extern int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path); -+extern int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path); -+ -+ - /* context.c */ - extern int mnt_context_prepare_srcpath(struct libmnt_context *cxt); - extern int mnt_context_prepare_target(struct libmnt_context *cxt); -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 37f47bd..f3ec573 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -286,6 +286,11 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr, - - id = mnt_fs_get_id(fs); - -+ /* avoid infinite loop. This only happens in rare cases -+ * such as in early userspace when the rootfs is its own parent */ -+ if (id == parent_id) -+ continue; -+ - if ((!lastchld_id || id > lastchld_id) && - (!*chld || id < chld_id)) { - *chld = fs; -@@ -438,7 +443,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - /* native @target */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- if (fs->target && strcmp(fs->target, path) == 0) -+ if (mnt_fs_streq_target(fs, path)) - return fs; - } - if (!tb->cache || !(cn = mnt_resolve_path(path, tb->cache))) -@@ -447,7 +452,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - /* canonicalized paths in struct libmnt_table */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- if (fs->target && strcmp(fs->target, cn) == 0) -+ if (mnt_fs_streq_target(fs, cn)) - return fs; - } - -@@ -456,12 +461,13 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { - char *p; - -- if (!fs->target || !mnt_fs_is_swaparea(fs) || -+ if (!fs->target || mnt_fs_is_swaparea(fs) || - (*fs->target == '/' && *(fs->target + 1) == '\0')) - continue; - - p = mnt_resolve_path(fs->target, tb->cache); -- if (strcmp(cn, p) == 0) -+ /* both canonicalized, strcmp() is fine here */ -+ if (p && strcmp(cn, p) == 0) - return fs; - } - return NULL; -@@ -480,9 +486,8 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - * The 2nd, 3rd and 4th iterations are not performed when @tb cache is not - * set (see mnt_table_set_cache()). - * -- * Note that valid source path is NULL; the libmount uses NULL instead of -- * "none". The "none" is used in /proc/{mounts,self/mountninfo} for pseudo -- * filesystems. -+ * Note that NULL is a valid source path; it will be replaced with "none". The -+ * "none" is used in /proc/{mounts,self/mountinfo} for pseudo filesystems. - * - * Returns: a tab entry or NULL. - */ -@@ -501,16 +506,10 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - /* native paths */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *src = mnt_fs_get_source(fs); -- -- p = mnt_fs_get_srcpath(fs); -- -- if (path == NULL && src == NULL) -- return fs; /* source is "none" */ -- if (path && p && streq_except_trailing_slash(p, path)) -+ if (mnt_fs_streq_srcpath(fs, path)) - return fs; -- if (!p && src) -- ntags++; /* mnt_fs_get_srcpath() returs nothing, it's TAG */ -+ if (mnt_fs_get_tag(fs, NULL, NULL) == 0) -+ ntags++; - } - - if (!path || !tb->cache || !(cn = mnt_resolve_path(path, tb->cache))) -@@ -520,8 +519,7 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - if (ntags < mnt_table_get_nents(tb)) { - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- p = mnt_fs_get_srcpath(fs); -- if (p && streq_except_trailing_slash(p, cn)) -+ if (mnt_fs_streq_srcpath(fs, cn)) - return fs; - } - } -@@ -552,7 +550,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - if (mnt_fs_get_tag(fs, &t, &v)) - continue; - x = mnt_resolve_tag(t, v, tb->cache); -- if (x && streq_except_trailing_slash(x, cn)) -+ -+ /* both canonicalized, strcmp() is fine here */ -+ if (x && strcmp(x, cn) == 0) - return fs; - } - } -@@ -567,7 +567,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - p = mnt_fs_get_srcpath(fs); - if (p) - p = mnt_resolve_path(p, tb->cache); -- if (p && streq_except_trailing_slash(cn, p)) -+ -+ /* both canonicalized, strcmp() is fine here */ -+ if (p && strcmp(p, cn) == 0) - return fs; - } - } -@@ -702,16 +704,18 @@ struct libmnt_fs *mnt_table_find_pair(struct libmnt_table *tb, const char *sourc - } - - /* -- * @tb: /proc/self/mountinfo -- * @fs: filesystem -- * @mountflags: MS_BIND or 0 -- * @fsroot: fs-root that will be probably used in the mountinfo file -+ * tb: /proc/self/mountinfo -+ * fs: filesystem -+ * mountflags: MS_BIND or 0 -+ * fsroot: fs-root that will be probably used in the mountinfo file - * for @fs after mount(2) - * - * For btrfs subvolumes this function returns NULL, but @fsroot properly set. - * - * Returns: entry from @tb that will be used as a source for @fs if the @fs is - * bindmount. -+ * -+ * Don't export to library API! - */ - struct libmnt_fs *mnt_table_get_fs_root(struct libmnt_table *tb, - struct libmnt_fs *fs, -@@ -814,6 +818,20 @@ err: - return NULL; - } - -+static int is_mountinfo(struct libmnt_table *tb) -+{ -+ struct libmnt_fs *fs; -+ -+ if (!tb) -+ return 0; -+ -+ fs = list_first_entry(&tb->ents, struct libmnt_fs, ents); -+ if (fs && mnt_fs_is_kernel(fs) && mnt_fs_get_root(fs)) -+ return 1; -+ -+ return 0; -+} -+ - /** - * mnt_table_is_mounted: - * @tb: /proc/self/mountinfo file -@@ -829,10 +847,9 @@ err: - int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - { - char *root = NULL; -- struct libmnt_fs *src_fs; -- const char *src, *tgt; -- char *xsrc = NULL; -- int flags = 0, rc = 0; -+ const char *src = NULL; -+ char *xsrc = NULL, *tgt; -+ int rc = 0; - - assert(tb); - assert(fstab_fs); -@@ -840,39 +857,49 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - if (mnt_fs_is_swaparea(fstab_fs)) - return 0; - -- if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0) -- flags = MS_BIND; -+ if (is_mountinfo(tb)) { -+ /* @tb is mountinfo, so we can try to use fs-roots */ -+ struct libmnt_fs *fs; -+ int flags = 0; -+ -+ if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0) -+ flags = MS_BIND; - -- src_fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); -- if (src_fs) -- src = mnt_fs_get_srcpath(src_fs); -+ fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); -+ if (fs) -+ src = mnt_fs_get_srcpath(fs); -+ } -+ -+ if (src) -+ src = xsrc = mnt_resolve_spec(src, tb->cache); - else if (mnt_fs_is_pseudofs(fstab_fs)) - src = mnt_fs_get_source(fstab_fs); - else - src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs), - tb->cache); - -- tgt = mnt_fs_get_target(fstab_fs); -+ tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache); - -- if (tgt && src && root) { -+ if (tgt && src) { - struct libmnt_iter itr; - struct libmnt_fs *fs; - - mnt_reset_iter(&itr, MNT_ITER_FORWARD); - - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *s = mnt_fs_get_srcpath(fs), -- *t = mnt_fs_get_target(fs), -- *r = mnt_fs_get_root(fs); -- -- /* -- * Note that kernel can add tailing slash to the -- * network filesystem source paths. -- */ -- if (t && s && r && -- strcmp(t, tgt) == 0 && -- streq_except_trailing_slash(s, src) && -- strcmp(r, root) == 0) -+ -+ if (root) { -+ /* mountinfo: compare root, source and target */ -+ const char *r = mnt_fs_get_root(fs); -+ -+ if (r && strcmp(r, root) == 0 && -+ mnt_fs_streq_srcpath(fs, src) && -+ mnt_fs_streq_target(fs, tgt)) -+ break; -+ } -+ /* mtab: compare source and target */ -+ else if (mnt_fs_streq_srcpath(fs, src) && -+ mnt_fs_streq_target(fs, tgt)) - break; - } - if (fs) -@@ -881,6 +908,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - - if (xsrc && !tb->cache) - free(xsrc); -+ if (!tb->cache) -+ free(tgt); - - free(root); - return rc; -diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c -index 0f618bb..28c8536 100644 ---- a/libmount/src/tab_parse.c -+++ b/libmount/src/tab_parse.c -@@ -180,12 +180,7 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) - unmangle_string(fs->vfs_optstr); - unmangle_string(fstype); - unmangle_string(src); -- -- if (!strcmp(fs->fs_optstr, "none")) { -- free(fs->fs_optstr); -- fs->fs_optstr = NULL; -- } else -- unmangle_string(fs->fs_optstr); -+ unmangle_string(fs->fs_optstr); - - rc = __mnt_fs_set_fstype_ptr(fs, fstype); - if (!rc) { -@@ -733,21 +728,14 @@ static struct libmnt_fs *mnt_table_merge_user_fs(struct libmnt_table *tb, struct - mnt_reset_iter(&itr, MNT_ITER_BACKWARD); - - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *s = mnt_fs_get_srcpath(fs), -- *t = mnt_fs_get_target(fs), -- *r = mnt_fs_get_root(fs); -+ const char *r = mnt_fs_get_root(fs); - - if (fs->flags & MNT_FS_MERGED) - continue; - -- /* -- * Note that kernel can add tailing slash to the network -- * filesystem source path -- */ -- if (s && t && r && -- strcmp(t, target) == 0 && -- streq_except_trailing_slash(s, src) && -- strcmp(r, root) == 0) -+ if (r && strcmp(r, root) == 0 -+ && mnt_fs_streq_target(fs, target) -+ && mnt_fs_streq_srcpath(fs, src)) - break; - } - -diff --git a/libmount/src/utils.c b/libmount/src/utils.c -index c7a1fd1..4d316d1 100644 ---- a/libmount/src/utils.c -+++ b/libmount/src/utils.c -@@ -235,6 +235,7 @@ int mnt_fstype_is_pseudofs(const char *type) - strcmp(type, "binfmt_misc") == 0 || - strcmp(type, "fuse.gvfs-fuse-daemon") == 0 || - strcmp(type, "debugfs") == 0 || -+ strcmp(type, "nfsd") == 0 || - strcmp(type, "spufs") == 0) - return 1; - return 0; -diff --git a/login-utils/login.c b/login-utils/login.c -index 84d8b1b..4f448f8 100644 ---- a/login-utils/login.c -+++ b/login-utils/login.c -@@ -128,6 +128,22 @@ static int timeout = LOGIN_TIMEOUT; - static int child_pid = 0; - static volatile int got_sig = 0; - -+#ifdef LOGIN_CHOWN_VCS -+/* true if the filedescriptor fd is a console tty, very Linux specific */ -+static int is_consoletty(int fd) -+{ -+ struct stat stb; -+ -+ if ((fstat(fd, &stb) >= 0) -+ && (major(stb.st_rdev) == TTY_MAJOR) -+ && (minor(stb.st_rdev) < 64)) { -+ return 1; -+ } -+ return 0; -+} -+#endif -+ -+ - /* - * Robert Ambrose writes: - * A couple of my users have a problem with login processes hanging around -@@ -316,15 +332,15 @@ static void chown_tty(struct login_context *cxt) - - #ifdef LOGIN_CHOWN_VCS - if (is_consoletty(0)) { -- if (chown(cxt->vcs, uid, gid)) /* vcs */ -- chown_err(cxt->vcs, uid, gid); -- if (chmod(cxt->vcs, cxt->tty_mode)) -- chmod_err(cxt->vcs, cxt->tty_mode); -- -- if (chown(cxt->vcsa, uid, gid)) /* vcsa */ -- chown_err(cxt->vcsa, uid, gid); -- if (chmod(cxt->vcsa, cxt->tty_mode)) -- chmod_err(cxt->vcsa, cxt->tty_mode); -+ if (chown(cxt->vcsn, uid, gid)) /* vcs */ -+ chown_err(cxt->vcsn, uid, gid); -+ if (chmod(cxt->vcsn, cxt->tty_mode)) -+ chmod_err(cxt->vcsn, cxt->tty_mode); -+ -+ if (chown(cxt->vcsan, uid, gid)) /* vcsa */ -+ chown_err(cxt->vcsan, uid, gid); -+ if (chmod(cxt->vcsan, cxt->tty_mode)) -+ chmod_err(cxt->vcsan, cxt->tty_mode); - } - #endif - } -@@ -403,21 +419,6 @@ static void init_tty(struct login_context *cxt) - } - - --#ifdef LOGIN_CHOWN_VCS --/* true if the filedescriptor fd is a console tty, very Linux specific */ --static int is_consoletty(int fd) --{ -- struct stat stb; -- -- if ((fstat(fd, &stb) >= 0) -- && (major(stb.st_rdev) == TTY_MAJOR) -- && (minor(stb.st_rdev) < 64)) { -- return 1; -- } -- return 0; --} --#endif -- - /* - * Log failed login attempts in _PATH_BTMP if that exists. - * Must be called only with username the name of an actual user. -@@ -1145,13 +1146,10 @@ static void init_environ(struct login_context *cxt) - setenv("TERM", termenv, 1); - - if (pwd->pw_uid) -- setenv("PATH", getlogindefs_str("ENV_PATH", _PATH_DEFPATH), 1); -- else { -- const char *x = getlogindefs_str("ENV_ROOTPATH", NULL); -- if (!x) -- x = getlogindefs_str("ENV_SUPATH", _PATH_DEFPATH_ROOT); -- setenv("PATH", x, 1); -- } -+ logindefs_setenv("PATH", "ENV_PATH", _PATH_DEFPATH); -+ -+ else if (logindefs_setenv("PATH", "ENV_ROOTPATH", NULL) != 0) -+ logindefs_setenv("PATH", "ENV_SUPATH", _PATH_DEFPATH_ROOT); - - /* mailx will give a funny error msg if you forget this one */ - len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name); -diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c -index fe590e9..e9517ac 100644 ---- a/login-utils/logindefs.c -+++ b/login-utils/logindefs.c -@@ -211,6 +211,43 @@ const char *getlogindefs_str(const char *name, const char *dflt) - return ptr->value; - } - -+/* -+ * For compatibililty with shadow-utils we have tu support additional -+ * syntax for environment variables in login.defs(5) file. The standard -+ * syntax is: -+ * -+ * ENV_FOO data -+ * -+ * but shadow-utils supports also -+ * -+ * ENV_FOO FOO=data -+ * -+ * the FOO= prefix has to be remove before we call setenv(). -+ */ -+int logindefs_setenv(const char *name, const char *conf, const char *dflt) -+{ -+ const char *val = getlogindefs_str(conf, dflt); -+ const char *p; -+ -+ if (!val) -+ return -1; -+ -+ p = strchr(val, '='); -+ if (p) { -+ size_t sz = strlen(name); -+ -+ if (strncmp(val, name, sz) == 0 && *(p + 1)) { -+ val = p + 1; -+ if (*val == '"') -+ val++; -+ if (!*val) -+ val = dflt; -+ } -+ } -+ -+ return val ? setenv(name, val, 1) : -1; -+} -+ - #ifdef TEST_PROGRAM - int main(int argc, char *argv[]) - { -diff --git a/login-utils/logindefs.h b/login-utils/logindefs.h -index 37d19e1..163869d 100644 ---- a/login-utils/logindefs.h -+++ b/login-utils/logindefs.h -@@ -5,5 +5,6 @@ extern int getlogindefs_bool(const char *name, int dflt); - extern long getlogindefs_num(const char *name, long dflt); - extern const char *getlogindefs_str(const char *name, const char *dflt); - extern void free_getlogindefs_data(void); -+extern int logindefs_setenv(const char *name, const char *conf, const char *dflt); - - #endif /* UTIL_LINUX_LOGINDEFS_H */ -diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am -index 799feca..281ec23 100644 ---- a/man/ru/Makefile.am -+++ b/man/ru/Makefile.am -@@ -1,9 +1,6 @@ - include $(top_srcdir)/config/include-Makefile.am - --mandir = @mandir@/ru -- --dist_man_MANS = -- - if BUILD_DDATE --dist_man_MANS += ddate.1 -+ruman1_DATA = ddate.1 -+EXTRA_DIST = $(ruman1_DATA) - endif -diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8 -index 028b19f..286d54b 100644 ---- a/misc-utils/lsblk.8 -+++ b/misc-utils/lsblk.8 -@@ -59,7 +59,7 @@ Use key="value" output format. - Use the raw output format. - .IP "\fB\-t, \-\-topology\fP" - Output info about block device topology. --This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED". -+This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE". - .SH NOTES - For the partitions are some information (e.g. queue attributes) inherited from - parental device. -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 8468b3f..54bf360 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -478,9 +478,14 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - switch(id) { - case COL_NAME: - if (cxt->dm_name) { -- snprintf(buf, sizeof(buf), "%s (%s)", -+ if ((lsblk->tt->flags & TT_FL_RAW) || -+ (lsblk->tt->flags & TT_FL_EXPORT)) -+ tt_line_set_data(ln, col, xstrdup(cxt->dm_name)); -+ else { -+ snprintf(buf, sizeof(buf), "%s (%s)", - cxt->dm_name, cxt->name); -- tt_line_set_data(ln, col, xstrdup(buf)); -+ tt_line_set_data(ln, col, xstrdup(buf)); -+ } - break; - } - case COL_KNAME: -diff --git a/mount/fstab.5 b/mount/fstab.5 -index b0cd763..c618947 100644 ---- a/mount/fstab.5 -+++ b/mount/fstab.5 -@@ -167,7 +167,7 @@ support filesystem - The subtype is defined by '.subtype' suffix. For - example 'fuse.sshfs'. It's recommended to use subtype notation rather than add - any prefix to the first fstab field (for example 'sshfs#example.com' is --depreacated). -+deprecated). - .RE - - .B The fourth field -diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8 -index a68836e..f50b072 100644 ---- a/sys-utils/losetup.8 -+++ b/sys-utils/losetup.8 -@@ -80,6 +80,8 @@ for non-root users. - force loop driver to reread size of the file associated with the specified loop device - .IP "\fB\-d, \-\-detach\fP \fIloopdev\fP..." - detach the file or device associated with the specified loop device(s) -+.IP "\fB\-D, \-\-detach-all\fP" -+detach all associated loop devices - .IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP" - enable data encryption with specified name or number - .IP "\fB\-f, \-\-find\fP" -diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c -index 16ace6f..9f03151 100644 ---- a/sys-utils/losetup.c -+++ b/sys-utils/losetup.c -@@ -362,7 +362,7 @@ int main(int argc, char **argv) - if (flags & LOOPDEV_FL_OFFSET) - loopcxt_set_offset(&lc, offset); - if (flags & LOOPDEV_FL_SIZELIMIT) -- loopcxt_set_offset(&lc, sizelimit); -+ loopcxt_set_sizelimit(&lc, sizelimit); - if (lo_flags) - loopcxt_set_flags(&lc, lo_flags); - if ((res = loopcxt_set_backing_file(&lc, file))) { -diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 -index 78e7a41..44d4402 100644 ---- a/sys-utils/mount.8 -+++ b/sys-utils/mount.8 -@@ -2760,6 +2760,10 @@ mount failure - .TP - .BR 64 - some mount succeeded -+.RE -+ -+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some -+failed, some success). - - .SH NOTES - The syntax of external mount helpers is: -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 15510e0..12ec372 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt) - struct libmnt_fs *fs; - int mntrc, ignored, rc = MOUNT_EX_SUCCESS; - -+ int nsucc = 0, nerrs = 0; -+ - itr = mnt_new_iter(MNT_ITER_FORWARD); - if (!itr) { - warn(_("failed to initialize libmount iterator")); -@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt) - printf(ignored == 1 ? _("%-25s: ignored\n") : - _("%-25s: already mounted\n"), - tgt); -- - } else if (mnt_context_is_fork(cxt)) { - if (mnt_context_is_verbose(cxt)) - printf("%-25s: mount successfully forked\n", tgt); - } else { -- rc |= mk_exit_code(cxt, mntrc); -+ mk_exit_code(cxt, mntrc); /* to print warnings */ - - if (mnt_context_get_status(cxt)) { -- rc |= MOUNT_EX_SOMEOK; -+ nsucc++; - - if (mnt_context_is_verbose(cxt)) - printf("%-25s: successfully mounted\n", tgt); -- } -+ } else -+ nerrs++; - } - } - - if (mnt_context_is_parent(cxt)) { - /* wait for mount --fork children */ -- int nerrs = 0, nchildren = 0; -+ int nchildren = 0; -+ -+ nerrs = 0, nsucc = 0; - - rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs); - if (!rc && nchildren) -- rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK; -+ nsucc = nchildren - nerrs; - } - -+ if (nerrs == 0) -+ rc = MOUNT_EX_SUCCESS; /* all success */ -+ else if (nsucc == 0) -+ rc = MOUNT_EX_FAIL; /* all failed */ -+ else -+ rc = MOUNT_EX_SOMEOK; /* some success, some failed */ -+ - mnt_free_iter(itr); - return rc; - } -@@ -290,6 +301,25 @@ static void selinux_warning(struct libmnt_context *cxt, const char *tgt) - # define selinux_warning(_x, _y) - #endif - -+/* temporary in mount(8) for v2.21.x releases, in v2.22 will be in libmount -+ */ -+static int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path) -+{ -+ const char *p; -+ -+ if (!fs) -+ return 0; -+ -+ p = mnt_fs_get_srcpath(fs); -+ -+ if (!mnt_fs_is_pseudofs(fs)) -+ return streq_except_trailing_slash(p, path); -+ -+ if (!p && !path) -+ return 1; -+ -+ return p && path && strcmp(p, path) == 0; -+} - - /* - * rc = 0 success -@@ -336,7 +366,11 @@ try_readonly: - return MOUNT_EX_USAGE; - } - -- if (src == NULL || tgt == NULL) { -+ /* -+ * TODO: add mnt_context_fstab_applied() to check if we found -+ * target/source in the file. -+ */ -+ if (!tgt) { - if (mflags & MS_REMOUNT) - warnx(_("%s not mounted"), src ? src : tgt); - else -@@ -408,7 +442,7 @@ try_readonly: - const char *s = mnt_fs_get_srcpath(fs), - *t = mnt_fs_get_target(fs); - -- if (t && s && streq_except_trailing_slash(s, src)) -+ if (t && s && mnt_fs_streq_srcpath(fs, src)) - fprintf(stderr, _( - " %s is already mounted on %s\n"), s, t); - } -@@ -697,7 +731,7 @@ int main(int argc, char **argv) - longopts, NULL)) != -1) { - - /* only few options are allowed for non-root users */ -- if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpr", c)) -+ if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpri", c)) - exit_non_root(option_to_longopt(c, longopts)); - - switch(c) { -diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c -index 5cc833d..d0a0069 100644 ---- a/sys-utils/mountpoint.c -+++ b/sys-utils/mountpoint.c -@@ -40,12 +40,12 @@ - - static int quiet; - --static dev_t dir_to_device(const char *spec) -+static int dir_to_device(const char *spec, dev_t *dev) - { - struct libmnt_table *tb = mnt_new_table_from_file("/proc/self/mountinfo"); - struct libmnt_fs *fs; - struct libmnt_cache *cache; -- dev_t res = 0; -+ int rc = -1; - - if (!tb) { - /* -@@ -57,7 +57,7 @@ static dev_t dir_to_device(const char *spec) - int len; - - if (stat(spec, &st) != 0) -- return 0; -+ return -1; - - cn = mnt_resolve_path(spec, NULL); /* canonicalize */ - -@@ -65,15 +65,17 @@ static dev_t dir_to_device(const char *spec) - free(cn); - - if (len < 0 || (size_t) len + 1 > sizeof(buf)) -- return 0; -+ return -1; - if (stat(buf, &pst) !=0) -- return 0; -+ return -1; - - if ((st.st_dev != pst.st_dev) || -- (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) -- return st.st_dev; -+ (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) { -+ *dev = st.st_dev; -+ return 0; -+ } - -- return 0; -+ return -1; - } - - /* to canonicalize all necessary paths */ -@@ -81,12 +83,14 @@ static dev_t dir_to_device(const char *spec) - mnt_table_set_cache(tb, cache); - - fs = mnt_table_find_target(tb, spec, MNT_ITER_BACKWARD); -- if (fs && mnt_fs_get_target(fs)) -- res = mnt_fs_get_devno(fs); -+ if (fs && mnt_fs_get_target(fs)) { -+ *dev = mnt_fs_get_devno(fs); -+ rc = 0; -+ } - - mnt_free_table(tb); - mnt_free_cache(cache); -- return res; -+ return rc; - } - - static int print_devno(const char *devname, struct stat *st) -@@ -185,8 +189,8 @@ int main(int argc, char **argv) - errx(EXIT_FAILURE, _("%s: not a directory"), spec); - return EXIT_FAILURE; - } -- src = dir_to_device(spec); -- if (!src) { -+ -+ if ( dir_to_device(spec, &src)) { - if (!quiet) - printf(_("%s is not a mountpoint\n"), spec); - return EXIT_FAILURE; -diff --git a/term-utils/script.c b/term-utils/script.c -index 58f9790..0d891b8 100644 ---- a/term-utils/script.c -+++ b/term-utils/script.c -@@ -437,6 +437,16 @@ doshell(void) { - else - shname = shell; - -+ /* -+ * When invoked from within /etc/csh.login, script spawns a csh shell -+ * that spawns programs that cannot be killed with a SIGTERM. This is -+ * because csh has a documented behaviour wherein it disables all -+ * signals when processing the /etc/csh.* files. -+ * -+ * Let's restore the default behavior. -+ */ -+ signal(SIGTERM, SIG_DFL); -+ - if (cflg) - execl(shell, shname, "-c", cflg, NULL); - else -diff --git a/tests/Makefile.am b/tests/Makefile.am -index fd62519..2c72318 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -7,5 +7,5 @@ EXTRA_DIST = expected \ - functions.sh \ - run.sh - --distclean-local: -+clean-local: - rm -rf output diff -diff --git a/tests/expected/libmount/tabfiles-find-target2 b/tests/expected/libmount/tabfiles-find-target2 -new file mode 100644 -index 0000000..8a6c57b ---- /dev/null -+++ b/tests/expected/libmount/tabfiles-find-target2 -@@ -0,0 +1,5 @@ -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-find-target3 b/tests/expected/libmount/tabfiles-find-target3 -new file mode 100644 -index 0000000..8a6c57b ---- /dev/null -+++ b/tests/expected/libmount/tabfiles-find-target3 -@@ -0,0 +1,5 @@ -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-parse-fstab b/tests/expected/libmount/tabfiles-parse-fstab -index 14bdfb4..d661526 100644 ---- a/tests/expected/libmount/tabfiles-parse-fstab -+++ b/tests/expected/libmount/tabfiles-parse-fstab -@@ -58,3 +58,8 @@ target: /mnt/gogogo - fstype: cifs - optstr: user=SRGROUP/baby,noauto - user-optstr: user=SRGROUP/baby,noauto -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo -index 95182dd..4470801 100644 ---- a/tests/expected/libmount/tabfiles-parse-mountinfo -+++ b/tests/expected/libmount/tabfiles-parse-mountinfo -@@ -296,7 +296,7 @@ id: 41 - parent: 20 - devno: 253:0 - ------ fs: --source: (null) -+source: none - target: /proc/sys/fs/binfmt_misc - fstype: binfmt_misc - optstr: rw,relatime -diff --git a/tests/expected/libmount/tabfiles-parse-mtab b/tests/expected/libmount/tabfiles-parse-mtab -index d7171ea..ffd0c13 100644 ---- a/tests/expected/libmount/tabfiles-parse-mtab -+++ b/tests/expected/libmount/tabfiles-parse-mtab -@@ -42,7 +42,7 @@ fstype: ext4 - optstr: rw,noatime - VFS-optstr: rw,noatime - ------ fs: --source: (null) -+source: none - target: /proc/sys/fs/binfmt_misc - fstype: binfmt_misc - optstr: rw -diff --git a/tests/expected/libmount/update-utab-mount b/tests/expected/libmount/update-utab-mount -index 1784e00..58a0179 100644 ---- a/tests/expected/libmount/update-utab-mount -+++ b/tests/expected/libmount/update-utab-mount -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/bar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/xyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/libmount/update-utab-move b/tests/expected/libmount/update-utab-move -index 12917cc..6008140 100644 ---- a/tests/expected/libmount/update-utab-move -+++ b/tests/expected/libmount/update-utab-move -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/libmount/update-utab-remount b/tests/expected/libmount/update-utab-remount -index 737e2a3..8e344b3 100644 ---- a/tests/expected/libmount/update-utab-remount -+++ b/tests/expected/libmount/update-utab-remount -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=user --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/mount/fstab-none b/tests/expected/mount/fstab-none -new file mode 100644 -index 0000000..3582111 ---- /dev/null -+++ b/tests/expected/mount/fstab-none -@@ -0,0 +1 @@ -+Success -diff --git a/tests/expected/mount/shared-subtree b/tests/expected/mount/shared-subtree -new file mode 100644 -index 0000000..3582111 ---- /dev/null -+++ b/tests/expected/mount/shared-subtree -@@ -0,0 +1 @@ -+Success -diff --git a/tests/expected/mount/shared-subtree-make-private b/tests/expected/mount/shared-subtree-make-private -new file mode 100644 -index 0000000..39cdd0d ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-private -@@ -0,0 +1 @@ -+- -diff --git a/tests/expected/mount/shared-subtree-make-shared b/tests/expected/mount/shared-subtree-make-shared -new file mode 100644 -index 0000000..8a205e8 ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-shared -@@ -0,0 +1 @@ -+shared -diff --git a/tests/expected/mount/shared-subtree-make-unbindable b/tests/expected/mount/shared-subtree-make-unbindable -new file mode 100644 -index 0000000..376cfac ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-unbindable -@@ -0,0 +1 @@ -+unbindable -diff --git a/tests/functions.sh b/tests/functions.sh -index 85b1621..6556e4e 100644 ---- a/tests/functions.sh -+++ b/tests/functions.sh -@@ -93,6 +93,8 @@ function ts_init_core_subtest_env { - TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-mnt" - - rm -f $TS_OUTPUT $TS_VGDUMP -+ [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -+ - touch $TS_OUTPUT - [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP - } -@@ -127,8 +129,6 @@ function ts_init_env { - - BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab" - -- [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -- [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" - - declare -a TS_SUID_PROGS - declare -a TS_SUID_USER -@@ -141,6 +141,8 @@ function ts_init_env { - export BLKID_FILE - - rm -f $TS_OUTPUT $TS_VGDUMP -+ [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -+ - touch $TS_OUTPUT - [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP - -@@ -219,8 +221,15 @@ function ts_gen_diff { - local res=0 - - if [ -s "$TS_OUTPUT" ]; then -+ -+ [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" - diff -u $TS_EXPECTED $TS_OUTPUT > $TS_DIFF -- [ -s $TS_DIFF ] && res=1 -+ -+ if [ -s $TS_DIFF ]; then -+ res=1 -+ else -+ rm -f $TS_DIFF; -+ fi - else - res=1 - fi -diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config -index 7ede38c..e2c2b00 100755 ---- a/tests/ts/build-sys/config -+++ b/tests/ts/build-sys/config -@@ -52,9 +52,18 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do - esac - fi - done -+ -+ # clean the tree, but exclude tests/{diff,output} dirs -+ # -+ [ -d tests/diff ] && mv tests/diff tests/diff.save -+ [ -d tests/output ] && mv tests/output tests/output.save -+ - make -j clean &> /dev/null -- cd $olddir - -+ [ -d tests/diff.save ] && mv tests/diff.save tests/diff -+ [ -d tests/output.save ] && mv tests/output.save tests/output -+ -+ cd $olddir - ts_finalize_subtest - done - -diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab -index aa49806..4c1d117 100755 ---- a/tests/ts/libmount/context-utab -+++ b/tests/ts/libmount/context-utab -@@ -67,6 +67,8 @@ grep -q $DEVICE /proc/mounts || \ - echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest - -+sleep 1 -+ - ts_init_subtest "umount-by-devname" - ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 - grep -q $DEVICE /proc/mounts && -@@ -81,6 +83,8 @@ grep -q $DEVICE $LIBMOUNT_UTAB || \ - echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest - -+sleep 1 -+ - ts_init_subtest "umount" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB && \ -@@ -94,6 +98,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then - /sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null - umount $MOUNTPOINT &> /dev/null - -+ sleep 1 -+ - ts_init_subtest "mount-uhelper-subvol" - mkdir -p $MOUNTPOINT &> /dev/null - ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -@@ -105,6 +111,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then - $TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 - ts_log "---" - -+ sleep 1 -+ - ts_init_subtest "umount-subvol" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB && \ -diff --git a/tests/ts/libmount/files/fstab b/tests/ts/libmount/files/fstab -index 2503065..a8f73bc 100644 ---- a/tests/ts/libmount/files/fstab -+++ b/tests/ts/libmount/files/fstab -@@ -10,3 +10,5 @@ proc /proc proc defaults 0 0 - - foo.com:/mnt/share /mnt/remote nfs noauto - //bar.com/gogogo /mnt/gogogo cifs user=SRGROUP/baby,noauto -+ -+/dev/foo /any/foo/ auto defaults 0 0 -diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles -index 7f4913e..671c649 100755 ---- a/tests/ts/libmount/tabfiles -+++ b/tests/ts/libmount/tabfiles -@@ -47,6 +47,16 @@ ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> - sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT - ts_finalize_subtest - -+ts_init_subtest "find-target2" -+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT -+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "find-target3" -+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT -+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -+ts_finalize_subtest -+ - ts_init_subtest "find-pair" - ts_valgrind $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT - sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none -new file mode 100755 -index 0000000..62a89ca ---- /dev/null -+++ b/tests/ts/mount/fstab-none -@@ -0,0 +1,30 @@ -+#!/bin/bash -+ -+TS_TOPDIR="$(dirname $0)/../.." -+TS_DESC="none" -+ -+. $TS_TOPDIR/functions.sh -+ts_init "$*" -+ts_skip_nonroot -+ -+set -o pipefail -+ -+ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" -+ -+mkdir -p $TS_MOUNTPOINT -+ -+$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT -+ -+$TS_CMD_FINDMNT --target "$TS_MOUNTPOINT" &> /dev/null -+[ $? -eq 0 ] || ts_die "Not found target (mount failed?)" -+ -+$TS_CMD_FINDMNT --source "none" --target "$TS_MOUNTPOINT" &> /dev/null -+[ $? -eq 0 ] || ts_die "Not found source and target" -+ -+$TS_CMD_UMOUNT $TS_MOUNTPOINT || ts_die "Cannot umount $TS_MOUNTPOINT" -+ -+ts_fstab_clean -+ -+ts_log "Success" -+ts_finalize -+ -diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree -new file mode 100755 -index 0000000..a0a76c5 ---- /dev/null -+++ b/tests/ts/mount/shared-subtree -@@ -0,0 +1,58 @@ -+#!/bin/bash -+ -+TS_TOPDIR="$(dirname $0)/../.." -+TS_DESC="shared-subtree" -+ -+. $TS_TOPDIR/functions.sh -+ts_init "$*" -+ts_skip_nonroot -+ -+function get_attr() -+{ -+ # It's usually stupid idea to use 'grep | awk', -+ # but use paths in awk /regex/ is too tricky... -+ # -+ # TODO; improve libmount and findmnt to return the -+ # shared-subtree flags -+ # -+ echo $(grep "$1" /proc/self/mountinfo | \ -+ awk '{print $7}' | \ -+ awk -F ':' '{ print $1 }') -+} -+ -+[ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT -+ -+# bind -+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT -+ -+# check the bind -+$TS_CMD_FINDMNT --kernel --target $TS_MOUNTPOINT &> /dev/null -+[ "$?" == "0" ] || ts_die "Cannot find binded $TS_MOUNTPOINT in /proc/self/mountinfo" -+ -+# use the same mounpoint for all sub-tests -+MOUNTPOINT="$TS_MOUNTPOINT" -+ -+ -+ts_init_subtest "make-shared" -+$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "make-private" -+$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "make-unbindable" -+$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ -+# clean up -+$TS_CMD_UMOUNT $TS_MOUNTPOINT -+rmdir $TS_MOUNTPOINT -+ -+ts_log "Success" -+ts_finalize -+ diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD deleted file mode 100644 index e8c2f5b24..000000000 --- a/testing/wpa_supplicant/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 150324 2012-02-16 20:41:55Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=wpa_supplicant -pkgver=0.7.3 -pkgrel=5 -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>=1.2.4' 'readline>=6.0' 'libnl') -optdepends=('wpa_supplicant_gui: wpa_gui program') -license=('GPL') -groups=('base') -backup=('etc/wpa_supplicant.conf') -source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) -sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' - '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' - 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" - - cd ${pkgname} - # Required by NetworkManager 0.8.995 - patch -Np2 -i "$srcdir/dbus.patch" - cp "${srcdir}/config" ./.config - sed -i 's@/usr/local@$(PREFIX)@g' Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - make PREFIX=/usr DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc" - install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" - install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} - install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" - install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" - rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 - - install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" - install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" - sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service - install -m755 -d "${pkgdir}/etc/dbus-1/system.d" - install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" -} diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config deleted file mode 100644 index eef35d045..000000000 --- a/testing/wpa_supplicant/config +++ /dev/null @@ -1,406 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# 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 -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - -# Include client MLME (management frame processing) for test driver -# This can be used to test MLME operations in hostapd with the test interface. -# space. -#CONFIG_CLIENT_MLME=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -#CONFIG_DRIVER_NONE=y - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is -# included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -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 - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -#CONFIG_EAP_SIM=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-PAX -#CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -#CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -#CONFIG_EAP_SAKE=y - -# EAP-GPSK -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -#CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y - -# EAP-IKEv2 -#CONFIG_EAP_IKEV2=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 - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -#CONFIG_PCSC=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# 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) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -CONFIG_READLINE=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 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 -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operatins system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template -#CONFIG_ELOOP=eloop - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -#CONFIG_L2_PACKET=linux - -# 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. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) -# internal = Internal TLSv1 implementation (experimental) -# none = Empty template -#CONFIG_TLS=openssl - -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -# even though the core GnuTLS library is released under LGPL, this extra -# library uses GPL and as such, the terms of GPL apply to the combination -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -# apply for distribution of the resulting binary. -#CONFIG_GNUTLS_EXTRA=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 -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for old DBus control interface -# (fi.epitest.hostap.WPASupplicant) -CONFIG_CTRL_IFACE_DBUS=y - -# Add support for new DBus control interface -# (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -CONFIG_DEBUG_FILE=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -#CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, comment out these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, comment out these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -CONFIG_LIBNL32=y diff --git a/testing/wpa_supplicant/dbus.patch b/testing/wpa_supplicant/dbus.patch deleted file mode 100644 index 4c5002003..000000000 --- a/testing/wpa_supplicant/dbus.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Fri, 17 Dec 2010 15:56:01 +0200 -Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes - -The supplicant was not emitting property changed events when the BSSs -property changed. - -Signed-off-by: Dan Williams <dcbw@redhat.com> -(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) ---- - wpa_supplicant/dbus/dbus_new.c | 6 ++++++ - wpa_supplicant/dbus/dbus_new.h | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c -index bdfbbac..c66640a 100644 ---- a/wpa_supplicant/dbus/dbus_new.c -+++ b/wpa_supplicant/dbus/dbus_new.c -@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, - wpas_dbus_getter_current_network; - prop = "CurrentNetwork"; - break; -+ case WPAS_DBUS_PROP_BSSS: -+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; -+ prop = "BSSs"; -+ break; - default: - wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", - __func__, property); -@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - } -@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - -diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h -index 80ea98c..9cdefcb 100644 ---- a/wpa_supplicant/dbus/dbus_new.h -+++ b/wpa_supplicant/dbus/dbus_new.h -@@ -30,6 +30,7 @@ enum wpas_dbus_prop { - WPAS_DBUS_PROP_STATE, - WPAS_DBUS_PROP_CURRENT_BSS, - WPAS_DBUS_PROP_CURRENT_NETWORK, -+ WPAS_DBUS_PROP_BSSS, - }; - - enum wpas_dbus_bss_prop { --- -1.7.4-rc1 - diff --git a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch deleted file mode 100644 index 8e7cd9a97..000000000 --- a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: [RFC] hostap: Allow linking with libnl-3. -Date: Tue, 15 Nov 2011 14:30:04 -0000 -From: Ben Greear <greearb@candelatech.com> - -I needed this patch to compile against the latest -libnl code. I added this to my config file: - -CONFIG_LIBNL32=y - -Signed-hostap: Ben Greear <greearb@candelatech.com> -rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> - ---- -:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak - src/drivers/drivers.mak | 21 ++++++++++++++------- - 2 files changed, 29 insertions(+), 14 deletions(-) - ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -31,11 +31,18 @@ NEED_SME=y - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+ifdef CONFIG_LIBNL32 -+ DRV_LIBS += -lnl-3 -+ DRV_LIBS += -lnl-genl-3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -I/usr/include/libnl3/ -+else -+ DRV_LIBS += -lnl - --ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl --DRV_CFLAGS += -DCONFIG_LIBNL20 -+ ifdef CONFIG_LIBNL20 -+ DRV_LIBS += -lnl-genl -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ endif - endif - endif - diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD deleted file mode 100644 index 6a1a53766..000000000 --- a/testing/xf86-input-acecad/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 150002 2012-02-12 09:44:03Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-acecad -pkgver=1.5.0 -pkgrel=3 -pkgdesc="X.Org acecad tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('sysfsutils') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - assign-local-private-after-allocating.patch) -sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' - '9301020b0ef3c6f2081e957481a88d2e187a7973') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch deleted file mode 100644 index e3e635a6f..000000000 --- a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 27 Jun 2011 03:13:54 +0000 -Subject: Assign local->private after allocating. - -It is detrimental to the user experience when the driver tries to derefernce -null pointers. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/acecad.c b/src/acecad.c -index ad6d793..604fe91 100644 ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - return BadAlloc; - - memset(priv, 0, sizeof(AceCadPrivateRec)); -+ local->private = priv; - - local->device_control = DeviceControl; - --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xf86-input-aiptek/PKGBUILD b/testing/xf86-input-aiptek/PKGBUILD deleted file mode 100644 index a317aafb6..000000000 --- a/testing/xf86-input-aiptek/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 150004 2012-02-12 09:44:04Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-aiptek -pkgver=1.4.1 -pkgrel=3 -pkgdesc="X.Org Aiptek USB Digital Tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD deleted file mode 100644 index b1c5e6159..000000000 --- a/testing/xf86-input-evdev/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 152652 2012-03-07 19:49:46Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <Alexander@archlinux.org - -pkgname=xf86-input-evdev -pkgver=2.7.0 -pkgrel=1 -pkgdesc="X.org evdev input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool' '!makeflags') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-input-joystick/50-joystick.conf b/testing/xf86-input-joystick/50-joystick.conf deleted file mode 100644 index 95a295ab0..000000000 --- a/testing/xf86-input-joystick/50-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/testing/xf86-input-joystick/PKGBUILD b/testing/xf86-input-joystick/PKGBUILD deleted file mode 100644 index 86faad029..000000000 --- a/testing/xf86-input-joystick/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 153029 2012-03-11 12:07:31Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=1 -pkgdesc="X.Org Joystick input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch - 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' - 'e1ff3699a0470c6bb78a53f718df9d8521621e11') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-joystick/git-fixes.patch b/testing/xf86-input-joystick/git-fixes.patch deleted file mode 100644 index b3afa06cc..000000000 --- a/testing/xf86-input-joystick/git-fixes.patch +++ /dev/null @@ -1,399 +0,0 @@ -From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 -From: Terry Lambert <tlambert@chromium.org> -Date: Sat, 16 Jul 2011 00:23:22 +0000 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert <tlambert@chromium.org> -Reviewed-by: Stephane Marchesin <marcheu@chromium.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/jstk.c b/src/jstk.c -index ec6b79a..6db0e7c 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } /* switch (what) */ - return Success; - } -diff --git a/src/jstk_key.c b/src/jstk_key.c -index 3c471ce..d699dcd 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, - DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); - dev->public.on = FALSE; - break; -+ default: -+ return BadValue; - } - - return Success; --- -cgit v0.9.0.2-2-gbebe -From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 -From: Devin J. Pohly <djpohly+xorg@gmail.com> -Date: Sat, 03 Sep 2011 23:00:07 +0000 -Subject: unify capitalization of joystick properties - -the axis keys high/low properties were inconsistently capitalized, -leading to potential confusion as to why one works but not the other. - -Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/include/joystick-properties.h b/include/joystick-properties.h -index 49ef800..36f4082 100644 ---- a/include/joystick-properties.h -+++ b/include/joystick-properties.h -@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { - - /** Scancodes for axis in high position */ - /* 8 bit, 4 per axis */ --#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" -+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" - - /** Set the mapping of each button to - none, x, y, zx, zy, button, key, speed_multiply, --- -cgit v0.9.0.2-2-gbebe -From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sat, 15 Oct 2011 22:47:52 +0000 -Subject: label buttons and axes - -Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. -Mapping can be changed while running so the labels will be constant. - -Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator -data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" -and "Rel Y", representing the aggregated post-calculation data from all axes. - -Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> ---- -diff --git a/man/joystick.man b/man/joystick.man -index da92ceb..b401de5 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -140,7 +140,11 @@ Neither - .B mode - nor - .B axis --needs to be set to generate extra valuator events. -+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with -+.I 1 -+, i.e. -+.I \*qAxis 1\*q -+for the first axis (being the 3rd valuator). - Default: not set. - .TP 7 - .BI "\*qaxis="[<factor>]<axis> \*q -@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys - The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. - The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. - -+.SH "XI2 Events" -+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: -+ -+.nf -+.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q -+\ \ ... -+.BI " Option \*qMapButton1\*q \*q" "button=1" \*q -+.BI " Option \*qMapButton2\*q \*q" "button=2" \*q -+.BI " Option \*qMapButton3\*q \*q" "button=3" \*q -+.BI " Option \*qMapButton4\*q \*q" "button=4" \*q -+.BI " Option \*qMapButton5\*q \*q" "button=5" \*q -+\ \ ... -+.fi -+ -+You might also want to set the device "floating" to stop it from reporting core events: -+.nf -+.BI " Option \*qFloating\*q \*q" "true" \*q -+.fi -+ - .SH "NOTES" - Configuration through - .I InputClass -diff --git a/src/jstk.c b/src/jstk.c -index 6db0e7c..772683f 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> -+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> - * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -21,7 +21,6 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - switch (what) { - case DEVICE_INIT: { - int m; -+ char str[32]; - CARD8 buttonmap[BUTTONMAP_SIZE+1]; - DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); - /* Probe device and return if error */ -@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - } - - for (m=0; m<=BUTTONMAP_SIZE; m++) { -+ sprintf(str, "Button %d", m); -+ - buttonmap[m] = m; -- } -+ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); -+ } -+ -+ - -- -- - if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, - btn_labels, - buttonmap) == FALSE) { -@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - if (priv->axis[i].valuator != -1) - { - DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); -+ sprintf(str, "Axis %d", i + 1); - priv->axis[i].valuator = m++; -+ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); - } - - if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, -@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = - /* a tool */ - }; - -- - /* - *************************************************************************** - * -@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { - jstkDriverPlug, - jstkDriverUnplug - }; -+ -+/* vim: set filetype=c.doxygen ts=4 et: */ -+ --- -cgit v0.9.0.2-2-gbebe -From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:27:22 +0000 -Subject: Fix option type for option duplication - -xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption -list. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index d699dcd..e842941 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *options; - InputOption *iopts = NULL, *tmp; - DeviceIntPtr dev; -+ XF86OptionPtr opts; - - /* duplicate option list, append to name */ -- options = xf86OptionListDuplicate(pInfo->options); -+ opts = xf86OptionListDuplicate(pInfo->options); - strcpy(name, pInfo->name); - strcat(name, " (keys)"); -- options = xf86ReplaceStrOption(options, "Name", name); -- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); -+ opts = xf86ReplaceStrOption(opts, "Name", name); -+ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); - -- while(options) -+ while(opts) - { - tmp = calloc(1, sizeof(InputOption)); - -- tmp->key = xf86OptionName(options); -- tmp->value = xf86OptionValue(options); -+ tmp->key = xf86OptionName(opts); -+ tmp->value = xf86OptionValue(opts); - tmp->next = iopts; - iopts = tmp; -- options = xf86NextOption(options); -+ opts = xf86NextOption(opts); - } - - /* duplicate attribute list */ --- -cgit v0.9.0.2-2-gbebe -From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:33:08 +0000 -Subject: Deal with opaque input option types. - -ABI 14 made the InputOption type opaque, move the existing code to ifdefs -and use the new function calls otherwise. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index e842941..a71275a 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 -+static InputOption* -+input_option_new(InputOption* list, char *key, char *value) -+{ -+ InputOption *tmp; -+ -+ tmp = calloc(1, sizeof(*tmp)); -+ tmp->key = key; -+ tmp->value = value; -+ tmp->next = list; -+ -+ return tmp; -+} -+ -+static void -+input_option_free_list(InputOption **list) -+{ -+ InputOption *iopts = *list; -+ -+ while(iopts) -+ { -+ InputOption *tmp = iopts->next; -+ free(iopts->key); -+ free(iopts->value); -+ free(iopts); -+ iopts = tmp; -+ } -+ -+ *list = NULL; -+} -+ -+#endif -+ - InputInfoPtr - jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - { - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *iopts = NULL, *tmp; -+ InputOption *iopts = NULL; - DeviceIntPtr dev; - XF86OptionPtr opts; - -@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - while(opts) - { -- tmp = calloc(1, sizeof(InputOption)); -- -- tmp->key = xf86OptionName(opts); -- tmp->value = xf86OptionValue(opts); -- tmp->next = iopts; -- iopts = tmp; -+ iopts = input_option_new(iopts, -+ xf86OptionName(opts), -+ xf86OptionValue(opts)); - opts = xf86NextOption(opts); - } - -@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - rc = NewInputDeviceRequest(iopts, attrs, &dev); - -- while(iopts) -- { -- tmp = iopts->next; -- free(iopts->key); -- free(iopts->value); -- free(iopts); -- iopts = tmp; -- } -+ input_option_free_list(&iopts); - - FreeInputAttributes(attrs); - --- -cgit v0.9.0.2-2-gbebe -From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 17:04:25 +0000 -Subject: man: valuators are not added automatically - ---- -diff --git a/man/joystick.man b/man/joystick.man -index b401de5..9f38ceb 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -129,9 +129,6 @@ can be one of: - - .B none, relative, accelerated, absolute - --Every axis which's mode is not --.B none --will be reported as an additional valuator. - .TP 7 - .B \*qvaluator\*q - Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always --- -cgit v0.9.0.2-2-gbebe -From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 19:36:07 +0000 -Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device - -udev does copy the Driver line to the list of options, but when manually -specifying the driver in xorg.conf, the option "Driver" is unset. Because we -do hotplug a sub-device from within the core device, we need the "Driver" -option to be present in the list. - -This should fix archlinux bug #23577: - https://bugs.archlinux.org/task/23577 - -Thanks to Malek for coming up with a fix. - -Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index a71275a..241b15d 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - strcat(name, " (keys)"); - opts = xf86ReplaceStrOption(opts, "Name", name); - opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); -+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); - - while(opts) - { --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD deleted file mode 100644 index aed5d63c3..000000000 --- a/testing/xf86-input-keyboard/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150010 2012-02-12 09:44:11Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-keyboard -pkgver=1.6.1 -pkgrel=2 -pkgdesc="X.Org keyboard input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ef30fecb9e846a5268ae339846401489a785e413') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD deleted file mode 100644 index c61c24faf..000000000 --- a/testing/xf86-input-mouse/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150012 2012-02-12 09:44:14Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-mouse -pkgver=1.7.1 -pkgrel=3 -pkgdesc="X.org mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-synaptics/10-synaptics.conf b/testing/xf86-input-synaptics/10-synaptics.conf deleted file mode 100644 index 81a90fb81..000000000 --- a/testing/xf86-input-synaptics/10-synaptics.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "TapButton1" "1" - Option "TapButton2" "2" - Option "TapButton3" "3" -EndSection diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD deleted file mode 100644 index 582c0e728..000000000 --- a/testing/xf86-input-synaptics/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 153531 2012-03-15 17:47:06Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-input-synaptics -pkgver=1.5.99.901 -pkgrel=2 -pkgdesc="Synaptics driver for notebook touchpads" -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxtst' 'mtdev') -makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11') -conflicts=('xorg-server<1.11.99.902') -replaces=('synaptics') -provides=('synaptics') -conflicts=('synaptics') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -backup=('etc/X11/xorg.conf.d/10-synaptics.conf') -source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf - synaptics-Fix-inverted-circular-scrolling-direction.patch) -sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f' - '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - rm -rf "${pkgdir}/usr/share/X11" -} diff --git a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch deleted file mode 100644 index fee383855..000000000 --- a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch +++ /dev/null @@ -1,40 +0,0 @@ -From patchwork Wed Mar 14 03:27:29 2012 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [synaptics] Fix inverted circular scrolling direction -Date: Wed, 14 Mar 2012 03:27:29 -0000 -From: Peter Hutterer <peter.hutterer@who-t.net> -X-Patchwork-Id: 9512 -Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com> -To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> -Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org> - -Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. -In said commit, the old-style button events were changed to delta -accumulation. Alas, for circular scrolling, a positive delta is up whereas -for everything else a positive delta is down. - -Reported-by: Thomas Bächler <thomas@archlinux.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - ---- -src/synaptics.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/synaptics.c b/src/synaptics.c -index fa46f0d..c9609cd 100644 ---- a/src/synaptics.c -+++ b/src/synaptics.c -@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, - double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); - if (delta >= 0.005 && diff != 0.0) { - if (priv->circ_scroll_vert) -- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; -+ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; - else -- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; -+ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; - priv->scroll.last_a = angle(priv, hw->x, hw->y); - DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); - } diff --git a/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD deleted file mode 100644 index d6505b833..000000000 --- a/testing/xf86-input-void/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150018 2012-02-12 09:44:20Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-void -pkgver=1.4.0 -pkgrel=3 -pkgdesc="X.org void input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') - - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index f6aa20835..000000000 --- a/testing/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,12 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all serial wacom tablets with a serial ID starting with WACf -# Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" - -LABEL="wacom_end" - diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD deleted file mode 100644 index 29be22670..000000000 --- a/testing/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 152851 2012-03-10 08:19:24Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.14.0 -pkgrel=1 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel>=1.12.0' 'libxext') -conflicts=('xorg-server<1.12.0') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 70-wacom.rules) -md5sums=('23d19a2b50a86b848df17297c745144f' - '10db4f8272286690255c1bcc18bfdd92') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/lib/udev/rules.d" - install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" -} diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD deleted file mode 100644 index 9f7234691..000000000 --- a/testing/xf86-video-apm/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150022 2012-02-12 09:44:25Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-apm -pkgver=1.2.3 -pkgrel=5 -pkgdesc="X.org Alliance ProMotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - apm-1.2.3-git.patch) -sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac' - 'ad9468519eb959bb879ba4e4993d6a83848d5c6f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/apm-1.2.3-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-apm/apm-1.2.3-git.patch b/testing/xf86-video-apm/apm-1.2.3-git.patch deleted file mode 100644 index 1c6afb29d..000000000 --- a/testing/xf86-video-apm/apm-1.2.3-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/apm.h b/src/apm.h -index bc66714..86c7663 100644 ---- a/src/apm.h -+++ b/src/apm.h -@@ -109,7 +109,7 @@ typedef struct { - char *MemMap; - pointer BltMap; - Bool UnlockCalled; -- IOADDRESS iobase, xport, xbase; -+ unsigned long iobase, xport, xbase; - unsigned char savedSR10; - CARD8 MiscOut; - CARD8 c9, d9, db, Rush; -diff --git a/src/apm_driver.c b/src/apm_driver.c -index f172bab..f77bb2b 100644 ---- a/src/apm_driver.c -+++ b/src/apm_driver.c -@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -- pApm->iobase = hwp->PIOOffset; -- pApm->xport = hwp->PIOOffset + 0x3C4; -+#if ABI_VIDEODRV_VERSION < 12 -+#define PIOOFFSET hwp->PIOOffset -+#else -+/* FIXME reintroduce domain support */ -+#define PIOOFFSET 0 -+#endif -+ pApm->iobase = PIOOFFSET; -+ pApm->xport = PIOOFFSET + 0x3C4; - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; diff --git a/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD deleted file mode 100644 index 97370566a..000000000 --- a/testing/xf86-video-ark/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 150024 2012-02-12 09:44:29Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ark -pkgver=0.7.4 -pkgrel=1 -pkgdesc="X.org ark video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch - ) -sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-ark/git-fixes.patch b/testing/xf86-video-ark/git-fixes.patch deleted file mode 100644 index 2de0f64be..000000000 --- a/testing/xf86-video-ark/git-fixes.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001 -From: Ondrej Zary <linux@rainbow-software.org> -Date: Sat, 04 Dec 2010 00:23:51 +0000 -Subject: Don't assume that FB address registers are initialized properly - -https://bugs.freedesktop.org/show_bug.cgi?id=28249 - -ark driver does not work with Hercules Stingray 64 card (ark2000pv). -X fails to start with: - -[...] -(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is -0x0000 -(II) ark(0): Creating default Display subsection in Screen section - "Default Screen Section" for depth/fbbpp 24/32 -(==) ark(0): Depth 24, (--) framebuffer bpp 32 -(==) ark(0): RGB weight 888 -(==) ark(0): Default visual is TrueColor -(**) ark(0): Chipset: "ark2000pv" -(--) ark(0): Framebuffer @ 0xe5e50000 -(==) ark(0): Using gamma correction (1.0, 1.0, 1.0) -(--) ark(0): Detected 2048 bytes video ram -[...] -Fatal server error: -AddScreen/ScreenInit failed for driver 0 - -Comparing with lspci, the framebuffer address is wrong: -00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller]) - Flags: medium devsel - Memory at e5000000 (32-bit, prefetchable) [size=4M] - [virtual] Expansion ROM at 1c000000 [disabled] [size=64K] - -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/ark.h b/src/ark.h -index de301dc..077f93b 100644 ---- a/src/ark.h -+++ b/src/ark.h -@@ -34,7 +34,6 @@ typedef struct _ARKRec { - #endif - EntityInfoPtr pEnt; - CARD32 IOAddress; -- CARD32 FBAddress; - unsigned char * FBBase; - unsigned char * MMIOBase; - unsigned long videoRam; -diff --git a/src/ark_driver.c b/src/ark_driver.c -index 5de3b9a..fec3e1a 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) - outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f); - modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01); - -- /* use membase's later on ??? */ -- pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + -- (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); -- -- pScrn->memPhysBase = pARK->FBAddress; -+#ifndef XSERVER_LIBPCIACCESS -+ pScrn->memPhysBase = pARK->PciInfo->memBase[0]; -+#else -+ pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr; -+#endif - - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", -- (unsigned long)pARK->FBAddress); -+ (unsigned long)pScrn->memPhysBase); - - if (!xf86SetGamma(pScrn, gzeros)) - return FALSE; -@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f; - new->sr10 |= 0x1f; - -- new->sr13 = pARK->FBAddress >> 16; -- new->sr14 = pARK->FBAddress >> 24; -+#ifndef XSERVER_LIBPCIACCESS -+ new->sr13 = pARK->PciInfo->memBase[0] >> 16; -+ new->sr14 = pARK->PciInfo->memBase[0] >> 24; -+#else -+ new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16; -+ new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24; -+#endif - - new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03; - switch (pScrn->videoRam) { -@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - pARK->PciTag, 0xb8000, 0x8000); - - pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -- pARK->PciTag, pARK->FBAddress, -+ pARK->PciTag, pARK->PciInfo->memBase[0], - pScrn->videoRam * 1024); - #else - -@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - { - void** result = (void**)&pARK->FBBase; - int err = pci_device_map_range(pARK->PciInfo, -- pARK->FBAddress, -+ pARK->PciInfo->regions[0].base_addr, - pScrn->videoRam * 1024, - PCI_DEV_MAP_FLAG_WRITABLE | - PCI_DEV_MAP_FLAG_WRITE_COMBINE, - result); - -- if (err) -+ if (err) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Cound not map framebuffer: %d\n", err); - return FALSE; -+ } - } - #endif - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD deleted file mode 100644 index c2bc925cc..000000000 --- a/testing/xf86-video-ast/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150026 2012-02-12 09:44:33Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ast -pkgver=0.93.9 -pkgrel=2 -pkgdesc="X.org ASPEED AST Graphics video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ast-0.93.9-vga.patch) -md5sums=('e25c6a55e9d07cc6054d6affc1231296' - '9aa9ea4c568b6563389fa634cb0f7cf0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/ast-0.93.9-vga.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-ast/ast-0.93.9-vga.patch b/testing/xf86-video-ast/ast-0.93.9-vga.patch deleted file mode 100644 index e05a78f56..000000000 --- a/testing/xf86-video-ast/ast-0.93.9-vga.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 16 Nov 2011 20:09:40 +0000 -Subject: Adapt to domain changes in videoabi 12 - -This is a blind change, I don't have this hardware handy to test with. -It probably wants the same new API that tdfx wants. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/ast_driver.c b/src/ast_driver.c -index bd3d338..128538f 100644 ---- a/src/ast_driver.c -+++ b/src/ast_driver.c -@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) - (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast"); - - /* Resource Allocation */ -+#if ABI_VIDEODRV_VERSION < 12 - pAST->IODBase = pScrn->domainIOBase; -+#else -+ pAST->IODBase = 0; -+#endif - /* "Patch" the PIOOffset inside vgaHW in order to force - * the vgaHW module to use our relocated i/o ports. - */ -- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; -+ -+#if ABI_VIDEODRV_VERSION < 12 -+ VGAHWPTR(pScrn)->PIOOffset = /* ... */ -+#endif -+ pAST->PIOOffset = -+ pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; - - pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase); - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD deleted file mode 100644 index 8d6cd0d84..000000000 --- a/testing/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 150028 2012-02-12 09:44:37Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.3 -pkgrel=2 -pkgdesc="X.org ati video driver" -arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(libpciaccess libdrm udev pixman ati-dri) -makedepends=('xorg-server-devel>=1.11.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD deleted file mode 100644 index b4db68965..000000000 --- a/testing/xf86-video-chips/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 150030 2012-02-12 09:44:42Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-chips -pkgver=1.2.4 -pkgrel=4 -pkgdesc="X.org Chips and Technologies video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(glibc) -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - chips-1.2.4-git.patch) -sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' - 'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/chips-1.2.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-chips/chips-1.2.4-git.patch b/testing/xf86-video-chips/chips-1.2.4-git.patch deleted file mode 100644 index 9d8e856a3..000000000 --- a/testing/xf86-video-chips/chips-1.2.4-git.patch +++ /dev/null @@ -1,912 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 225e516..c0ed508 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - --# Checks for programs. --AM_PROG_CC_C_O -- - AH_TOP([#include "xorg-server.h"]) - - # Define a configure option for an alternate module directory -diff --git a/man/chips.man b/man/chips.man -index 740af38..0c022ee 100644 ---- a/man/chips.man -+++ b/man/chips.man -@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off - Force driver to leave centering and stretching registers alone. This - can fix some laptop suspend/resume problems. Default: off - .TP --.BI "Option \*qOverlay\*q" --Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. --.TP - .BI "Option \*qColorKey\*q \*q" integer \*q - Set the colormap index used for the transparency key for the depth 8 plane - when operating in 8+16 overlay mode. The value must be in the range -diff --git a/src/ct_accel.c b/src/ct_accel.c -index 3920b0a..4b5776a 100644 ---- a/src/ct_accel.c -+++ b/src/ct_accel.c -@@ -428,19 +428,7 @@ chips_imagewrite: - infoPtr->ImageWriteFlags |= NO_PLANEMASK; - #endif - -- --#ifdef CHIPS_HIQV -- if (XAAInit(pScreen, infoPtr)) { -- if (cPtr->Flags & ChipsOverlay8plus16) -- return(XAAInitDualFramebufferOverlay(pScreen, -- CTNAME(DepthChange))); -- else -- return TRUE; -- } else -- return FALSE; --#else - return(XAAInit(pScreen, infoPtr)); --#endif - } - - #ifdef CHIPS_HIQV -@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, - #endif - w *= cAcl->BytesPerPixel; - ctBLTWAIT; --#ifdef CHIPS_HIQV -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && -- (pScrn->depth == 8)) -- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); --#endif - ctSETSRCADDR(srcaddr); - ctSETDSTADDR(destaddr); - #ifdef CHIPS_HIQV -@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - patternaddr = (paty * pScrn->displayWidth + - (patx & ~0x3F)) * cAcl->BytesPerPixel; - cAcl->patternyrot = (patx & 0x3F) >> 3; --#ifdef CHIPS_HIQV -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr += cPtr->FbOffset16; --#endif - - ctBLTWAIT; - ctSETPATSRCADDR(patternaddr); -@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - - #ifdef CHIPS_HIQV - patternaddr = paty * pScrn->displayWidth + patx; -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr = patternaddr * 2 + cPtr->FbOffset16; -- else -- patternaddr *= cAcl->BytesPerPixel; -+ patternaddr *= cAcl->BytesPerPixel; - #else - patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; - #endif -@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - destpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - -@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - y++; - - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETDSTADDR(destaddr); -@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - srcpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | -@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dst += dstwidth; - y++; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - ctBLTWAIT; - ctSETSRCADDR(srcaddr); - ctSETHEIGHTWIDTHGO(h, bytesPerLine); -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 6624b79..a2e5c94 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags) - } - - } -- xfree(usedChips); -+ free(usedChips); - } - } - -@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags) - pScrn->ValidMode = CHIPSValidMode; - foundScreen = TRUE; - } -- xfree(usedChips); -+ free(usedChips); - } - } - #endif - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - #endif -@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - cPtr->PIOBase = hwp->PIOOffset; -+#else -+ cPtr->PIOBase = 0; -+#endif -+ - /* - * Must allow ensure that storage for the 2nd set of vga registers is - * allocated for dual channel cards -@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - } - } - -- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { -- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { -- if (pScrn->bitsPerPixel == 16) { -- if (cPtr->Flags & ChipsLinearSupport) { -- cPtr->Flags |= ChipsOverlay8plus16; -- if(!xf86GetOptValInteger( -- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) -- pScrn->colorKey = TRANSPARENCY_KEY; -- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "PseudoColor overlay enabled.\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"Stretch\" \"ON\".\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"LcdCenter\" \"OFF\".\n"); -- if (cPtr->Flags & ChipsShadowFB) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Disabling \"Shadow Framebuffer\".\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " Not support with option \"8Plus16\".\n"); -- cPtr->Flags &= ~ChipsShadowFB; -- cPtr->Rotate = 0; -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Option \"Overlay\" is not supported in this configuration\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); -- } -- } -- -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -- &(cPtr->videoKey))) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", -+ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -+ &(cPtr->videoKey))) { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", - cPtr->videoKey); -- } else { -- cPtr->videoKey = (1 << pScrn->offset.red) | -+ } else { -+ cPtr->videoKey = (1 << pScrn->offset.red) | - (1 << pScrn->offset.green) | - (((pScrn->mask.blue >> pScrn->offset.blue) - 1) - << pScrn->offset.blue); -- } - } - - if (cPtr->Flags & ChipsShadowFB) { -@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - /* and 32bits on the others. Thus multiply by a suitable factor */ - if (cPtr->Flags & Chips64BitMemory) { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / bytesPerPixel); - } else { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / bytesPerPixel); - } -@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags) - /* Should we re-save the text mode on each VT enter? */ - if(!chipsModeInit(pScrn, pScrn->currentMode)) - return FALSE; -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) - CHIPSResetVideo(pScrn); - -@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, - int i, index, shift ; - CHIPSEntPtr cPtrEnt; - -- shift = ((pScrn->depth == 15) && -- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; -+ shift = (pScrn->depth == 15) ? 3 : 0; - - if (cPtr->UseDualChannel) { - cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], -@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, - hwp->disablePalette(hwp); - } - --static Bool --cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, -- int xsize, int ysize, int dpix, int dpiy, -- int width16, int width8) --{ -- return -- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8) && -- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8, 16, 8)); --} -- - /* Mandatory */ - static Bool - CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!chipsMapMem(pScrn)) - return FALSE; - -- /* Setup a pointer to the overlay if needed */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; -- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; -- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Too little memory for overlay. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Max overlay Width/Height 1024 pixels. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- } -- - /* Setup the MMIO register access functions if need */ - if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { - CHIPSSetMmioExtFuncs(cPtr); -@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - miClearVisualTypes(); - - /* Setup the visuals we support. */ -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ -- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, -- pScrn->rgbBits, PseudoColor)) -- return FALSE; -- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) -- return FALSE; -- } else { -- if (!miSetVisualTypes(pScrn->depth, -+ if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) -- return FALSE; -- } -+ return FALSE; - miSetPixmapDepths (); - - /* -@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - break; - #endif - case 16: -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + -- cPtr->FbOffset16, FBStart, width, -- height, pScrn->xDpi, pScrn->yDpi, -- displayWidth, displayWidth); -- break; -- } - default: - ret = fbScreenInit(pScreen, FBStart, - width,height, -@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth, pBankInfo)) { -- xfree(pBankInfo); -+ free(pBankInfo); - pBankInfo = NULL; - return FALSE; - } -@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (pScrn->bitsPerPixel < 8) - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY / 2; -- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) -- freespace = allocatebase - pScrn->displayWidth * -- pScrn->virtualY - cPtr->FbSize16; - else - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY * (pScrn->bitsPerPixel >> 3); -@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - AvailFBArea.y2 = cAcl->CacheEnd / - (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); - -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- xf86InitFBManager(pScreen, &AvailFBArea); -- } -+ xf86InitFBManager(pScreen, &AvailFBArea); - } - if (cPtr->Flags & ChipsAccelSupport) { - if (IS_HiQV(cPtr)) { -@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!miCreateDefColormap(pScreen)) - return FALSE; - -- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, -- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) -- return FALSE; -- } else { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, -+ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), - NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) -- return FALSE; -- } -+ return FALSE; - - #ifndef XSERVER_LIBPCIACCESS - racflag = RAC_COLORMAP; -@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - xf86SetSilkenMouse(pScreen); - #endif - -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) { - CHIPSInitVideo(pScreen); - } -@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - Base >>= 3; - break; - case 16: -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- Base >>= 1; -- else -- Base >>= 2; -+ Base >>= 1; - break; - case 24: - if (!IS_HiQV(cPtr)) -@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - cPtr->writeMSS(cPtr, hwp, MSS); - } - -- if (cPtr->Flags & ChipsOverlay8plus16) { -- Base = (Base << 3) & ~(unsigned long)0xF; -- -- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); -- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); -- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); -- } -- - } - - /* Mandatory */ -@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - CHIPSPtr cPtr = CHIPSPTR(pScrn); - -- if (flags & MODECHECK_FINAL) { -- /* Don't subtract FrambufferSize here as it should be subtracted already */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY -- < 0)) -- return MODE_MEM; -- } - /* The tests here need to be expanded */ - if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) - return MODE_NO_INTERLACE; -@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } else { - ChipsStd->Attribute[0x10] = 0x01; /* mode */ - } -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { -- /* Make sure that the overlay isn't visible in the overscan region */ -- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) -- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; -- } else -- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ -+ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ - ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ - ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ - -@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* set virtual screen width */ - tmp = pScrn->displayWidth >> 3; - if (pScrn->bitsPerPixel == 16) { -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- tmp <<= 1; /* double the width of the buffer */ -+ tmp <<= 1; /* double the width of the buffer */ - } else if (pScrn->bitsPerPixel == 24) { - tmp += tmp << 1; - } else if (pScrn->bitsPerPixel == 32) { -@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - - /* centering/stretching */ - if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { -- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || -- (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { - ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ - ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ - ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ -@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - -- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) -- || (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { - ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ - ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ - } else { -@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - ChipsNew->XR[0x82] |=0x02; - - /* software mode flag */ -- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? -- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? -+ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? - min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : - mode->CrtcHDisplay, mode->CrtcVDisplay); - #ifdef DEBUG -@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - /* bpp depend */ -- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { -+ if (pScrn->bitsPerPixel == 16) { - ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; - if (cPtr->Flags & ChipsGammaSupport) - ChipsNew->XR[0x82] |= 0x0C; -@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* Turn off multimedia by default as it degrades performance */ - ChipsNew->XR[0xD0] &= 0x0f; - -- /* Setup the video/overlay */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ --#ifdef SAR04 -- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ --#endif -- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ -- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) -- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ -- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ -- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ -- if (pScrn->weight.green == 5) -- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ -- -- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ -- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ -- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ -- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ -- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ -- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; -- -- /* Left Edge of Overlay */ -- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; -- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); -- /* Right Edge of Overlay */ -- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) & 0xFF; -- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) >> 8) & 0x07; -- /* Top Edge of Overlay */ -- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; -- ChipsNew->MR[0x2F] &= 0xF8; -- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); -- /* Bottom Edge of Overlay*/ -- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; -- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - -- 1 ) >> 8) & 0x07; -- -- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ -- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ -- ChipsNew->MR[0x3D] = 0x00; -- ChipsNew->MR[0x3E] = 0x00; -- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ -- ChipsNew->MR[0x40] = 0xFF; -- ChipsNew->MR[0x41] = 0xFF; -- ChipsNew->MR[0x42] = 0x00; -- } else if (cPtr->Flags & ChipsVideoSupport) { -+ if (cPtr->Flags & ChipsVideoSupport) { - #if 0 /* if we do this even though video isn't playing we kill performance */ - ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ - #endif -@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) - } - - /* Set SAR04 multimedia register correctly */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- || (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - #ifdef SAR04 - cPtr->writeXR(cPtr, 0x4E, 0x04); - if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) -diff --git a/src/ct_driver.h b/src/ct_driver.h -index d8ce228..9033867 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -114,7 +114,6 @@ typedef struct { - /* Options flags for the C&T chipsets */ - #define ChipsHWCursor 0x00001000 - #define ChipsShadowFB 0x00002000 --#define ChipsOverlay8plus16 0x00004000 - #define ChipsUseNewFB 0x00008000 - - /* Architecture type flags */ -@@ -272,11 +271,13 @@ typedef struct { - - typedef struct _CHIPSRec { - pciVideoPtr PciInfo; -+#ifndef XSERVER_LIBPCIACCESS - PCITAG PciTag; -+#endif - int Chipset; - EntityInfoPtr pEnt; -- IOADDRESS PIOBase; -- CARD32 IOAddress; -+ unsigned long PIOBase; -+ unsigned long IOAddress; - unsigned long FbAddress; - unsigned int IOBase; - unsigned char * FbBase; -diff --git a/src/ct_video.c b/src/ct_video.c -index a68acb9..c9e5bb4 100644 ---- a/src/ct_video.c -+++ b/src/ct_video.c -@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) - CHIPSPtr cPtr = CHIPSPTR(pScrn); - int num_adaptors; - -- if (!(cPtr->Flags & ChipsOverlay8plus16) && -- (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - newAdaptor = CHIPSSetupImageVideo(pScreen); - CHIPSInitOffscreenImages(pScreen); - } -diff --git a/util/dRegs.c b/util/dRegs.c -index b7edc8f..0d2f0cb 100644 ---- a/util/dRegs.c -+++ b/util/dRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int main(void) - { -diff --git a/util/iopl.h b/util/iopl.h -new file mode 100644 -index 0000000..e08207c ---- /dev/null -+++ b/util/iopl.h -@@ -0,0 +1,60 @@ -+#ifdef __NetBSD__ -+# include <sys/types.h> -+# include <machine/pio.h> -+# include <machine/sysarch.h> -+#else -+# if defined(__linux__) -+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc -+ * # include <sys/io.h> -+ */ -+int iopl(int level); -+# endif -+# if defined(SVR4) && defined(i386) -+# include <sys/types.h> -+# ifdef NCR -+ /* broken NCR <sys/sysi86.h> */ -+# define __STDC -+# include <sys/sysi86.h> -+# undef __STDC -+# else -+# include <sys/sysi86.h> -+# endif -+# ifdef SVR4 -+# if !defined(sun) -+# include <sys/seg.h> -+# endif -+# endif -+# include <sys/v86.h> -+# if defined(sun) -+# include <sys/psw.h> -+# endif -+# endif -+# include "AsmMacros.h" -+#endif /* NetBSD */ -+ -+#include <unistd.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+#ifdef __NetBSD__ -+# define SET_IOPL() i386_iopl(3) -+# define RESET_IOPL() i386_iopl(0) -+#else -+# if defined(SVR4) && defined(i386) -+# ifndef SI86IOPL -+# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) -+# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) -+# else -+# define SET_IOPL() sysi86(SI86IOPL,3) -+# define RESET_IOPL() sysi86(SI86IOPL,0) -+# endif -+# else -+# ifdef linux -+# define SET_IOPL() iopl(3) -+# define RESET_IOPL() iopl(0) -+# else -+# define SET_IOPL() (void)0 -+# define RESET_IOPL() (void)0 -+# endif -+# endif -+#endif -diff --git a/util/mRegs.c b/util/mRegs.c -index f359738..843d01d 100644 ---- a/util/mRegs.c -+++ b/util/mRegs.c -@@ -1,63 +1,8 @@ -- -- -- -- -- -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - int hex2int(char* str); - -diff --git a/util/modClock.c b/util/modClock.c -index 89a291a..45af19b 100644 ---- a/util/modClock.c -+++ b/util/modClock.c -@@ -1,61 +1,12 @@ -- --#ifdef __NetBSD__ --# include <sys/types.h> --# include <machine/pio.h> --# include <machine/sysarch.h> --#else --# if defined(SVR4) && defined(i386) --# include <sys/types.h> --# ifdef NCR -- /* broken NCR <sys/sysi86.h> */ --# define __STDC --# include <sys/sysi86.h> --# undef __STDC --# else --# include <sys/sysi86.h> --# endif --# ifdef SVR4 --# if !defined(sun) --# include <sys/seg.h> --# endif --# endif --# include <sys/v86.h> --# if defined(sun) --# include <sys/psw.h> --# endif --# endif --# include "AsmMacros.h" --#endif /* NetBSD */ -- - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+ - #ifndef Lynx - #include <fnmatch.h> - #endif - --#ifdef __NetBSD__ --# define SET_IOPL() i386_iopl(3) --# define RESET_IOPL() i386_iopl(0) --#else --# if defined(SVR4) && defined(i386) --# ifndef SI86IOPL --# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) --# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) --# else --# define SET_IOPL() sysi86(SI86IOPL,3) --# define RESET_IOPL() sysi86(SI86IOPL,0) --# endif --# else --# ifdef linux --# define SET_IOPL() iopl(3) --# define RESET_IOPL() iopl(0) --# else --# define SET_IOPL() (void)0 --# define RESET_IOPL() (void)0 --# endif --# endif --#endif -+#include "iopl.h" - - #define tolerance 0.01 /* +/- 1% */ - diff --git a/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD deleted file mode 100644 index 89c58466b..000000000 --- a/testing/xf86-video-cirrus/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150032 2012-02-12 09:44:48Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-cirrus -pkgver=1.3.2 -pkgrel=8 -pkgdesc="X.org Cirrus Logic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - cirrus-1.3.2-git.patch) -md5sums=('8195d03ed0be0975c03441e66a9f53b3' - '3e3677f330f1c24ce0f570c81f2b9de2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/cirrus-1.3.2-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-cirrus/cirrus-1.3.2-git.patch b/testing/xf86-video-cirrus/cirrus-1.3.2-git.patch deleted file mode 100644 index 5701a8473..000000000 --- a/testing/xf86-video-cirrus/cirrus-1.3.2-git.patch +++ /dev/null @@ -1,846 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index aa89732..7bd8873 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,17 +18,18 @@ - # 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. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL - --EXTRA_DIST = README.multihead ChangeLog -+EXTRA_DIST = README.multihead - --MAINTAINERCLEANFILES=ChangeLog -+.PHONY: ChangeLog INSTALL - --.PHONY: ChangeLog -+INSTALL: -+ $(INSTALL_CMD) - - ChangeLog: - $(CHANGELOG_CMD) - --dist-hook: ChangeLog -+dist-hook: ChangeLog INSTALL - -diff --git a/configure.ac b/configure.ac -index d205eb3..68c3eb3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,47 +20,47 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-cirrus], -- 1.3.2, -+ [1.3.2], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-cirrus) -- -+ [xf86-video-cirrus]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG --m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.2) -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC --XORG_CWARNFLAGS - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -78,21 +78,15 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --# Checks for header files. --AC_HEADER_STDC - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=cirrus - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION --XORG_CHANGELOG -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..1ea26b3 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,28 +1,25 @@ - # --# Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# 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. --# --# 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 THE OPEN GROUP 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. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. --# -+# Copyright (c) 2005, Oracle and/or its affiliates. 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 (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. -+# - - drivermandir = $(DRIVER_MAN_DIR) - -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/cirrus.man b/man/cirrus.man -index 009011e..af46248 100644 ---- a/man/cirrus.man -+++ b/man/cirrus.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH CIRRUS __drivermansuffix__ __vendorversion__ -diff --git a/src/CirrusClk.c b/src/CirrusClk.c -index a3590c9..6fd6270 100644 ---- a/src/CirrusClk.c -+++ b/src/CirrusClk.c -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */ -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -diff --git a/src/alp.h b/src/alp.h -index 01c5301..a182d0c 100644 ---- a/src/alp.h -+++ b/src/alp.h -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */ -- - /* (c) Itai Nahshon */ - - #ifndef ALP_H -diff --git a/src/alp_driver.c b/src/alp_driver.c -index fe81757..d3d8e4f 100644 ---- a/src/alp_driver.c -+++ b/src/alp_driver.c -@@ -15,8 +15,6 @@ - #include "config.h" - #endif - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */ -- - /* All drivers should typically include these */ - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -29,6 +27,10 @@ - /* Drivers for PCI hardware need this */ - #include "xf86PciInfo.h" - -+#ifndef PCI_CHIP_GD7556 /* for old xf86PciInfo.h */ -+#define PCI_CHIP_GD7556 0x004C -+#endif -+ - /* Drivers that need to access the PCI config space directly need this */ - #include "xf86Pci.h" - -@@ -119,6 +121,11 @@ static void AlpOffscreenAccelInit(ScrnInfoPtr pScrn); - static void AlpDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, int flags); - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+static void PC98CIRRUS755xEnable(ScrnInfoPtr pScrn); -+static void PC98CIRRUS755xDisable(ScrnInfoPtr pScrn); -+#endif -+ - /* - * This is intentionally screen-independent. It indicates the binding - * choice made in the first PreInit. -@@ -153,6 +160,8 @@ static int gd5430_MaxClocks[] = { 85500, 85500, 50000, 28500, 0 }; - static int gd5446_MaxClocks[] = { 135100, 135100, 85500, 85500, 0 }; - static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 }; - static int gd7548_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7555_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7556_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; - - #ifdef XFree86LOADER - -@@ -248,7 +257,7 @@ AlpFreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -385,6 +394,11 @@ AlpCountRam(ScrnInfoPtr pScrn) - break; - } - break; -+ -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ videoram = 2048; /* for PC-9821 La13 etc. */ -+ break; - } - - /* UNMap the Alp memory and MMIO areas */ -@@ -407,6 +421,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn) - { - int *linePitches = NULL; - int i, n = 0; -+ int max_pitch; -+ - CirPtr pCir = CIRPTR(pScrn); - - /* XXX ajv - 512, 576, and 1536 may not be supported -@@ -423,8 +439,21 @@ GetAccelPitchValues(ScrnInfoPtr pScrn) - 1280, 1536, 1600, 1920, 2048, 0 }; - #endif - -+ switch (pCir->Chipset) { -+ case PCI_CHIP_GD5436: -+ case PCI_CHIP_GD5446: -+ max_pitch = 0x1ff << 3; -+ break; -+ -+ default: -+ /* FIXME max_pitch for other chipsets? */ -+ max_pitch = (pScrn->bitsPerPixel / 8) * 2048; -+ break; -+ } -+ - for (i = 0; accelWidths[i] != 0; i++) { -- if (accelWidths[i] % pCir->Rounding == 0) { -+ if ((accelWidths[i] % pCir->Rounding == 0) -+ && ((accelWidths[i] * pScrn->bitsPerPixel / 8) <= max_pitch)) { - n++; - linePitches = xnfrealloc(linePitches, n * sizeof(int)); - linePitches[n - 1] = accelWidths[i]; -@@ -482,12 +511,17 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - - pCir = CIRPTR(pScrn); - pCir->pScrn = pScrn; -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pCir->PIOReg = hwp->PIOOffset + 0x3CE; -+#else -+ pCir->PIOReg = 0x3CE; -+#endif - - /* Get the entity, and make sure it is PCI. */ - pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - if (pCir->pEnt->location.type != BUS_PCI) { -- xfree(pCir->pEnt); -+ free(pCir->pEnt); - return FALSE; - } - -@@ -498,7 +532,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - PCI_DEV_DEV(pCir->PciInfo), - PCI_DEV_FUNC(pCir->PciInfo)); - -- if (xf86LoadSubModule(pScrn, "int10")) { -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) { - xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); - pInt = xf86InitInt10(pCir->pEnt->index); - xf86FreeInt10(pInt); -@@ -509,8 +544,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - - PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10); - PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14); -- - } -+#endif - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; -@@ -574,7 +609,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pCir->Options = xalloc(sizeof(CirOptions)))) -+ if (!(pCir->Options = malloc(sizeof(CirOptions)))) - return FALSE; - memcpy(pCir->Options, CirOptions, sizeof(CirOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options); -@@ -589,6 +624,16 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - - from = X_DEFAULT; - pCir->HWCursor = FALSE; -+ -+ switch (pCir->Chipset) { -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ pCir->HWCursor = TRUE; -+ break; -+ default: -+ break; -+ } -+ - if (xf86GetOptValBool(pCir->Options, OPTION_HW_CURSOR, &pCir->HWCursor)) - from = X_CONFIG; - -@@ -863,10 +908,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - case PCI_CHIP_GD5430: - case PCI_CHIP_GD5434_4: - case PCI_CHIP_GD5434_8: -- case PCI_CHIP_GD5436: - /* case PCI_CHIP_GD5440: */ - p = gd5430_MaxClocks; - break; -+ case PCI_CHIP_GD5436: - case PCI_CHIP_GD5446: - p = gd5446_MaxClocks; - break; -@@ -876,6 +921,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) - case PCI_CHIP_GD7548: - p = gd7548_MaxClocks; - break; -+ case PCI_CHIP_GD7555: -+ p = gd7555_MaxClocks; -+ break; -+ case PCI_CHIP_GD7556: -+ p = gd7556_MaxClocks; -+ break; - } - if (!p) - return FALSE; -@@ -1360,6 +1411,11 @@ AlpModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - - vgaHWProtect(pScrn, FALSE); - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (xf86IsPc98()) -+ PC98CIRRUS755xEnable(pScrn); -+#endif -+ - return TRUE; - } - -@@ -1489,7 +1545,7 @@ AlpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pCir->shadowFB) { - pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height); -+ pCir->ShadowPtr = malloc(pCir->ShadowPitch * height); - displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FbBase = pCir->ShadowPtr; - } else { -@@ -1782,6 +1838,11 @@ AlpLeaveVT(int scrnIndex, int flags) - - AlpRestore(pScrn); - vgaHWLock(hwp); -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); -+#endif - } - - -@@ -1813,12 +1874,17 @@ AlpCloseScreen(int scrnIndex, ScreenPtr pScreen) - xf86DestroyCursorInfoRec(pCir->CursorInfoRec); - pCir->CursorInfoRec = NULL; - if (pCir->DGAModes) -- xfree(pCir->DGAModes); -+ free(pCir->DGAModes); - pCir->DGAnumModes = 0; - pCir->DGAModes = NULL; - - pScrn->vtSema = FALSE; - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); -+#endif -+ - pScreen->CloseScreen = pCir->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); - } -@@ -2081,3 +2147,53 @@ AlpOffscreenAccelInit(ScrnInfoPtr pScrn) - box.y2 - pScrn->virtualY); - } - } -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+static void -+PC98CIRRUS755xEnable(ScrnInfoPtr pScrn) /* enter_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outb(0xfac, 0x02); -+ -+ outb(0x68, 0x0e); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8f); -+ outb(0x6a, 0x06); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, inb(data) & 0xef); -+ outb(index, 0x1a); -+ outb(data, inb(data) & 0xf3); -+} -+ -+static void -+PC98CIRRUS755xDisable(ScrnInfoPtr pScrn) /* leave_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, 0x71); -+ outb(index, 0x1a); -+ outb(data, inb(data) | 0x0c); -+ -+ outb(0xfac,0x00); -+ -+ outb(0x68, 0x0f); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8e); -+ outb(0x6a, 0x21); -+ outb(0x6a, 0x69); -+ outb(0x6a, 0x06); -+} -+#endif -diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c -index 79dfce7..9891eb4 100644 ---- a/src/alp_hwcurs.c -+++ b/src/alp_hwcurs.c -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */ -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -diff --git a/src/alp_i2c.c b/src/alp_i2c.c -index 9e6ae67..7365215 100644 ---- a/src/alp_i2c.c -+++ b/src/alp_i2c.c -@@ -4,8 +4,6 @@ - #include "config.h" - #endif - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */ -- - #include "xf86.h" - #include "xf86_OSproc.h" - #include "compiler.h" -diff --git a/src/alp_xaa.c b/src/alp_xaa.c -index 95741fc..7a96e1a 100644 ---- a/src/alp_xaa.c -+++ b/src/alp_xaa.c -@@ -4,8 +4,6 @@ - #include "config.h" - #endif - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ -- - #include "xf86.h" - #include "xf86_OSproc.h" - #include "compiler.h" -diff --git a/src/alp_xaam.c b/src/alp_xaam.c -index 0193a43..3ecc7de 100644 ---- a/src/alp_xaam.c -+++ b/src/alp_xaam.c -@@ -1,6 +1,5 @@ - /* (c) Itai Nahshon */ - /* #define DEBUG */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -diff --git a/src/cir.h b/src/cir.h -index 904d9cc..861966d 100644 ---- a/src/cir.h -+++ b/src/cir.h -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */ -- - /* (c) Itai Nahshon */ - - #ifndef CIR_H -@@ -23,7 +21,7 @@ typedef struct { - CARD32 properties; - pciVideoPtr PciInfo; - PCITAG PciTag; -- IOADDRESS PIOReg; -+ unsigned long PIOReg; - union { - struct lgRec *lg; - struct alpRec *alp; -diff --git a/src/cir_dga.c b/src/cir_dga.c -index bc98df6..f930231 100644 ---- a/src/cir_dga.c -+++ b/src/cir_dga.c -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */ - /* - * Copyright 2000 by Egbert Eich - * -@@ -83,9 +82,9 @@ CirDGAInit(ScreenPtr pScreen) - if (!pCir->DGAnumModes) { - pMode = firstMode = pScrn->modes; - while (pMode) { -- newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec)); - if (!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -diff --git a/src/cir_driver.c b/src/cir_driver.c -index 5466c48..7e470bb 100644 ---- a/src/cir_driver.c -+++ b/src/cir_driver.c -@@ -15,8 +15,6 @@ - #include "config.h" - #endif - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */ -- - /* All drivers should typically include these */ - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -29,6 +27,10 @@ - /* Drivers for PCI hardware need this */ - #include "xf86PciInfo.h" - -+#ifndef PCI_CHIP_GD7556 /* for old xf86PciInfo.h */ -+#define PCI_CHIP_GD7556 0x004C -+#endif -+ - /* Drivers that need to access the PCI config space directly need this */ - #include "xf86Pci.h" - -@@ -90,6 +92,8 @@ SymTabRec CIRChipsets[] = { - { PCI_CHIP_GD5464BD, "CL-GD5464BD" }, - { PCI_CHIP_GD5465, "CL-GD5465" }, - { PCI_CHIP_GD7548, "CL-GD7548" }, -+ { PCI_CHIP_GD7555, "CL-GD7555" }, -+ { PCI_CHIP_GD7556, "CL-GD7556" }, - {-1, NULL } - }; - -@@ -107,6 +111,8 @@ _X_EXPORT PciChipsets CIRPciChipsets[] = { - { PCI_CHIP_GD5464BD,PCI_CHIP_GD5464BD, RES_SHARED_VGA }, - { PCI_CHIP_GD5465, PCI_CHIP_GD5465, RES_SHARED_VGA }, - { PCI_CHIP_GD7548, PCI_CHIP_GD7548, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7555, PCI_CHIP_GD7555, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7556, PCI_CHIP_GD7556, RES_SHARED_VGA }, - { -1, -1, RES_UNDEFINED} - }; - -@@ -238,7 +244,7 @@ CIRProbe(DriverPtr drv, int flags) - CIRChipsets, CIRPciChipsets, devSections, - numDevSections, drv, &usedChips); - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - if (flags & PROBE_DETECT) -@@ -280,7 +286,7 @@ CIRProbe(DriverPtr drv, int flags) - pScrn->Probe = NULL; - } - } -- xfree(usedChips); -+ free(usedChips); - - return foundScreen; - } -diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h -index f0f5cf8..669b8fe 100644 ---- a/src/cir_pcirename.h -+++ b/src/cir_pcirename.h -@@ -34,6 +34,33 @@ enum region_type { - REGION_IO - }; - -+#include "xf86Module.h" -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 -+ -+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux) -+#define PCI_DOM_MASK 0x01fful -+#else -+#define PCI_DOM_MASK 0x0ffu -+#endif -+ -+#ifndef PCI_DOM_MASK -+# define PCI_DOM_MASK 0x0ffu -+#endif -+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu) -+ -+static inline uint32_t -+pciTag(int busnum, int devnum, int funcnum) -+{ -+ uint32_t tag; -+ tag = (busnum & (PCI_DOMBUS_MASK)) << 16; -+ tag |= (devnum & 0x00001fu) << 11; -+ tag |= (funcnum & 0x000007u) << 8; -+ -+ return tag; -+} -+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */ -+ - #ifndef XSERVER_LIBPCIACCESS - - /* pciVideoPtr */ -diff --git a/src/cir_shadow.c b/src/cir_shadow.c -index b89890a..0716a64 100644 ---- a/src/cir_shadow.c -+++ b/src/cir_shadow.c -@@ -1,5 +1,3 @@ --/* $XFree86: Exp $ */ -- - /* - Copyright (c) 1999,2000 The XFree86 Project Inc. - based on code written by Mark Vojkovich <markv@valinux.com> -diff --git a/src/lg.h b/src/lg.h -index 9d91053..985f634 100644 ---- a/src/lg.h -+++ b/src/lg.h -@@ -10,8 +10,6 @@ - * Inspired by cir.h - */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */ -- - #ifndef LG_H - #define LG_H - #define LG_DEBUG -diff --git a/src/lg_driver.c b/src/lg_driver.c -index cfc3e65..fc864f8 100644 ---- a/src/lg_driver.c -+++ b/src/lg_driver.c -@@ -13,7 +13,6 @@ - * David Dawes, Andrew E. Mileski, Leonard N. Zubkoff, - * Guy DESBIEF, Itai Nahshon. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -@@ -259,7 +258,7 @@ LgFreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -373,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) - - pCir = CIRPTR(pScrn); - pCir->pScrn = pScrn; -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pCir->PIOReg = hwp->PIOOffset + 0x3CE; -+#else -+ pCir->PIOReg = 0x3CE; -+#endif - - /* Get the entity, and make sure it is PCI. */ - pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); -@@ -454,7 +458,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pCir->Options = xalloc(sizeof(LgOptions)))) -+ if (!(pCir->Options = malloc(sizeof(LgOptions)))) - return FALSE; - memcpy(pCir->Options, LgOptions, sizeof(LgOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options); -@@ -1314,7 +1318,7 @@ LgScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pCir->shadowFB) { - pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height); -+ pCir->ShadowPtr = malloc(pCir->ShadowPitch * height); - displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FbBase = pCir->ShadowPtr; - } else { -@@ -1617,7 +1621,7 @@ LgCloseScreen(int scrnIndex, ScreenPtr pScreen) - xf86DestroyCursorInfoRec(pCir->CursorInfoRec); - pCir->CursorInfoRec = NULL; - if (pCir->DGAModes) -- xfree(pCir->DGAModes); -+ free(pCir->DGAModes); - pCir->DGAnumModes = 0; - pCir->DGAModes = NULL; - -diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c -index b41b79a..381db1c 100644 ---- a/src/lg_hwcurs.c -+++ b/src/lg_hwcurs.c -@@ -10,7 +10,6 @@ - * Much of this code is inspired by the HW cursor code from XFree86 - * 3.3.3. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -diff --git a/src/lg_i2c.c b/src/lg_i2c.c -index 05e083c..145cc2e 100644 ---- a/src/lg_i2c.c -+++ b/src/lg_i2c.c -@@ -1,7 +1,5 @@ - /* (c) Itai Nahshon */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */ -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -diff --git a/src/lg_xaa.c b/src/lg_xaa.c -index fd8c70a..8bab365 100644 ---- a/src/lg_xaa.c -+++ b/src/lg_xaa.c -@@ -10,7 +10,6 @@ - * Much of this code is inspired by the XAA acceleration from XFree86 - * 3.3.3, laguna_acl.c - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */ - - #ifdef HAVE_CONFIG_H - #include "config.h" -diff --git a/src/lg_xaa.h b/src/lg_xaa.h -index 7359a49..162aa5d 100644 ---- a/src/lg_xaa.h -+++ b/src/lg_xaa.h -@@ -13,7 +13,6 @@ - * This header file draws much from the file cir_blitLG.h in version 3.3.3 - * of XFree86. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */ - - /* This header file defines the necessary structures, contstants, and - variables for using the bitBLT engine on a Laguna family graphics diff --git a/testing/xf86-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD deleted file mode 100644 index 13906ed33..000000000 --- a/testing/xf86-video-dummy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150034 2012-02-12 09:44:52Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-dummy -pkgver=0.3.5 -pkgrel=1 -pkgdesc="X.org dummy video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('41cfcaec986ab13e931d260953c5a3f626fd1d2b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD deleted file mode 100644 index 8fe5012b9..000000000 --- a/testing/xf86-video-fbdev/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150036 2012-02-12 09:44:56Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-fbdev -pkgver=0.4.2 -pkgrel=6 -pkgdesc="X.org framebuffer video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD deleted file mode 100644 index f749217b0..000000000 --- a/testing/xf86-video-glint/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150435 2012-02-17 17:32:58Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-glint -pkgver=1.2.7 -pkgrel=1 -pkgdesc="X.org GLINT/Permedia video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD deleted file mode 100644 index ae2d800e9..000000000 --- a/testing/xf86-video-i128/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150041 2012-02-12 09:45:03Z andyrtr $ -# Maintainer:Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i128 -pkgver=1.3.4 -pkgrel=5 -pkgdesc="X.org Number 9 I128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - i128-1.3.4-git.patch) -sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775' - 'c282f9de94ef7225f03034c9c07f40f46bd44bdc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-i128/i128-1.3.4-git.patch b/testing/xf86-video-i128/i128-1.3.4-git.patch deleted file mode 100644 index 581ed7bb7..000000000 --- a/testing/xf86-video-i128/i128-1.3.4-git.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff --git a/man/i128.man b/man/i128.man -index 920d2ab..a8e2e54 100644 ---- a/man/i128.man -+++ b/man/i128.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH I128 __drivermansuffix__ __vendorversion__ -diff --git a/src/i128_driver.c b/src/i128_driver.c -index 903a3a8..92f9d58 100644 ---- a/src/i128_driver.c -+++ b/src/i128_driver.c -@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags) - numDevSections, drv, &usedChips); - - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - - if (numUsed <= 0) - return FALSE; - - if (flags & PROBE_DETECT) { -- xfree(usedChips); -+ free(usedChips); - return FALSE; - } - -@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - -- xfree(usedChips); -+ free(usedChips); - - return foundScreen; - } -@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) - int i; - ClockRangePtr clockRanges; - MessageType from; -- IOADDRESS iobase; -+ unsigned long iobase; - char *ramdac = NULL; - CARD32 tmpl, tmph, tmp; - unsigned char n, m, p, mdc, df; -@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pI128->Options = xalloc(sizeof(I128Options)))) -+ if (!(pI128->Options = malloc(sizeof(I128Options)))) - return FALSE; - memcpy(pI128->Options, I128Options, sizeof(I128Options)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI128->Options); -@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) - xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n", - PCI_SUB_VENDOR_ID(pI128->PciInfo)); - -- iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset; -+ iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ iobase += hwp->PIOOffset; -+#endif - pI128->RegRec.iobase = iobase; - - pI128->io.rbase_g = inl(iobase) & 0xFFFFFF00; -@@ -1157,7 +1160,7 @@ I128FreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -1704,12 +1707,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen) - XAADestroyInfoRec(pI128->XaaInfoRec); - if (pI128->ExaDriver) { - exaDriverFini(pScreen); -- xfree(pI128->ExaDriver); -+ free(pI128->ExaDriver); - } - if (pI128->CursorInfoRec) - xf86DestroyCursorInfoRec(pI128->CursorInfoRec); - if (pI128->DGAModes) -- xfree(pI128->DGAModes); -+ free(pI128->DGAModes); - pScrn->vtSema = FALSE; - - pScreen->CloseScreen = pI128->CloseScreen; -@@ -1804,7 +1807,7 @@ I128DDC1Read(ScrnInfoPtr pScrn) - I128Ptr pI128 = I128PTR(pScrn); - unsigned char val; - unsigned long tmp, ddc; -- IOADDRESS iobase; -+ unsigned long iobase; - - iobase = pI128->RegRec.iobase; - ddc = inl(iobase + 0x2C); -@@ -1839,7 +1842,7 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data) - { - I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]); - unsigned long ddc; -- IOADDRESS iobase; -+ unsigned long iobase; - #if 0 - static int lastclock = -1, lastdata = -1; - #endif -@@ -1867,7 +1870,7 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data) - unsigned char drv, val; - unsigned long ddc; - unsigned long tmp; -- IOADDRESS iobase; -+ unsigned long iobase; - - iobase = pI128->RegRec.iobase; - ddc = inl(iobase + 0x2C); -@@ -1889,7 +1892,7 @@ I128I2CInit(ScrnInfoPtr pScrn) - { - I128Ptr pI128 = I128PTR(pScrn); - I2CBusPtr I2CPtr; -- IOADDRESS iobase; -+ unsigned long iobase; - unsigned long soft_sw, ddc; - - I2CPtr = xf86CreateI2CBusRec(); -@@ -2102,7 +2105,7 @@ void - I128DumpActiveRegisters(ScrnInfoPtr pScrn) - { - I128Ptr pI128 = I128PTR(pScrn); -- IOADDRESS iobase; -+ unsigned long iobase; - unsigned long rbase_g, rbase_w, rbase_a, rbase_b, rbase_i, rbase_e; - unsigned long id, config1, config2, sgram, soft_sw, ddc, vga_ctl; - volatile CARD32 *vrba, *vrbg, *vrbw; -diff --git a/src/i128dga.c b/src/i128dga.c -index 48823aa..8bc2fcb 100644 ---- a/src/i128dga.c -+++ b/src/i128dga.c -@@ -59,15 +59,15 @@ I128DGAInit(ScreenPtr pScreen) - while(pMode) { - - if(0 /*pScrn->displayWidth != pMode->HDisplay*/) { -- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - } else { -- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -diff --git a/src/i128reg.h b/src/i128reg.h -index 56b9c33..a72b525 100644 ---- a/src/i128reg.h -+++ b/src/i128reg.h -@@ -75,7 +75,7 @@ struct i128mem { - - /* save the registers needed for restoration in this structure */ - typedef struct { -- IOADDRESS iobase; /* saved only for iobase indexing */ -+ unsigned long iobase; /* saved only for iobase indexing */ - CARD32 config1; /* iobase+0x1C register */ - CARD32 config2; /* iobase+0x20 register */ - CARD32 sgram; /* iobase+0x24 register */ diff --git a/testing/xf86-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD deleted file mode 100644 index 24edf52e9..000000000 --- a/testing/xf86-video-i740/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150043 2012-02-12 09:45:06Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i740 -pkgver=1.3.2 -pkgrel=8 -pkgdesc="X.org Intel i740 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD deleted file mode 100644 index ae7ba48b9..000000000 --- a/testing/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 151053 2012-02-24 15:04:28Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.18.0 -pkgrel=1 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') -makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.11.99.903' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD deleted file mode 100644 index 4341bcce1..000000000 --- a/testing/xf86-video-mach64/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150047 2012-02-12 09:45:12Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mach64 -pkgver=6.9.0 -pkgrel=3 -pkgdesc="X.org mach64 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr #--enable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD deleted file mode 100644 index 59d9bcd29..000000000 --- a/testing/xf86-video-mga/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 153627 2012-03-16 18:24:30Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mga -pkgver=1.4.13 -pkgrel=6 -pkgdesc="X.org mga video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378' - 'f2f07d2ab7c4fccd127fc890e074049962819ccf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr --disable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-mga/git-fixes.patch b/testing/xf86-video-mga/git-fixes.patch deleted file mode 100644 index 70650b0d1..000000000 --- a/testing/xf86-video-mga/git-fixes.patch +++ /dev/null @@ -1,5192 +0,0 @@ -From 951474c7fcd1b28d3178a6644d58958cb3bdf5a8 Mon Sep 17 00:00:00 2001 -From: Yannick Heneault <yheneaul@matrox.com> -Date: Wed, 25 Aug 2010 15:16:27 +0000 -Subject: modified G200SE conditionnal statement about revision register for products compatibility. - ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 5a1e9b4..83649ee 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -1081,7 +1081,7 @@ MGACountRam(ScrnInfoPtr pScrn) - - if (pMga->is_G200SE) - pMga->reg_1e24 = INREG(0x1e24); /* stash the model for later */ -- if (pMga->reg_1e24 == 0x01) { -+ if (pMga->reg_1e24 >= 0x01) { - MGAUnmapMem(pScrn); - ProbeSize = 16384; - ProbeSizeOffset = 0x10000; -@@ -3253,7 +3253,7 @@ MGA_HAL( - MGA_NOT_HAL( - if (pMga->is_G200SE) { - OUTREG8(0x1FDE, 0x06); -- if (pMga->reg_1e24 == 0x01) -+ if (pMga->reg_1e24 >= 0x01) - OUTREG8(0x1FDF, 0x03); - else - OUTREG8(0x1FDF, 0x14); -@@ -4326,7 +4326,7 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - return MODE_VIRTUAL_X; - if (mode->VDisplay > 1200) - return MODE_VIRTUAL_Y; -- if (pMga->reg_1e24 == 0x01 && -+ if (pMga->reg_1e24 >= 0x01 && - xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244) - return MODE_BANDWIDTH; - } else if (pMga->is_G200WB){ --- -cgit v0.9.0.2-2-gbebe -From 0bd44fad450843b7f1c35c70ab356a2b250d107d Mon Sep 17 00:00:00 2001 -From: Jesse Adkins <jesserayadkins@gmail.com> -Date: Tue, 28 Sep 2010 20:29:51 +0000 -Subject: Purge cvs tags. - -Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/mga.man b/man/mga.man -index 3a7a9f8..e1e674f 100644 ---- a/man/mga.man -+++ b/man/mga.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.7 2003/04/03 07:11:03 herrb Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH mga __drivermansuffix__ __vendorversion__ -diff --git a/src/binding.h b/src/binding.h -index 6dcd1e9..57e9b92 100644 ---- a/src/binding.h -+++ b/src/binding.h -@@ -13,7 +13,6 @@ - @end - - ***************************************************************************************/ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.3 2000/10/24 22:45:08 dawes Exp $ */ - - #ifndef _BINDING - #define _BINDING -diff --git a/src/mga.h b/src/mga.h -index 2cb3d88..7725b56 100644 ---- a/src/mga.h -+++ b/src/mga.h -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.87tsi Exp $ */ - /* - * MGA Millennium (MGA2064W) functions - * -diff --git a/src/mga_common.h b/src/mga_common.h -index 90f6b37..81be2bc 100644 ---- a/src/mga_common.h -+++ b/src/mga_common.h -@@ -25,8 +25,6 @@ - * Converted to common header format: - * Jens Owen <jens@tungstengraphics.com> - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $ -- * - */ - - #ifndef _MGA_COMMON_H_ -diff --git a/src/mga_dri.h b/src/mga_dri.h -index f1afb5d..1984b9c 100644 ---- a/src/mga_dri.h -+++ b/src/mga_dri.h -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.6 2001/04/10 16:08:01 dawes Exp $ */ -- - /* - * Copyright 2000 VA Linux Systems Inc., Fremont, California. - * All Rights Reserved. -diff --git a/src/mga_dripriv.h b/src/mga_dripriv.h -index 3ddd133..feca134 100644 ---- a/src/mga_dripriv.h -+++ b/src/mga_dripriv.h -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h,v 1.4 2001/04/10 16:08:01 dawes Exp $ */ -- - /* - * Copyright 2000 VA Linux Systems Inc., Fremont, California. - * All Rights Reserved. -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 83649ee..72e7acc 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -1,4 +1,3 @@ --/* $XConsortium: mga_driver.c /main/12 1996/10/28 05:13:26 kaleb $ */ - /* - * MGA Millennium (MGA2064W) with Ti3026 RAMDAC driver v.1.1 - * -diff --git a/src/mga_macros.h b/src/mga_macros.h -index 69dc8e3..bffd063 100644 ---- a/src/mga_macros.h -+++ b/src/mga_macros.h -@@ -1,5 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */ -- - #ifndef _MGA_MACROS_H_ - #define _MGA_MACROS_H_ - -diff --git a/src/mga_reg.h b/src/mga_reg.h -index 6251976..ffe4723 100644 ---- a/src/mga_reg.h -+++ b/src/mga_reg.h -@@ -1,11 +1,3 @@ --/* $XConsortium: mgareg.h /main/2 1996/10/25 10:33:21 kaleb $ */ -- -- -- --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.18 2001/09/26 12:59:18 alanh Exp $ */ -- -- -- - /* - * MGA Millennium (MGA2064W) functions - * MGA Mystique (MGA1064SG) functions -diff --git a/src/mga_sarea.h b/src/mga_sarea.h -index c5ffbbc..16fc9ce 100644 ---- a/src/mga_sarea.h -+++ b/src/mga_sarea.h -@@ -1,5 +1,3 @@ --/* $XFree86$ */ -- - /* - * Copyright 2000 Gareth Hughes - * All Rights Reserved. -diff --git a/src/mgareg_flags.h b/src/mgareg_flags.h -index 69050fc..548af86 100644 ---- a/src/mgareg_flags.h -+++ b/src/mgareg_flags.h -@@ -19,7 +19,6 @@ - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mgareg_flags.h,v 1.2 2003/01/12 03:55:47 tsi Exp $ */ - - #ifndef _MGAREGS_H_ - #define _MGAREGS_H_ -diff --git a/util/stormdwg.c b/util/stormdwg.c -index 99f76cc..b43cc32 100644 ---- a/util/stormdwg.c -+++ b/util/stormdwg.c -@@ -1,8 +1,3 @@ --/* $XConsortium: dwg.c /main/2 1996/10/28 06:57:55 kaleb $ */ -- -- -- --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/util/stormdwg.c,v 1.1 1997/04/12 14:11:29 hohndel Exp $ */ - - #include <stdio.h> - #include <stdlib.h> --- -cgit v0.9.0.2-2-gbebe -From 636c3c88e7e9cb30010fe1731cd7356849f3f172 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 14 Oct 2010 18:36:06 +0000 -Subject: Don't allow the config file to override BIOS location - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 72e7acc..37bf847 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -1779,23 +1779,16 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - #ifndef XSERVER_LIBPCIACCESS - /* - * Find the BIOS base. Get it from the PCI config if possible. Otherwise -- * use the VGA default. Allow the config file to override this. -+ * use the VGA default. - */ - -- pMga->BiosFrom = X_NONE; -- if (pMga->device->BiosBase != 0) { -- /* XXX This isn't used */ -- pMga->BiosAddress = pMga->device->BiosBase; -- pMga->BiosFrom = X_CONFIG; -- } else { -- /* details: rombase sdk pp 4-15 */ -- if (pMga->PciInfo->biosBase != 0) { -- pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; -- pMga->BiosFrom = X_PROBED; -- } else if (pMga->Primary) { -- pMga->BiosAddress = 0xc0000; -- pMga->BiosFrom = X_DEFAULT; -- } -+ /* details: rombase sdk pp 4-15 */ -+ if (pMga->PciInfo->biosBase != 0) { -+ pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; -+ pMga->BiosFrom = X_PROBED; -+ } else if (pMga->Primary) { -+ pMga->BiosAddress = 0xc0000; -+ pMga->BiosFrom = X_DEFAULT; - } - if (pMga->BiosAddress) { - xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n", --- -cgit v0.9.0.2-2-gbebe -From f7a2ef60e18e2cc464f69c1cad4681096c645651 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 30 Oct 2010 16:38:31 +0000 -Subject: Sun's copyrights now belong to Oracle - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/Makefile.am b/man/Makefile.am -index b3688ce..1ea26b3 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,5 @@ - # --# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -+# Copyright (c) 2005, Oracle and/or its affiliates. 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"), -@@ -19,7 +19,7 @@ - # 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. --# -+# - - drivermandir = $(DRIVER_MAN_DIR) - --- -cgit v0.9.0.2-2-gbebe -From 5f1b04e86e79938c8158055a777280a649f95510 Mon Sep 17 00:00:00 2001 -From: Yannick Heneault <yheneaul@matrox.com> -Date: Fri, 17 Dec 2010 14:00:46 +0000 -Subject: added support for G200ER. - ---- -diff --git a/src/mga.h b/src/mga.h -index 7725b56..c520e86 100644 ---- a/src/mga.h -+++ b/src/mga.h -@@ -136,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*); - #define PCI_CHIP_MGAG200_EH_PCI 0x0533 - #endif - -+#ifndef PCI_CHIP_MGAG200_ER_PCI -+#define PCI_CHIP_MGAG200_ER_PCI 0x0534 -+#endif -+ - /* - * Read/write to the DAC via MMIO - */ -@@ -199,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*); - typedef struct { - unsigned char ExtVga[6]; - unsigned char DacClk[6]; -- unsigned char * DacRegs; -+ unsigned char ExtVga_Index24; -+ unsigned char Dac_Index90; -+ unsigned char * DacRegs; - unsigned long crtc2[0x58]; - unsigned char dac2[0x21]; - CARD32 Option; -@@ -478,6 +484,7 @@ typedef struct { - int is_G200WB:1; - int is_G200EV:1; - int is_G200EH:1; -+ int is_G200ER:1; - - int KVM; - -diff --git a/src/mga_dacG.c b/src/mga_dacG.c -index df00765..fca1031 100644 ---- a/src/mga_dacG.c -+++ b/src/mga_dacG.c -@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg) - outMGAdac(MGA1064_REMHEADCTL, ucTempByte); - } - -+#define G200ER_PLLREF 48000 -+#define G200ER_VCOMIN 1056000 -+#define G200ER_VCOMAX 1488000 -+ -+static void MGAG200ERComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *piM, int *piN, int *piP) -+{ -+ -+ int ulM; -+ int ulN; -+ int ulO; -+ int ulR; -+ -+ CARD32 ulComputedFo; -+ CARD32 ulVco; -+ CARD32 ulFDelta; -+ CARD32 ulFTmpDelta; -+ -+ CARD32 aulMDivValue[] = {1, 2, 4, 8}; -+ -+ CARD32 ulFo = lFo; -+ -+ ulFDelta = 0xFFFFFFFF; -+ -+ for (ulR = 0; ulR < 4; ulR++) -+ { -+ if(ulFDelta==0) break; -+ for (ulN = 5; (ulN <= 128) ; ulN++) -+ { -+ if(ulFDelta==0) break; -+ for (ulM = 3; ulM >= 0; ulM--) -+ { -+ if(ulFDelta==0) break; -+ for (ulO = 5; ulO <= 32; ulO++) -+ { -+ ulVco = (G200ER_PLLREF * (ulN+1)) / (ulR+1); -+ // Validate vco -+ if (ulVco < G200ER_VCOMIN) continue; -+ if (ulVco > G200ER_VCOMAX) continue; -+ ulComputedFo = ulVco / (aulMDivValue[ulM] * (ulO+1)); -+ -+ if (ulComputedFo > ulFo) -+ { -+ ulFTmpDelta = ulComputedFo - ulFo; -+ } -+ else -+ { -+ ulFTmpDelta = ulFo - ulComputedFo; -+ } -+ -+ if (ulFTmpDelta < ulFDelta) -+ { -+ ulFDelta = ulFTmpDelta; -+ // XG200ERPIXPLLCM M<1:0> O<7:3> -+ *piM = (CARD8)ulM | (CARD8)(ulO<<3); -+ // -+ // XG200ERPIXPLLCN N<6:0> -+ *piN = (CARD8)ulN; -+ // -+ // XG200ERPIXPLLCP R<1:0> cg<7:4> (Use R value) -+ *piP = (CARD8)ulR | (CARD8)(ulR<<3); -+ -+ // Test -+ int ftest = (G200ER_PLLREF * (ulN+1)) / ((ulR+1) * aulMDivValue[ulM] * (ulO+1)); -+ ftest=ftest; -+ } -+ } // End O Loop -+ } // End M Loop -+ } // End N Loop -+ } // End R Loop -+} -+ -+static void -+MGAG200ERPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg) -+{ -+ //TODO G200ER Validate sequence -+ CARD8 ucPixCtrl, ucTempByte; -+ MGAPtr pMga = MGAPTR(pScrn); -+ -+ -+ // Set pixclkdis to 1 -+ ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL); -+ ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS; -+ outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl); -+ -+ ucTempByte = inMGAdac(MGA1064_REMHEADCTL); -+ ucTempByte |= MGA1064_REMHEADCTL_CLKDIS; -+ outMGAdac(MGA1064_REMHEADCTL, ucTempByte); -+ -+ // Select PLL Set C -+ ucTempByte = INREG8(MGAREG_MEM_MISC_READ); -+ ucTempByte |= (0x3<<2) | 0xc0; //select MGA pixel clock -+ OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte); -+ -+ ucPixCtrl &= ~MGA1064_PIX_CLK_CTL_CLK_DIS; -+ ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN; -+ outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl); -+ -+ // Wait 500 us -+ usleep(500); -+ -+ // Program the Pixel PLL Register -+ outMGAdac(MGA1064_ER_PIX_PLLC_N, mgaReg->PllN); -+ outMGAdac(MGA1064_ER_PIX_PLLC_M, mgaReg->PllM); -+ outMGAdac(MGA1064_ER_PIX_PLLC_P, mgaReg->PllP); -+ -+ // Wait 50 us -+ usleep(50); -+ -+} -+ - static void - MGAG200WBPrepareForModeSwitch(ScrnInfoPtr pScrn) - { -@@ -768,8 +878,13 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out ) - - pReg->PllM = m; - pReg->PllN = n; -- pReg->PllP = p; -- } else { -+ pReg->PllP = p; -+ } else if (pMga->is_G200ER) { -+ MGAG200ERComputePLLParam(pScrn, f_out, &m, &n, &p); -+ pReg->PllM = m; -+ pReg->PllN = n; -+ pReg->PllP = p; -+ } else { - /* Do the calculations for m, n, p and s */ - MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s ); - -@@ -966,6 +1081,10 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - pReg->Option2 = 0x0000b000; - break; - -+ case PCI_CHIP_MGAG200_ER_PCI: -+ pReg->Dac_Index90 = 0; -+ break; -+ - case PCI_CHIP_MGAG200_EH_PCI: - pReg->DacRegs[MGA1064_MISC_CTL] = - MGA1064_MISC_CTL_VGA8 | -@@ -1088,6 +1207,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - if (pMga->is_G200WB){ - pReg->ExtVga[1] |= 0x88; - } -+ pReg->ExtVga_Index24 = 0x05; - - pVga->CRTC[0] = ht - 4; - pVga->CRTC[1] = hd; -@@ -1327,10 +1447,15 @@ MGA_NOT_HAL( - if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) && - (i >= 0x44) && (i <= 0x4E)) - continue; -- -+ - outMGAdac(i, mgaReg->DacRegs[i]); - } - -+ if (pMga->is_G200ER) -+ { -+ outMGAdac(0x90, mgaReg->Dac_Index90); -+ } -+ - if (!MGAISGx50(pMga)) { - /* restore pci_option register */ - #ifdef XSERVER_LIBPCIACCESS -@@ -1361,7 +1486,9 @@ MGA_NOT_HAL( - #endif - } - -- if (pMga->is_G200EV) { -+ if (pMga->is_G200ER) { -+ MGAG200ERPIXPLLSET(pScrn, mgaReg); -+ } else if (pMga->is_G200EV) { - MGAG200EVPIXPLLSET(pScrn, mgaReg); - } else if (pMga->is_G200WB) { - MGAG200WBPIXPLLSET(pScrn, mgaReg); -@@ -1388,6 +1515,11 @@ MGA_NOT_HAL( - for (i = 0; i < 6; i++) - OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i); - -+ if (pMga->is_G200ER) { -+ OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24); -+ OUTREG8(MGAREG_CRTCEXT_DATA, mgaReg->ExtVga_Index24); -+ } -+ - /* This handles restoring the generic VGA registers. */ - if (pMga->is_G200SE) { - MGAG200SERestoreMode(pScrn, vgaReg); -@@ -1404,7 +1536,7 @@ MGA_NOT_HAL( - OUTREG16(MGAREG_CRTCEXT_INDEX, 6); - OUTREG16(MGAREG_CRTCEXT_DATA, 0); - } -- -+ - /* - * this is needed to properly restore start address - */ -@@ -1555,6 +1687,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, - mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M); - mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N); - mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P); -+ } else if (pMga->is_G200ER) { -+ mgaReg->PllM = inMGAdac(MGA1064_ER_PIX_PLLC_M); -+ mgaReg->PllN = inMGAdac(MGA1064_ER_PIX_PLLC_N); -+ mgaReg->PllP = inMGAdac(MGA1064_ER_PIX_PLLC_P); -+ mgaReg->Dac_Index90 = inMGAdac(0x90); - } - - mgaReg->PIXPLLCSaved = TRUE; -@@ -1583,6 +1720,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, - OUTREG8(MGAREG_CRTCEXT_INDEX, i); - mgaReg->ExtVga[i] = INREG8(MGAREG_CRTCEXT_DATA); - } -+ if (pMga->is_G200ER) -+ { -+ OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24); -+ mgaReg->ExtVga_Index24 = INREG8(MGAREG_CRTCEXT_DATA); -+ } - - #ifdef DEBUG - ErrorF("Saved values:\nDAC:"); -@@ -1737,7 +1879,7 @@ static const struct mgag_i2c_private { - { (1 << 0), (1 << 2) }, - { (1 << 4), (1 << 5) }, - { (1 << 0), (1 << 1) }, /* G200SE, G200EV and G200WB I2C bits */ -- { (1 << 1), (1 << 0) }, /* G200EH I2C bits */ -+ { (1 << 1), (1 << 0) }, /* G200EH, G200ER I2C bits */ - }; - - -@@ -1750,7 +1892,7 @@ MGAG_ddc1Read(ScrnInfoPtr pScrn) - - if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV) - i2c_index = 3; -- else if (pMga->is_G200EH) -+ else if (pMga->is_G200EH || pMga->is_G200ER) - i2c_index = 4; - else - i2c_index = 0; -@@ -1851,7 +1993,7 @@ MGAG_i2cInit(ScrnInfoPtr pScrn) - - if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV) - i2c_index = 3; -- else if (pMga->is_G200EH) -+ else if (pMga->is_G200EH || pMga->is_G200ER) - i2c_index = 4; - else - i2c_index = 0; -@@ -1976,7 +2118,7 @@ void MGAGSetupFuncs(ScrnInfoPtr pScrn) - pMga->Save = MGAGSave; - pMga->Restore = MGAGRestore; - pMga->ModeInit = MGAGInit; -- if (!pMga->is_G200WB){ -+ if ((!pMga->is_G200WB) && (!pMga->is_G200ER)) { - pMga->ddc1Read = MGAG_ddc1Read; - /* vgaHWddc1SetSpeed will only work if the card is in VGA mode */ - pMga->DDC1SetSpeed = vgaHWddc1SetSpeedWeak(); -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 37bf847..7232c73 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -403,6 +403,21 @@ static const struct mga_device_attributes attribs[] = { - 8192, 0x4000, /* Memory probe size & offset values */ - }, - -+ /* G200ER */ -+ [15] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs, -+ (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION), -+ { -+ { 50000, 230000 }, /* System VCO frequencies */ -+ { 50000, 203400 }, /* Pixel VCO frequencies */ -+ { 0, 0 }, /* Video VCO frequencies */ -+ 45000, /* Memory clock */ -+ 27050, /* PLL reference frequency */ -+ 0, /* Supports fast bitblt? */ -+ MGA_HOST_PCI /* Host interface */ -+ }, -+ -+ 16384, 0x4000, /* Memory probe size & offset values */ -+ } - }; - - #ifdef XSERVER_LIBPCIACCESS -@@ -432,6 +447,8 @@ static const struct pci_id_match mga_device_match[] = { - - MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ), - -+ MGA_DEVICE_MATCH(PCI_CHIP_MGAG200_ER_PCI, 15 ), -+ - { 0, 0, 0 }, - }; - #endif -@@ -449,6 +466,7 @@ static SymTabRec MGAChipsets[] = { - { PCI_CHIP_MGAG200_SE_A_PCI, "mgag200 SE A PCI" }, - { PCI_CHIP_MGAG200_SE_B_PCI, "mgag200 SE B PCI" }, - { PCI_CHIP_MGAG200_EV_PCI, "mgag200 EV Maxim" }, -+ { PCI_CHIP_MGAG200_ER_PCI, "mgag200 ER SH7757" }, - { PCI_CHIP_MGAG200_WINBOND_PCI, "mgag200 eW Nuvoton" }, - { PCI_CHIP_MGAG200_EH_PCI, "mgag200eH" }, - { PCI_CHIP_MGAG400, "mgag400" }, -@@ -471,6 +489,8 @@ static PciChipsets MGAPciChipsets[] = { - RES_SHARED_VGA }, - { PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI, - RES_SHARED_VGA }, -+ { PCI_CHIP_MGAG200_ER_PCI, PCI_CHIP_MGAG200_ER_PCI, -+ RES_SHARED_VGA }, - { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI, - RES_SHARED_VGA }, - { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI, -@@ -912,6 +932,11 @@ MGAProbe(DriverPtr drv, int flags) - case PCI_CHIP_MGAG200_EH_PCI: - attrib_no = 14; - break; -+ -+ case PCI_CHIP_MGAG200_ER_PCI: -+ attrib_no = 15; -+ break; -+ - - default: - return FALSE; -@@ -1285,6 +1310,11 @@ MGAdoDDC(ScrnInfoPtr pScrn) - MGASave(pScrn); - - /* It is now safe to talk to the card */ -+ /* Allow access to DDC */ -+ if (pMga->is_G200ER) { -+ CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2); -+ outMGAdac(MGA1064_GEN_IO_CTL2, ucData | 1); -+ } - - /* Initialize I2C buses - used by DDC if available */ - if (pMga->i2cInit) { -@@ -1326,6 +1356,12 @@ MGAdoDDC(ScrnInfoPtr pScrn) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of monitor info\n"); - } - -+ /* Remove access to DDC */ -+ if (pMga->is_G200ER) { -+ CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2); -+ outMGAdac(MGA1064_GEN_IO_CTL2, ucData & ~1); -+ } -+ - /* Restore previous state and unmap MGA memory and MMIO areas */ - MGARestore(pScrn); - MGAUnmapMem(pScrn); -@@ -1619,6 +1655,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI); - pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI); - pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI); -+ pMga->is_G200ER = (pMga->Chipset == PCI_CHIP_MGAG200_ER_PCI); - - #ifdef USEMGAHAL - if (pMga->chip_attribs->HAL_chipset) { -@@ -1782,14 +1819,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - * use the VGA default. - */ - -- /* details: rombase sdk pp 4-15 */ -- if (pMga->PciInfo->biosBase != 0) { -- pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; -- pMga->BiosFrom = X_PROBED; -- } else if (pMga->Primary) { -- pMga->BiosAddress = 0xc0000; -- pMga->BiosFrom = X_DEFAULT; -- } -+ /* details: rombase sdk pp 4-15 */ -+ if (pMga->PciInfo->biosBase != 0) { -+ pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000; -+ pMga->BiosFrom = X_PROBED; -+ } else if (pMga->Primary) { -+ pMga->BiosAddress = 0xc0000; -+ pMga->BiosFrom = X_DEFAULT; -+ } - if (pMga->BiosAddress) { - xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n", - (unsigned long)pMga->BiosAddress); -@@ -2134,6 +2171,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: - MGAGSetupFuncs(pScrn); -@@ -2247,6 +2285,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - pMga->SrcOrg = 0; - pMga->DstOrg = 0; - break; -@@ -2424,16 +2463,17 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - maxPitch = 2048; - break; - case PCI_CHIP_MGAG200_SE_A_PCI: -- if (pScrn->videoRam < 2048){ -+ if (pScrn->videoRam < 2048){ - maxPitch = 1280; -- } -- break; -+ } -+ break; - case PCI_CHIP_MGAG200: - case PCI_CHIP_MGAG200_PCI: - case PCI_CHIP_MGAG200_SE_B_PCI: - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: - maxPitch = 4096; -@@ -4332,10 +4372,13 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - return MODE_BANDWIDTH; - } else if (pMga->is_G200EV - && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) { -- return MODE_BANDWIDTH; -+ return MODE_BANDWIDTH; - } else if (pMga->is_G200EH - && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) { - return MODE_BANDWIDTH; -+ } else if (pMga->is_G200ER -+ && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 550)) { -+ return MODE_BANDWIDTH; - } - - lace = 1 + ((mode->Flags & V_INTERLACE) != 0); -diff --git a/src/mga_merge.c b/src/mga_merge.c -index 753f752..1fd0572 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -363,6 +363,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: - MGAGSetupFuncs(pScrn); -@@ -518,6 +519,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: - maxPitch = 4096; -diff --git a/src/mga_reg.h b/src/mga_reg.h -index ffe4723..5a37db6 100644 ---- a/src/mga_reg.h -+++ b/src/mga_reg.h -@@ -369,6 +369,7 @@ - #define MGA1064_MISC_CTL_VGA8 ( 0x01 << 3 ) - #define MGA1064_MISC_CTL_DAC_RAM_CS ( 0x01 << 4 ) - -+#define MGA1064_GEN_IO_CTL2 0x29 - #define MGA1064_GEN_IO_CTL 0x2a - #define MGA1064_GEN_IO_DATA 0x2b - #define MGA1064_SYS_PLL_M 0x2c -@@ -429,6 +430,10 @@ - #define MGA1064_EH_PIX_PLLC_N 0xb7 - #define MGA1064_EH_PIX_PLLC_P 0xb8 - -+/* Modified PLL for G200 Maxim (G200ER) */ -+#define MGA1064_ER_PIX_PLLC_M 0xb7 -+#define MGA1064_ER_PIX_PLLC_N 0xb6 -+#define MGA1064_ER_PIX_PLLC_P 0xb8 - - #define MGA1064_DISP_CTL 0x8a - #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK 0x01 -diff --git a/src/mga_storm.c b/src/mga_storm.c -index 87473c8..db7fae7 100644 ---- a/src/mga_storm.c -+++ b/src/mga_storm.c -@@ -1131,6 +1131,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn ) - case PCI_CHIP_MGAG200_WINBOND_PCI: - case PCI_CHIP_MGAG200_EV_PCI: - case PCI_CHIP_MGAG200_EH_PCI: -+ case PCI_CHIP_MGAG200_ER_PCI: - pMga->SrcOrg = 0; - OUTREG(MGAREG_SRCORG, pMga->realSrcOrg); - OUTREG(MGAREG_DSTORG, pMga->DstOrg); --- -cgit v0.9.0.2-2-gbebe -From 43280e6521815582f219d42821d896093c9c0d5f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 22 Jun 2011 21:02:29 +0000 -Subject: Don't include xf86Priv.h - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/mga_dri.c b/src/mga_dri.c -index 3fda623..14f342f 100644 ---- a/src/mga_dri.c -+++ b/src/mga_dri.c -@@ -32,7 +32,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Priv.h" - - #include "xf86PciInfo.h" - #include "xf86Pci.h" --- -cgit v0.9.0.2-2-gbebe -From c083bf0a66bef9a4345847f39be5fb895c211f79 Mon Sep 17 00:00:00 2001 -From: Christian Toutant <ctoutant@matrox.com> -Date: Wed, 03 Aug 2011 13:45:13 +0000 -Subject: Added support for G200SE Pilot3 - -Optimize use of bandwidth and increase maximum resolution to 1920x1200 - -Signed-off-by: Christian Toutant <ctoutant@matrox.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 7232c73..b140013 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -3282,15 +3282,71 @@ MGA_HAL( - outb(0xfac, 0x02); - } - -- MGA_NOT_HAL( -- if (pMga->is_G200SE) { -+ /* -+ This function optimize the Priority Request control -+ Higher HiPriLvl will reduce drawing performance -+ We need to give enough bandwith to crtc to avoid visual artifact -+ */ -+ if (pMga->is_G200SE) -+ { -+ if (pMga->reg_1e24 >= 0x02) -+ { -+ /* Calulate CRTC Priority value */ -+ CARD8 ucHiPriLvl; -+ CARD32 ulBitsPerPixel; -+ CARD32 ulMemoryBandwidth; -+ -+ /* uiBitsPerPixel can only be 8,16 or32 */ -+ if (pScrn->bitsPerPixel > 16) -+ { -+ ulBitsPerPixel = 32; -+ } -+ else if (pScrn->bitsPerPixel > 8) -+ { -+ ulBitsPerPixel = 16; -+ } -+ else -+ { -+ ulBitsPerPixel = 8; -+ } -+ -+ -+ ulMemoryBandwidth = (mode->Clock * ulBitsPerPixel) / 1000; -+ -+ if (ulMemoryBandwidth > 3100) ucHiPriLvl = 0; -+ else if (ulMemoryBandwidth > 2600) ucHiPriLvl = 1; -+ else if (ulMemoryBandwidth > 1900) ucHiPriLvl = 2; -+ else if (ulMemoryBandwidth > 1160) ucHiPriLvl = 3; -+ else if (ulMemoryBandwidth > 440) ucHiPriLvl = 4; -+ else ucHiPriLvl = 5; -+ - OUTREG8(0x1FDE, 0x06); -- if (pMga->reg_1e24 >= 0x01) -- OUTREG8(0x1FDF, 0x03); -- else -- OUTREG8(0x1FDF, 0x14); -+ OUTREG8(0x1FDF, ucHiPriLvl); -+ -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock == %d\n", mode->Clock); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel == %d\n", pScrn->bitsPerPixel); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MemoryBandwidth == %d\n", ulMemoryBandwidth); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl == %02X\n", ucHiPriLvl); - } -- ); -+ else -+ { -+ MGA_NOT_HAL( -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock == %d\n", mode->Clock); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel == %d\n", pScrn->bitsPerPixel); -+ OUTREG8(0x1FDE, 0x06); -+ if (pMga->reg_1e24 >= 0x01) -+ { -+ OUTREG8(0x1FDF, 0x03); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl == 03\n"); -+ } -+ else -+ { -+ OUTREG8(0x1FDF, 0x14); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl == 14h\n"); -+ } -+ ); -+ } -+ } - - pMga->CurrentLayout.mode = mode; - -@@ -4354,13 +4410,23 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - MGAPtr pMga = MGAPTR(pScrn); - - if (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) { -- if (mode->HDisplay > 1600) -- return MODE_VIRTUAL_X; -- if (mode->VDisplay > 1200) -- return MODE_VIRTUAL_Y; -- if (pMga->reg_1e24 >= 0x01 && -- xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244) -- return MODE_BANDWIDTH; -+ if (pMga->reg_1e24 == 0x01) { -+ if (mode->HDisplay > 1600) -+ return MODE_VIRTUAL_X; -+ if (mode->VDisplay > 1200) -+ return MODE_VIRTUAL_Y; -+ if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244) -+ return MODE_BANDWIDTH; -+ } else { -+ if (pMga->reg_1e24 >= 0x02) { -+ if (mode->HDisplay > 1920) -+ return MODE_VIRTUAL_X; -+ if (mode->VDisplay > 1200) -+ return MODE_VIRTUAL_Y; -+ if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 301) -+ return MODE_BANDWIDTH; -+ } -+ } - } else if (pMga->is_G200WB){ - if (mode->Flags & V_DBLSCAN) - return MODE_NO_DBLESCAN; --- -cgit v0.9.0.2-2-gbebe -From 01ca2186ea028b2549de509b51726aa08519fce0 Mon Sep 17 00:00:00 2001 -From: Christian Toutant <ctoutant@matrox.com> -Date: Tue, 20 Sep 2011 17:07:16 +0000 -Subject: Reset tagfifo for renesas. - -For renesas, we need to reset tagfifo after a mode switch. - -Signed-off-by: Christian Toutant <ctoutant@matrox.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index b140013..58a1390 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -3282,6 +3282,28 @@ MGA_HAL( - outb(0xfac, 0x02); - } - -+ /* Reset tagfifo*/ -+ if (pMga->is_G200ER) -+ { -+ CARD32 ulMemCtl = INREG(MGAREG_MEMCTL); -+ CARD8 ucSeq1; -+ -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Reset tagfifo\n"); -+ /* Screen off */ -+ OUTREG8(MGAREG_SEQ_INDEX, 0x01); /* Select SEQ1 */ -+ ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20; -+ OUTREG8(MGAREG_SEQ_DATA, ucSeq1); -+ -+ /* Reset tagfifo */ -+ OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x002000000); -+ usleep(1000); /* wait 1ms */ -+ OUTREG(MGAREG_MEMCTL, ulMemCtl & ~0x002000000); -+ -+ /* Screen on */ -+ OUTREG8(MGAREG_SEQ_DATA, ucSeq1 & ~0x20); -+ -+ } -+ - /* - This function optimize the Priority Request control - Higher HiPriLvl will reduce drawing performance -diff --git a/src/mga_reg.h b/src/mga_reg.h -index 5a37db6..ae0fe8c 100644 ---- a/src/mga_reg.h -+++ b/src/mga_reg.h -@@ -119,6 +119,9 @@ - #define MGAREG_WACCEPTSEQ 0x1dd4 - #define MGAREG_WMISC 0x1e70 - -+ -+#define MGAREG_MEMCTL 0x2E08 -+ - /* OPMODE register additives */ - - #define MGAOPM_DMA_GENERAL (0x00 << 2) --- -cgit v0.9.0.2-2-gbebe -From ae90c47503bc1015a50e7ea6d22ec10e5e0d4113 Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Tue, 13 Sep 2011 21:01:57 +0000 -Subject: Nothing uses clientlx.c, so delete it. - -Adam Jackson wrote: - - Hey, so, remember back in the dark ages when dualhead was this - insanely wild differentiating feature? Matrox thought it was so - special, in fact, that they hid most of the implementation of it - (and a bunch of other stuff) in a binary-only blob called the - HALlib. As you'd expect it was pretty much a cut-and-paste of - the relevant Windows code, and then some open glue to keep it - working; clientlx.c is that glue. - - I guess the theory was that if you don't tell people which - registers to duplicate to implement a second pipe in their own - hardware, they won't figure it out? A pretty eyeroll-worthy - idea even at the time, and definitely not something we should be - condoning anymore. - - Kill it with fire ... - -Signed-off-by: Jamey Sharp <jamey@minilop.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 17211bb..44417de 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -32,7 +32,6 @@ mga_drv_la_LIBADD = $(noinst_LTLIBRARIES) - mga_drv_la_SOURCES = \ - binding.h \ - client.h \ -- clientlx.c \ - mga_arc.c \ - mga_bios.c \ - mga_common.h \ -diff --git a/src/binding.h b/src/binding.h -index 57e9b92..616aed7 100644 ---- a/src/binding.h -+++ b/src/binding.h -@@ -37,37 +37,6 @@ typedef char CHAR; - typedef unsigned char UCHAR; - typedef unsigned char FAR*LPUCHAR; - --typedef struct TAGCLIENTTABLE{ -- ULONG (DECL *ClientReadConfigSpaceByte )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientReadConfigSpaceDword )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientWriteConfigSpaceByte )(LPVOID , ULONG, UCHAR); -- ULONG (DECL *ClientWriteConfigSpaceDword )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientOpenRegisterBase )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientCloseRegisterBase )(LPVOID ); -- ULONG (DECL *ClientReadRegisterByte )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientReadRegisterDword )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientWriteRegisterByte )(LPVOID , ULONG, UCHAR); -- ULONG (DECL *ClientWriteRegisterDword )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientOpenMemoryBase )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientCloseMemoryBase )(LPVOID ); -- ULONG (DECL *ClientReadMemoryByte )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientReadMemoryDword )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientWriteMemoryByte )(LPVOID , ULONG, UCHAR); -- ULONG (DECL *ClientWriteMemoryDword )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientOpenSystemDevice )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientCloseSystemDevice )(LPVOID ); -- ULONG (DECL *ClientReadSystemDeviceByte )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientReadSystemDeviceDword )(LPVOID , ULONG, LPVOID ); -- ULONG (DECL *ClientWriteSystemDeviceByte )(LPVOID , ULONG, UCHAR); -- ULONG (DECL *ClientWriteSystemDeviceDword )(LPVOID , ULONG, ULONG); -- ULONG (DECL *ClientWait )(LPVOID , ULONG); -- ULONG (DECL *ClientGetBiosInfo ) (LPVOID, LPVOID, LPVOID); -- ULONG (DECL *ClientReadDDCEdid ) (LPVOID, LPVOID, ULONG); --#ifdef DEBUG -- ULONG (DECL *ClientDebug ) (LPVOID, ULONG, LPVOID, ULONG, LPVOID); --#endif --} CLIENTTABLE, FAR *LPCLIENTTABLE; -- - #endif /* _INTERNALBINDING */ - - /*************************************************************************************************** -diff --git a/src/client.h b/src/client.h -index 8348b64..59aca5d 100644 ---- a/src/client.h -+++ b/src/client.h -@@ -17,46 +17,6 @@ typedef struct TAGCLIENTDATA - pointer pMga; - } CLIENTDATA, *LPCLIENTDATA; - --extern ULONG DECL ClientReadConfigSpaceByte(LPBOARDHANDLE, ULONG, LPUCHAR); --extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG ); --extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR); --extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE ); --extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR ); --extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG ); --extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR); --extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE ); --extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR ); --extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG ); --extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR); --extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE ); --extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR ); --extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG ); --extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR); --extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG); --extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG); --extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG); --extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR); --extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG ); --extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID); --extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS); --extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG); --extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID); --extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE); --extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG); --extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR); --extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG); --extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE); --extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG); --extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR); --extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR); --extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG); -- - #if defined(__cplusplus) - } - #endif -diff --git a/src/clientlx.c b/src/clientlx.c -deleted file mode 100644 -index 9c6ab50..0000000 ---- a/src/clientlx.c -+++ b/dev/null -@@ -1,848 +0,0 @@ --/******************************************************************************\ -- -- clientlx.c -- -- Copyright © 1997, Matrox Graphics Inc. -- -- All Rights Reserved. -- --\******************************************************************************/ --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif -- --#include "xf86_OSproc.h" --#include "xf86Pci.h" --#include "client.h" --#include "mga.h" -- --CLIENTTABLE ClientFunctions = { -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadConfigSpaceByte, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadConfigSpaceDword, -- (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteConfigSpaceByte, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteConfigSpaceDword, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenRegisterBase, -- (ULONG (DECL *)(LPVOID)) ClientCloseRegisterBase, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadRegisterByte, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadRegisterDword, -- (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteRegisterByte, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteRegisterDword, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenMemoryBase, -- (ULONG (DECL *)(LPVOID)) ClientCloseMemoryBase, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadMemoryByte, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadMemoryDword, -- (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteMemoryByte, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteMemoryDword, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenSystemDevice, -- (ULONG (DECL *)(LPVOID)) ClientCloseSystemDevice, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadSystemDeviceByte, -- (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadSystemDeviceDword, -- (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteSystemDeviceByte, -- (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteSystemDeviceDword, -- (ULONG (DECL *)(LPVOID,ULONG)) ClientWait, -- (ULONG (DECL *)(LPVOID,LPVOID,LPVOID)) ClientGetBiosInfo, -- (ULONG (DECL *)(LPVOID,LPVOID,ULONG)) ClientReadDDCEdid --}; -- --/******************************************************************************\ -- -- Function : ClientReadConfigSpaceByte -- -- Description : Read a Byte from the configuration space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specifib board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR *pucByte | pointer to a byte that will receive -- the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR *pucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr)pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- --#ifdef XSERVER_LIBPCIACCESS -- pci_device_cfg_read_u8(pMga->PciInfo, pucByte, ulOffset); --#else -- *pucByte = pciReadByte(pMga->PciTag,ulOffset); --#endif -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadConfigSpaceDword -- -- Description : Read a Dword from the configuration space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG *pulDword | Dword to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG *pulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr)pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- --#ifdef XSERVER_LIBPCIACCESS -- pci_device_cfg_read_u32(pMga->PciInfo, (uint32_t *) pulDword, ulOffset); --#else -- *pulDword = pciReadLong(pMga->PciTag,ulOffset); --#endif -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteConfigSpaceByte -- -- Description : Write a Byte from the configuration space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR ucByte | Byte to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR ucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr)pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- --#ifdef XSERVER_LIBPCIACCESS -- pci_device_cfg_write_u8(pMga->PciInfo, ucByte, ulOffset); --#else -- pciWriteByte(pMga->PciTag,ulOffset, ucByte); --#endif -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteConfigSpaceDword -- -- Description : Write a Dword from the configuration space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG ulDword | Dword containing the data to be written -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG ulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr)pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- --#ifdef XSERVER_LIBPCIACCESS -- pci_device_cfg_write_u32(pMga->PciInfo, (uint32_t) ulDword, ulOffset); --#else -- pciWriteLong(pMga->PciTag,ulOffset, ulDword); --#endif -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientOpenRegisterBase -- -- Description : Map the register base for future call to ClientReadRegisterX -- and ClientWriteRegisterX. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulAddress | Physical address of the Register aperture -- ULONG ulSize | Size in Byte of the Register Aperture -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr)pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- -- pClientStruct->ulRegisterBase = (ULONG) pMga->IOBase; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientCloseRegisterBase -- -- Description : Unmap the register base address and free resources needed -- to address it. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientCloseRegisterBase(LPBOARDHANDLE pBoard) --{ -- ASSERT_HANDLER(pBoard); -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadRegisterByte -- -- Description : Read a byte from the Register space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure. -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR *pucByte | pointer to the byte that will receive -- the data. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR *pucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *pucByte = *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)); -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadRegisterDword -- -- Description : Read a Dword from the Register space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG *pulDword | pointer to the dword that will receive -- the data. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG *pulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *pulDword = *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)); -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteRegisterByte -- -- Description : Write a Byte from the Register space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR ucByte | CHAR to receive the data. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR ucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)) = ucByte; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteRegisterSpaceDword -- -- Description : Write a Dword from the Register space. -- -- I/O Desc. : LPBOARDHANDLE *| pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG ulDword | Dword to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG ulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)) = ulDword; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientOpenMemoryBase -- -- Description : Map the Memory base for future call to ClientReadMemoryX -- and ClientWriteMemoryX. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulAddress | Physical address of the Register aperture -- ULONG ulSize | Size in Byte of the Register Aperture -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- MGAPtr pMga = (MGAPtr) pClientStruct->pMga; -- -- ASSERT_HANDLER(pBoard); -- -- pClientStruct->ulFrameBufferBase = (ULONG) pMga->FbBase; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientCloseMemoryBase -- -- Description : Unmap the Frame Buffer aperture and free resources -- needed to address it. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard) --{ -- ASSERT_HANDLER(pBoard); -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadMemoryByte -- -- Description : Read a Byte from the Frame Buffer space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR *ucByte | CHAR to receive the data -- -- Return Val : ULONG --\******************************************************************************/ --ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *pucByte = *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)); -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadMemoryDword -- -- Description : Read a Dword from the Frame Buffer Space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG *uDword | Dword to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG *pulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *pulDword = *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)); -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteMemoryByte -- -- Description : Write a Byte from the Frame Buffer space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR ucByte | CHAR to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ucByte; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteMemoryDword -- -- Description : Write a Dword from the Frame Buffer space. -- -- I/O desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG ulDword | Dword to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG ulDword) --{ -- LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); -- -- ASSERT_HANDLER(pBoard); -- -- *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ulDword; -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientOpenSystemDevice -- -- Description : Map a System device aperture for future call to -- ClientReadSystemDeviceX and ClientWriteSystemDeviceX. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulAddress | Physical address of the Register aperture -- ULONG ulSize | Size in Byte of the Register Aperture -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress, -- ULONG ulSize) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientCloseSystemDevice -- -- Description : Unmap the System Device aperture address and free -- resources needed to address it. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientCloseSystemDevice (LPBOARDHANDLE pBoard) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadSystemDeviceByte -- -- Description : Read a Byte from the device Space. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG pucByte | Byte to read the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR *pucByte) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadSystemDeviceDword -- -- Description : Read a Dword from the Frame Buffer Space -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG ulDword | Dword to Read the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG *pulDword) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteSystemByte -- -- Description : Write a Byte from the System Device Aperture -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- UCHAR ucByte | Byte to receive the data -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, -- UCHAR ucByte) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientWriteSystemDword -- -- Description : Write a Dword from the System Device Aperture. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulOffset | Offset of the Byte to be read. -- ULONG uDword | Dword to receive the data -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, -- ULONG ulDword) --{ -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientWait -- -- Description : Wait for ulDelayus micro-seconds. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- ULONG ulDelayus | Delay in uSec -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus) --{ -- int i; -- ULONG ulTmp; -- -- ASSERT_HANDLER(pBoard); -- -- for(i = 0; i < ulDelayus * 3; i++) -- { -- ClientReadRegisterDword(pBoard,0x1e14,&ulTmp); -- } -- -- return 0; --} -- -- --/******************************************************************************\ -- -- Function : ClientGetBiosInfo -- -- Description : This function will be call if no PINS can be found -- in physical EEPROM. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPUCHAR | Buffer where we copy bios pins. -- ULONG | Bios version -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVersion) --{ -- Bool bNotFound = TRUE; -- UCHAR ucBIOS[32768]; -- UCHAR ucTmpByte; -- UCHAR ucCheckSum; -- UCHAR ucPinsIndex; -- UCHAR ucPinsSize; -- ULONG ulTmpDword; -- ULONG ulPinsOffset = 0; -- ULONG ulPCIINFOffset; -- -- ASSERT_HANDLER(pBoard); -- -- xf86ReadBIOS(0xc0000,0,ucBIOS,32768); -- -- if(ucBIOS[0] == 0x55) -- { -- if(ucBIOS[1] == 0xaa) -- { -- while((ulPinsOffset < 0x10000) && bNotFound) -- { -- ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset); -- ucPinsSize = (UCHAR) (ulTmpDword >> 16); -- if(((ulTmpDword & 0x0000ffff) == 0x0000412e) -- && ucPinsSize <= 128) -- { -- ucCheckSum = 0; -- for(ucPinsIndex = 0;ucPinsIndex < ucPinsSize; ucPinsIndex++) -- { -- pucPins[ucPinsIndex] = ucBIOS[ulPinsOffset + -- ucPinsIndex]; -- ucCheckSum += pucPins[ucPinsIndex]; -- } -- if(ucCheckSum == 0) -- { -- bNotFound = FALSE; -- } -- } -- ulPinsOffset++; -- } -- -- if(bNotFound) -- { -- return 1; -- } -- -- ulPCIINFOffset = *(ULONG *)(ucBIOS + 0x18); -- ulPCIINFOffset &= 0x0000ffff; -- ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset); -- -- if(ulTmpDword == 0x52494350) /* "PCIR" */ -- { -- ulPCIINFOffset += 0x12; -- ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset); -- *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) | -- ((ulTmpDword &0xf) << 12) | ((ulTmpDword >> 8) -- & 0xff); -- } -- else -- { -- return 1; -- } -- } -- else -- { -- return 1; -- } -- } -- else -- { -- return 1; -- } -- -- if(!*pulBIOSVersion) -- { -- ucTmpByte = ucBIOS[5]; -- *pulBIOSVersion = ((ULONG) (ucTmpByte >> 4) << 16) | ((ULONG) -- (ucTmpByte & 0x0f) << 12); -- } -- -- return 0; --} -- --/******************************************************************************\ -- -- Function : ClientCallBiosInt10 -- -- Description : Call the BIOS Int10h with specified parameters. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPBIOSREGS pBiosRegs | Pointor to the Bios register -- structure. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs) --{ -- ASSERT_HANDLER(pBoard); -- -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientReadDDCEdid -- -- Description : Not implemented. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPBIOSREGS pBiosRegs | Pointor to the Bios register -- structure. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid, -- ULONG ulMonitorIndex) --{ -- ASSERT_HANDLER(pBoard); -- -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientCustomCall -- -- Description : Not implemented. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPBIOSREGS pBiosRegs | Pointor to the Bios register -- structure. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber, -- LPVOID pInData, LPVOID pOutData) --{ -- ASSERT_HANDLER(pBoard); -- -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientApplyEpromPatch -- -- Description : Not implemented. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPBIOSREGS pBiosRegs | Pointor to the Bios register -- structure. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard) --{ -- ASSERT_HANDLER(pBoard); -- -- return 1; --} -- -- --/******************************************************************************\ -- -- Function : ClientDetectHostInterface -- -- Description : Not implemented. -- -- I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure -- containing all the information about a specific board. -- LPBIOSREGS pBiosRegs | Pointor to the Bios register -- structure. -- -- Return Val : ULONG -- --\******************************************************************************/ --ULONG ClientDetectHostInterface(LPBOARDHANDLE pBoard, LPULONG pulData) --{ -- ASSERT_HANDLER(pBoard); -- -- return 1; --} -- --- -cgit v0.9.0.2-2-gbebe -From 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1 Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Thu, 15 Sep 2011 15:29:11 +0000 -Subject: Delete support for MGA's proprietary HAL: unifdef USEMGAHAL. - -This patch produced with: - for f in `git grep -Fwl USEMGAHAL`; do - unifdef -B -UUSEMGAHAL $f | sponge $f - done - -Adam Jackson wrote: - - Hey, so, remember back in the dark ages when dualhead was this - insanely wild differentiating feature? Matrox thought it was so - special, in fact, that they hid most of the implementation of it - (and a bunch of other stuff) in a binary-only blob called the - HALlib. As you'd expect it was pretty much a cut-and-paste of - the relevant Windows code, and then some open glue to keep it - working; clientlx.c is that glue. - - I guess the theory was that if you don't tell people which - registers to duplicate to implement a second pipe in their own - hardware, they won't figure it out? A pretty eyeroll-worthy - idea even at the time, and definitely not something we should be - condoning anymore. - - Kill it with fire, but while you're at it, untangle the hideous - mess of MGA_HAL() macros too. - -Signed-off-by: Jamey Sharp <jamey@minilop.net> -Cc: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/mga.h b/src/mga.h -index c520e86..fced6aa 100644 ---- a/src/mga.h -+++ b/src/mga.h -@@ -42,10 +42,6 @@ - #include "mga_dri.h" - #endif - --#ifdef USEMGAHAL --#include "client.h" --#endif -- - typedef enum { - OPTION_SW_CURSOR, - OPTION_HW_CURSOR, -@@ -329,11 +325,6 @@ typedef enum { - - typedef struct { - int lastInstance; --#ifdef USEMGAHAL -- LPCLIENTDATA pClientStruct; -- LPBOARDHANDLE pBoard; -- LPMGAHWINFO pMgaHwInfo; --#endif - int refCount; - CARD32 masterFbAddress; - long masterFbMapSize; -@@ -459,12 +450,6 @@ struct mga_device_attributes { - }; - - typedef struct { --#ifdef USEMGAHAL -- LPCLIENTDATA pClientStruct; -- LPBOARDHANDLE pBoard; -- LPMGAMODEINFO pMgaModeInfo; -- LPMGAHWINFO pMgaHwInfo; --#endif - EntityInfoPtr pEnt; - struct mga_bios_values bios; - CARD8 BiosOutputMode; -@@ -650,9 +635,6 @@ typedef struct { - MGAPaletteInfo palinfo[256]; /* G400 hardware bug workaround */ - FBLinearPtr LinearScratch; - Bool softbooted; --#ifdef USEMGAHAL -- Bool HALLoaded; --#endif - OptionInfoPtr Options; - - /* Exa */ -@@ -810,26 +792,6 @@ void MGAG200SESaveMode(ScrnInfoPtr, vgaRegPtr); - void MGAG200SERestoreMode(ScrnInfoPtr, vgaRegPtr); - void MGAG200SEHWProtect(ScrnInfoPtr, Bool); - --#ifdef USEMGAHAL --/************ ESC Call Definition ***************/ --typedef struct { -- char *function; -- void (*funcptr)(ScrnInfoPtr pScrn, unsigned long *param, char *out, DisplayModePtr pMode); --} MGAEscFuncRec, *MGAEscFuncPtr; -- --typedef struct { -- char function[32]; -- unsigned long parameters[32]; --} EscCmdStruct; -- --extern LPMGAMODEINFO pMgaModeInfo[2]; --extern MGAMODEINFO TmpMgaModeInfo[2]; -- --extern void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode); --void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo); --/************************************************/ --#endif -- - static __inline__ void - MGA_MARK_SYNC(MGAPtr pMga, ScrnInfoPtr pScrn) - { -diff --git a/src/mga_dacG.c b/src/mga_dacG.c -index fca1031..b489dea 100644 ---- a/src/mga_dacG.c -+++ b/src/mga_dacG.c -@@ -1001,9 +1001,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - break; - case PCI_CHIP_MGAG400: - case PCI_CHIP_MGAG550: --#ifdef USEMGAHAL -- MGA_HAL(break;); --#endif - if (MGAISGx50(pMga)) - break; - -@@ -1046,9 +1043,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - break; - case PCI_CHIP_MGAG200_SE_A_PCI: - case PCI_CHIP_MGAG200_SE_B_PCI: --#ifdef USEMGAHAL -- MGA_HAL(break;); --#endif - pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03; - pReg->DacRegs[MGA1064_PIX_CLK_CTL] = - MGA1064_PIX_CLK_CTL_SEL_PLL; -@@ -1097,9 +1091,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - case PCI_CHIP_MGAG200: - case PCI_CHIP_MGAG200_PCI: - default: --#ifdef USEMGAHAL -- MGA_HAL(break;); --#endif - if(pMga->OverclockMem) { - /* 143 Mhz */ - pReg->DacRegs[ MGA1064_SYS_PLL_M ] = 0x06; -@@ -1496,21 +1487,6 @@ MGA_NOT_HAL( - MGAG200EHPIXPLLSET(pScrn, mgaReg); - } - ); /* MGA_NOT_HAL */ --#ifdef USEMGAHAL -- /* -- * Work around another bug in HALlib: it doesn't restore the -- * DAC width register correctly. MATROX: hint, hint. -- */ -- MGA_HAL( -- outMGAdac(MGA1064_MUL_CTL,mgaReg->DacRegs[0]); -- outMGAdac(MGA1064_MISC_CTL,mgaReg->DacRegs[1]); -- if (!MGAISGx50(pMga)) { -- outMGAdac(MGA1064_PIX_PLLC_M,mgaReg->DacRegs[2]); -- outMGAdac(MGA1064_PIX_PLLC_N,mgaReg->DacRegs[3]); -- outMGAdac(MGA1064_PIX_PLLC_P,mgaReg->DacRegs[4]); -- } -- ); --#endif - /* restore CRTCEXT regs */ - for (i = 0; i < 6; i++) - OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i); -@@ -1650,24 +1626,6 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg, - * DAC width register correctly. - */ - --#ifdef USEMGAHAL -- /* -- * Work around another bug in HALlib: it doesn't restore the -- * DAC width register correctly (s.o.). MATROX: hint, hint. -- */ -- MGA_HAL( -- if (mgaReg->DacRegs == NULL) { -- mgaReg->DacRegs = xnfcalloc(MGAISGx50(pMga) ? 2 : 5, 1); -- } -- mgaReg->DacRegs[0] = inMGAdac(MGA1064_MUL_CTL); -- mgaReg->DacRegs[1] = inMGAdac(MGA1064_MISC_CTL); -- if (!MGAISGx50(pMga)) { -- mgaReg->DacRegs[2] = inMGAdac(MGA1064_PIX_PLLC_M); -- mgaReg->DacRegs[3] = inMGAdac(MGA1064_PIX_PLLC_N); -- mgaReg->DacRegs[4] = inMGAdac(MGA1064_PIX_PLLC_P); -- } -- ); --#endif - MGA_NOT_HAL( - /* - * The port I/O code necessary to read in the extended registers. -@@ -1793,12 +1751,6 @@ MGAGSetCursorPosition(ScrnInfoPtr pScrn, int x, int y) - x += 64; - y += 64; - --#ifdef USEMGAHAL -- MGA_HAL( -- x += pMga->HALGranularityOffX; -- y += pMga->HALGranularityOffY; -- ); --#endif - /* cursor update must never occurs during a retrace period (pp 4-160) */ - while( INREG( MGAREG_Status ) & 0x08 ); - -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 58a1390..d770031 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -1509,10 +1509,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - int flags24; - MGAEntPtr pMgaEnt = NULL; - Bool Default; --#ifdef USEMGAHAL -- ULONG status; -- CARD8 MiscCtlReg; --#endif - - /* - * Note: This function is only called once at server startup, and -@@ -1657,37 +1653,9 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI); - pMga->is_G200ER = (pMga->Chipset == PCI_CHIP_MGAG200_ER_PCI); - --#ifdef USEMGAHAL -- if (pMga->chip_attribs->HAL_chipset) { -- Bool loadHal = TRUE; -- -- from = X_DEFAULT; -- if (xf86FindOption(pMga->device->options, "NoHal")) { -- loadHal = !xf86SetBoolOption(pMga->device->options, -- "NoHal", !loadHal); -- from = X_CONFIG; -- } else if (xf86FindOption(pMga->device->options, "Hal")) { -- loadHal = xf86SetBoolOption(pMga->device->options, -- "Hal", loadHal); -- from = X_CONFIG; -- } -- if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) { -- xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n"); -- pMga->HALLoaded = TRUE; -- } else { -- xf86DrvMsg(pScrn->scrnIndex, from, "Matrox HAL module not loaded " -- "- using builtin mode setup instead\n"); -- pMga->HALLoaded = FALSE; -- } -- } --#endif -- - pMga->DualHeadEnabled = FALSE; - if (xf86IsEntityShared(pScrn->entityList[0])) {/* dual-head mode requested*/ - if ( --#ifdef USEMGAHAL -- pMga->HALLoaded || --#endif - !MGA_DH_NEEDS_HAL(pMga)) { - pMga->DualHeadEnabled = TRUE; - } else if (xf86IsPrimInitDone(pScrn->entityList[0])) { -@@ -2088,30 +2056,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "\"Merged Framebuffer\" mode only supported on G450 and G550 boards.\n"); - } else { --#ifdef USEMGAHAL -- if(pMga->HALLoaded) -- { -- pMga->MergedFB = TRUE; -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Using \"Merged Framebuffer\" mode.\n"); -- /* -- * a few options that won't work well together -- */ -- if(pMga->HWCursor) /*Should we give the choice? */ -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- " -- Hardware Cursor disabled.\n"); -- pMga->HWCursor = FALSE; -- if(pMga->ShadowFB) -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- " -- Shadow Framebuffer disabled.\n"); -- pMga->ShadowFB = FALSE; -- if(pMga->FBDev) -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- " -- Framebuffer device disabled.\n"); -- pMga->FBDev = FALSE; -- } /* MGA_HAL */ -- else --#endif - { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "HALLib not loaded! NOT using \"Merged Framebuffer\" mode.\n"); -@@ -2404,10 +2348,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - clockRanges->clockIndex = -1; /* programmable */ - clockRanges->interlaceAllowed = TRUE; - clockRanges->doubleScanAllowed = TRUE; --#ifdef USEMGAHAL -- MGA_HAL(clockRanges->interlaceAllowed = FALSE); -- MGA_HAL(clockRanges->doubleScanAllowed = FALSE); --#endif - if (pMga->SecondCrtc == TRUE) - clockRanges->interlaceAllowed = FALSE; - -@@ -2513,80 +2453,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - MGAFreeRec(pScrn); - return FALSE; - } --#ifdef USEMGAHAL -- MGA_HAL( -- -- if(pMga->SecondCrtc == FALSE) { -- -- pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize()); -- pMga->pClientStruct = xalloc(sizeof(CLIENTDATA)); -- pMga->pClientStruct->pMga = (MGAPtr) pMga; -- -- MGAMapMem(pScrn); -- /* -- * For some reason the MGAOPM_DMA_BLIT bit needs to be set -- * on G200 before opening the HALlib. I don't know why. -- * MATROX: hint, hint. -- */ -- /*if (pMga->Chipset == PCI_CHIP_MGAG200 || -- pMga->Chipset == PCI_CHIP_MGAG200_PCI) */{ -- CARD32 opmode; -- opmode = INREG(MGAREG_OPMODE); -- OUTREG(MGAREG_OPMODE, MGAOPM_DMA_BLIT | opmode); -- } -- /* wrapping OpenLibrary to fix broken registers. MATROX: hint, hint. */ -- MiscCtlReg = inMGAdac(MGA1064_MISC_CTL); -- MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA)); -- outMGAdac(MGA1064_MISC_CTL,MiscCtlReg); -- MGAUnmapMem(pScrn); -- pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO)); -- MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo); -- -- /* copy the board handles */ -- if (pMga->DualHeadEnabled) { -- pMgaEnt->pClientStruct = pMga->pClientStruct; -- pMgaEnt->pBoard = pMga->pBoard; -- pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo; -- } -- -- } else { /* Second CRTC && entity is shared */ -- pMga->pBoard = pMgaEnt->pBoard; -- pMga->pClientStruct = pMgaEnt->pClientStruct; -- pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo; -- -- } -- -- MGAFillModeInfoStruct(pScrn,NULL); -- /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable -- * because no mode is given -- */ -- pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX; -- pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY; -- -- -- if (ISDIGITAL1(pMga)) -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "Digital screen detected on first head.\n"); -- if (ISTV1(pMga)) -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "TV detected on first head.\n"); -- if (ISDIGITAL2(pMga)) -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "Digital screen detected on second head.\n"); -- if (ISTV2(pMga)) -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "TV detected on second head.\n"); -- -- -- if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGAValidateMode from HALlib found the mode to be invalid.\n" -- "\tError: 0x%lx\n", status); -- return FALSE; -- } -- pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch; -- ); /* MGA_HAL */ --#endif - - /* If the Device section explicitly set HasSDRAM, don't bother checking. - */ -@@ -2620,9 +2486,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - * driver and if the driver doesn't provide code to set them. They - * are not pre-initialised at all. - */ --#ifdef USEMGAHAL -- MGA_HAL(xf86SetCrtcForModes(pScrn, 0)); --#endif - MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V)); - - /* Set the current mode to the first in the list */ -@@ -2790,46 +2653,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - }; - - --#ifdef USEMGAHAL -- MGA_HAL( -- /* Close the library after preinit */ -- /* This needs to only happen after this board has completed preinit -- * both times -- */ -- -- if(pMga->DualHeadEnabled) { -- /* Entity is shared make sure refcount == 2 */ -- /* If ref count is 2 then reset it to 0 */ -- if(pMgaEnt->refCount == 2) { -- /* Both boards have done there initialization */ -- MGACloseLibrary(pMga->pBoard); -- -- if (pMga->pBoard) -- xfree(pMga->pBoard); -- if (pMga->pClientStruct) -- xfree(pMga->pClientStruct); -- if (pMga->pMgaModeInfo) -- xfree(pMga->pMgaModeInfo); -- if (pMga->pMgaHwInfo) -- xfree(pMga->pMgaHwInfo); -- pMgaEnt->refCount = 0; -- } -- } else { -- MGACloseLibrary(pMga->pBoard); -- -- if (pMga->pBoard) -- xfree(pMga->pBoard); -- if (pMga->pClientStruct) -- xfree(pMga->pClientStruct); -- if (pMga->pMgaModeInfo) -- xfree(pMga->pMgaModeInfo); -- if (pMga->pMgaHwInfo) -- xfree(pMga->pMgaHwInfo); -- } -- -- ); /* MGA_HAL */ --#endif -- - xf86SetPrimInitDone(pScrn->entityList[0]); - - return TRUE; -@@ -2995,9 +2818,6 @@ MGASave(ScrnInfoPtr pScrn) - MGARegPtr mgaReg = &pMga->SavedReg; - - if(pMga->SecondCrtc == TRUE) return; --#ifdef USEMGAHAL -- MGA_HAL(if (pMga->pBoard != NULL) MGASaveVgaState(pMga->pBoard)); --#endif - - /* I need to save the registers for the second head also */ - /* Save the register for 0x80 to 0xa0 */ -@@ -3007,135 +2827,6 @@ MGASave(ScrnInfoPtr pScrn) - (*pMga->Save)(pScrn, vgaReg, mgaReg, pMga->Primary); - } - --#ifdef USEMGAHAL --/* Convert DisplayModeRec parameters in MGAMODEINFO parameters. --* mode parameter optionnal. */ --void --MGAFillModeInfoStruct(ScrnInfoPtr pScrn, DisplayModePtr mode) --{ -- const char *s; -- MGAPtr pMga = MGAPTR(pScrn); -- -- Bool digital1 = FALSE; -- Bool digital2 = FALSE; -- Bool tv1 = FALSE; -- Bool tv2 = FALSE; -- Bool swap_head -- = xf86ReturnOptValBool(pMga->Options, OPTION_SWAPPED_HEAD, FALSE); -- -- if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) { -- mode = pMga->SecondCrtc ? -- ((MergedDisplayModePtr)mode->Private)->Monitor2 -- : ((MergedDisplayModePtr)mode->Private)->Monitor1; -- } -- -- -- if (pMga->pMgaHwInfo) -- { -- digital1 = ISDIGITAL1(pMga); -- digital2 = ISDIGITAL2(pMga); -- tv1 = ISTV1(pMga); -- tv2 = ISTV2(pMga); -- } -- -- /*FIXME: causes segfault elsewhere if not commented*/ -- /*if(!pMga->pMgaModeInfo)*/ pMga->pMgaModeInfo = xalloc(sizeof(MGAMODEINFO)); -- pMga->pMgaModeInfo->flOutput = 0; -- pMga->pMgaModeInfo->ulDeskWidth = pScrn->virtualX; -- pMga->pMgaModeInfo->ulDeskHeight = pScrn->virtualY; -- pMga->pMgaModeInfo->ulFBPitch = 0; -- pMga->pMgaModeInfo->ulBpp = pScrn->bitsPerPixel; -- pMga->pMgaModeInfo->ulZoom = 1; -- pMga->pMgaModeInfo->flSignalMode = 0x10; -- -- /* Set TV standard */ -- if ((s = xf86GetOptValString(pMga->Options, OPTION_TVSTANDARD))) { -- if (!xf86NameCmp(s, "PAL")) { -- pMga->pMgaModeInfo->flSignalMode = 0x00; -- pMga->pMgaModeInfo->ulRefreshRate = 50; -- pMga->pMgaModeInfo->ulTVStandard = TV_PAL; -- } else { -- pMga->pMgaModeInfo->ulRefreshRate = 60; -- pMga->pMgaModeInfo->ulTVStandard = TV_NTSC; -- } -- } else { -- pMga->pMgaModeInfo->ulRefreshRate = 0; -- pMga->pMgaModeInfo->ulTVStandard = TV_NTSC; -- } -- -- /* Set Cable Type */ -- if ((s = xf86GetOptValString(pMga->Options, OPTION_CABLETYPE))) { -- if (!xf86NameCmp(s, "SCART_RGB")) { -- pMga->pMgaModeInfo->ulCableType = TV_SCART_RGB; -- } else if (!xf86NameCmp(s, "SCART_COMPOSITE")) { -- pMga->pMgaModeInfo->ulCableType = TV_SCART_COMPOSITE; -- } else if (!xf86NameCmp(s, "SCART_TYPE2")) { -- pMga->pMgaModeInfo->ulCableType = TV_SCART_TYPE2; -- } else { -- pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE; -- } -- } else { -- pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE; -- } -- -- if(mode) { -- pMga->pMgaModeInfo->ulHorizRate = 0; -- pMga->pMgaModeInfo->ulDispWidth = mode->HDisplay; -- pMga->pMgaModeInfo->ulDispHeight = mode->VDisplay; -- pMga->pMgaModeInfo->ulPixClock = mode->Clock; -- pMga->pMgaModeInfo->ulHFPorch = mode->HSyncStart - mode->HDisplay; -- pMga->pMgaModeInfo->ulHSync = mode->HSyncEnd - mode->HSyncStart; -- pMga->pMgaModeInfo->ulHBPorch = mode->HTotal - mode->HSyncEnd; -- pMga->pMgaModeInfo->ulVFPorch = mode->VSyncStart - mode->VDisplay; -- pMga->pMgaModeInfo->ulVSync = mode->VSyncEnd - mode->VSyncStart; -- pMga->pMgaModeInfo->ulVBPorch = mode->VTotal - mode->VSyncEnd; -- } -- /* Use DstOrg directly */ -- /* This is an offset in pixels not memory */ -- pMga->pMgaModeInfo->ulDstOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8); -- pMga->pMgaModeInfo->ulDisplayOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8); -- pMga->pMgaModeInfo->ulPanXGran = 0; -- pMga->pMgaModeInfo->ulPanYGran = 0; -- -- if(pMga->SecondCrtc == TRUE) { -- pMga->pMgaModeInfo->flOutput = MGAMODEINFO_SECOND_CRTC | -- MGAMODEINFO_FORCE_PITCH | -- MGAMODEINFO_FORCE_DISPLAYORG; -- if (digital2) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2; -- } else if (tv2) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV; -- } else { -- if (!swap_head) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2; -- } else { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1; -- } -- } -- } else { -- pMga->pMgaModeInfo->flOutput = MGAMODEINFO_FORCE_PITCH; -- if (digital1) { -- if ((pMga->Chipset == PCI_CHIP_MGAG200) || -- (pMga->Chipset == PCI_CHIP_MGAG200_PCI)) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_FLATPANEL1; -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2; -- } else { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL1; -- } -- } else if (tv1) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV; -- } else { -- if (!swap_head) { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1; -- } else { -- pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2; -- } -- } -- } -- pMga->pMgaModeInfo->ulFBPitch = pScrn->displayWidth; --} --#endif -- - /* - * Initialise a new mode. This is currently still using the old - * "initialise struct, restore/write struct to HW" model. That could -@@ -3150,9 +2841,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - MGAPtr pMga = MGAPTR(pScrn); - MGARegPtr mgaReg; - --#ifdef USEMGAHAL -- ULONG status; --#endif - vgaHWUnlock(hwp); - - /* if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) { -@@ -3175,56 +2863,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - vgaReg = &hwp->ModeReg; - mgaReg = &pMga->ModeReg; --#ifdef USEMGAHAL -- MGA_HAL( -- MGAFillModeInfoStruct(pScrn,mode); -- -- /* Validate the parameters */ -- if ((status = MGAValidateMode(pMga->pBoard, pMga->pMgaModeInfo)) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGAValidateMode from HALlib found the mode to be invalid.\n" -- "\tError: %lx\n", status); -- return FALSE; -- } -- -- /* -- * Find mode for second head. -- */ -- if(pMga->MergedFB) { -- -- MGAFillModeInfoStruct(pMga->pScrn2,mode); -- /* Validates the Video parameters */ -- if ((status = MGAValidateVideoParameters(pMga->pBoard, MGAPTR(pMga->pScrn2)->pMgaModeInfo)) -- != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGAValidateVideoParameters from HALlib found the mode to be invalid.\n\tError: %lx\n", status); -- return FALSE; -- } -- } -- ); /*MGA_HAL */ -- --#endif -- --#ifdef USEMGAHAL --MGA_HAL( -- -- /*************************** ESC *****************************/ -- TmpMgaModeInfo[0] = *pMga->pMgaModeInfo; -- -- if(pMga->SecondCrtc == TRUE) -- pMgaModeInfo[1] = pMga->pMgaModeInfo; -- else -- pMgaModeInfo[0] = pMga->pMgaModeInfo; -- -- TmpMgaModeInfo[0].ulDispWidth = 0; -- -- if(!pMga->MergedFB) /* FIXME: Must deal with this once PowerDesk & MergedFB -- compatibility will exist */ -- MGAFillDisplayModeStruct(mode, pMga->pMgaModeInfo); -- /*************************************************************/ -- --); /* MGA_HAL */ --#endif - - #ifdef XF86DRI - if (pMga->directRenderingEnabled) { -@@ -3232,38 +2870,6 @@ MGA_HAL( - } - #endif - --#ifdef USEMGAHAL -- MGA_HAL( -- /* Initialize the board */ -- if(MGASetMode(pMga->pBoard,pMga->pMgaModeInfo) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGASetMode returned an error." -- " Make sure to validate the mode before.\n"); -- return FALSE; -- } -- if(pMga->MergedFB -- && MGASetMode(pMga->pBoard,MGAPTR(pMga->pScrn2)->pMgaModeInfo) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGASetMode returned an error." -- " Make sure to validate the mode before.\n"); -- } -- -- ); /* MGA_HAL */ -- -- /* getting around bugs in the HAL lib. MATROX: hint, hint. */ -- MGA_HAL( -- if (pMga->chip_attribs->hwcursor_1064) { -- if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) { -- outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, -- pMga->FbCursorOffset >> 10); -- outMGAdac(MGA1064_CURSOR_BASE_ADR_HI, -- pMga->FbCursorOffset >> 18); -- outMGAdac(MGA1064_CURSOR_CTL, 0x00); -- } -- } -- ); /* MGA_HAL */ --#endif -- - MGA_NOT_HAL((*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE)); - - MGAStormSync(pScrn); -@@ -3472,14 +3078,6 @@ MGARestore(ScrnInfoPtr pScrn) - vgaHWProtect(pScrn, TRUE); - } - if (pMga->Primary) { --#ifdef USEMGAHAL -- MGA_HAL( -- if(pMga->pBoard != NULL) { -- MGASetVgaMode(pMga->pBoard); -- MGARestoreVgaState(pMga->pBoard); -- } -- ); /* MGA_HAL */ --#endif - (*pMga->Restore)(pScrn, vgaReg, mgaReg, TRUE); - } else { - vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE); -@@ -3588,81 +3186,12 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex); - pMgaEnt = pPriv->ptr; - pMgaEnt->refCount++; --#ifdef USEMGAHAL -- MGA_HAL( -- if(pMgaEnt->refCount == 1) { -- CARD8 MiscCtlReg; -- pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize()); -- pMga->pClientStruct = xalloc(sizeof(CLIENTDATA)); -- pMga->pClientStruct->pMga = (MGAPtr) pMga; -- -- /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/ -- MiscCtlReg = inMGAdac(MGA1064_MISC_CTL); -- MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA)); -- outMGAdac(MGA1064_MISC_CTL,MiscCtlReg); -- pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO)); -- MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo); -- -- /* Detecting for type of display */ -- if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_TV) { -- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TV detected\n"); -- } -- if (pMga->pMgaHwInfo->ulCapsFirstOutput & -- MGAHWINFOCAPS_OUTPUT_DIGITAL) { -- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, -- "Digital Screen detected\n"); -- } -- if (pMga->pMgaHwInfo->ulCapsSecondOutput & -- MGAHWINFOCAPS_OUTPUT_DIGITAL) { -- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, -- "Digital Screen detected\n"); -- } -- -- /* Now copy these to the entitystructure */ -- pMgaEnt->pClientStruct = pMga->pClientStruct; -- pMgaEnt->pBoard = pMga->pBoard; -- pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo; -- } else { /* Ref count is 2 */ -- pMga->pClientStruct = pMgaEnt->pClientStruct; -- pMga->pBoard = pMgaEnt->pBoard; -- pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo; -- } -- ); /* MGA_HAL */ --#endif - } else { --#ifdef USEMGAHAL -- CARD8 MiscCtlReg; -- -- MGA_HAL( -- pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize()); -- pMga->pClientStruct = xalloc(sizeof(CLIENTDATA)); -- pMga->pClientStruct->pMga = (MGAPtr) pMga; -- -- MiscCtlReg = inMGAdac(MGA1064_MISC_CTL); -- /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/ -- MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA)); -- outMGAdac(MGA1064_MISC_CTL,MiscCtlReg); -- pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO)); -- MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo); -- ); /* MGA_HAL */ --#endif - } - if (pMga->is_G200SE) { - pScrn->videoRam = VRTemp; - pMga->FbMapSize = FBTemp; - } --#ifdef USEMGAHAL -- MGA_HAL( -- /* There is a problem in the HALlib: set soft reset bit */ -- /* MATROX: hint, hint. */ -- if (!pMga->Primary && !pMga->FBDev && -- (SUBSYS_ID(pMga->PciInfo) == PCI_CARD_MILL_G200_SG)) { -- OUTREG(MGAREG_Reset, 1); -- usleep(200); -- OUTREG(MGAREG_Reset, 0); -- } -- ); /* MGA_HAL */ --#endif - - /* Initialise the MMIO vgahw functions */ - vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET); -@@ -3969,66 +3498,8 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - Bool - MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - { --#ifdef USEMGAHAL -- char sCmdIn[256]; -- char sCmdOut[256]; -- FILE* fdIn; --# ifdef MATROX_WRITEBACK -- FILE* fdOut; --# endif --#endif - - if (mode->Flags & 0x80000000) { --#ifdef USEMGAHAL -- --# ifdef MATROX_WRITEBACK --# define MWB(x) { x; } --# define MWB_COND(x) x --# else --# define MWB(x) --# define MWB_COND(x) 1 --# endif -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -- -- MGA_HAL( -- fdIn = fopen("/tmp/mgaDriverIn", "rt"); -- MWB(fdOut = fopen("/tmp/mgaDriverOut", "wt")) -- -- if(fdIn && MWB_COND(fdOut)) -- { -- -- fgets(sCmdIn, 255, fdIn); -- -- if(sCmdIn) -- { -- -- MGAExecuteEscCmd(xf86Screens[scrnIndex], sCmdIn, sCmdOut, mode); -- -- /* Remove file and close file descriptor */ -- remove("/tmp/mgaDriverIn"); -- fclose(fdIn); -- MWB( -- /* Write output data to output file for -- calling application */ -- fputs(sCmdOut, fdOut); -- fclose(fdOut); -- ) -- mode->Flags &= 0x7FFFFFFF; -- return TRUE; -- } -- else -- { -- mode->Flags &= 0x7FFFFFFF; -- return FALSE; -- } -- } -- else -- { -- mode->Flags &= 0x7FFFFFFF; -- return FALSE; -- } -- ) --#endif - return FALSE; - } else - return MGAModeInit(xf86Screens[scrnIndex], mode); -@@ -4040,28 +3511,6 @@ MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - void - MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y) - { --#ifdef USEMGAHAL -- MGA_HAL( -- MGAPtr pMga = MGAPTR(pScrn); -- MGAPtr pMga2; -- int xg = 1; -- int yg = 1; -- if(pMga->pMgaModeInfo && pMga->pMgaModeInfo->ulPanXGran && pMga->pMgaModeInfo->ulPanYGran) { -- xg = pMga->pMgaModeInfo->ulPanXGran; -- yg = pMga->pMgaModeInfo->ulPanYGran; -- } -- if(pMga->pScrn2 && (pMga2 = MGAPTR(pMga->pScrn2)) ) { -- -- if(pMga2->pMgaModeInfo && pMga2->pMgaModeInfo->ulPanXGran && pMga2->pMgaModeInfo->ulPanYGran) { -- xg = max(xg,pMga2->pMgaModeInfo->ulPanXGran); -- yg = max(yg,pMga2->pMgaModeInfo->ulPanYGran); -- } -- } -- xg=16; /*ncoder: temporary */ -- *x -= *x % xg; -- *y -= *y % yg; -- ); --#endif - } - - -@@ -4087,16 +3536,6 @@ MGAAdjustFrame(int scrnIndex, int x, int y, int flags) - /* wanted to improve panning granularity problems without risking - * compatibility issues. Existing code looked hardware dependent. - */ --#ifdef USEMGAHAL -- MGA_HAL( -- pMga->HALGranularityOffX = x; -- pMga->HALGranularityOffY = y; -- MGAAdjustGranularity(pScrn,&x,&y); -- pMga->HALGranularityOffX = pMga->HALGranularityOffX - x; -- pMga->HALGranularityOffY = pMga->HALGranularityOffY - y; -- HALSetDisplayStart(pMga->pBoard,x,y,0); -- ); --#endif - MGA_NOT_HAL( - if(pMga->ShowCache && y && pScrn->vtSema) - y += pScrn->virtualY - 1; -@@ -4139,12 +3578,6 @@ MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags) - pScrn = xf86Screens[scrnIndex]; - pMga = MGAPTR(pScrn); - pLayout = &pMga->CurrentLayout; --#ifdef USEMGAHAL -- MGA_HAL( -- MGAAdjustGranularity(pScrn,&x,&y); -- HALSetDisplayStart(pMga->pBoard,x,y,1); -- ); --#endif - MGA_NOT_HAL( - if(pMga->ShowCache && y && pScrn->vtSema) - y += pScrn->virtualY - 1; -@@ -4258,9 +3691,6 @@ MGALeaveVT(int scrnIndex, int flags) - DRILock(pScreen, 0); - } - #endif --#ifdef USEMGAHAL -- MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); ); --#endif - } - - -@@ -4280,9 +3710,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - MGAPtr pMga = MGAPTR(pScrn); - MGAEntPtr pMgaEnt = NULL; - --#ifdef USEMGAHAL -- MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); ); --#endif - if (pMga->MergedFB) - MGACloseScreenMerged(scrnIndex, pScreen); - -@@ -4311,37 +3738,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - pMgaEnt->refCount--; - } - --#ifdef USEMGAHAL -- MGA_HAL( -- if(pMga->DualHeadEnabled) { -- if(pMgaEnt->refCount == 0) { -- /* Both boards have closed there screen */ -- MGACloseLibrary(pMga->pBoard); -- -- if (pMga->pBoard) -- xfree(pMga->pBoard); -- if (pMga->pClientStruct) -- xfree(pMga->pClientStruct); -- if (pMga->pMgaModeInfo) -- xfree(pMga->pMgaModeInfo); -- if (pMga->pMgaHwInfo) -- xfree(pMga->pMgaHwInfo); -- } -- } else { -- MGACloseLibrary(pMga->pBoard); -- -- if (pMga->pBoard) -- xfree(pMga->pBoard); -- if (pMga->pClientStruct) -- xfree(pMga->pClientStruct); -- if (pMga->pMgaModeInfo) -- xfree(pMga->pMgaModeInfo); -- if (pMga->pMgaHwInfo) -- xfree(pMga->pMgaHwInfo); -- } -- ); /* MGA_HAL */ --#endif -- - #ifdef USE_XAA - if (pMga->AccelInfoRec) - XAADestroyInfoRec(pMga->AccelInfoRec); -diff --git a/src/mga_esc.c b/src/mga_esc.c -index e811712..41b734a 100644 ---- a/src/mga_esc.c -+++ b/src/mga_esc.c -@@ -10,782 +10,4 @@ - #include "config.h" - #endif - --#ifdef USEMGAHAL -- --/* All drivers should typically include these */ --#include "xf86.h" --#include "xf86_OSproc.h" -- --/* All drivers need this */ -- --#include "compiler.h" -- --/* Drivers for PCI hardware need this */ --#include "xf86PciInfo.h" -- --/* Drivers that need to access the PCI config space directly need this */ --#include "xf86Pci.h" -- --/* All drivers initialising the SW cursor need this */ --#include "mipointer.h" -- --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- --#include "micmap.h" -- --#include "xf86DDC.h" --#include "vbe.h" -- --#include "fb.h" --#include "dixstruct.h" -- --#include "mga_reg.h" --#include "mga.h" --#include "mga_macros.h" -- --/* ESC */ --LPMGAMODEINFO pMgaModeInfo[2] = {NULL}; --MGAMODEINFO TmpMgaModeInfo[2] = {{0}}; -- --/* ESC Implementation */ --static void EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); --static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode); -- --static LPMGAMODEINFO GetModeInfoPtr(ULONG ulScreen); --static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult); --static Bool convertNumber(unsigned long *pulNumber, char *sNumber); -- -- --static MGAEscFuncRec FunctionTable[] = { -- {"hal", EscHal}, -- {"test", EscTest}, -- {"read", EscRead}, -- {"write", EscWrite}, -- {"left", EscHLeft}, -- {"right", EscHRight}, -- {"down", EscVDown}, -- {"up", EscVUp}, -- {"h+", EscHLarger}, -- {"h-", EscHSmaller}, -- {"v+", EscVTaller}, -- {"v-", EscVSmaller}, -- {"refresh", EscRefresh}, -- {"undo", EscRestoreVidParm}, -- {"merged", EscMerged}, -- {NULL,NULL} --}; -- -- --void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo) --{ -- pMode->Clock = pModeInfo->ulPixClock; -- -- pMode->HDisplay = pModeInfo->ulDispWidth; -- pMode->HSyncStart = pModeInfo->ulDispWidth -- + pModeInfo->ulHFPorch; -- pMode->HSyncEnd = pModeInfo->ulDispWidth -- + pModeInfo->ulHFPorch -- + pModeInfo->ulHSync; -- pMode->HTotal = pModeInfo->ulDispWidth -- + pModeInfo->ulHFPorch -- + pModeInfo->ulHSync -- + pModeInfo->ulHBPorch; -- -- pMode->VDisplay = pModeInfo->ulDispHeight; -- pMode->VSyncStart = pModeInfo->ulDispHeight -- + pModeInfo->ulVFPorch; -- pMode->VSyncEnd = pModeInfo->ulDispHeight -- + pModeInfo->ulVFPorch -- + pModeInfo->ulVSync; -- pMode->VTotal = pModeInfo->ulDispHeight -- + pModeInfo->ulVFPorch -- + pModeInfo->ulVSync -- + pModeInfo->ulVBPorch; -- -- pMode->VRefresh = pModeInfo->ulRefreshRate; --} -- --static LPMGAMODEINFO GetModeInfoPtr(ULONG ulScreen) --{ -- -- if ( !TmpMgaModeInfo[ulScreen].ulDispWidth ) -- { -- TmpMgaModeInfo[ulScreen] = *pMgaModeInfo[ulScreen]; -- } -- -- return &TmpMgaModeInfo[ulScreen]; --} -- -- --static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult) --{ -- sprintf(sResult, "%d %d %d %d %d %d %d %d %d %d %d", -- pModeInfo->ulDispWidth, -- pModeInfo->ulDispHeight, -- pModeInfo->ulBpp, -- pModeInfo->ulPixClock, -- pModeInfo->ulHFPorch, -- pModeInfo->ulHSync, -- pModeInfo->ulHBPorch, -- pModeInfo->ulVFPorch, -- pModeInfo->ulVSync, -- pModeInfo->ulVBPorch, -- pModeInfo->flSignalMode); --} -- -- --static float GetVRefresh(LPMGAMODEINFO pModeInfo) --{ -- ULONG ulHTotal; -- ULONG ulVTotal; -- -- ulHTotal = -- pModeInfo->ulDispWidth + -- pModeInfo->ulHFPorch + -- pModeInfo->ulHSync + -- pModeInfo->ulHBPorch; -- -- ulVTotal = -- pModeInfo->ulDispHeight + -- pModeInfo->ulVFPorch + -- pModeInfo->ulVSync + -- pModeInfo->ulVBPorch; -- -- return ((float)pModeInfo->ulPixClock * 1000.0) / (ulHTotal * ulVTotal); --} -- --static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMGA = MGAPTR(pScrn); -- -- if(pMGA->HALLoaded) -- strcpy(sResult, "YES"); -- else -- strcpy(sResult, "NO"); -- --} -- --static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char --*sResult, DisplayModePtr pMode) --{ -- strcpy(sResult, "YES"); --} -- --static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char --*sResult, DisplayModePtr pMode) --{ -- strcpy(sResult, "YES"); --} -- --static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- ULONG ulSource, ulAddr, ulData; -- UCHAR ucIndex; -- -- if ( (param[0] & 0xffff) < 2 ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- -- ulSource = param[1] >> 16; -- ulAddr = param[1] & 0xffff; -- -- -- switch( ulSource ) -- { -- case 0: -- ulData = INREG(ulAddr); -- sprintf(sResult, "MGA[%04X] = 0x%08X", ulAddr, ulData); -- break; -- case 1: -- ucIndex = INREG8(0x3c00); -- OUTREG8(0x3c00, (UCHAR)ulAddr); -- ulData = (ULONG)INREG8(0x3c0a); -- OUTREG8(0x3c00, ucIndex); -- sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData); -- break; -- case 2: -- ucIndex = INREG8(0x1fd4); -- OUTREG8(0x1fd4, (UCHAR)ulAddr); -- ulData = (ULONG)INREG8(0x1fd5); -- OUTREG8(0x1fd4, ucIndex); -- sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData); -- break; -- case 3: -- ucIndex = INREG8(0x1fde); -- OUTREG8(0x1fde, (UCHAR)ulAddr); -- ulData = (ULONG)INREG8(0x1fdf); -- OUTREG8(0x1fde, ucIndex); -- sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData); -- break; -- default: -- strcpy(sResult, "ERROR# 2"); -- break; -- } --} -- --static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- ULONG ulSource, ulAddr, ulData; -- UCHAR ucIndex; -- -- if ( (param[0] & 0xffff) < 3 ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- ulSource = param[1] >> 16; -- ulAddr = param[1] & 0xffff; -- ulData = param[2]; -- -- -- switch( ulSource ) -- { -- case 0: -- OUTREG(ulAddr, ulData); -- strcpy(sResult, "OK"); -- break; -- case 1: -- ucIndex = INREG8(0x3c00); -- OUTREG8(0x3c00, (UCHAR)ulAddr); -- OUTREG8(0x3c0a, (UCHAR)ulData); -- OUTREG8(0x3c00, ucIndex); -- strcpy(sResult, "OK"); -- break; -- case 2: -- ucIndex = INREG8(0x1fd4); -- OUTREG8(0x1fd4, (UCHAR)ulAddr); -- OUTREG8(0x1fd5, (UCHAR)ulData); -- OUTREG8(0x1fd4, ucIndex); -- strcpy(sResult, "OK"); -- break; -- case 3: -- ucIndex = INREG8(0x1fde); -- OUTREG8(0x1fde, (UCHAR)ulAddr); -- OUTREG8(0x1fdf, (UCHAR)ulData); -- OUTREG8(0x1fde, ucIndex); -- strcpy(sResult, "OK"); -- break; -- default: -- strcpy(sResult, "ERROR# 2"); -- break; -- } --} -- --static void EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- -- if (pModeInfo->ulHBPorch > (8 * param[1]) ) -- { -- pModeInfo->ulHBPorch -=8 * param[1]; -- pModeInfo->ulHFPorch +=8 * param[1]; -- MGASetMode(pMga->pBoard, pModeInfo); -- } -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- --static void EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if (pModeInfo->ulHFPorch > (8 * param[1]) ) -- { -- pModeInfo->ulHFPorch -=8 * param[1]; -- pModeInfo->ulHBPorch +=8 * param[1]; -- MGASetMode(pMga->pBoard, pModeInfo); -- } -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- -- --static void EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if (pModeInfo->ulVBPorch > (param[1]) ) -- { -- pModeInfo->ulVBPorch -= param[1]; -- pModeInfo->ulVFPorch += param[1]; -- MGASetMode(pMga->pBoard, pModeInfo); -- } -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- --static void EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if (pModeInfo->ulVFPorch >= (param[1]) ) -- { -- pModeInfo->ulVFPorch -= param[1]; -- pModeInfo->ulVBPorch += param[1]; -- MGASetMode(pMga->pBoard, pModeInfo); -- } -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- --static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- float fRefresh, fPixelClock; -- ULONG ulStep; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if ((param[0] & 0xffff) > 1) -- { -- -- ulStep = param[1] * 8; -- } -- else -- { -- -- ulStep = 8; -- } -- -- fRefresh = GetVRefresh(pModeInfo); -- fPixelClock = (float)pModeInfo->ulPixClock; -- if (pModeInfo->ulHBPorch >= ulStep ) -- { -- pModeInfo->ulHBPorch -= ulStep; -- } -- else -- { -- pModeInfo->ulHBPorch = 0; -- } -- pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo)); -- MGASetMode(pMga->pBoard, pModeInfo); -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- --static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- float fRefresh, fPixelClock; -- ULONG ulStep; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if ((param[0] & 0xffff) > 1) -- { -- -- ulStep = param[1] * 8; -- } -- else -- { -- -- ulStep = 8; -- } -- -- -- fRefresh = GetVRefresh(pModeInfo); -- fPixelClock = (float)pModeInfo->ulPixClock; -- pModeInfo->ulHBPorch += ulStep; -- pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo)); -- -- MGASetMode(pMga->pBoard, pModeInfo); -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- --static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- float fRefresh, fPixelClock; -- ULONG ulStep; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if ((param[0] & 0xffff) > 1) -- { -- -- ulStep = param[1]; -- } -- else -- { -- -- ulStep = 1; -- } -- -- fRefresh = GetVRefresh(pModeInfo); -- fPixelClock = (float)pModeInfo->ulPixClock; -- -- if (pModeInfo->ulVBPorch >= ulStep ) -- { -- pModeInfo->ulVBPorch -= ulStep; -- } -- else -- { -- pModeInfo->ulVBPorch = 0; -- } -- -- pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo)); -- MGASetMode(pMga->pBoard, pModeInfo); -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- --static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- float fRefresh, fPixelClock; -- ULONG ulStep; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if ((param[0] & 0xffff) > 1) -- { -- -- ulStep = param[1]; -- } -- else -- { -- -- ulStep = 1; -- } -- -- -- fRefresh = GetVRefresh(pModeInfo); -- fPixelClock = (float)pModeInfo->ulPixClock; -- pModeInfo->ulVFPorch += ulStep; -- pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo)); -- MGASetMode(pMga->pBoard, pModeInfo); -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- -- --static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- LPMGAMODEINFO pModeInfo; -- float fRefresh, fPixelClock; -- -- pModeInfo = GetModeInfoPtr(param[0] >> 16); -- -- if ( !pMgaModeInfo ) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- if ((param[0] & 0xffff) < 2) -- { -- strcpy(sResult, "#error 1"); -- return; -- } -- -- fRefresh = GetVRefresh(pModeInfo); -- -- fPixelClock = (float)pModeInfo->ulPixClock; -- pModeInfo->ulPixClock = (ULONG)( ((float)param[1] * fPixelClock) / fRefresh); -- -- pModeInfo->ulRefreshRate = param[1]; -- -- MGASetMode(pMga->pBoard, pModeInfo); -- -- MGAFillDisplayModeStruct(pMode, pModeInfo); -- -- GetVideoParameterStr(pModeInfo, sResult); --} -- --static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode) --{ -- MGAPtr pMga = MGAPTR(pScrn); -- -- TmpMgaModeInfo[param[0] >> 16].ulDispWidth = 0; -- MGASetMode(pMga->pBoard, pMgaModeInfo[param[0] >> 16]); -- -- MGAFillDisplayModeStruct(pMode, pMgaModeInfo[param[0] >> 16]); -- -- GetVideoParameterStr(pMgaModeInfo[param[0] >> 16], sResult); --} -- --static Bool convertNumber(unsigned long *pulNumber, char *sNumber) --{ -- unsigned long i, ulDigit, shiftHex; -- Bool bResult = TRUE; -- -- if (sNumber == NULL) -- { -- return FALSE; -- } -- -- -- /* Convert number */ -- if ( (sNumber[0] == '0') && (sNumber[1] == 'x') ) -- { -- shiftHex = 0; -- *pulNumber = 0; -- -- for (i = strlen(sNumber) - 1; i > 1; i--) -- { -- if (shiftHex > 28) -- { -- bResult = FALSE; -- break; -- } -- -- if ( !isxdigit(sNumber[i]) ) -- { -- bResult = FALSE; -- break; -- } -- -- ulDigit = toupper(sNumber[i]) - '0'; -- if (ulDigit > 9) -- { -- ulDigit -= 7; -- } -- *pulNumber += ulDigit << shiftHex; -- shiftHex += 4; -- } -- } -- else -- { -- for (i = 0; i < strlen(sNumber); i++) -- { -- if ( !isdigit(sNumber[i]) ) -- { -- bResult = FALSE; -- break; -- } -- } -- *pulNumber = atoi(sNumber); -- } -- -- return bResult; --} -- --static Bool GetEscCommand(char *cmdline, EscCmdStruct *escCmd) --{ -- unsigned long i, paramIndex, ulHI; -- Bool bResult; -- char *pParameter, *function; -- -- bResult = TRUE; /* success */ -- -- function = strtok(cmdline, " \t\n,"); -- -- -- escCmd->parameters[0] = 0; -- if (function) -- { -- /* Find Screen */ -- if (function[1] == ':' ) -- { -- escCmd->parameters[0] = (unsigned long)(function[0] - '0') << 16; -- strncpy(escCmd->function, function+2, 32); -- } -- else -- { -- strncpy(escCmd->function, function, 32); -- } -- -- } -- else -- { -- strcpy(escCmd->function, "#ERROR -1"); -- escCmd->parameters[0] = 0; -- return FALSE; -- } -- -- paramIndex = 1; -- while ( (pParameter = strtok(NULL, " \t\n,")) != NULL ) -- { -- if (paramIndex > 31) -- { -- /* 32 parameters supported */ -- break; -- } -- -- i = 0; -- while(pParameter[i] && pParameter[i] != ':') -- { -- i++; -- } -- -- if ( pParameter[i] ) -- { -- pParameter[i] = '\0'; -- bResult = convertNumber(&escCmd->parameters[paramIndex], &pParameter[i+1]); -- bResult |= convertNumber(&ulHI, pParameter); -- escCmd->parameters[paramIndex] &= 0xffff; -- escCmd->parameters[paramIndex] += ulHI << 16; -- pParameter[i] = ':'; -- } -- else -- { -- bResult = convertNumber(&escCmd->parameters[paramIndex], pParameter); -- } -- -- -- if (!bResult) -- { -- break; -- } -- paramIndex++; -- } -- -- escCmd->parameters[0] += paramIndex; -- return bResult; -- --} -- --void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode) --{ -- int i = 0; -- int ulScreen = 0; -- MGAPtr pMga = MGAPTR(pScrn); -- EscCmdStruct EscCmd; -- -- if (pMga->SecondCrtc) -- { -- ulScreen = 1; -- } -- else -- { -- ulScreen = 0; -- } -- -- -- if (FunctionTable[0].function && GetEscCommand(cmdline, &EscCmd) ) -- { -- i = 0; -- -- while ( FunctionTable[i].function && strcmp(FunctionTable[i].function, EscCmd.function) ) -- { -- i++; -- } -- -- if (FunctionTable[i].function) -- { -- EscCmd.parameters[0] &= 0xffff; -- EscCmd.parameters[0] |= ulScreen << 16; -- -- FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode); -- } -- else -- { -- strcpy(sResult, "error# -1"); -- } -- } -- else -- { -- strcpy(sResult, "error# -1"); -- } --} --#else - int mga_foo; --#endif -diff --git a/src/mga_macros.h b/src/mga_macros.h -index bffd063..130651d 100644 ---- a/src/mga_macros.h -+++ b/src/mga_macros.h -@@ -74,18 +74,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \ - #define CHECK_DMA_QUIESCENT(pMGA, pScrn) - #endif - --#ifdef USEMGAHAL --#define MGA_HAL(x) { \ -- MGAPtr pMga = MGAPTR(pScrn); \ -- if (pMga->HALLoaded && pMga->chip_attribs->HAL_chipset) { x; } \ --} --#define MGA_NOT_HAL(x) { \ -- MGAPtr pMga = MGAPTR(pScrn); \ -- if (!pMga->HALLoaded || !pMga->chip_attribs->HAL_chipset) { x; } \ --} --#else - #define MGA_NOT_HAL(x) { x; } --#endif - - #define MGAISGx50(x) ((x)->is_Gx50) - -diff --git a/src/mga_merge.c b/src/mga_merge.c -index 1fd0572..2affe3b 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -236,9 +236,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - int i; - char* s; - ClockRangePtr clockRanges; --#ifdef USEMGAHAL -- ULONG status; --#endif - MgaScrn2Rel Monitor2Pos; - - xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n"); -@@ -252,9 +249,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - } - - pMga = MGAPTR(pScrn); --#ifdef USEMGAHAL -- pMga->pMgaModeInfo = NULL; /*will be allocated later if NULL*/ --#endif - pMga1 = MGAPTR(pScrn1); - pMga1->pScrn2 = pScrn; - -@@ -456,10 +450,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - clockRanges->clockIndex = -1; /* programmable */ - clockRanges->interlaceAllowed = TRUE; - clockRanges->doubleScanAllowed = TRUE; --#ifdef USEMGAHAL -- MGA_HAL(clockRanges->interlaceAllowed = FALSE); -- MGA_HAL(clockRanges->doubleScanAllowed = FALSE); --#endif - clockRanges->interlaceAllowed = FALSE; /*no interlace on CRTC2 */ - - clockRanges->ClockMulFactor = 1; -@@ -562,30 +552,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - MGAFreeRec(pScrn); - return FALSE; - } --#ifdef USEMGAHAL -- MGA_HAL( -- -- pMga->pBoard = pMga1->pBoard; -- pMga->pClientStruct = pMga1->pClientStruct; -- pMga->pMgaHwInfo = pMga1->pMgaHwInfo; -- -- -- MGAFillModeInfoStruct(pScrn,NULL); -- /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable -- * because no mode is given -- */ -- pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX; -- pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY; -- -- if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "MGAValidateMode from HALlib found the mode to be invalid.\n" -- "\tError: 0x%lx\n", status); -- return FALSE; -- } -- pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch; -- ); /* MGA_HAL */ --#endif - - /* - * Set the CRTC parameters for all of the modes based on the type -@@ -595,9 +561,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - * driver and if the driver doesn't provide code to set them. They - * are not pre-initialised at all. - */ --#ifdef USEMGAHAL -- MGA_HAL(xf86SetCrtcForModes(pScrn, 0)); --#endif - MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V)); - - /* Set the current mode to the first in the list */ --- -cgit v0.9.0.2-2-gbebe -From ee09a9a340f8946f2d4a71a431b64189dbb5c256 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Tue, 27 Sep 2011 02:22:09 +0000 -Subject: Remove xalloc/xcalloc/xrealloc/xfree - -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Matt Turner <mattst88@gmail.com> ---- -diff --git a/src/mga_dga.c b/src/mga_dga.c -index d43b96d..224e4ba 100644 ---- a/src/mga_dga.c -+++ b/src/mga_dga.c -@@ -111,7 +111,7 @@ SECOND_PASS: - if(secondPitch) - pitch = secondPitch; - -- if(!(newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)))) -+ if(!(newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)))) - break; - - modes = newmodes; -diff --git a/src/mga_dri.c b/src/mga_dri.c -index 14f342f..957c6df 100644 ---- a/src/mga_dri.c -+++ b/src/mga_dri.c -@@ -91,24 +91,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen ) - case 16: - numConfigs = 8; - -- pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig), -+ pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig), - numConfigs ); - if ( !pConfigs ) { - return FALSE; - } - -- pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec), -+ pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec), - numConfigs ); - if ( !pMGAConfigs ) { -- xfree( pConfigs ); -+ free(pConfigs); - return FALSE; - } - -- pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr), -+ pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr), - numConfigs ); - if ( !pMGAConfigPtrs ) { -- xfree( pConfigs ); -- xfree( pMGAConfigs ); -+ free(pConfigs); -+ free(pMGAConfigs); - return FALSE; - } - -@@ -182,24 +182,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen ) - case 32: - numConfigs = 8; - -- pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig), -+ pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig), - numConfigs ); - if ( !pConfigs ) { - return FALSE; - } - -- pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec), -+ pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec), - numConfigs ); - if ( !pMGAConfigs ) { -- xfree( pConfigs ); -+ free(pConfigs); - return FALSE; - } - -- pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr), -+ pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr), - numConfigs ); - if ( !pMGAConfigPtrs ) { -- xfree( pConfigs ); -- xfree( pMGAConfigs ); -+ free(pConfigs); -+ free(pMGAConfigs); - return FALSE; - } - -@@ -973,11 +973,11 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg, - - if (nbox>1) { - /* Keep ordering in each band, reverse order of bands */ -- pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox); -+ pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox); - if (!pboxNew1) return; -- pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox); -+ pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox); - if (!pptNew1) { -- xfree(pboxNew1); -+ free(pboxNew1); - return; - } - pboxBase = pboxNext = pbox+nbox-1; -@@ -1008,14 +1008,14 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg, - - if (nbox > 1) { - /*reverse orderof rects in each band */ -- pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox); -- pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox); -+ pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox); -+ pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox); - if (!pboxNew2 || !pptNew2) { -- if (pptNew2) xfree(pptNew2); -- if (pboxNew2) xfree(pboxNew2); -+ if (pptNew2) free(pptNew2); -+ if (pboxNew2) free(pboxNew2); - if (pboxNew1) { -- xfree(pptNew1); -- xfree(pboxNew1); -+ free(pptNew1); -+ free(pboxNew1); - } - return; - } -@@ -1066,12 +1066,12 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg, - MGASelectBuffer(pScrn, MGA_FRONT); - - if (pboxNew2) { -- xfree(pptNew2); -- xfree(pboxNew2); -+ free(pptNew2); -+ free(pboxNew2); - } - if (pboxNew1) { -- xfree(pptNew1); -- xfree(pboxNew1); -+ free(pptNew1); -+ free(pboxNew1); - } - - pMga->AccelInfoRec->NeedToSync = TRUE; -@@ -1150,7 +1150,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) - if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) { - pDRIInfo->busIdString = DRICreatePCIBusID(pMga->PciInfo); - } else { -- pDRIInfo->busIdString = xalloc(64); -+ pDRIInfo->busIdString = malloc(64); - sprintf( pDRIInfo->busIdString, "PCI:%d:%d:%d", - #ifdef XSERVER_LIBPCIACCESS - ((pMga->PciInfo->domain << 8) | pMga->PciInfo->bus), -@@ -1198,7 +1198,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) - - pDRIInfo->SAREASize = SAREA_MAX; - -- pMGADRI = (MGADRIPtr)xcalloc( sizeof(MGADRIRec), 1 ); -+ pMGADRI = (MGADRIPtr)calloc( sizeof(MGADRIRec), 1 ); - if ( !pMGADRI ) { - DRIDestroyInfoRec( pMga->pDRIInfo ); - pMga->pDRIInfo = 0; -@@ -1208,9 +1208,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) - } - - pMGADRIServer = (MGADRIServerPrivatePtr) -- xcalloc( sizeof(MGADRIServerPrivateRec), 1 ); -+ calloc( sizeof(MGADRIServerPrivateRec), 1 ); - if ( !pMGADRIServer ) { -- xfree( pMGADRI ); -+ free( pMGADRI ); - DRIDestroyInfoRec( pMga->pDRIInfo ); - pMga->pDRIInfo = 0; - xf86DrvMsg( pScrn->scrnIndex, X_ERROR, -@@ -1249,9 +1249,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) - pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; - - if ( !DRIScreenInit( pScreen, pDRIInfo, &pMga->drmFD ) ) { -- xfree( pMGADRIServer ); -+ free( pMGADRIServer ); - pMga->DRIServerInfo = 0; -- xfree( pDRIInfo->devPrivate ); -+ free( pDRIInfo->devPrivate ); - pDRIInfo->devPrivate = 0; - DRIDestroyInfoRec( pMga->pDRIInfo ); - pMga->pDRIInfo = 0; -@@ -1495,20 +1495,20 @@ void MGADRICloseScreen( ScreenPtr pScreen ) - - if ( pMga->pDRIInfo ) { - if ( pMga->pDRIInfo->devPrivate ) { -- xfree( pMga->pDRIInfo->devPrivate ); -+ free( pMga->pDRIInfo->devPrivate ); - pMga->pDRIInfo->devPrivate = 0; - } - DRIDestroyInfoRec( pMga->pDRIInfo ); - pMga->pDRIInfo = 0; - } - if ( pMga->DRIServerInfo ) { -- xfree( pMga->DRIServerInfo ); -+ free(pMga->DRIServerInfo); - pMga->DRIServerInfo = 0; - } - if ( pMga->pVisualConfigs ) { -- xfree( pMga->pVisualConfigs ); -+ free(pMga->pVisualConfigs); - } - if ( pMga->pVisualConfigsPriv ) { -- xfree( pMga->pVisualConfigsPriv ); -+ free( pMga->pVisualConfigsPriv ); - } - } -diff --git a/src/mga_driver.c b/src/mga_driver.c -index d770031..d4ae346 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -646,7 +646,7 @@ MGAFreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -813,7 +813,7 @@ MGAProbe(DriverPtr drv, int flags) - MGAChipsets, MGAPciChipsets, devSections, - numDevSections, drv, &usedChips); - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -971,7 +971,7 @@ MGAProbe(DriverPtr drv, int flags) - } - } - } -- xfree(usedChips); -+ free(usedChips); - - return foundScreen; - } -@@ -1715,7 +1715,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - #endif - } - -- if (!(pMga->Options = xalloc(sizeof(MGAOptions)))) -+ if (!(pMga->Options = malloc(sizeof(MGAOptions)))) - return FALSE; - memcpy(pMga->Options, MGAOptions, sizeof(MGAOptions)); - -@@ -2384,7 +2384,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - switch(pMga->Chipset) { - case PCI_CHIP_MGA2064: - if (!pMga->NoAccel) { -- linePitches = xalloc(sizeof(Pitches1)); -+ linePitches = malloc(sizeof(Pitches1)); - memcpy(linePitches, Pitches1, sizeof(Pitches1)); - minPitch = maxPitch = 0; - } -@@ -2393,7 +2393,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - case PCI_CHIP_MGA2164_AGP: - case PCI_CHIP_MGA1064: - if (!pMga->NoAccel) { -- linePitches = xalloc(sizeof(Pitches2)); -+ linePitches = malloc(sizeof(Pitches2)); - memcpy(linePitches, Pitches2, sizeof(Pitches2)); - minPitch = maxPitch = 0; - } -@@ -2431,7 +2431,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - LOOKUP_BEST_REFRESH); - - if (linePitches) -- xfree(linePitches); -+ free(linePitches); - } - - if (i < 1 && pMga->FBDev) { -@@ -3294,7 +3294,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pMga->ShadowFB) { - pMga->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pMga->ShadowPtr = xalloc(pMga->ShadowPitch * height); -+ pMga->ShadowPtr = malloc(pMga->ShadowPitch * height); - displayWidth = pMga->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = pMga->ShadowPtr; - } else { -@@ -3745,21 +3745,21 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - #ifdef USE_EXA - if (pMga->ExaDriver) { - exaDriverFini(pScreen); -- xfree(pMga->ExaDriver); -+ free(pMga->ExaDriver); - } - #endif - if (pMga->CursorInfoRec) - xf86DestroyCursorInfoRec(pMga->CursorInfoRec); - if (pMga->ShadowPtr) -- xfree(pMga->ShadowPtr); -+ free(pMga->ShadowPtr); - if (pMga->DGAModes) -- xfree(pMga->DGAModes); -+ free(pMga->DGAModes); - if (pMga->adaptor) -- xfree(pMga->adaptor); -+ free(pMga->adaptor); - if (pMga->portPrivate) -- xfree(pMga->portPrivate); -+ free(pMga->portPrivate); - if (pMga->ScratchBuffer) -- xfree(pMga->ScratchBuffer); -+ free(pMga->ScratchBuffer); - - pScrn->vtSema = FALSE; - -diff --git a/src/mga_merge.c b/src/mga_merge.c -index 2affe3b..e3216c9 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -70,9 +70,9 @@ CopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, DisplayModePtr i, DisplayM - DisplayModePtr mode; - int dx = 0,dy = 0; - /* start with first node */ -- mode = xalloc(sizeof(DisplayModeRec)); -+ mode = malloc(sizeof(DisplayModeRec)); - memcpy(mode,i, sizeof(DisplayModeRec)); -- mode->Private = xalloc(sizeof(MergedDisplayModeRec)); -+ mode->Private = malloc(sizeof(MergedDisplayModeRec)); - ((MergedDisplayModePtr)mode->Private)->Monitor1 = i; - ((MergedDisplayModePtr)mode->Private)->Monitor2 = j; - ((MergedDisplayModePtr)mode->Private)->Monitor2Pos = srel; -@@ -239,7 +239,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - MgaScrn2Rel Monitor2Pos; - - xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n"); -- pScrn = xalloc(sizeof(ScrnInfoRec)); -+ pScrn = malloc(sizeof(ScrnInfoRec)); - memcpy(pScrn,pScrn1,sizeof(ScrnInfoRec)); - - pScrn->driverPrivate = NULL; -@@ -270,7 +270,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - - /* Set pScrn->monitor */ - { -- pScrn->monitor = xalloc(sizeof(MonRec)); -+ pScrn->monitor = malloc(sizeof(MonRec)); - /* copy everything we don't care about */ - memcpy(pScrn->monitor,pScrn1->monitor,sizeof(MonRec)); - pScrn->monitor->DDC = NULL; /*FIXME:have to try this */ -@@ -484,7 +484,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - switch(pMga->Chipset) { - case PCI_CHIP_MGA2064: - if (!pMga->NoAccel) { -- linePitches = xalloc(sizeof(Pitches1)); -+ linePitches = malloc(sizeof(Pitches1)); - memcpy(linePitches, Pitches1, sizeof(Pitches1)); - minPitch = maxPitch = 0; - } -@@ -493,7 +493,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - case PCI_CHIP_MGA2164_AGP: - case PCI_CHIP_MGA1064: - if (!pMga->NoAccel) { -- linePitches = xalloc(sizeof(Pitches2)); -+ linePitches = malloc(sizeof(Pitches2)); - memcpy(linePitches, Pitches2, sizeof(Pitches2)); - minPitch = maxPitch = 0; - } -@@ -529,7 +529,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - LOOKUP_BEST_REFRESH); - - if (linePitches) -- xfree(linePitches); -+ free(linePitches); - } - - -@@ -881,10 +881,10 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) { - ScrnInfoPtr pScrn2 = pMga->pScrn2; - - if(pScrn2) { -- xfree(pScrn2->monitor); -+ free(pScrn2->monitor); - pScrn2->monitor = NULL; - -- xfree(pScrn2); -+ free(pScrn2); - pMga->pScrn2 = NULL; - } - -@@ -893,8 +893,8 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) { - do { - DisplayModePtr p = pScrn1->currentMode->next; - if(pScrn1->currentMode->Private) -- xfree(pScrn1->currentMode->Private); -- xfree(pScrn1->currentMode); -+ free(pScrn1->currentMode->Private); -+ free(pScrn1->currentMode); - pScrn1->currentMode = p; - }while( pScrn1->currentMode != pScrn1->modes); - } -diff --git a/src/mga_storm.c b/src/mga_storm.c -index db7fae7..f0e6194 100644 ---- a/src/mga_storm.c -+++ b/src/mga_storm.c -@@ -583,7 +583,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) - BoxRec AvailFBArea; - int i; - -- pMga->ScratchBuffer = xalloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3); -+ pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3); - if(!pMga->ScratchBuffer) return FALSE; - - pMga->AccelInfoRec = infoPtr = XAACreateInfoRec(); -diff --git a/src/mga_vga.c b/src/mga_vga.c -index 9f00b3d..0ac8bf7 100644 ---- a/src/mga_vga.c -+++ b/src/mga_vga.c -@@ -197,17 +197,17 @@ MGAG200SESaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) - hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ - hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ - hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ -- if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) { -+ if (hwp->FontInfo1 || (hwp->FontInfo1 = malloc(FONT_AMOUNT))) { - hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */ - hwp->writeGr(hwp, 0x04, 0x02); /* read plane 2 */ - slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT); - } -- if (hwp->FontInfo2 || (hwp->FontInfo2 = xalloc(FONT_AMOUNT))) { -+ if (hwp->FontInfo2 || (hwp->FontInfo2 = malloc(FONT_AMOUNT))) { - hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */ - hwp->writeGr(hwp, 0x04, 0x03); /* read plane 3 */ - slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT); - } -- if (hwp->TextInfo || (hwp->TextInfo = xalloc(2 * TEXT_AMOUNT))) { -+ if (hwp->TextInfo || (hwp->TextInfo = malloc(2 * TEXT_AMOUNT))) { - hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */ - hwp->writeGr(hwp, 0x04, 0x00); /* read plane 0 */ - slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT); -diff --git a/src/mga_video.c b/src/mga_video.c -index a69c973..beb5a3c 100644 ---- a/src/mga_video.c -+++ b/src/mga_video.c -@@ -131,8 +131,8 @@ void MGAInitVideo(ScreenPtr pScreen) - num_adaptors = 1; - adaptors = &newAdaptor; - } else { -- newAdaptors = /* need to free this someplace */ -- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ /* need to free this someplace */ -+ newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -147,7 +147,7 @@ void MGAInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - } - - /* client libraries expect an encoding */ -@@ -231,10 +231,10 @@ MGAAllocAdaptor(ScrnInfoPtr pScrn, Bool doublebuffer) - if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn))) - return NULL; - -- if(!(pPriv = xcalloc(1, sizeof(MGAPortPrivRec) + -+ if(!(pPriv = calloc(1, sizeof(MGAPortPrivRec) + - (sizeof(DevUnion) * MGA_MAX_PORTS)))) - { -- xfree(adapt); -+ free(adapt); - return NULL; - } - -@@ -1082,18 +1082,18 @@ MGAAllocateSurface( - surface->width = w; - surface->height = h; - -- if(!(surface->pitches = xalloc(sizeof(int)))) { -+ if(!(surface->pitches = malloc(sizeof(int)))) { - MGAFreeMemory(pScrn, surface_memory); - return BadAlloc; - } -- if(!(surface->offsets = xalloc(sizeof(int)))) { -- xfree(surface->pitches); -+ if(!(surface->offsets = malloc(sizeof(int)))) { -+ free(surface->pitches); - MGAFreeMemory(pScrn, surface_memory); - return BadAlloc; - } -- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { -- xfree(surface->pitches); -- xfree(surface->offsets); -+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) { -+ free(surface->pitches); -+ free(surface->offsets); - MGAFreeMemory(pScrn, surface_memory); - return BadAlloc; - } -@@ -1137,9 +1137,9 @@ MGAFreeSurface( - if(pPriv->isOn) - MGAStopSurface(surface); - MGAFreeMemory(pScrn, pPriv->surface_memory); -- xfree(surface->pitches); -- xfree(surface->offsets); -- xfree(surface->devPrivate.ptr); -+ free(surface->pitches); -+ free(surface->offsets); -+ free(surface->devPrivate.ptr); - - return Success; - } -@@ -1231,7 +1231,7 @@ MGAInitOffscreenImages(ScreenPtr pScreen) - XF86OffscreenImagePtr offscreenImages; - - /* need to free this someplace */ -- if(!(offscreenImages = xalloc(num * sizeof(XF86OffscreenImageRec)))) -+ if(!(offscreenImages = malloc(num * sizeof(XF86OffscreenImageRec)))) - return; - - offscreenImages[0].image = &Images[0]; --- -cgit v0.9.0.2-2-gbebe -From 1036e32e006d496023553ea566cb13ae93933719 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Tue, 27 Sep 2011 02:35:48 +0000 -Subject: Remove if(E != NULL) checks around free(E) - -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Matt Turner <mattst88@gmail.com> ---- -diff --git a/src/mga_dri.c b/src/mga_dri.c -index 957c6df..1454994 100644 ---- a/src/mga_dri.c -+++ b/src/mga_dri.c -@@ -1011,8 +1011,8 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg, - pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox); - pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox); - if (!pboxNew2 || !pptNew2) { -- if (pptNew2) free(pptNew2); -- if (pboxNew2) free(pboxNew2); -+ free(pptNew2); -+ free(pboxNew2); - if (pboxNew1) { - free(pptNew1); - free(pboxNew1); -@@ -1494,21 +1494,13 @@ void MGADRICloseScreen( ScreenPtr pScreen ) - DRICloseScreen( pScreen ); - - if ( pMga->pDRIInfo ) { -- if ( pMga->pDRIInfo->devPrivate ) { -- free( pMga->pDRIInfo->devPrivate ); -- pMga->pDRIInfo->devPrivate = 0; -- } -+ free(pMga->pDRIInfo->devPrivate); -+ pMga->pDRIInfo->devPrivate = 0; - DRIDestroyInfoRec( pMga->pDRIInfo ); - pMga->pDRIInfo = 0; - } -- if ( pMga->DRIServerInfo ) { -- free(pMga->DRIServerInfo); -- pMga->DRIServerInfo = 0; -- } -- if ( pMga->pVisualConfigs ) { -- free(pMga->pVisualConfigs); -- } -- if ( pMga->pVisualConfigsPriv ) { -- free( pMga->pVisualConfigsPriv ); -- } -+ free(pMga->DRIServerInfo); -+ pMga->DRIServerInfo = 0; -+ free(pMga->pVisualConfigs); -+ free(pMga->pVisualConfigsPriv); - } -diff --git a/src/mga_driver.c b/src/mga_driver.c -index d4ae346..dcbfabf 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -644,8 +644,6 @@ MGAGetRec(ScrnInfoPtr pScrn) - void - MGAFreeRec(ScrnInfoPtr pScrn) - { -- if (pScrn->driverPrivate == NULL) -- return; - free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } -@@ -2430,8 +2428,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - pMga->FbMapSize, - LOOKUP_BEST_REFRESH); - -- if (linePitches) -- free(linePitches); -+ free(linePitches); - } - - if (i < 1 && pMga->FBDev) { -@@ -3750,16 +3747,11 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - #endif - if (pMga->CursorInfoRec) - xf86DestroyCursorInfoRec(pMga->CursorInfoRec); -- if (pMga->ShadowPtr) -- free(pMga->ShadowPtr); -- if (pMga->DGAModes) -- free(pMga->DGAModes); -- if (pMga->adaptor) -- free(pMga->adaptor); -- if (pMga->portPrivate) -- free(pMga->portPrivate); -- if (pMga->ScratchBuffer) -- free(pMga->ScratchBuffer); -+ free(pMga->ShadowPtr); -+ free(pMga->DGAModes); -+ free(pMga->adaptor); -+ free(pMga->portPrivate); -+ free(pMga->ScratchBuffer); - - pScrn->vtSema = FALSE; - -diff --git a/src/mga_merge.c b/src/mga_merge.c -index e3216c9..c1cf2eb 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -528,8 +528,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - pMga->FbMapSize, - LOOKUP_BEST_REFRESH); - -- if (linePitches) -- free(linePitches); -+ free(linePitches); - } - - -@@ -892,8 +891,7 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) { - pScrn1->currentMode = pScrn1->modes; - do { - DisplayModePtr p = pScrn1->currentMode->next; -- if(pScrn1->currentMode->Private) -- free(pScrn1->currentMode->Private); -+ free(pScrn1->currentMode->Private); - free(pScrn1->currentMode); - pScrn1->currentMode = p; - }while( pScrn1->currentMode != pScrn1->modes); -diff --git a/src/mga_video.c b/src/mga_video.c -index beb5a3c..784e7b1 100644 ---- a/src/mga_video.c -+++ b/src/mga_video.c -@@ -146,8 +146,7 @@ void MGAInitVideo(ScreenPtr pScreen) - if(num_adaptors) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - -- if(newAdaptors) -- free(newAdaptors); -+ free(newAdaptors); - } - - /* client libraries expect an encoding */ --- -cgit v0.9.0.2-2-gbebe -From 560967b4ffdb103f95121c43708dd5fc680a5045 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Tue, 27 Sep 2011 02:37:04 +0000 -Subject: Fix printf format specifier warning - -Signed-off-by: Matt Turner <mattst88@gmail.com> ---- -diff --git a/src/mga_exa.c b/src/mga_exa.c -index f292327..e5eaa92 100644 ---- a/src/mga_exa.c -+++ b/src/mga_exa.c -@@ -865,7 +865,7 @@ mgaExaInit(ScreenPtr pScreen) - - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "X %d Y %d bpp %d\n", - pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel); -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %x, osb %x\n", -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %lx, osb %lx\n", - pExa->memoryBase, pExa->memorySize, pExa->offScreenBase); - - /* In PW24 mode, we need to align to "3 64-bytes" */ --- -cgit v0.9.0.2-2-gbebe -From 07792ef41f33aa5419168263637e34ee614f26e2 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Tue, 27 Sep 2011 02:38:17 +0000 -Subject: Remove calls to xf86IsPc98() - -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Matt Turner <mattst88@gmail.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index dcbfabf..4af36ca 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -2164,7 +2164,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - /* - * Reset card if it isn't primary one - */ -- if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() ) -+ if ( (!pMga->Primary && !pMga->FBDev) ) - MGASoftReset(pScrn); - - if (pScrn->videoRam == 0) { -@@ -2878,13 +2878,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - vgaHWProtect(pScrn, FALSE); - } - -- if (xf86IsPc98()) { -- if (pMga->Chipset == PCI_CHIP_MGA2064) -- outb(0xfac, 0x01); -- else -- outb(0xfac, 0x02); -- } -- - /* Reset tagfifo*/ - if (pMga->is_G200ER) - { -@@ -3680,8 +3673,6 @@ MGALeaveVT(int scrnIndex, int flags) - MGARestore(pScrn); - vgaHWLock(hwp); - -- if (xf86IsPc98()) -- outb(0xfac, 0x00); - #ifdef XF86DRI - if (pMga->directRenderingEnabled) { - pScreen = screenInfo.screens[scrnIndex]; -@@ -3755,9 +3746,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - - pScrn->vtSema = FALSE; - -- if (xf86IsPc98()) -- outb(0xfac, 0x00); -- - xf86ClearPrimInitDone(pScrn->entityList[0]); - - if(pMga->BlockHandler) -diff --git a/src/mga_merge.c b/src/mga_merge.c -index c1cf2eb..aec3443 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -385,7 +385,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - /* - * Reset card if it isn't primary one - */ -- if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() ) -+ if ( (!pMga->Primary && !pMga->FBDev) ) - MGASoftReset(pScrn); - - --- -cgit v0.9.0.2-2-gbebe -From f9acf37be49844bea8165be9786afe37fd999229 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Sat, 29 Oct 2011 23:31:08 +0000 -Subject: Include <unistd.h> for usleep - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/mga_vga.c b/src/mga_vga.c -index 0ac8bf7..8f52951 100644 ---- a/src/mga_vga.c -+++ b/src/mga_vga.c -@@ -2,6 +2,8 @@ - #include "config.h" - #endif - -+#include <unistd.h> -+ - #include "misc.h" - #include "xf86.h" - #include "xf86_OSproc.h" --- -cgit v0.9.0.2-2-gbebe -From d9cf07a4f424b2beb844ea1b3ec5d468e79a747c Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Sat, 29 Oct 2011 23:34:41 +0000 -Subject: Include "xf86Modes.h" for xf86ModeBandwidth - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 4af36ca..d9f6ea4 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -52,6 +52,10 @@ - #include "xf86.h" - #include "xf86_OSproc.h" - -+#ifdef HAVE_XF86MODEBANDWIDTH -+#include "xf86Modes.h" -+#endif -+ - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" - #include "xf86RAC.h" --- -cgit v0.9.0.2-2-gbebe -From 644ba5d11049e63ea61b5cc4fb889b0f840965ff Mon Sep 17 00:00:00 2001 -From: Christian Toutant <ctoutant@matrox.com> -Date: Wed, 07 Dec 2011 20:42:39 +0000 -Subject: Add support for Video Memory greater then 8M - -Expand memory mapping of framebuffer from 8 to 16MB - -Fix segfault on redhat distibution - -Signed-off-by: Christian Toutant <ctoutant@matrox.com> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index d9f6ea4..ae36378 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -2707,9 +2707,18 @@ MGAMapMem(ScrnInfoPtr pScrn) - if (pMga->IOBase == NULL) - return FALSE; - -- pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -- pMga->PciTag, pMga->FbAddress, -- pMga->FbMapSize); -+ if (pMga->is_G200ER) -+ { -+ pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -+ pMga->PciTag, pMga->FbAddress, -+ pMga->FbMapSize); -+ } -+ else -+ { -+ pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -+ pMga->PciTag, pMga->FbAddress, -+ pMga->FbMapSize); -+ } - if (pMga->FbBase == NULL) - return FALSE; - #endif -@@ -3139,11 +3148,19 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pMga = MGAPTR(pScrn); - MGAdac = &pMga->Dac; - -- if (pMga->is_G200SE) { -- VRTemp = pScrn->videoRam; -- FBTemp = pMga->FbMapSize; -- pScrn->videoRam = 8192; -- pMga->FbMapSize = pScrn->videoRam * 1024; -+ if (pMga->is_G200SE) -+ { -+ VRTemp = pScrn->videoRam; -+ FBTemp = pMga->FbMapSize; -+ if (pMga->reg_1e24 >= 0x01) -+ { -+ pScrn->videoRam = 16384; -+ } -+ else -+ { -+ pScrn->videoRam = 8192; -+ } -+ pMga->FbMapSize = pScrn->videoRam * 1024; - } - - -@@ -3701,10 +3718,26 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - vgaHWPtr hwp = VGAHWPTR(pScrn); - MGAPtr pMga = MGAPTR(pScrn); - MGAEntPtr pMgaEnt = NULL; -+ CARD32 VRTemp, FBTemp; - - if (pMga->MergedFB) - MGACloseScreenMerged(scrnIndex, pScreen); - -+ if (pMga->is_G200SE) -+ { -+ VRTemp = pScrn->videoRam; -+ FBTemp = pMga->FbMapSize; -+ if (pMga->reg_1e24 >= 0x01) -+ { -+ pScrn->videoRam = 16384; -+ } -+ else -+ { -+ pScrn->videoRam = 8192; -+ } -+ pMga->FbMapSize = pScrn->videoRam * 1024; -+ } -+ - if (pScrn->vtSema) { - if (pMga->FBDev) { - fbdevHWRestore(pScrn); -@@ -3716,6 +3749,13 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - vgaHWUnmapMem(pScrn); - } - } -+ -+ if (pMga->is_G200SE) -+ { -+ pScrn->videoRam = VRTemp; -+ pMga->FbMapSize = FBTemp; -+ } -+ - #ifdef XF86DRI - if (pMga->directRenderingEnabled) { - MGADRICloseScreen(pScreen); --- -cgit v0.9.0.2-2-gbebe -From cc9d2e808de20723c9035952242d966455d583b7 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Thu, 29 Dec 2011 03:44:40 +0000 -Subject: Check MGAAllocAdaptor() for memory allocation failure - -If it couldn't allocate memory, don't attempt to write a bunch of values -to the NULL pointer before returning it, but just pass the NULL along -right away. - -Resolves parfait warnings of the form: - -Error: Null pointer dereference (CWE 476) - Write to null pointer 'adapt' - at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'. - Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320. - Null pointer introduced at line 237 in function 'MGAAllocAdaptor'. - -repeated for every line writing to the adapt pointer in each function. - -[ This bug was found by the Parfait 0.4.2 bug checking tool. - For more information see http://labs.oracle.com/projects/parfait/ ] - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Mark Kettenis <kettenis@openbsd.org> ---- -diff --git a/src/mga_video.c b/src/mga_video.c -index 784e7b1..abce31f 100644 ---- a/src/mga_video.c -+++ b/src/mga_video.c -@@ -269,6 +269,8 @@ MGASetupImageVideoOverlay(ScreenPtr pScreen) - XF86VideoAdaptorPtr adapt; - - adapt = MGAAllocAdaptor(pScrn, TRUE); -+ if (adapt == NULL) -+ return NULL; - - adapt->type = XvWindowMask | XvInputMask | XvImageMask; - adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT; -@@ -316,6 +318,8 @@ MGASetupImageVideoTexture(ScreenPtr pScreen) - MGAPtr pMga = MGAPTR(pScrn); - - adapt = MGAAllocAdaptor(pScrn, FALSE); -+ if (adapt == NULL) -+ return NULL; - - adapt->type = XvWindowMask | XvInputMask | XvImageMask; - adapt->flags = 0; -@@ -1298,6 +1302,8 @@ MGASetupImageVideoILOAD(ScreenPtr pScreen) - MGAPtr pMga = MGAPTR(pScrn); - - adapt = MGAAllocAdaptor(pScrn, FALSE); -+ if (adapt == NULL) -+ return NULL; - - adapt->type = XvWindowMask | XvInputMask | XvImageMask; - adapt->flags = 0; --- -cgit v0.9.0.2-2-gbebe -From 9223c44a731f48c66c226eb88dcb6f9d574cb599 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Tue, 03 Jan 2012 22:35:18 +0000 -Subject: When we can't load the xaa or exa modules, use shadowfb instead - -Signed-off-by: Julien Cristau <jcristau@debian.org> ---- -diff --git a/src/mga_driver.c b/src/mga_driver.c -index ae36378..00469e7 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -2101,6 +2101,31 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - } - } - -+ /* Load XAA if needed */ -+ if (!pMga->NoAccel) { -+#ifdef USE_EXA -+ if (pMga->Exa) { -+ if (!xf86LoadSubModule(pScrn, "exa")) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Falling back to shadowfb\n"); -+ pMga->ShadowFB = TRUE; -+ pMga->NoAccel = TRUE; -+ } -+ } else { -+#endif -+#ifdef USE_XAA -+ if (!xf86LoadSubModule(pScrn, "xaa")) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Falling back to shadowfb\n"); -+ pMga->ShadowFB = TRUE; -+ pMga->NoAccel = TRUE; -+ } -+#endif -+#ifdef USE_EXA -+ } -+#endif -+ } -+ - switch (pMga->Chipset) { - case PCI_CHIP_MGA2064: - case PCI_CHIP_MGA2164: -@@ -2596,27 +2621,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - return FALSE; - } - -- /* Load XAA if needed */ -- if (!pMga->NoAccel) { --#ifdef USE_EXA -- if (pMga->Exa) { -- if (!xf86LoadSubModule(pScrn, "exa")) { -- MGAFreeRec(pScrn); -- return FALSE; -- } -- } else { --#endif --#ifdef USE_XAA -- if (!xf86LoadSubModule(pScrn, "xaa")) { -- MGAFreeRec(pScrn); -- return FALSE; -- } --#endif --#ifdef USE_EXA -- } --#endif -- } -- - /* Load ramdac if needed */ - if (pMga->HWCursor) { - if (!xf86LoadSubModule(pScrn, "ramdac")) { --- -cgit v0.9.0.2-2-gbebe -From 4c4beaf628c9c5dd531605e40696ed31db0e97b8 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed, 04 Jan 2012 05:15:07 +0000 -Subject: Untangle XF86DRI from the driver-specific DRI define - -XF86DRI is defined by xorg-server.h, so --disable-dri in the driver -itself does exactly nothing other than not fill in the CFLAGS -and thus stop the driver from compiling. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/configure.ac b/configure.ac -index 540c390..840ff3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI]) - AM_CONDITIONAL(DRI, test "x$DRI" = xyes) - if test "x$DRI" = xyes; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) -- AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) -- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) -+ AC_DEFINE(MGADRI,1,[Enable DRI driver support]) -+ AC_DEFINE(MGADRI_DEVEL,1,[Enable developmental DRI driver support]) - fi - - save_CFLAGS="$CFLAGS" -diff --git a/src/mga.h b/src/mga.h -index fced6aa..77406f1 100644 ---- a/src/mga.h -+++ b/src/mga.h -@@ -28,7 +28,11 @@ - #include "xf86DDC.h" - #include "xf86xv.h" - --#ifdef XF86DRI -+#ifndef XF86DRI -+#undef MGADRI -+#endif -+ -+#ifdef MGADRI - #include "xf86drm.h" - - #define _XF86DRI_SERVER_ -@@ -589,7 +593,7 @@ typedef struct { - int expandRemaining; - int expandHeight; - int expandY; --#ifdef XF86DRI -+#ifdef MGADRI - Bool directRenderingEnabled; - DRIInfoPtr pDRIInfo; - int drmFD; -@@ -743,7 +747,7 @@ void MGAPointerMoved(int index, int x, int y); - void MGAInitVideo(ScreenPtr pScreen); - void MGAResetVideo(ScrnInfoPtr pScrn); - --#ifdef XF86DRI -+#ifdef MGADRI - - #define MGA_FRONT 0x1 - #define MGA_BACK 0x2 -diff --git a/src/mga_driver.c b/src/mga_driver.c -index 00469e7..af005f1 100644 ---- a/src/mga_driver.c -+++ b/src/mga_driver.c -@@ -101,7 +101,7 @@ - #include "shadowfb.h" - #include "fbdevhw.h" - --#ifdef XF86DRI -+#ifdef MGADRI - #include "dri.h" - #endif - -@@ -1532,7 +1532,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - - pMga = MGAPTR(pScrn); - /* Set here until dri is enabled */ --#ifdef XF86DRI -+#ifdef MGADRI - pMga->haveQuiescense = 1; - #endif - /* Get the entity, and make sure it is PCI. */ -@@ -1706,13 +1706,13 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - } - - if (pMga->DualHeadEnabled) { --#ifdef XF86DRI -+#ifdef MGADRI - pMga->GetQuiescence = MGAGetQuiescenceShared; - #endif - } else { /* single-head mode */ - pMga->SecondCrtc = FALSE; - pMga->HWCursor = TRUE; --#ifdef XF86DRI -+#ifdef MGADRI - pMga->GetQuiescence = MGAGetQuiescence; - #endif - } -@@ -1942,7 +1942,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - if (pScrn->depth == 8) - pScrn->rgbBits = 8; - --#ifdef XF86DRI -+#ifdef MGADRI - from = X_DEFAULT; - pMga->agpMode = MGA_DEFAULT_AGP_MODE; - -@@ -2637,7 +2637,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) - } - } - --#ifdef XF86DRI -+#ifdef MGADRI - /* Load the dri module if requested. */ - if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) { - xf86LoadSubModule(pScrn, "dri"); -@@ -2878,7 +2878,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - vgaReg = &hwp->ModeReg; - mgaReg = &pMga->ModeReg; - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) { - DRILock(screenInfo.screens[pScrn->scrnIndex], 0); - } -@@ -2989,7 +2989,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - pMga->M1currentMode = (DisplayModePtr)mode->Private; - } - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) - DRIUnlock(screenInfo.screens[pScrn->scrnIndex]); - #endif -@@ -3138,7 +3138,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - MGAEntPtr pMgaEnt = NULL; - int f; - CARD32 VRTemp, FBTemp; --#ifdef XF86DRI -+#ifdef MGADRI - MessageType driFrom = X_DEFAULT; - #endif - DPMSSetProcPtr mga_dpms_set_proc = NULL; -@@ -3317,7 +3317,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - FBStart = pMga->FbStart; - } - --#ifdef XF86DRI -+#ifdef MGADRI - /* - * Setup DRI after visuals have been established. - * -@@ -3473,7 +3473,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - MGAInitVideo(pScreen); - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) { - /* Now that mi, drm and others have done their thing, - * complete the DRI setup. -@@ -3625,7 +3625,7 @@ MGAEnterVT(int scrnIndex, int flags) - - pMga = MGAPTR(pScrn); - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) { - if (pMga->irq) { - /* Need to make sure interrupts are enabled */ -@@ -3651,7 +3651,7 @@ static Bool - MGAEnterVTFBDev(int scrnIndex, int flags) - { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; --#ifdef XF86DRI -+#ifdef MGADRI - ScreenPtr pScreen; - MGAPtr pMga; - -@@ -3690,7 +3690,7 @@ MGALeaveVT(int scrnIndex, int flags) - { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - vgaHWPtr hwp = VGAHWPTR(pScrn); --#ifdef XF86DRI -+#ifdef MGADRI - MGAPtr pMga = MGAPTR(pScrn); - ScreenPtr pScreen; - #endif -@@ -3698,7 +3698,7 @@ MGALeaveVT(int scrnIndex, int flags) - MGARestore(pScrn); - vgaHWLock(hwp); - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) { - pScreen = screenInfo.screens[scrnIndex]; - DRILock(pScreen, 0); -@@ -3760,7 +3760,7 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen) - pMga->FbMapSize = FBTemp; - } - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) { - MGADRICloseScreen(pScreen); - pMga->directRenderingEnabled=FALSE; -diff --git a/src/mga_exa.c b/src/mga_exa.c -index e5eaa92..ced6452 100644 ---- a/src/mga_exa.c -+++ b/src/mga_exa.c -@@ -41,7 +41,7 @@ - #include "mga_macros.h" - - #include "exa.h" --#ifdef XF86DRI -+#ifdef MGADRI - #include "mga_dri.h" - #endif - -@@ -763,7 +763,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker) - while (INREG (MGAREG_Status) & 0x10000); - } - --#ifdef XF86DRI -+#ifdef MGADRI - static void - init_dri(ScrnInfoPtr pScrn) - { -@@ -837,7 +837,7 @@ init_dri(ScrnInfoPtr pScrn) - MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN; - dri->backPitch = widthBytes; - } --#endif /* XF86DRI */ -+#endif /* MGADRI */ - - Bool - mgaExaInit(ScreenPtr pScreen) -@@ -898,7 +898,7 @@ mgaExaInit(ScreenPtr pScreen) - pExa->UploadToScreen = mgaUploadToScreen; - pExa->DownloadFromScreen = mgaDownloadFromScreen; - --#ifdef XF86DRI -+#ifdef MGADRI - if (pMga->directRenderingEnabled) - init_dri(pScrn); - #endif -diff --git a/src/mga_macros.h b/src/mga_macros.h -index 130651d..d3b0d0e 100644 ---- a/src/mga_macros.h -+++ b/src/mga_macros.h -@@ -17,7 +17,7 @@ - - #define RGBEQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff)) - --#ifdef XF86DRI -+#ifdef MGADRI - #define MGA_SYNC_XTAG 0x275f4200 - - #define MGABUSYWAIT() do { \ -@@ -64,7 +64,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \ - WAITFIFO(1); \ - OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); } - --#ifdef XF86DRI -+#ifdef MGADRI - #define CHECK_DMA_QUIESCENT(pMGA, pScrn) { \ - if (!pMGA->haveQuiescense) { \ - pMGA->GetQuiescence( pScrn ); \ -diff --git a/src/mga_merge.c b/src/mga_merge.c -index aec3443..f355f76 100644 ---- a/src/mga_merge.c -+++ b/src/mga_merge.c -@@ -316,7 +316,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) - pMga->Chipset = pMga1->Chipset; - pMga->ChipRev = pMga1->ChipRev; - --#ifdef XF86DRI -+#ifdef MGADRI - pMga->agpMode = pMga1->agpMode; - #endif - -diff --git a/src/mga_storm.c b/src/mga_storm.c -index f0e6194..7ac3ae0 100644 ---- a/src/mga_storm.c -+++ b/src/mga_storm.c -@@ -24,7 +24,7 @@ - #include "miline.h" - #include "servermd.h" - --#ifdef XF86DRI -+#ifdef MGADRI - #include "GL/glxtokens.h" - #endif - -@@ -32,7 +32,7 @@ - #include "mga_reg.h" - #include "mga_macros.h" - --#ifdef XF86DRI -+#ifdef MGADRI - #include "mga_dri.h" - #endif - -@@ -797,7 +797,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) - break; - } - --#ifdef XF86DRI -+#ifdef MGADRI - if ( pMga->directRenderingEnabled ) { - MGADRIServerPrivatePtr pMGADRIServer = pMga->DRIServerInfo; - BoxRec MemBox; -@@ -899,7 +899,7 @@ Bool mgaAccelInit( ScreenPtr pScreen ) - pMGADRIServer->textureOffset ); - } - else --#endif /* defined(XF86DRI) */ -+#endif /* defined(MGADRI) */ - { - AvailFBArea.x1 = 0; - AvailFBArea.x2 = pScrn->displayWidth; --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD deleted file mode 100644 index a98a092a4..000000000 --- a/testing/xf86-video-neomagic/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 153830 2012-03-19 19:44:28Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=7 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.diff) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3' - '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fixes.diff - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-neomagic/git-fixes.diff b/testing/xf86-video-neomagic/git-fixes.diff deleted file mode 100644 index dafba0b2f..000000000 --- a/testing/xf86-video-neomagic/git-fixes.diff +++ /dev/null @@ -1,616 +0,0 @@ -From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Tue, 20 Jul 2010 20:15:29 +0000 -Subject: config: upgrade to util-macros 1.8 for additional man page support - -Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS -The value of MAN_SUBST is the same for all X.Org packages. ---- -diff --git a/configure.ac b/configure.ac -index 38cba3a..a80955b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - - # Checks for programs. -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ --- -cgit v0.9.0.2-2-gbebe -From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Tue, 20 Jul 2010 22:45:19 +0000 -Subject: config: update AC_PREREQ statement to 2.60 - -Unrelated to the previous patches, the new value simply reflects -the reality that the minimum level for autoconf to configure -all x.org modules is 2.60 dated June 2006. - -ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index a80955b..1c7ff1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,7 +20,7 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-neomagic], - 1.2.5, - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], --- -cgit v0.9.0.2-2-gbebe -From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Tue, 20 Jul 2010 23:41:31 +0000 -Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 - -XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls -AC_PROG_C_C99. This sets gcc with -std=gnu99. -If AC_PROG_CC macro is called afterwards, it resets CC to gcc. - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 1c7ff1a..aa17100 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS - # Checks for programs. - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - --- -cgit v0.9.0.2-2-gbebe -From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 00:24:42 +0000 -Subject: config: remove unrequired AC_HEADER_STDC - -Autoconf says: -"This macro is obsolescent, as current systems have conforming -header files. New programs need not use this macro". - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index aa17100..30c0e86 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,8 +79,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" - --# Checks for header files. --AC_HEADER_STDC - - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) --- -cgit v0.9.0.2-2-gbebe -From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 01:44:57 +0000 -Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS]) - -This macro is called by PKG_CHECK_MODULES - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 30c0e86..86f016f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=neomagic --- -cgit v0.9.0.2-2-gbebe -From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 13:27:42 +0000 -Subject: config: complete AC_INIT m4 quoting - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 86f016f..46cb0cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,9 +22,9 @@ - - AC_PREREQ([2.60]) - AC_INIT([xf86-video-neomagic], -- 1.2.5, -+ [1.2.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-neomagic) -+ [xf86-video-neomagic]) - - AC_CONFIG_SRCDIR([Makefile.am]) - AM_CONFIG_HEADER([config.h]) --- -cgit v0.9.0.2-2-gbebe -From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 18:05:22 +0000 -Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 46cb0cc..7261ed5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic], - [xf86-video-neomagic]) - - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - - AM_INIT_AUTOMAKE([foreign dist-bzip2]) --- -cgit v0.9.0.2-2-gbebe -From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 18:37:41 +0000 -Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 7261ed5..1d0a3d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL - AH_TOP([#include "xorg-server.h"]) - - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) --- -cgit v0.9.0.2-2-gbebe -From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 20:07:00 +0000 -Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/configure.ac b/configure.ac -index 1d0a3d3..73dde93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,8 +91,9 @@ AC_SUBST([moduledir]) - DRIVER_NAME=neomagic - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT --- -cgit v0.9.0.2-2-gbebe -From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Wed, 21 Jul 2010 20:49:04 +0000 -Subject: config: add comments for main statements - ---- -diff --git a/configure.ac b/configure.ac -index 73dde93..befac41 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,18 +20,18 @@ - # - # Process this file with autoconf to produce a configure script - -+# Initialize Autoconf - AC_PREREQ([2.60]) - AC_INIT([xf86-video-neomagic], - [1.2.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [xf86-video-neomagic]) -- - AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - - # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION], - XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, - AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), -@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir, - [moduledir="$libdir/xorg/modules"]) - - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - - save_CFLAGS="$CFLAGS" --- -cgit v0.9.0.2-2-gbebe -From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001 -From: Jesse Adkins <jesserayadkins@gmail.com> -Date: Tue, 28 Sep 2010 20:29:51 +0000 -Subject: Purge cvs tags. - -Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/man/neomagic.man b/man/neomagic.man -index 9daffe5..af8181c 100644 ---- a/man/neomagic.man -+++ b/man/neomagic.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH NEOMAGIC __drivermansuffix__ __vendorversion__ --- -cgit v0.9.0.2-2-gbebe -From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 11 Oct 2011 17:43:51 +0000 -Subject: Use malloc/calloc/realloc/free directly - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/neo_dga.c b/src/neo_dga.c -index 4227da6..3e2a02e 100644 ---- a/src/neo_dga.c -+++ b/src/neo_dga.c -@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen) - - while(pMode) { - -- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -diff --git a/src/neo_driver.c b/src/neo_driver.c -index b12c125..c51dad4 100644 ---- a/src/neo_driver.c -+++ b/src/neo_driver.c -@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - } - -@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - #endif - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - -@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) - xf86CollectOptions(pScrn, NULL); - /* Process the options */ - if (nPtr->NeoChipset == NM2070) { -- if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options)))) -+ if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options)))) - return FALSE; - memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options)); - } else { -- if (!(nPtr->Options = xalloc(sizeof(NEOOptions)))) -+ if (!(nPtr->Options = malloc(sizeof(NEOOptions)))) - return FALSE; - memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions)); - } -@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(nPtr->shadowFB) { - nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height); -+ nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height); - displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = nPtr->ShadowPtr; - } else { -@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen) - if (nPtr->CursorInfo) - xf86DestroyCursorInfoRec(nPtr->CursorInfo); - if (nPtr->ShadowPtr) -- xfree(nPtr->ShadowPtr); -+ free(nPtr->ShadowPtr); - - pScrn->vtSema = FALSE; - pScreen->CloseScreen = nPtr->CloseScreen; -@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - if (NeoNew->reg) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg); -- xfree(NeoNew->reg); -+ free(NeoNew->reg); - NeoNew->reg = NULL; - } - -diff --git a/src/neo_video.c b/src/neo_video.c -index a9e1e25..0edae30 100644 ---- a/src/neo_video.c -+++ b/src/neo_video.c -@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen) - numAdaptors = 1; - overlayAdaptors = &newAdaptor; - } else { -- newAdaptors = xalloc((numAdaptors + 1) -+ newAdaptors = malloc((numAdaptors + 1) - * sizeof(XF86VideoAdaptorPtr*)); - if (newAdaptors){ - memcpy(newAdaptors, overlayAdaptors, -@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors); - - if (newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - } - - static XF86VideoEncodingRec NEOVideoEncodings[] = -@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen) - #ifdef DEBUG - xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n"); - #endif -- if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(DevUnion) + - sizeof(NEOPortRec))) == NULL){ - return (NULL); -@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen) - #ifdef DEBUG - xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n"); - #endif -- if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){ -+ if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){ - return; - } - -@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id, - - surface->width = width; - surface->height = height; -- if ((surface->pitches = xalloc(sizeof(int))) == NULL){ -+ if ((surface->pitches = malloc(sizeof(int))) == NULL){ - xf86FreeOffscreenLinear(linear); - return (BadAlloc); - } -- if ((surface->offsets = xalloc(sizeof(int))) == NULL){ -- xfree(surface->pitches); -+ if ((surface->offsets = malloc(sizeof(int))) == NULL){ -+ free(surface->pitches); - xf86FreeOffscreenLinear(linear); - return (BadAlloc); - } - -- if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){ -- xfree(surface->pitches); -- xfree(surface->offsets); -+ if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){ -+ free(surface->pitches); -+ free(surface->offsets); - xf86FreeOffscreenLinear(linear); - return (BadAlloc); - } -@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface) - NEOStopSurface(surface); - - xf86FreeOffscreenLinear(pPriv->linear); -- xfree(surface->pitches); -- xfree(surface->offsets); -- xfree(surface->devPrivate.ptr); -+ free(surface->pitches); -+ free(surface->offsets); -+ free(surface->devPrivate.ptr); - return (Success); - } - --- -cgit v0.9.0.2-2-gbebe -From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Tue, 11 Oct 2011 17:45:11 +0000 -Subject: Include <stdlib.h> for abs() - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/neo_driver.c b/src/neo_driver.c -index c51dad4..f8bca2c 100644 ---- a/src/neo_driver.c -+++ b/src/neo_driver.c -@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include "scrnintstr.h" - #include "servermd.h" - -+#include <stdlib.h> - #include <unistd.h> - - /* Mandatory functions */ --- -cgit v0.9.0.2-2-gbebe -From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 21:50:28 +0000 -Subject: Fall back to shadowfb when XAA is unavailable - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/neo_driver.c b/src/neo_driver.c -index f8bca2c..a034f86 100644 ---- a/src/neo_driver.c -+++ b/src/neo_driver.c -@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) - if (nPtr->showcache) - xf86DrvMsg(pScrn->scrnIndex,X_CONFIG, - "Show chache for debugging\n"); -+ -+ if (!xf86LoadSubModule(pScrn, "xaa")) { -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n"); -+ nPtr->shadowFB = 1; -+ } -+ -+ if (nPtr->shadowFB) { -+ if (!xf86LoadSubModule(pScrn, "shadow")) { -+ RETURN; -+ } -+ } -+ - if (nPtr->shadowFB) { - nPtr->noAccel = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) - RETURN; - } - -- if (!xf86LoadSubModule(pScrn, "xaa")) -- RETURN; -- -- if (nPtr->shadowFB) { -- if (!xf86LoadSubModule(pScrn, "shadow")) { -- RETURN; -- } -- } -- - if (!nPtr->swCursor) { - if (!xf86LoadSubModule(pScrn, "ramdac")) - RETURN; --- -cgit v0.9.0.2-2-gbebe -From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 19 Dec 2011 21:51:31 +0000 -Subject: Fix for new vgahw ABI - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/neo_driver.c b/src/neo_driver.c -index a034f86..509a77f 100644 ---- a/src/neo_driver.c -+++ b/src/neo_driver.c -@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags) - if (!vgaHWGetHWRec(pScrn)) - return FALSE; - hwp = VGAHWPTR(pScrn); -+ vgaHWSetStdFuncs(hwp); - - /* Allocate the NeoRec driverPrivate */ - if (!NEOGetRec(pScrn)) { --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD deleted file mode 100644 index 2bba90438..000000000 --- a/testing/xf86-video-nouveau/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 150053 2012-02-12 09:45:20Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=xf86-video-nouveau -_gitdate=20120210 -pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=1 -pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('f35c12d64542d0ea792a9e5af63a2e5a') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-${_gitdate} - pushd /tmp/$pkgname-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 - popd -} - -build() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr - make -} - -package() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - make DESTDIR=$pkgdir install -} diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install deleted file mode 100644 index 027154ff3..000000000 --- a/testing/xf86-video-nouveau/xf86-video-nouveau.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { - cat << _EOF - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/testing/xf86-video-nv/PKGBUILD b/testing/xf86-video-nv/PKGBUILD deleted file mode 100644 index dea94d6d5..000000000 --- a/testing/xf86-video-nv/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 150055 2012-02-12 09:45:22Z andyrtr $ -# Maintainer:Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-nv -pkgver=2.1.18 -pkgrel=5 -pkgdesc="X.org nv video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD deleted file mode 100644 index e12cf975d..000000000 --- a/testing/xf86-video-openchrome/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 150057 2012-02-12 09:45:24Z andyrtr $ -# Contributor: Paul Mattal <paul@mattal.com> -# Maintainer: Juergen Hoetzel <juergen@hoetzel.info> - -pkgname=xf86-video-openchrome -pkgver=0.2.905 -pkgrel=1 -pkgdesc="X.Org Openchrome drivers" -arch=(i686 x86_64) -license=('custom') -url="http://www.openchrome.org" -depends=('libdrm' 'libxvmc') -makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa') #'glproto' 'libgl') -replaces=('openchrome' 'xf86-video-via') -options=('!libtool' '!emptydirs' '!makeflags') -conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri') -source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('51871431a4a9204ab8ec79335c0cc041') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr # --disable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD deleted file mode 100644 index 85d09171a..000000000 --- a/testing/xf86-video-r128/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 150059 2012-02-12 09:45:26Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-r128 -pkgver=6.8.1 -pkgrel=8 -pkgdesc="X.org ati Rage128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86driproto' 'libdrm' 'mesa') # 'glproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -md5sums=('2b90854a62a4d45d652062f582dc8d13' - '3937776d4427861d0797e47119ac327d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - - autoreconf -fi - ./configure --prefix=/usr #--enable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-r128/git-fixes.patch b/testing/xf86-video-r128/git-fixes.patch deleted file mode 100644 index 933e8fb2a..000000000 --- a/testing/xf86-video-r128/git-fixes.patch +++ /dev/null @@ -1,842 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..05bcb74 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,91 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright 2007 George Sapountzis - --Please submit updated COPYING files to the Xorg bugzilla: -+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: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+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. -+ -+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, -+ Precision Insight, Inc., Cedar Park, Texas, and -+ VA Linux Systems Inc., Fremont, California. -+ -+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 on 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 -+NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX -+SYSTEMS AND/OR THEIR SUPPLIERS 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. -+ -+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. -+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. -+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 (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 -+PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. -+ -+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org -+ -+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 Marc Aurele La France not be used in advertising or -+publicity pertaining to distribution of the software without specific, -+written prior permission. Marc Aurele La France makes no representations -+about the suitability of this software for any purpose. It is provided -+"as-is" without express or implied warranty. -+ -+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -+EVENT SHALL MARC AURELE LA FRANCE 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. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/Makefile.am b/Makefile.am -index 1f4c3c4..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,21 +18,15 @@ - # 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. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL - --if BUILD_LINUXDOC --README.r128: README.r128.sgml -- $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128 -+.PHONY: ChangeLog INSTALL - --endif -- --EXTRA_DIST = README.r128 README.r128.sgml ChangeLog --CLEANFILES = ChangeLog -- --.PHONY: ChangeLog -+INSTALL: -+ $(INSTALL_CMD) - - ChangeLog: - $(CHANGELOG_CMD) - --dist-hook: ChangeLog -+dist-hook: ChangeLog INSTALL -diff --git a/README b/README -index cb61870..5c6f59d 100644 ---- a/README -+++ b/README -@@ -1,4 +1,161 @@ --xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server -+ Information for ATI Rage 128 Users -+ Precision Insight, Inc., SuSE GmbH -+ 13 June 2000 -+ ____________________________________________________________ -+ -+ Table of Contents -+ -+ -+ 1. Supported Hardware -+ 2. Features -+ 3. Technical Notes -+ 4. Reported Working Video Cards -+ 5. Configuration -+ 6. Driver Options -+ 7. Known Limitations -+ 8. Authors -+ -+ -+ ______________________________________________________________________ -+ -+ 1. Supported Hardware -+ -+ -+ o ATI Rage 128 based cards -+ -+ -+ -+ 2. Features -+ -+ -+ o Full support (including hardware accelerated 2D drawing) for 8, 15, -+ 16, 24 bit pixel depths. -+ -+ o Hardware cursor support to reduce sprite flicker. -+ -+ o Support for high resolution video modes up to 1800x1440 @ 70Hz. -+ -+ o Support for doublescan video modes (e.g., 320x200 and 320x240). -+ -+ o Support for gamma correction at all pixel depths. -+ -+ o Fully programmable clock supported. -+ -+ o Robust text mode restore for VT switching. -+ -+ -+ -+ 3. Technical Notes -+ -+ -+ o None -+ -+ -+ -+ 4. Reported Working Video Cards -+ -+ -+ o Rage Fury AGP 32MB -+ -+ o XPERT 128 AGP 16MB -+ -+ o XPERT 99 AGP 8MB -+ -+ -+ -+ 5. Configuration -+ -+ The driver auto-detects all device information necessary to initialize -+ the card. The only lines you need in the "Device" section of your -+ xorg.conf file are: -+ -+ Section "Device" -+ Identifier "Rage 128" -+ Driver "r128" -+ EndSection -+ -+ -+ or let xorgconfig do this for you. -+ -+ However, if you have problems with auto-detection, you can specify: -+ -+ o VideoRam - in kilobytes -+ -+ o MemBase - physical address of the linear framebuffer -+ -+ o IOBase - physical address of the memory mapped IO registers -+ -+ o ChipID - PCI DEVICE ID -+ -+ -+ -+ 6. Driver Options -+ -+ -+ o "hw_cursor" - request hardware cursor (default) -+ -+ o "sw_cursor" - software cursor only -+ -+ o "no_accel" - software rendering only -+ -+ o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) -+ -+ o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) -+ -+ -+ -+ 7. Known Limitations -+ -+ -+ o None -+ -+ -+ -+ 8. Authors -+ -+ The X11R7.5 driver was originally part of XFree86 4.4 rc2. -+ -+ The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: -+ -+ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> -+ -+ o Kevin E. Martin <mailto:kevin@precisioninsight.com> -+ -+ The XFree86 4 driver was funded by ATI and was donated to The XFree86 -+ Project by: -+ -+ Precision Insight, Inc. -+ Cedar Park, TX -+ USA -+ -+ -+ The XFree86 3.3.x driver used for the port was written by: -+ -+ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> -+ -+ o Kevin E. Martin <mailto:kevin@precisioninsight.com> -+ -+ The XFree86 3.3.x driver was funded by ATI and was donated to The -+ XFree86 Project by Precision Insight, Inc. It was based in part on -+ an earlier driver that was written by: -+ -+ o Alan Hourihane <mailto:alanh@fairlite.demon.co.uk> -+ -+ o Dirk Hohndel <mailto:hohndel@suse.de> -+ -+ This early driver was funded and donated to The XFree86 Project by: -+ -+ SuSE GmbH -+ Schanzaekerstr. 10 -+ 90443 Nuernberg -+ Germany -+ -+ -+ -+ http://www.precisioninsight.com -+ -+ http://www.suse.com -+ - - Please submit bugs & patches to the Xorg bugzilla: - -diff --git a/README.r128 b/README.r128 -deleted file mode 100644 -index dcc2715..0000000 ---- a/README.r128 -+++ /dev/null -@@ -1,160 +0,0 @@ -- Information for ATI Rage 128 Users -- Precision Insight, Inc., SuSE GmbH -- 13 June 2000 -- ____________________________________________________________ -- -- Table of Contents -- -- -- 1. Supported Hardware -- 2. Features -- 3. Technical Notes -- 4. Reported Working Video Cards -- 5. Configuration -- 6. Driver Options -- 7. Known Limitations -- 8. Authors -- -- -- ______________________________________________________________________ -- -- [1m1. Supported Hardware[0m -- -- -- +o ATI Rage 128 based cards -- -- -- -- [1m2. Features[0m -- -- -- +o Full support (including hardware accelerated 2D drawing) for 8, 15, -- 16, 24 bit pixel depths. -- -- +o Hardware cursor support to reduce sprite flicker. -- -- +o Support for high resolution video modes up to 1800x1440 @ 70Hz. -- -- +o Support for doublescan video modes (e.g., 320x200 and 320x240). -- -- +o Support for gamma correction at all pixel depths. -- -- +o Fully programmable clock supported. -- -- +o Robust text mode restore for VT switching. -- -- -- -- [1m3. Technical Notes[0m -- -- -- +o None -- -- -- -- [1m4. Reported Working Video Cards[0m -- -- -- +o Rage Fury AGP 32MB -- -- +o XPERT 128 AGP 16MB -- -- +o XPERT 99 AGP 8MB -- -- -- -- [1m5. Configuration[0m -- -- The driver auto-detects all device information necessary to initialize -- the card. The only lines you need in the "Device" section of your -- xorg.conf file are: -- -- Section "Device" -- Identifier "Rage 128" -- Driver "r128" -- EndSection -- -- -- or let xorgconfig do this for you. -- -- However, if you have problems with auto-detection, you can specify: -- -- +o VideoRam - in kilobytes -- -- +o MemBase - physical address of the linear framebuffer -- -- +o IOBase - physical address of the memory mapped IO registers -- -- +o ChipID - PCI DEVICE ID -- -- -- -- [1m6. Driver Options[0m -- -- -- +o "hw_cursor" - request hardware cursor (default) -- -- +o "sw_cursor" - software cursor only -- -- +o "no_accel" - software rendering only -- -- +o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) -- -- +o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) -- -- -- -- [1m7. Known Limitations[0m -- -- -- +o None -- -- -- -- [1m8. Authors[0m -- -- The X11R6.8 driver was originally part of XFree86 4.4 rc2. -- -- The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: -- -- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> -- -- +o Kevin E. Martin <kevin@precisioninsight.com> -- -- The XFree86 4 driver was funded by ATI and was donated to The XFree86 -- Project by: -- -- Precision Insight, Inc. -- Cedar Park, TX -- USA -- -- -- The XFree86 3.3.x driver used for the port was written by: -- -- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> -- -- +o Kevin E. Martin <kevin@precisioninsight.com> -- -- The XFree86 3.3.x driver was funded by ATI and was donated to The -- XFree86 Project by Precision Insight, Inc. It was based in part on -- an earlier driver that was written by: -- -- +o Alan Hourihane <alanh@fairlite.demon.co.uk> -- -- +o Dirk Hohndel <hohndel@suse.de> -- -- This early driver was funded and donated to The XFree86 Project by: -- -- SuSE GmbH -- Schanzaekerstr. 10 -- 90443 Nuernberg -- Germany -- -- -- -- http://www.precisioninsight.com -- -- http://www.suse.com -- -- -- -diff --git a/README.r128.sgml b/README.r128.sgml -deleted file mode 100644 -index 8d7f448..0000000 ---- a/README.r128.sgml -+++ /dev/null -@@ -1,138 +0,0 @@ --<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[ --<!ENTITY % defs SYSTEM "defs.ent"> %defs; --]> -- --<article> --<title>Information for ATI Rage 128 Users --<author>Precision Insight, Inc., SuSE GmbH --<date>13 June 2000 -- --<ident> --</ident> -- --<toc> -- --<sect>Supported Hardware --<p> --<itemize> -- <item>ATI Rage 128 based cards --</itemize> -- -- --<sect>Features --<p> --<itemize> -- <item>Full support (including hardware accelerated 2D drawing) for 8, 15, -- 16, 24 bit pixel depths. -- <item>Hardware cursor support to reduce sprite flicker. -- <item>Support for high resolution video modes up to 1800x1440 @ 70Hz. -- <item>Support for doublescan video modes (e.g., 320x200 and 320x240). -- <item>Support for gamma correction at all pixel depths. -- <item>Fully programmable clock supported. -- <item>Robust text mode restore for VT switching. --</itemize> -- -- --<sect>Technical Notes --<p> --<itemize> -- <item>None --</itemize> -- -- --<sect>Reported Working Video Cards --<p> --<itemize> -- <item>Rage Fury AGP 32MB -- <item>XPERT 128 AGP 16MB -- <item>XPERT 99 AGP 8MB --</itemize> -- -- --<sect>Configuration --<p> --The driver auto-detects all device information necessary to --initialize the card. The only lines you need in the "Device" --section of your xorg.conf file are: --<verb> -- Section "Device" -- Identifier "Rage 128" -- Driver "r128" -- EndSection --</verb> --or let <tt>xorgconfig</tt> do this for you. -- --However, if you have problems with auto-detection, you can specify: --<itemize> -- <item>VideoRam - in kilobytes -- <item>MemBase - physical address of the linear framebuffer -- <item>IOBase - physical address of the memory mapped IO registers -- <item>ChipID - PCI DEVICE ID --</itemize> -- -- --<sect>Driver Options --<p> --<itemize> -- <item>"hw_cursor" - request hardware cursor (default) -- <item>"sw_cursor" - software cursor only -- <item>"no_accel" - software rendering only -- <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default) -- <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) --</itemize> -- -- --<sect>Known Limitations --<p> --<itemize> -- <item>None --</itemize> -- -- --<sect>Authors --<p> --The X11R&relvers; driver was originally part of XFree86 4.4 rc2. -- --The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: --<itemize> -- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> -- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> --</itemize> --<p> --The XFree86 4 driver was funded by ATI and was donated to The XFree86 --Project by: --<verb> -- Precision Insight, Inc. -- Cedar Park, TX -- USA --</verb> --<p> --The XFree86 3.3.x driver used for the port was written by: --<itemize> -- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> -- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> --</itemize> --The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86 --Project by Precision Insight, Inc. It was based in part on an earlier --driver that was written by: --<itemize> -- <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email> -- <item>Dirk Hohndel <email>hohndel@suse.de</email> --</itemize> --<p>This early driver was funded and donated to The XFree86 Project by: --<verb> -- SuSE GmbH -- Schanzaekerstr. 10 -- 90443 Nuernberg -- Germany --</verb> -- --<p> --<htmlurl name="http://www.precisioninsight.com" -- url="http://www.precisioninsight.com"> --<p> --<htmlurl name="http://www.suse.com" -- url="http://www.suse.com"> -- -- --</article> -diff --git a/configure.ac b/configure.ac -index 4e0f463..d5a0821 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,28 +20,30 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-r128], -- 6.8.1, -+ [6.8.1], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-r128) -- -+ [xf86-video-r128]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG --m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.2) -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS - - AM_MAINTAINER_MODE - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - if test "x$GCC" = "xyes"; then - CPPFLAGS="$CPPFLAGS -Wall" -@@ -49,38 +51,35 @@ fi - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], -+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), - [DRI="$enableval"], - [DRI=auto]) - --# Checks for extensions --XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") - AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) -+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- - if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) --AC_SUBST([DRI_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=r128 - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION --XORG_CHECK_LINUXDOC --XORG_CHANGELOG -- - AC_MSG_NOTICE( - [Please change the Driver line in xorg.conf from "ati" to "r128" or install] - [the ati wrapper as well:] - [ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati] - ) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 858ba62..4e22d61 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# 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. --# --# 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 THE OPEN GROUP 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. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# 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. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/r128.man b/man/r128.man -index 5c7c4fe..4ba933d 100644 ---- a/man/r128.man -+++ b/man/r128.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH R128 __drivermansuffix__ __vendorversion__ -diff --git a/src/r128_driver.c b/src/r128_driver.c -index d6448b6..9d08d77 100644 ---- a/src/r128_driver.c -+++ b/src/r128_driver.c -@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn) - /* BIOS */ - from = X_PROBED; - info->BIOSAddr = info->PciInfo->biosBase & 0xfffe0000; -- if (dev->BiosBase) { -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "BIOS address override, using 0x%08lx instead of 0x%08lx\n", -- dev->BiosBase, -- info->BIOSAddr); -- info->BIOSAddr = dev->BiosBase; -- from = X_CONFIG; -- } - if (info->BIOSAddr) { - xf86DrvMsg(pScrn->scrnIndex, from, - "BIOS at 0x%08lx\n", info->BIOSAddr); diff --git a/testing/xf86-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD deleted file mode 100644 index d0c6ed8cc..000000000 --- a/testing/xf86-video-rendition/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 150061 2012-02-12 09:45:29Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-rendition -pkgver=4.2.4 -pkgrel=6 -pkgdesc="X.org Rendition video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool' '!strip') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - rendition-4.2.4-git.patch) -sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565' - 'e023650fa418be9a92d159acd8ac0bc23704dfb3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/rendition-4.2.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so" -} diff --git a/testing/xf86-video-rendition/rendition-4.2.4-git.patch b/testing/xf86-video-rendition/rendition-4.2.4-git.patch deleted file mode 100644 index 26cff2fd3..000000000 --- a/testing/xf86-video-rendition/rendition-4.2.4-git.patch +++ /dev/null @@ -1,809 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5091e50..f74b912 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,45 +20,45 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-rendition], -- 4.2.4, -+ [4.2.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-rendition) -- -+ [xf86-video-rendition]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - - # Checks for libraries. -@@ -78,17 +78,16 @@ fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - # Checks for header files. --AC_HEADER_STDC - AC_CHECK_HEADERS([elf.h] [elf_abi.h]) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=rendition - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/rendition.man b/man/rendition.man -index 3658ab0..afeee91 100644 ---- a/man/rendition.man -+++ b/man/rendition.man -@@ -1,4 +1,3 @@ --.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH RENDITION __drivermansuffix__ __vendorversion__ -diff --git a/src/accelX.c b/src/accelX.c -index a499c56..ed4964e 100644 ---- a/src/accelX.c -+++ b/src/accelX.c -@@ -289,7 +289,7 @@ int - RENDITIONInitUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - if (0 == verite_getstride(pScreenInfo, NULL, - &pRendition->board.mode.stride0, -@@ -367,7 +367,7 @@ void - RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - vu8 memend; - -@@ -410,7 +410,7 @@ void - RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - vu8 memend; - - #ifdef DEBUG -@@ -445,7 +445,7 @@ void - RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - int c; - -@@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo, - int w, int h) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -@@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo, - int x, int y, int w, int h) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -@@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo, - int bias) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob = pRendition->board.io_base; -+ unsigned long iob = pRendition->board.io_base; - - - #ifdef DEBUG -diff --git a/src/rendition.c b/src/rendition.c -index 7a9e18b..3202b49 100644 ---- a/src/rendition.c -+++ b/src/rendition.c -@@ -330,7 +330,7 @@ renditionProbe(DriverPtr drv, int flags) - renditionChipsets, renditionPCIchipsets, - devSections, numDevSections, drv, &usedChips); - -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -359,7 +359,7 @@ renditionProbe(DriverPtr drv, int flags) - foundScreen=TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - return foundScreen; - } -@@ -400,7 +400,7 @@ renditionGetRec(ScrnInfoPtr pScreenInfo) - sleep(1); - #endif - if (!pScreenInfo->driverPrivate) -- pScreenInfo->driverPrivate=xcalloc(sizeof(renditionRec), 1); -+ pScreenInfo->driverPrivate=calloc(sizeof(renditionRec), 1); - - /* perhaps some initialization? <ml> */ - -@@ -421,7 +421,7 @@ renditionFreeRec(ScrnInfoPtr pScreenInfo) - #endif - if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) - vgaHWFreeHWRec(pScreenInfo); -- xfree(pScreenInfo->driverPrivate); -+ free(pScreenInfo->driverPrivate); - pScreenInfo->driverPrivate=NULL; - - #ifdef DEBUG -@@ -596,7 +596,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) - /* collect all of the options flags and process them */ - - xf86CollectOptions(pScreenInfo, NULL); -- if (!(pRendition->Options = xalloc(sizeof(renditionOptions)))) -+ if (!(pRendition->Options = malloc(sizeof(renditionOptions)))) - return FALSE; - memcpy(pRendition->Options, renditionOptions, sizeof(renditionOptions)); - xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, -@@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) - vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ - - pRendition->board.accel=0; -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pRendition->board.vgaio_base = pvgaHW->PIOOffset; -+#else -+ pRendition->board.vgaio_base = 0; -+#endif - pRendition->board.io_base = pRendition->board.vgaio_base - #ifdef XSERVER_LIBPCIACCESS - + pRendition->PciInfo->regions[1].base_addr; -@@ -1167,7 +1171,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pRendition->board.shadowPitch - = BitmapBytePad(pScreenInfo->bitsPerPixel * width); - pRendition->board.shadowPtr -- = xalloc(pRendition->board.shadowPitch * height); -+ = malloc(pRendition->board.shadowPitch * height); - displayWidth = pRendition->board.shadowPitch - / (pScreenInfo->bitsPerPixel >> 3); - FBBase = pRendition->board.shadowPtr; -@@ -1484,7 +1488,7 @@ static xf86MonPtr - renditionDDC (ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 temp; - - xf86MonPtr MonInfo = NULL; -@@ -1517,7 +1521,7 @@ static unsigned int - renditionDDC1Read (ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 value = 0; - - /* wait for Vsync */ -diff --git a/src/v1krisc.c b/src/v1krisc.c -index 2554263..9b7b4e2 100644 ---- a/src/v1krisc.c -+++ b/src/v1krisc.c -@@ -83,20 +83,20 @@ - * local function prototypes - */ - --static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask); --static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask); -+static void verite_iopoll(unsigned long port, vu32 data, vu32 mask); -+static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask); - --static vu32 readRF(IOADDRESS io_base, vu8 index); --static void writeRF(IOADDRESS io_base, vu8 index, vu32 data); -+static vu32 readRF(unsigned long io_base, vu8 index); -+static void writeRF(unsigned long io_base, vu8 index, vu32 data); - --static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type); --static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type); -+static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type); -+static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type); - - #if 0 --static void risc_step(IOADDRESS io_base, vu32 count); -+static void risc_step(unsigned long io_base, vu32 count); - #endif --static void risc_forcestep(IOADDRESS io_base, vu32 instruction); --static void risc_continue(IOADDRESS io_base); -+static void risc_forcestep(unsigned long io_base, vu32 instruction); -+static void risc_continue(unsigned long io_base); - - - -@@ -113,7 +113,7 @@ void - v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - v1k_stop(pScreenInfo); - risc_forcestep(io_base, NOP_INSTR); -@@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - vu8 debugreg, statusreg; -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - vu16 STATUS = 0x4A; /* v2x00 io register offset */ - int c; - -@@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - vu32 c, p1, p2; -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - /* first flush store accumulation buffers so data is all in memory */ - p1=risc_readmem(io_base, 0, READ_WORD); -@@ -255,7 +255,7 @@ void - v1k_softreset(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS io_base=pRendition->board.io_base; -+ unsigned long io_base=pRendition->board.io_base; - - verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC); - verite_out8(io_base+STATEINDEX, STATEINDEX_PC); -@@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc) - */ - - /* -- * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) -+ * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask) - * - * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. - */ - static void --verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) -+verite_iopoll(unsigned long port, vu32 data, vu32 mask) - { - vu32 c; - -@@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask) - - - /* -- * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) -+ * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask) - * - * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached. - */ - static void --verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) -+verite_iopoll8(unsigned long port, vu8 data, vu8 mask) - { - vu32 c; - -@@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask) - - - /* -- * static vu32 readRF(IOADDRESS io_base, vu8 index) -+ * static vu32 readRF(unsigned long io_base, vu8 index) - * - * Reads data from register file. - */ - static vu32 --readRF(IOADDRESS io_base, vu8 index) -+readRF(unsigned long io_base, vu8 index) - { - vu32 data, instr; - vu8 debug, stateindex; -@@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index) - - - /* -- * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data) -+ * static void writeRF(unsigned long io_base, vu8 index, vu32 data) - * - * Set RF register, being careful on how to set regs below 64. - */ - static void --writeRF(IOADDRESS io_base, vu8 index, vu32 data) -+writeRF(unsigned long io_base, vu8 index, vu32 data) - { - vu8 special=0; - -@@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data) - - - /* -- * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) -+ * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) - * - * NOTE: Assumes RISC is in hold mode. - */ - static vu32 --risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) -+risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type) - { - vu32 data; - -@@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type) - - - /* -- * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) -+ * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) - * - * NOTE: Assumes RISC is in hold mode. - */ - static void --risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) -+risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type) - { - writeRF(io_base, RISC_RA, addr); /* point to memory */ - writeRF(io_base, RISC_FP, data); /* set data */ -@@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type) - - #if 0 - /* -- * static void risc_step(IOADDRESS io_base, vu32 count) -+ * static void risc_step(unsigned long io_base, vu32 count) - * - * Single step the RISC. NOTE: Do not force instruction into RISCIR! - */ - static void --risc_step(IOADDRESS io_base, vu32 count) -+risc_step(unsigned long io_base, vu32 count) - { - vu32 c, d; - vu8 debugreg; -@@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count) - - - /* -- * static void risc_forcestep(IOADDRESS io_base, vu32 instruction) -+ * static void risc_forcestep(unsigned long io_base, vu32 instruction) - * - * Single step RISC; force instruction; assumes RISC held. - */ - static void --risc_forcestep(IOADDRESS io_base, vu32 instruction) -+risc_forcestep(unsigned long io_base, vu32 instruction) - { - vu32 c; - vu8 debugreg, stateindex; -@@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction) - - - /* -- * static void risc_continue(IOADDRESS io_base) -+ * static void risc_continue(unsigned long io_base) - * - * Turn off hold bit. - */ - static void --risc_continue(IOADDRESS io_base) -+risc_continue(unsigned long io_base) - { - vu8 debugreg; - -diff --git a/src/vboard.c b/src/vboard.c -index 49499e2..622715f 100644 ---- a/src/vboard.c -+++ b/src/vboard.c -@@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); - -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu8 *vmb; - vu32 offset; - vu8 memendian; -@@ -207,7 +207,7 @@ void - verite_check_csucode(ScrnInfoPtr pScreenInfo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu8 *vmb; - vu32 offset; - int c; -diff --git a/src/vgafont-std.data b/src/vgafont-std.data -index db63ea8..c47983f 100644 ---- a/src/vgafont-std.data -+++ b/src/vgafont-std.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */ - #ifndef __VGAFONT_STD__ - #define __VGAFONT_STD__ - -diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data -index ad34582..23b5908 100644 ---- a/src/vgafont-vrx.data -+++ b/src/vgafont-vrx.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */ - #ifndef __VGAFONT_VRX__ - #define __VGAFONT_VRX__ - -diff --git a/src/vgapalette.data b/src/vgapalette.data -index 5267608..106028d 100644 ---- a/src/vgapalette.data -+++ b/src/vgapalette.data -@@ -1,4 +1,3 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */ - #ifndef __VGAPALETTE__ - #define __VGAPALETTE__ - -diff --git a/src/vloaduc.c b/src/vloaduc.c -index 67bf901..5c6aab0 100644 ---- a/src/vloaduc.c -+++ b/src/vloaduc.c -@@ -103,7 +103,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - sz=SW16(ehdr.e_phentsize); - num=SW16(ehdr.e_phnum); - if (0!=sz && 0!=num) { -- orig_pphdr=pphdr=(Elf32_Phdr *)xalloc(sz*num); -+ orig_pphdr=pphdr=(Elf32_Phdr *)malloc(sz*num); - if (!pphdr) { - ErrorF("RENDITION: Cannot allocate global memory (1)\n"); - close(fd); -@@ -125,7 +125,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - sz=SW16(ehdr.e_shentsize); - num=SW16(ehdr.e_shnum); - if (0!=sz && 0!=num) { -- orig_pshdr=pshdr=(Elf32_Shdr *)xalloc(sz*num); -+ orig_pshdr=pshdr=(Elf32_Shdr *)malloc(sz*num); - if (!pshdr) { - ErrorF("RENDITION: Cannot allocate global memory (2)\n"); - close(fd); -@@ -148,7 +148,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - loadSegment2board(pScreenInfo, fd, pphdr); - pphdr=(Elf32_Phdr *)(((char *)pphdr)+sz); - } while (--num); -- xfree(orig_pphdr); -+ free(orig_pphdr); - } - else { - do { -@@ -158,7 +158,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name) - loadSection2board(pScreenInfo, fd, pshdr); - pshdr=(Elf32_Shdr *)(((char *)pshdr)+sz); - } while (--num) ; -- xfree(orig_pshdr); -+ free(orig_pshdr); - } - close(fd); - -@@ -195,7 +195,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr) - return; - } - -- data=(vu8 *)xalloc(size); -+ data=(vu8 *)malloc(size); - if (NULL == data){ - ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes", - (unsigned long)size); -@@ -210,7 +210,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr) - - mmve(pScreenInfo, size, data, physAddr); - -- xfree(data); -+ free(data); - } - - -diff --git a/src/vmodes.c b/src/vmodes.c -index c0bd0df..f2dae0b 100644 ---- a/src/vmodes.c -+++ b/src/vmodes.c -@@ -20,6 +20,7 @@ - #include "v1kregs.h" - #include "v2kregs.h" - -+#include <unistd.h> - - #undef DEBUG - -@@ -201,7 +202,7 @@ struct V1000ClocksStr { - * local function prototypes - */ - --static void set_PLL(IOADDRESS iob, vu32 value); -+static void set_PLL(unsigned long iob, vu32 value); - static double V1000CalcClock(double target, int *M, int *N, int *P); - static double V2200CalcClock(double target, int *m, int *n, int *p); - -@@ -509,13 +510,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width, - */ - - /* -- * void set_PLL(IOADDRESS iob, vu32 value) -+ * void set_PLL(unsigned long iob, vu32 value) - * - * Set PLL clock to desired frequency for the V1000. - */ - - void --set_PLL(IOADDRESS iob, vu32 value) -+set_PLL(unsigned long iob, vu32 value) - { - vu32 ulD; - int b; -diff --git a/src/vos.h b/src/vos.h -index 7b55f77..999c870 100644 ---- a/src/vos.h -+++ b/src/vos.h -@@ -23,18 +23,18 @@ - /* - * function prototypes - */ --#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \ -+#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \ - outb(port, data) - --#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \ -+#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \ - outw(port, data) - --#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \ -+#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \ - outl(port, data) - --#define /*vu8*/ verite_in8(/*IOADDRESS*/ io_base) ((vu8)inb(io_base)) --#define /*vu16*/ verite_in16(/*IOADDRESS*/ io_base) ((vu16)inw(io_base)) --#define /*vu32*/ verite_in32(/*IOADDRESS*/ io_base) ((vu32)inl(io_base)) -+#define /*vu8*/ verite_in8(/*unsigned long*/ io_base) ((vu8)inb(io_base)) -+#define /*vu16*/ verite_in16(/*unsigned long*/ io_base) ((vu16)inw(io_base)) -+#define /*vu32*/ verite_in32(/*unsigned long*/ io_base) ((vu32)inl(io_base)) - - /* memory accesses */ - #define verite_read_memory32(base, offset) MMIO_IN32(base, offset) -diff --git a/src/vramdac.c b/src/vramdac.c -index 7c8acbd..21c1df7 100644 ---- a/src/vramdac.c -+++ b/src/vramdac.c -@@ -93,11 +93,11 @@ - * local function prototypes - */ - --static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data); --static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data); -+static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data); -+static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data); - #if 0 --static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask); --static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask); -+static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask); -+static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask); - #endif - - /* -@@ -159,7 +159,7 @@ int - verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - vu8 cmd0,cmd1,cmd2; - vu8 cmd3_data=0; - -@@ -271,7 +271,7 @@ verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size) - BT485_3_COLOR_CURSOR, BT485_X_WINDOW_CURSOR }; - static vu8 csizes[]={ BT485_32_BY_32_CURSOR, BT485_64_BY_64_CURSOR }; - -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - #ifdef DEBUG - ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type); -@@ -304,7 +304,7 @@ void - verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - x+=Cursor_size-xo; - y+=Cursor_size-yo; -@@ -327,7 +327,7 @@ void - verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - - #ifdef DEBUG - ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n", -@@ -374,7 +374,7 @@ verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage) - int c, bytes, row; - vu8 *src = cursorimage; - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR; -+ unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR; - vu8 tmp; - vu8 memend; /* Added for byte-swap fix */ - -@@ -454,7 +454,7 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices, - LOCO *colors, VisualPtr pVisual) - { - renditionPtr pRendition = RENDITIONPTR(pScreenInfo); -- IOADDRESS iob=pRendition->board.io_base; -+ unsigned long iob=pRendition->board.io_base; - vu32 crtc_status; - int i, index; - -@@ -485,12 +485,12 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices, - */ - - /* -- * static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) -+ * static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data) - * - * - */ - static void --Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) -+Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data) - { - vu8 tmp; - -@@ -501,12 +501,12 @@ Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data) - - - /* -- * static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) -+ * static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data) - * - * - */ - static void --Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) -+Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data) - { - /* - * Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80); -@@ -522,24 +522,24 @@ Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data) - - #if 0 - /* -- * static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask) -+ * static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask) - * - * - */ - static vu8 --Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask) -+Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask) - { - return verite_in8(port+reg)&mask; - } - - - /* -- * static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask) -+ * static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask) - * - * - */ - static vu8 --Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask) -+Bt485_read_cmd3_masked(unsigned long port, vu8 mask) - { - vu8 value; - -diff --git a/src/vtypes.h b/src/vtypes.h -index 257870b..e4ad468 100644 ---- a/src/vtypes.h -+++ b/src/vtypes.h -@@ -123,7 +123,7 @@ struct verite_board_t { - vu16 chip; - - /* */ -- IOADDRESS io_base, vgaio_base; -+ unsigned long io_base, vgaio_base; - vu32 mmio_base; - vu32 vmmio_base; - vu32 mem_size; diff --git a/testing/xf86-video-s3/LICENSE b/testing/xf86-video-s3/LICENSE deleted file mode 100644 index a4c8d5dd4..000000000 --- a/testing/xf86-video-s3/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - - XFree86 4.x driver for S3 chipsets - - -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 Ani Joshi not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. Ani Joshi makes no representations -about the suitability of this software for any purpose. It is provided -"as-is" without express or implied warranty. - -ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL ANI JOSHI 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/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD deleted file mode 100644 index 969a50529..000000000 --- a/testing/xf86-video-s3/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 150063 2012-02-12 09:45:32Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-s3 -pkgver=0.6.3 -pkgrel=7 -pkgdesc="X.org S3 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -md5sums=('5eb06d88533fb327d067928faeb20860' - '77a455ce7e254c73b1cbd408c7f4ecf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xf86-video-s3/git-fixes.patch b/testing/xf86-video-s3/git-fixes.patch deleted file mode 100644 index 712b3c9c0..000000000 --- a/testing/xf86-video-s3/git-fixes.patch +++ /dev/null @@ -1,458 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..458ab5f 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,70 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+ Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - --Please submit updated COPYING files to the Xorg bugzilla: -+ XFree86 4.x driver for S3 chipsets - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+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 Ani Joshi not be used in advertising or -+publicity pertaining to distribution of the software without specific, -+written prior permission. Ani Joshi makes no representations -+about the suitability of this software for any purpose. It is provided -+"as-is" without express or implied warranty. -+ -+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL ANI JOSHI 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. -+Copyright 2007 George Sapountzis -+ -+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. -+ -+Copyright (C) 1994-2000 The XFree86 Project, Inc. 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, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT 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. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+ -+Copyright 1995-1997 The XFree86 Project, Inc. -+Copyright (c) 1999,2000 The XFree86 Project Inc. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index ad0b227..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,133 +0,0 @@ --2009-06-25 Evgeny M. zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- Revert the old behaviour when the BIOS settings are used for -- intialization of DRAM/VRAM timings, i. e. we don't touch the -- timings during initialization phase until any memory option (like -- slow_edodram) is specified. -- -- Add manual page. -- --2009-05-25 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_video.c: -- -- Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for -- testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by -- overriding Chipset with "Trio64UV+" but not on real hardware). -- -- S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId -- as Trio32/64 but only with chip revision greater or eq 0x40. So if -- you have problems with NewMMIO, you may override ChipRev in "Device" -- section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO -- also disables overlay video (Xv) because it isn't implemented for -- Old MMIO yet. -- --2009-05-04 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_shadow.c: -- -- Add shadowFB option. It can be used to speedup drawing when -- hardware acceleration is undesirable or unavailable (for colour depth -- 24 with 24 bpp framebuffer, for example). shadowFB is disabled by -- default. Enabling shadowFB option disables HW acceleration. Thanks -- to Egor Ivanov for initial porting of shadowFB from s3virge. -- -- Interlace mode support. -- -- Close bug #14999. -- --2008-07-06 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_video.c: -- -- Streams Processor initialization. -- -- XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). -- -- * src/s3_driver.c: -- -- Add XVideo option (enabled by default). -- -- Replace "swcursor" by "hwcursor" option (HW cursor -- not implemented yet for all chipsets). -- -- Close bug #5527: 24-bit colour depth support (24bpp and -- 32bpp framebuffer) for TRIOs. Acceleration doesn't work -- with packed colour mode (24 bpp FB) but works with 32bpp -- framebuffer mode (hardware limitation? -- need data). -- -- Fix system hang-up when switching between console and X session. -- -- Some minor changes of driver messages. -- --2008-02-23 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly -- others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64 -- * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make -- the 1024x768@16bpp mode work. -- Thanks to Richard Driscoll for these patches. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- Bump to 0.4.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/s3_video.c: (S3PutImage): -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- * src/s3_IBMRGB.c: -- * src/s3_Ti.c: -- * src/s3_Trio64DAC.c: -- * src/s3_bios.c: -- * src/s3_cursor.c: -- * src/s3_dga.c: -- * src/s3_driver.c: -- * src/s3_video.c: -- Unlibcwrap. Bump server version requirement. Bump to 0.4.0. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 7052905..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,5 +18,15 @@ - # 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. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL -+ -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index 0eecc87..0ac34f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,42 +20,50 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-s3], -- 0.6.3, -+ [0.6.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-s3) -- -+ [xf86-video-s3]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC -+ -+# Checks for programs. -+AM_PROG_CC_C_O - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" - --# Checks for header files. --AC_HEADER_STDC -- - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=s3 - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --XORG_CHECK_LINUXDOC -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# 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. --# --# 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 THE OPEN GROUP 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. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# 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. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/src/s3.h b/src/s3.h -index 49b8a54..0875fc9 100644 ---- a/src/s3.h -+++ b/src/s3.h -@@ -113,7 +113,6 @@ typedef struct _S3Rec { - XAAInfoRecPtr pXAA; - xf86CursorInfoPtr pCurs; - xf86Int10InfoPtr pInt10; -- vbeInfoPtr pVBE; - XF86VideoAdaptorPtr adaptor; - S3PortPrivPtr portPrivate; - -diff --git a/src/s3_driver.c b/src/s3_driver.c -index 29e343d..4519b33 100644 ---- a/src/s3_driver.c -+++ b/src/s3_driver.c -@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - S3Ptr pS3; - vgaHWPtr hwp; - ClockRangePtr clockRanges; -+ vbeInfoPtr pVBE; - rgb zeros = {0, 0, 0}; - Gamma gzeros = {0.0, 0.0, 0.0}; - int i, vgaCRIndex, vgaCRReg; -@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - } - - if (xf86LoadSubModule(pScrn, "vbe")) { -- pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ vbeFree(pVBE); - } - - if (pS3->shadowFB) { diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD deleted file mode 100644 index 04d446f53..000000000 --- a/testing/xf86-video-s3virge/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 150065 2012-02-12 09:45:34Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-s3virge -pkgver=1.10.4 -pkgrel=7 -pkgdesc="X.org S3 Virge video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - copyright.patch - s3virge-1.10.4-vga.patch) -md5sums=('6517bbbf808c700502d51acdc44662f8' - 'f91fb259e3632fb9130fcbe69ecd9d6a' - '45c7d912734c9f7dfc1f42077827cb8e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" - patch -Np1 -i ${srcdir}/s3virge-1.10.4-vga.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-s3virge/copyright.patch b/testing/xf86-video-s3virge/copyright.patch deleted file mode 100644 index ba988c6d6..000000000 --- a/testing/xf86-video-s3virge/copyright.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Sun, 13 Jun 2010 14:26:32 +0000 -Subject: COPYING: update file with Copyright notices from source code. - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/COPYING b/COPYING -index 7f33cbf..727ca51 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,60 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. - --Please submit updated COPYING files to the Xorg bugzilla: -+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: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT 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. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry, -+NH - All Rights Reserved -+ -+This code may be freely incorporated in any program without royalty, as long -+as the copyright notice stays intact. -+ -+Additions by Kevin E. Martin (martin@cs.unc.edu) -+ -+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL KEVIN E. MARTIN 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. -+ -+Copyright 2007 George Sapountzis -+ -+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. - --http://lists.freedesktop.org/mailman/listinfo/xorg --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch deleted file mode 100644 index 3fb1fd6cf..000000000 --- a/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 16 Nov 2011 19:58:29 +0000 -Subject: Adapt to missing PIOOffset in videoabi 12 - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/s3v_driver.c b/src/s3v_driver.c -index 2ced9ac..0f754dd 100644 ---- a/src/s3v_driver.c -+++ b/src/s3v_driver.c -@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - S3VPtr ps3v; - IOADDRESS vgaCRIndex, vgaCRReg; - unsigned char val; -- -+ unsigned int PIOOffset = 0; -+ - PVERB5(" S3VEnableMmio\n"); - - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); -+ -+#if ABI_VIDEODRV_VERSION < 12 -+ PIOOffset = hwp->PIOOffset; -+#endif -+ - /* - * enable chipset (seen on uninitialized secondary cards) - * might not be needed once we use the VGA softbooter -@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - * to be set correctly already and MMIO _has_ to be - * enabled. - */ -- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/ -- outb(hwp->PIOOffset + 0x3C3, val | 0x01); -+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/ -+ outb(PIOOffset + 0x3C3, val | 0x01); - /* - * set CR registers to color mode - * in mono mode extended CR registers - * are not accessible. (EE 05/04/99) - */ -- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01); -+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01); - vgaHWGetIOBase(hwp); /* Get VGA I/O base */ -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = PIOOffset + hwp->IOBase + 4; - vgaCRReg = vgaCRIndex + 1; - #if 1 - /* -@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - /* Enable new MMIO, if TRIO mmio is already */ - /* enabled, then it stays enabled. */ - outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08); -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val); -+ outb(PIOOffset + VGA_MISC_OUT_W, val); - if (S3_TRIO_3D_SERIES(ps3v->Chipset)) { - outb(vgaCRIndex, 0x40); - val = inb(vgaCRReg); -@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn) - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); - -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = hwp->IOBase + 4; -+#if ABI_VIDEODRV_VERSION < 12 -+ vgaCRIndex += hwp->PIOOffset; -+#endif - vgaCRReg = vgaCRIndex + 1; - outb(vgaCRIndex, 0x53); - /* Restore register's original state */ --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD deleted file mode 100644 index 74cb1514d..000000000 --- a/testing/xf86-video-savage/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 150182 2012-02-14 09:08:45Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-savage -pkgver=2.3.3 -pkgrel=3 -_gitver=c4022796ec69bb3223d435d8442f9168aebe9c3d -pkgdesc="X.org savage video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') # 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903' 'savage-dri') -options=(!libtool !makeflags) -groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/snapshot/xf86-video-savage-${_gitver}.tar.gz - ftp://ftp..archlinux.org/other/xf86-video-savage/xf86-video-savage-${_gitver}.tar.gz) -md5sums=('3a7921de0d365ab5dd1af15010807e36') - -build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - autoreconf -fi - ./configure --prefix=/usr --disable-dri - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-siliconmotion/PKGBUILD b/testing/xf86-video-siliconmotion/PKGBUILD deleted file mode 100644 index 8780c4996..000000000 --- a/testing/xf86-video-siliconmotion/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 150069 2012-02-12 09:45:39Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-siliconmotion -pkgver=1.7.5 -pkgrel=4 -pkgdesc="X.org siliconmotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - smi-1.7.5-vga.patch) -sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' - '50b0e4aa858d7f8eb6f7e826f62fde23f01afe48') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/smi-1.7.5-vga.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/testing/xf86-video-siliconmotion/smi-1.7.5-vga.patch deleted file mode 100644 index ef353f0df..000000000 --- a/testing/xf86-video-siliconmotion/smi-1.7.5-vga.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 16 Nov 2011 20:03:25 +0000 -Subject: Adapt to missing PIOOffset in videoabi 12 - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/smi_driver.c b/src/smi_driver.c -index 9c10e46..86644c7 100644 ---- a/src/smi_driver.c -+++ b/src/smi_driver.c -@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) - LEAVE(FALSE); - - hwp = VGAHWPTR(pScrn); -+#if ABI_VIDEODRV_VERSION < 12 - pSmi->PIOBase = hwp->PIOOffset; -+#else -+ pSmi->PIOBase = 0; -+#endif - - xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " - "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET, --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD deleted file mode 100644 index 04bb1d6a0..000000000 --- a/testing/xf86-video-sis/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 150127 2012-02-13 07:58:15Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sis -pkgver=0.10.3 -pkgrel=7 -pkgdesc="X.org SiS video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-f5dafa24.patch) -sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5' - 'b61c6a78723aa59f8c82152fec42475b611cd1e7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-f5dafa24.patch" - libtoolize --force --copy - aclocal - autoconf - automake - - ./configure --prefix=/usr --disable-dri - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-sis/git-f5dafa24.patch b/testing/xf86-video-sis/git-f5dafa24.patch deleted file mode 100644 index 8c15b974b..000000000 --- a/testing/xf86-video-sis/git-f5dafa24.patch +++ /dev/null @@ -1,1654 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 33c0d65..62ad933 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,54 +20,53 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-sis], -- 0.10.3, -+ [0.10.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-sis) -- -+ [xf86-video-sis]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC --XORG_PROG_RAWCPP - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], -+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), - [DRI="$enableval"], - [DRI=auto]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) -+# Obtain compiler/linker options for the driver dependencies -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") -@@ -76,9 +75,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- - if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -@@ -103,8 +99,8 @@ AC_MSG_RESULT([$DRI]) - AM_CONDITIONAL(DRI, test x$DRI = xyes) - if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) -- AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) -- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) -+ AC_DEFINE(SISDRI,1,[Enable DRI driver support]) -+ AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support]) - fi - - # technically this should be a configure flag. meh. -@@ -118,20 +114,19 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - CPPFLAGS="$SAVE_CPPFLAGS" - - if test "x$XSERVER_LIBPCIACCESS" = xyes; then -- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901]) - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([DRI_CFLAGS]) --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=sis - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 1b26ac2..9ceb36f 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MANDEFS = \ -- -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ -- -D__appmansuffix__=$(APP_MAN_SUFFIX) \ -- -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ -- -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -- -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -- -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ -- -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ -- -D__xconfigfile__=xorg.conf \ -- -D__xservername__=Xorg -- --# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM --# to cpp, because that trick does not work on all ANSI C preprocessors. --# Delete line numbers from the cpp output (-P is not portable, I guess). --# Allow XCOMM to be preceded by whitespace and provide a means of generating --# output lines with trailing backslashes. --# Allow XHASH to always be substituted, even in cases where XCOMM isn't. -- --CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ -- -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -- -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -- -e '/^[ ]*XHASH/s/XHASH/\#/' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -- - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - .man.$(DRIVER_MAN_SUFFIX): -- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -diff --git a/man/sis.man b/man/sis.man -index 9ae4a1b..578bb68 100644 ---- a/man/sis.man -+++ b/man/sis.man -@@ -1,17 +1,5 @@ --.\" $XFree86$ --.\" $XdotOrg$ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' --#ifdef __xservername__ --#define __myservername__ __xservername__ --#else --#define __myservername__ XFree86 --#endif --#ifdef __xconfigfile__ --#define __myxconfigfile__ __xconfigfile__ --#else --#define __myxconfigfile__ XF86Config --#endif - .TH SIS __drivermansuffix__ __vendorversion__ - .SH NAME - sis \- SiS and XGI video driver -@@ -25,7 +13,7 @@ sis \- SiS and XGI video driver - .fi - .SH DESCRIPTION - .B sis --is an __myservername__ driver for SiS (Silicon Integrated Systems) and XGI video -+is an __xservername__ driver for SiS (Silicon Integrated Systems) and XGI video - chips. The driver is accelerated and provides support for colordepths of 8, 16 - and 24 bpp. XVideo, Render and other extensions are supported as well. - .SH SUPPORTED HARDWARE -@@ -60,7 +48,7 @@ for SiS315, 55x, 330, 661/741/76x (plus M, FX, MX, GX variants thereof), 340 - and all XGI chips. - .PP - .SH CONFIGURATION DETAILS --Please refer to __myxconfigfile__(__filemansuffix__) for general configuration -+Please refer to __xconfigfile__(__filemansuffix__) for general configuration - details. This section only covers configuration details specific to this - driver. - .PP -@@ -428,11 +416,7 @@ The amount is to be specified in megabyte, the default is 8. - .SH "KNOWN BUGS" - none. - .SH "SEE ALSO" --#ifdef __xservername__ - __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) --#else --XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) --#endif - .PP - .B "http://www.winischhofer.eu/linuxsisvga.shtml" - for more information and updates -diff --git a/src/initextx.c b/src/initextx.c -index 5c00398..1e84d0f 100644 ---- a/src/initextx.c -+++ b/src/initextx.c -@@ -238,10 +238,10 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo - continue; - } - -- if(!(new = xalloc(sizeof(DisplayModeRec)))) return first; -+ if(!(new = malloc(sizeof(DisplayModeRec)))) return first; - memset(new, 0, sizeof(DisplayModeRec)); -- if(!(new->name = xalloc(10))) { -- xfree(new); -+ if(!(new->name = malloc(10))) { -+ free(new); - return first; - } - if(!first) first = new; -@@ -385,11 +385,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo - } - } - -- if(!(new = xalloc(sizeof(DisplayModeRec)))) return first; -+ if(!(new = malloc(sizeof(DisplayModeRec)))) return first; - - memset(new, 0, sizeof(DisplayModeRec)); -- if(!(new->name = xalloc(12))) { -- xfree(new); -+ if(!(new->name = malloc(12))) { -+ free(new); - return first; - } - if(!first) first = new; -@@ -470,11 +470,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo - - if(pSiS->SiS_Pr->CP_DataValid[i]) { - -- if(!(new = xalloc(sizeof(DisplayModeRec)))) return first; -+ if(!(new = malloc(sizeof(DisplayModeRec)))) return first; - - memset(new, 0, sizeof(DisplayModeRec)); -- if(!(new->name = xalloc(10))) { -- xfree(new); -+ if(!(new->name = malloc(10))) { -+ free(new); - return first; - } - if(!first) first = new; -diff --git a/src/osdef.h b/src/osdef.h -index cd6b907..5776910 100644 ---- a/src/osdef.h -+++ b/src/osdef.h -@@ -110,12 +110,12 @@ - #warning sisfb will not work! - #endif - --#define OutPortByte(p,v) outb((u8)(v),(IOADDRESS)(p)) --#define OutPortWord(p,v) outw((u16)(v),(IOADDRESS)(p)) --#define OutPortLong(p,v) outl((u32)(v),(IOADDRESS)(p)) --#define InPortByte(p) inb((IOADDRESS)(p)) --#define InPortWord(p) inw((IOADDRESS)(p)) --#define InPortLong(p) inl((IOADDRESS)(p)) -+#define OutPortByte(p,v) outb((u8)(v),(unsigned long)(p)) -+#define OutPortWord(p,v) outw((u16)(v),(unsigned long)(p)) -+#define OutPortLong(p,v) outl((u32)(v),(unsigned long)(p)) -+#define InPortByte(p) inb((unsigned long)(p)) -+#define InPortWord(p) inw((unsigned long)(p)) -+#define InPortLong(p) inl((unsigned long)(p)) - #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) - - #endif /* LINUX_KERNEL */ -@@ -129,12 +129,12 @@ - #define SIS300 - #define SIS315H - --#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v)) --#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v)) --#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v)) --#define InPortByte(p) inSISREG((IOADDRESS)(p)) --#define InPortWord(p) inSISREGW((IOADDRESS)(p)) --#define InPortLong(p) inSISREGL((IOADDRESS)(p)) -+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v)) -+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v)) -+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v)) -+#define InPortByte(p) inSISREG((unsigned long)(p)) -+#define InPortWord(p) inSISREGW((unsigned long)(p)) -+#define InPortLong(p) inSISREGL((unsigned long)(p)) - #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize) - - #endif /* XF86 */ -diff --git a/src/sis.h b/src/sis.h -index 400b83f..f2ca3a9 100644 ---- a/src/sis.h -+++ b/src/sis.h -@@ -86,6 +86,14 @@ - #include "xf86cmap.h" - #include "vbe.h" - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+#define _swapl(x, n) swapl(x,n) -+#define _swaps(x, n) swaps(x,n) -+#else -+#define _swapl(x, n) swapl(x) -+#define _swaps(x, n) swaps(x) -+#endif -+ - #define SIS_HaveDriverFuncs 0 - - #undef SISISXORG6899900 -@@ -173,7 +181,13 @@ - - #undef SISHAVEDRMWRITE - #undef SISNEWDRI --#ifdef XF86DRI -+ -+/* if the server was built without DRI support, force-disable DRI */ -+#ifndef XF86DRI -+#undef SISDRI -+#endif -+ -+#ifdef SISDRI - #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0) - #define SISHAVEDRMWRITE - #endif -@@ -187,7 +201,7 @@ - #include "dri.h" - #include "GL/glxint.h" - #include "sis_dri.h" --#endif /* XF86DRI */ -+#endif /* SISDRI */ - - /* Configurable stuff: ------------------------------------- */ - -@@ -251,7 +265,6 @@ - #endif - - /* Need that for SiSCtrl and Pseudo-Xinerama */ --#define NEED_REPLIES /* ? */ - #define EXTENSION_PROC_ARGS void * - #include "extnsionst.h" /* required */ - #include <X11/extensions/panoramiXproto.h> /* required */ -@@ -805,7 +818,7 @@ typedef struct { - ScrnInfoPtr pScrn_2; - UChar *BIOS; - struct SiS_Private *SiS_Pr; --#ifdef XF86DRI -+#ifdef SISDRI - SISAGPHTYPE agpHandle; - ULong agpAddr; - UChar *agpBase; -@@ -971,7 +984,7 @@ typedef struct { - void *RealFbBase; /* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */ - CARD32 IOAddress; /* MMIO physical address */ - void *IOBase; /* MMIO linear address */ -- IOADDRESS IODBase; /* Base of PIO memory area */ -+ unsigned long IODBase; /* Base of PIO memory area */ - #ifdef __alpha__ - void *IOBaseDense; /* MMIO for Alpha platform */ - #endif -@@ -1085,7 +1098,7 @@ typedef struct { - unsigned int cmdQueueSize_div2; - unsigned int cmdQueueSize_div4; - unsigned int cmdQueueSize_4_3; --#ifdef XF86DRI -+#ifdef SISDRI - SISAGPHTYPE agpHandle; - ULong agpAddr; - UChar *agpBase; -@@ -1144,7 +1157,7 @@ typedef struct { - - /* DRI */ - Bool loadDRI; --#ifdef XF86DRI -+#ifdef SISDRI - Bool directRenderingEnabled; - DRIInfoPtr pDRIInfo; - int drmSubFD; -@@ -1348,7 +1361,7 @@ typedef struct { - Bool skipswitchcheck; - unsigned int VBFlagsInit; - DisplayModePtr currentModeLast; -- IOADDRESS MyPIOOffset; -+ unsigned long MyPIOOffset; - Bool OverruleRanges; - Bool BenchMemCpy; - Bool NeedCopyFastVidCpy; -diff --git a/src/sis6326_video.c b/src/sis6326_video.c -index c6b18e2..66352b7 100644 ---- a/src/sis6326_video.c -+++ b/src/sis6326_video.c -@@ -170,7 +170,7 @@ void SIS6326InitVideo(ScreenPtr pScreen) - adaptors = &newAdaptor; - } else { - /* need to free this someplace */ -- newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -185,7 +185,7 @@ void SIS6326InitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - } - - /* client libraries expect an encoding */ -@@ -531,7 +531,7 @@ SIS6326SetupImageVideo(ScreenPtr pScreen) - return NULL; - #endif - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(SISPortPrivRec) + - sizeof(DevUnion)))) - return NULL; -diff --git a/src/sis_dga.c b/src/sis_dga.c -index d358645..16b0ee4 100644 ---- a/src/sis_dga.c -+++ b/src/sis_dga.c -@@ -150,18 +150,18 @@ SISSetupDGAMode( - - if(pMode->HDisplay != otherPitch) { - -- newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - - } else { - -- newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return NULL; - } - modes = newmodes; -diff --git a/src/sis_dri.c b/src/sis_dri.c -index 3a476a2..97ed951 100644 ---- a/src/sis_dri.c -+++ b/src/sis_dri.c -@@ -149,19 +149,19 @@ SISInitVisualConfigs(ScreenPtr pScreen) - case 32: - numConfigs = (useZ16) ? 8 : 16; - -- if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig), -+ if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig), - numConfigs))) { - return FALSE; - } -- if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec), -+ if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec), - numConfigs))) { -- xfree(pConfigs); -+ free(pConfigs); - return FALSE; - } -- if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr), -+ if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr), - numConfigs))) { -- xfree(pConfigs); -- xfree(pSISConfigs); -+ free(pConfigs); -+ free(pSISConfigs); - return FALSE; - } - for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i]; -@@ -319,7 +319,7 @@ SISDRIScreenInit(ScreenPtr pScreen) - pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo); - } else { - #endif -- pDRIInfo->busIdString = xalloc(64); -+ pDRIInfo->busIdString = malloc(64); - sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", - pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc); - #ifdef SISHAVECREATEBUSID -@@ -383,7 +383,7 @@ SISDRIScreenInit(ScreenPtr pScreen) - pDRIInfo->SAREASize = SAREA_MAX; - #endif - -- if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) { -+ if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) { - DRIDestroyInfoRec(pSIS->pDRIInfo); - pSIS->pDRIInfo = 0; - return FALSE; -@@ -401,7 +401,7 @@ SISDRIScreenInit(ScreenPtr pScreen) - - if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) { - xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n"); -- xfree(pDRIInfo->devPrivate); -+ free(pDRIInfo->devPrivate); - pDRIInfo->devPrivate = 0; - DRIDestroyInfoRec(pSIS->pDRIInfo); - pSIS->pDRIInfo = 0; -@@ -794,7 +794,7 @@ SISDRICloseScreen(ScreenPtr pScreen) - - if(pSIS->pDRIInfo) { - if(pSIS->pDRIInfo->devPrivate) { -- xfree(pSIS->pDRIInfo->devPrivate); -+ free(pSIS->pDRIInfo->devPrivate); - pSIS->pDRIInfo->devPrivate = NULL; - } - DRIDestroyInfoRec(pSIS->pDRIInfo); -@@ -802,12 +802,12 @@ SISDRICloseScreen(ScreenPtr pScreen) - } - - if(pSIS->pVisualConfigs) { -- xfree(pSIS->pVisualConfigs); -+ free(pSIS->pVisualConfigs); - pSIS->pVisualConfigs = NULL; - } - - if(pSIS->pVisualConfigsPriv) { -- xfree(pSIS->pVisualConfigsPriv); -+ free(pSIS->pVisualConfigsPriv); - pSIS->pVisualConfigsPriv = NULL; - } - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index d95b5f1..7a5be4e 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -74,8 +74,7 @@ - - #include "sis_driver.h" - --#define _XF86DGA_SERVER_ --#include <X11/extensions/xf86dgastr.h> -+#include <X11/extensions/xf86dgaproto.h> - - #include "globals.h" - -@@ -86,11 +85,35 @@ - #include <X11/extensions/dpms.h> - #endif - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 -+#include <inputstr.h> /* for inputInfo */ -+#endif -+ - --#ifdef XF86DRI -+#ifdef SISDRI - #include "dri.h" - #endif - -+/* -+ * LookupWindow was removed with video abi 11. -+ */ -+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4) -+#ifndef DixGetAttrAccess -+#define DixGetAttrAccess (1<<4) -+#endif -+#endif -+ -+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 2) -+static inline int -+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access) -+{ -+ *pWin = LookupWindow(id, client); -+ if (!*pWin) -+ return BadWindow; -+ return Success; -+} -+#endif -+ - /* Globals (yes, these ARE really required to be global) */ - - #ifdef SISUSEDEVPORT -@@ -299,9 +322,9 @@ SISFreeRec(ScrnInfoPtr pScrn) - pSiSEnt = pSiS->entityPrivate; - #endif - -- if(pSiS->pstate) xfree(pSiS->pstate); -+ if(pSiS->pstate) free(pSiS->pstate); - pSiS->pstate = NULL; -- if(pSiS->fonts) xfree(pSiS->fonts); -+ if(pSiS->fonts) free(pSiS->fonts); - pSiS->fonts = NULL; - - #ifdef SISDUALHEAD -@@ -312,11 +335,11 @@ SISFreeRec(ScrnInfoPtr pScrn) - * and we need the BIOS image and SiS_Private for the first - * head. - */ -- if(pSiSEnt->BIOS) xfree(pSiSEnt->BIOS); -+ if(pSiSEnt->BIOS) free(pSiSEnt->BIOS); - pSiSEnt->BIOS = pSiS->BIOS = NULL; -- if(pSiSEnt->SiS_Pr) xfree(pSiSEnt->SiS_Pr); -+ if(pSiSEnt->SiS_Pr) free(pSiSEnt->SiS_Pr); - pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL; -- if(pSiSEnt->RenderAccelArray) xfree(pSiSEnt->RenderAccelArray); -+ if(pSiSEnt->RenderAccelArray) free(pSiSEnt->RenderAccelArray); - pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL; - pSiSEnt->pScrn_1 = NULL; - } else { -@@ -327,21 +350,21 @@ SISFreeRec(ScrnInfoPtr pScrn) - } - } else { - #endif -- if(pSiS->BIOS) xfree(pSiS->BIOS); -+ if(pSiS->BIOS) free(pSiS->BIOS); - pSiS->BIOS = NULL; -- if(pSiS->SiS_Pr) xfree(pSiS->SiS_Pr); -+ if(pSiS->SiS_Pr) free(pSiS->SiS_Pr); - pSiS->SiS_Pr = NULL; -- if(pSiS->RenderAccelArray) xfree(pSiS->RenderAccelArray); -+ if(pSiS->RenderAccelArray) free(pSiS->RenderAccelArray); - pSiS->RenderAccelArray = NULL; - #ifdef SISDUALHEAD - } - #endif - #ifdef SISMERGED -- if(pSiS->CRT2HSync) xfree(pSiS->CRT2HSync); -+ if(pSiS->CRT2HSync) free(pSiS->CRT2HSync); - pSiS->CRT2HSync = NULL; -- if(pSiS->CRT2VRefresh) xfree(pSiS->CRT2VRefresh); -+ if(pSiS->CRT2VRefresh) free(pSiS->CRT2VRefresh); - pSiS->CRT2VRefresh = NULL; -- if(pSiS->MetaModes) xfree(pSiS->MetaModes); -+ if(pSiS->MetaModes) free(pSiS->MetaModes); - pSiS->MetaModes = NULL; - if(pSiS->CRT2pScrn) { - if(pSiS->CRT2pScrn->modes) { -@@ -353,10 +376,10 @@ SISFreeRec(ScrnInfoPtr pScrn) - while(pSiS->CRT2pScrn->monitor->Modes) - xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes); - } -- if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC); -- xfree(pSiS->CRT2pScrn->monitor); -+ if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC); -+ free(pSiS->CRT2pScrn->monitor); - } -- xfree(pSiS->CRT2pScrn); -+ free(pSiS->CRT2pScrn); - pSiS->CRT2pScrn = NULL; - } - if(pSiS->CRT1Modes) { -@@ -366,8 +389,8 @@ SISFreeRec(ScrnInfoPtr pScrn) - do { - DisplayModePtr p = pScrn->currentMode->next; - if(pScrn->currentMode->Private) -- xfree(pScrn->currentMode->Private); -- xfree(pScrn->currentMode); -+ free(pScrn->currentMode->Private); -+ free(pScrn->currentMode); - pScrn->currentMode = p; - } while(pScrn->currentMode != pScrn->modes); - } -@@ -380,7 +403,7 @@ SISFreeRec(ScrnInfoPtr pScrn) - #endif - while(pSiS->SISVESAModeList) { - sisModeInfoPtr mp = pSiS->SISVESAModeList->next; -- xfree(pSiS->SISVESAModeList); -+ free(pSiS->SISVESAModeList); - pSiS->SISVESAModeList = mp; - } - if(pSiS->pVbe) vbeFree(pSiS->pVbe); -@@ -392,7 +415,7 @@ SISFreeRec(ScrnInfoPtr pScrn) - - if(pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -501,7 +524,7 @@ SISProbe(DriverPtr drv, int flags) - numDevSections, drv, &usedChipsXGI); - - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - - numUsed = numUsedSiS + numUsedXGI; - -@@ -577,8 +600,8 @@ SISProbe(DriverPtr drv, int flags) - - } - -- if(usedChipsSiS) xfree(usedChipsSiS); -- if(usedChipsXGI) xfree(usedChipsXGI); -+ if(usedChipsSiS) free(usedChipsSiS); -+ if(usedChipsXGI) free(usedChipsXGI); - - return foundScreen; - } -@@ -642,10 +665,10 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - if(!(nramp = xf86GetGammaRampSize(pScreen))) return; - - for(i=0; i<3; i++) { -- ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort)); -+ ramp[i] = (UShort *)malloc(nramp * sizeof(UShort)); - if(!ramp[i]) { -- if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; } -- if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; } -+ if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; } -+ if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; } - return; - } - } -@@ -705,9 +728,9 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - - xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]); - -- xfree(ramp[0]); -- xfree(ramp[1]); -- xfree(ramp[2]); -+ free(ramp[0]); -+ free(ramp[1]); -+ free(ramp[2]); - ramp[0] = ramp[1] = ramp[2] = NULL; - } - #endif -@@ -1135,10 +1158,10 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - DisplayModePtr mode; - int dx = 0,dy = 0; - -- if(!((mode = xalloc(sizeof(DisplayModeRec))))) return dest; -+ if(!((mode = malloc(sizeof(DisplayModeRec))))) return dest; - memcpy(mode, i, sizeof(DisplayModeRec)); -- if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) { -- xfree(mode); -+ if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) { -+ free(mode); - return dest; - } - ((SiSMergedDisplayModePtr)mode->Private)->CRT1 = i; -@@ -1223,8 +1246,8 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n", - mode->name, mode->HDisplay, mode->VDisplay); -- xfree(mode->Private); -- xfree(mode); -+ free(mode->Private); -+ free(mode); - - return dest; - } -@@ -2131,10 +2154,10 @@ SiSProcXineramaQueryVersion(ClientPtr client) - rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION; - rep.minorVersion = SIS_XINERAMA_MINOR_VERSION; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.majorVersion, n); -- swaps(&rep.minorVersion, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swaps(&rep.majorVersion, n); -+ _swaps(&rep.minorVersion, n); - } - WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep); - return (client->noClientException); -@@ -2147,19 +2170,20 @@ SiSProcXineramaGetState(ClientPtr client) - WindowPtr pWin; - xPanoramiXGetStateReply rep; - register int n; -+ int rc; - - REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); -- pWin = LookupWindow(stuff->window, client); -- if(!pWin) return BadWindow; -+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); -+ if (rc != Success) -+ return rc; - - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.state = !SiSnoPanoramiXExtension; - if(client->swapped) { -- swaps (&rep.sequenceNumber, n); -- swapl (&rep.length, n); -- swaps (&rep.state, n); -+ _swaps (&rep.sequenceNumber, n); -+ _swapl (&rep.length, n); - } - WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep); - return client->noClientException; -@@ -2172,19 +2196,20 @@ SiSProcXineramaGetScreenCount(ClientPtr client) - WindowPtr pWin; - xPanoramiXGetScreenCountReply rep; - register int n; -+ int rc; - - REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); -- pWin = LookupWindow(stuff->window, client); -- if(!pWin) return BadWindow; -+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); -+ if (rc != Success) -+ return rc; - - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.ScreenCount = SiSXineramaNumScreens; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.ScreenCount, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); - } - WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep); - return client->noClientException; -@@ -2197,10 +2222,12 @@ SiSProcXineramaGetScreenSize(ClientPtr client) - WindowPtr pWin; - xPanoramiXGetScreenSizeReply rep; - register int n; -+ int rc; - - REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); -- pWin = LookupWindow (stuff->window, client); -- if(!pWin) return BadWindow; -+ rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); -+ if (rc != Success) -+ return rc; - - rep.type = X_Reply; - rep.length = 0; -@@ -2208,10 +2235,10 @@ SiSProcXineramaGetScreenSize(ClientPtr client) - rep.width = SiSXineramadataPtr[stuff->screen].width; - rep.height = SiSXineramadataPtr[stuff->screen].height; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.width, n); -- swaps(&rep.height, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.width, n); -+ _swapl(&rep.height, n); - } - WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep); - return client->noClientException; -@@ -2230,9 +2257,9 @@ SiSProcXineramaIsActive(ClientPtr client) - rep.state = !SiSnoPanoramiXExtension; - if(client->swapped) { - register int n; -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.state, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.state, n); - } - WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep); - return client->noClientException; -@@ -2251,9 +2278,9 @@ SiSProcXineramaQueryScreens(ClientPtr client) - rep.length = rep.number * sz_XineramaScreenInfo >> 2; - if(client->swapped) { - register int n; -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.number, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.number, n); - } - WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep); - -@@ -2268,10 +2295,10 @@ SiSProcXineramaQueryScreens(ClientPtr client) - scratch.height = SiSXineramadataPtr[i].height; - if(client->swapped) { - register int n; -- swaps(&scratch.x_org, n); -- swaps(&scratch.y_org, n); -- swaps(&scratch.width, n); -- swaps(&scratch.height, n); -+ _swaps(&scratch.x_org, n); -+ _swaps(&scratch.y_org, n); -+ _swaps(&scratch.width, n); -+ _swaps(&scratch.height, n); - } - WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch); - } -@@ -2308,7 +2335,7 @@ SiSSProcXineramaQueryVersion (ClientPtr client) - { - REQUEST(xPanoramiXQueryVersionReq); - register int n; -- swaps(&stuff->length,n); -+ _swaps(&stuff->length,n); - REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); - return SiSProcXineramaQueryVersion(client); - } -@@ -2318,7 +2345,7 @@ SiSSProcXineramaGetState(ClientPtr client) - { - REQUEST(xPanoramiXGetStateReq); - register int n; -- swaps (&stuff->length, n); -+ _swaps (&stuff->length, n); - REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); - return SiSProcXineramaGetState(client); - } -@@ -2328,7 +2355,7 @@ SiSSProcXineramaGetScreenCount(ClientPtr client) - { - REQUEST(xPanoramiXGetScreenCountReq); - register int n; -- swaps (&stuff->length, n); -+ _swaps (&stuff->length, n); - REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); - return SiSProcXineramaGetScreenCount(client); - } -@@ -2338,7 +2365,7 @@ SiSSProcXineramaGetScreenSize(ClientPtr client) - { - REQUEST(xPanoramiXGetScreenSizeReq); - register int n; -- swaps (&stuff->length, n); -+ _swaps (&stuff->length, n); - REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); - return SiSProcXineramaGetScreenSize(client); - } -@@ -2348,7 +2375,7 @@ SiSSProcXineramaIsActive(ClientPtr client) - { - REQUEST(xXineramaIsActiveReq); - register int n; -- swaps (&stuff->length, n); -+ _swaps (&stuff->length, n); - REQUEST_SIZE_MATCH(xXineramaIsActiveReq); - return SiSProcXineramaIsActive(client); - } -@@ -2358,7 +2385,7 @@ SiSSProcXineramaQueryScreens(ClientPtr client) - { - REQUEST(xXineramaQueryScreensReq); - register int n; -- swaps (&stuff->length, n); -+ _swaps (&stuff->length, n); - REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); - return SiSProcXineramaQueryScreens(client); - } -@@ -2389,7 +2416,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry) - { - /* Called by CloseDownExtensions() */ - if(SiSXineramadataPtr) { -- Xfree(SiSXineramadataPtr); -+ free(SiSXineramadataPtr); - SiSXineramadataPtr = NULL; - } - } -@@ -2454,7 +2481,7 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn) - if(!pSiS->XineramaExtEntry) break; - - if(!(SiSXineramadataPtr = (SiSXineramaData *) -- xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break; -+ calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break; - - SiSXineramaGeneration = serverGeneration; - success = TRUE; -@@ -2493,10 +2520,10 @@ SiSFreeCRT2Structs(SISPtr pSiS) - while(pSiS->CRT2pScrn->monitor->Modes) - xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes); - } -- if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC); -- xfree(pSiS->CRT2pScrn->monitor); -+ if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC); -+ free(pSiS->CRT2pScrn->monitor); - } -- xfree(pSiS->CRT2pScrn); -+ free(pSiS->CRT2pScrn); - pSiS->CRT2pScrn = NULL; - } - } -@@ -2902,22 +2929,22 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn) - Bool gotit = FALSE; - - if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) { -- if((mysisfbinfo = xalloc(sisfbinfosize))) { -+ if((mysisfbinfo = malloc(sisfbinfosize))) { - if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) { - gotit = TRUE; - } else { -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - } - } else { -- if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) { -+ if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) { - if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) { - gotit = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Possibly old version of sisfb detected. Please update.\n"); - } else { -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - } -@@ -3056,7 +3083,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn) - } - } - } -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - close (fd); -@@ -3216,7 +3243,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pSiS->pInt = NULL; - - /* Save PCI Domain Base */ --#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) -+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 - pSiS->IODBase = 0; - #else - pSiS->IODBase = pScrn->domainIOBase; -@@ -4078,7 +4105,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } - #endif - if(!pSiS->BIOS) { -- if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) { -+ if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Could not allocate memory for video BIOS image\n"); - } else { -@@ -4173,7 +4200,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } else { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Could not find/read video BIOS\n"); -- xfree(pSiS->BIOS); -+ free(pSiS->BIOS); - pSiS->BIOS = NULL; - } - } -@@ -5559,7 +5586,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - /* Do some MergedFB mode initialisation */ - #ifdef SISMERGED - if(pSiS->MergedFB) { -- pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec)); -+ pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec)); - if(!pSiS->CRT2pScrn) { - SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr); - pSiS->MergedFB = FALSE; -@@ -5592,7 +5619,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } else { - SISErrorLog(pScrn, mergednocrt1, mergeddisstr); - } -- if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn); -+ if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn); - pSiS->CRT2pScrn = NULL; - pSiS->MergedFB = FALSE; - } -@@ -5639,7 +5666,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } else { - SISErrorLog(pScrn, mergednocrt2, mergeddisstr); - } -- if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn); -+ if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn); - pSiS->CRT2pScrn = NULL; - pSiS->MergedFB = FALSE; - } -@@ -6016,7 +6043,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - - #ifdef SISMERGED - if(pSiS->MergedFB) { -- pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec)); -+ pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec)); - if(pSiS->CRT2pScrn->monitor) { - DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL; - memcpy(pSiS->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec)); -@@ -6025,10 +6052,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pSiS->CRT2pScrn->monitor->id = (char *)crt2monname; - tempm = pScrn->monitor->Modes; - while(tempm) { -- if(!(newm = xalloc(sizeof(DisplayModeRec)))) break; -+ if(!(newm = malloc(sizeof(DisplayModeRec)))) break; - memcpy(newm, tempm, sizeof(DisplayModeRec)); -- if(!(newm->name = xalloc(strlen(tempm->name) + 1))) { -- xfree(newm); -+ if(!(newm->name = malloc(strlen(tempm->name) + 1))) { -+ free(newm); - break; - } - strcpy(newm->name, tempm->name); -@@ -6070,7 +6097,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } else { - SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, %s.\n", - mergeddisstr); -- if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn); -+ if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn); - pSiS->CRT2pScrn = NULL; - pSiS->MergedFB = FALSE; - } -@@ -6835,8 +6862,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - #ifdef SIS_USE_XAA - if(!pSiS->useEXA) { - if (!xf86LoadSubModule(pScrn, "xaa")) { -- SISErrorLog(pScrn, "Could not load xaa module\n"); -- goto my_error_1; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Falling back to shadowfb\n"); -+ pSiS->NoAccel = 1; -+ pSiS->ShadowFB = 1; - } - } - #endif -@@ -6855,7 +6884,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } - } - #endif -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n"); - } - - /* Load shadowfb (if needed) */ -@@ -6867,7 +6895,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } - - /* Load the dri and glx modules if requested. */ --#ifdef XF86DRI -+#ifdef SISDRI - if(pSiS->loadDRI) { - if(!xf86LoaderCheckSymbol("DRIScreenInit")) { - if(xf86LoadSubModule(pScrn, "dri")) { -@@ -7454,7 +7482,7 @@ SISVESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) - (function == MODE_SAVE)) { - /* don't rely on the memory not being touched */ - if(!pSiS->pstate) { -- pSiS->pstate = xalloc(pSiS->stateSize); -+ pSiS->pstate = malloc(pSiS->stateSize); - } - memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize); - } -@@ -8675,7 +8703,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pSiS->ShadowFB) { - pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height); -+ pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height); - displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = pSiS->ShadowPtr; - } else { -@@ -8703,7 +8731,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */ - --#ifdef XF86DRI -+#ifdef SISDRI - if(pSiS->loadDRI) { - #ifdef SISDUALHEAD - /* No DRI in dual head mode */ -@@ -8849,14 +8877,14 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - pSiS->CRT2ColNum = 1 << pScrn->rgbBits; - -- if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) { -+ if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) { - pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum]; -- if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) { -+ if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) { - int i = pSiS->CRT2ColNum; - SISCalculateGammaRampCRT2(pScrn); - while(i--) pSiS->crt2cindices[i] = i; - } else { -- xfree(pSiS->crt2gcolortable); -+ free(pSiS->crt2gcolortable); - pSiS->crt2gcolortable = NULL; - pSiS->CRT2SepGamma = FALSE; - } -@@ -9016,7 +9044,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - #endif - --#ifdef XF86DRI -+#ifdef SISDRI - if(pSiS->loadDRI) { - if(pSiS->directRenderingEnabled) { - /* Now that mi, drm and others have done their thing, -@@ -9322,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y) - } - } - if(doit) { -- UpdateCurrentTime(); - sigstate = xf86BlockSIGIO(); -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 -+ { -+ double dx = x, dy = y; -+ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); -+ x = (int)dx; -+ y = (int)dy; -+ } -+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13 -+ miPointerSetPosition(inputInfo.pointer, Absolute, x, y); -+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 -+ miPointerSetPosition(inputInfo.pointer, x, y); -+#else -+ UpdateCurrentTime(); - miPointerAbsoluteCursor(x, y, currentTime.milliseconds); -+#endif - xf86UnblockSIGIO(sigstate); - return; - } -@@ -9737,7 +9778,7 @@ SISEnterVT(int scrnIndex, int flags) - - SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); - --#ifdef XF86DRI -+#ifdef SISDRI - if(pSiS->directRenderingEnabled) { - DRIUnlock(screenInfo.screens[scrnIndex]); - } -@@ -9763,7 +9804,7 @@ SISLeaveVT(int scrnIndex, int flags) - { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - SISPtr pSiS = SISPTR(pScrn); --#ifdef XF86DRI -+#ifdef SISDRI - ScreenPtr pScreen; - - if(pSiS->directRenderingEnabled) { -@@ -9847,7 +9888,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen) - SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex); - } - --#ifdef XF86DRI -+#ifdef SISDRI - if(pSiS->directRenderingEnabled) { - SISDRICloseScreen(pScreen); - pSiS->directRenderingEnabled = FALSE; -@@ -9941,7 +9982,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen) - if(pSiS->useEXA) { - if(pSiS->EXADriverPtr) { - exaDriverFini(pScreen); -- xfree(pSiS->EXADriverPtr); -+ free(pSiS->EXADriverPtr); - pSiS->EXADriverPtr = NULL; - pSiS->exa_scratch = NULL; - } -@@ -9954,33 +9995,33 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen) - } - - if(pSiS->ShadowPtr) { -- xfree(pSiS->ShadowPtr); -+ free(pSiS->ShadowPtr); - pSiS->ShadowPtr = NULL; - } - - if(pSiS->DGAModes) { -- xfree(pSiS->DGAModes); -+ free(pSiS->DGAModes); - pSiS->DGAModes = NULL; - } - - if(pSiS->adaptor) { -- xfree(pSiS->adaptor); -+ free(pSiS->adaptor); - pSiS->adaptor = NULL; - pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL; - } - - if(pSiS->blitadaptor) { -- xfree(pSiS->blitadaptor); -+ free(pSiS->blitadaptor); - pSiS->blitadaptor = NULL; - } - - if(pSiS->crt2gcolortable) { -- xfree(pSiS->crt2gcolortable); -+ free(pSiS->crt2gcolortable); - pSiS->crt2gcolortable = NULL; - } - - if(pSiS->crt2cindices) { -- xfree(pSiS->crt2cindices); -+ free(pSiS->crt2cindices); - pSiS->crt2cindices = NULL; - } - -diff --git a/src/sis_memcpy.c b/src/sis_memcpy.c -index 6ad62e8..3634401 100644 ---- a/src/sis_memcpy.c -+++ b/src/sis_memcpy.c -@@ -638,13 +638,13 @@ SiS_AllocBuffers(ScrnInfoPtr pScrn, UChar **buf1, UChar **buf2, UChar **buf3) - (*buf1) = (UChar *)pSiS->FbBase + offset; - (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31); - -- if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) { -+ if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) { - SISFreeFBMemory(pScrn, &handle); - return NULL; - } - -- if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) { -- xfree((*buf2)); -+ if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) { -+ free((*buf2)); - SISFreeFBMemory(pScrn, &handle); - return NULL; - } -@@ -1098,8 +1098,8 @@ SiSVidCopyInitGen(ScreenPtr pScreen, SISMCFuncData *MCFunctions, vidCopyFunc *UM - - /* Free buffers */ - SISFreeFBMemory(pScrn, &fbhandle); -- xfree(buf2); -- xfree(buf3); -+ free(buf2); -+ free(buf3); - - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, - "Using %s method for aligned data transfers %s video RAM\n", -diff --git a/src/sis_opt.c b/src/sis_opt.c -index 3517549..3fa12c9 100644 ---- a/src/sis_opt.c -+++ b/src/sis_opt.c -@@ -448,7 +448,7 @@ SiSOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return; -+ if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return; - - memcpy(pSiS->Options, SISOptions, sizeof(SISOptions)); - -@@ -480,7 +480,7 @@ SiSOptions(ScrnInfoPtr pScrn) - #endif - pSiS->ShadowFB = FALSE; - pSiS->loadDRI = FALSE; --#ifdef XF86DRI -+#ifdef SISDRI - pSiS->agpWantedPages = AGP_PAGES; - #endif - pSiS->VESA = -1; -@@ -888,7 +888,7 @@ SiSOptions(ScrnInfoPtr pScrn) - if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) { - int result; - Bool valid = FALSE; -- char *tempstr = xalloc(strlen(strptr) + 1); -+ char *tempstr = malloc(strlen(strptr) + 1); - result = sscanf(strptr, "%s %d", tempstr, &ival); - if(result >= 1) { - if(!xf86NameCmp(tempstr,"LeftOf")) { -@@ -946,18 +946,18 @@ SiSOptions(ScrnInfoPtr pScrn) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Except for \"Clone\", the parameter may be followed by an integer.\n"); - } -- xfree(tempstr); -+ free(tempstr); - } - if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) { -- pSiS->MetaModes = xalloc(strlen(strptr) + 1); -+ pSiS->MetaModes = malloc(strlen(strptr) + 1); - if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1); - } - if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) { -- pSiS->CRT2HSync = xalloc(strlen(strptr) + 1); -+ pSiS->CRT2HSync = malloc(strlen(strptr) + 1); - if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1); - } - if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) { -- pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1); -+ pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1); - if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1); - } - if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) { -@@ -2034,7 +2034,7 @@ SiSOptions(ScrnInfoPtr pScrn) - } - } - --#ifdef XF86DRI -+#ifdef SISDRI - /* DRI */ - from = X_DEFAULT; - if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) { -diff --git a/src/sis_utility.c b/src/sis_utility.c -index a9bcd2b..eda194f 100644 ---- a/src/sis_utility.c -+++ b/src/sis_utility.c -@@ -34,8 +34,6 @@ - #endif - - #include "sis.h" --#define NEED_REPLIES --#define NEED_EVENTS - #include <X11/X.h> - #include "dixstruct.h" - -@@ -1882,10 +1880,10 @@ SiSProcSiSCtrlQueryVersion(ClientPtr client) - rep.majorVersion = SISCTRL_MAJOR_VERSION; - rep.minorVersion = SISCTRL_MINOR_VERSION; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.majorVersion, n); -- swaps(&rep.minorVersion, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swaps(&rep.majorVersion, n); -+ _swaps(&rep.minorVersion, n); - } - WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep); - return (client->noClientException); -@@ -1926,15 +1924,15 @@ SiSProcSiSCtrlCommand(ClientPtr client) - rep.sequenceNumber = client->sequence; - - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.screen, n); -- swapl(&rep.sdc_id, n); -- swapl(&rep.sdc_command, n); -- swapl(&rep.sdc_result_header, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.screen, n); -+ _swapl(&rep.sdc_id, n); -+ _swapl(&rep.sdc_command, n); -+ _swapl(&rep.sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&rep.sdc_parm[i], n); -- swapl(&rep.sdc_result[i], n); -+ _swapl(&rep.sdc_parm[i], n); -+ _swapl(&rep.sdc_result[i], n); - } - } - WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep); -@@ -1961,7 +1959,7 @@ SiSSProcSiSCtrlQueryVersion(ClientPtr client) - { - REQUEST(xSiSCtrlQueryVersionReq); - register int n; -- swaps(&stuff->length, n); -+ _swaps(&stuff->length, n); - REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); - return SiSProcSiSCtrlQueryVersion(client); - } -@@ -1972,14 +1970,14 @@ SiSSProcSiSCtrlCommand(ClientPtr client) - REQUEST(xSiSCtrlCommandReq); - register int n; - int i; -- swaps(&stuff->length, n); -- swapl(&stuff->screen, n); -- swapl(&stuff->sdc_id, n); -- swapl(&stuff->sdc_command, n); -- swapl(&stuff->sdc_result_header, n); -+ _swaps(&stuff->length, n); -+ _swapl(&stuff->screen, n); -+ _swapl(&stuff->sdc_id, n); -+ _swapl(&stuff->sdc_command, n); -+ _swapl(&stuff->sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&stuff->sdc_parm[i], n); -- swapl(&stuff->sdc_result[i], n); -+ _swapl(&stuff->sdc_parm[i], n); -+ _swapl(&stuff->sdc_result[i], n); - } - REQUEST_SIZE_MATCH(xSiSCtrlCommandReq); - return SiSProcSiSCtrlCommand(client); -@@ -2007,7 +2005,7 @@ SiSCtrlResetProc(ExtensionEntry* extEntry) - * in SiSCtrlExtUnregister()) - */ - if(extEntry->extPrivate) { -- xfree(extEntry->extPrivate); -+ free(extEntry->extPrivate); - extEntry->extPrivate = NULL; - } - } -@@ -2028,7 +2026,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn) - - if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) { - -- if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1))) -+ if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1))) - return; - - if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0, -@@ -2038,7 +2036,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn) - StandardMinorOpcode))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to add SISCTRL extension\n"); -- xfree(myctrl); -+ free(myctrl); - return; - } - -diff --git a/src/sis_vga.c b/src/sis_vga.c -index 3f6219b..4c887b8 100644 ---- a/src/sis_vga.c -+++ b/src/sis_vga.c -@@ -1429,7 +1429,7 @@ SiSVGASaveFonts(ScrnInfoPtr pScrn) - attr10 = SiS_ReadAttr(pSiS, 0x10); - if(attr10 & 0x01) return; - -- if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) { -+ if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Could not save console fonts, mem allocation failed\n"); - return; -@@ -1716,8 +1716,8 @@ SiSVGAMapMem(ScrnInfoPtr pScrn) - - #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - #if XSERVER_LIBPCIACCESS -- pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, -- pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize); -+ (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize, -+ PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase); - #else - pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT, - pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize); -@@ -1737,7 +1737,12 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn) - - if(pSiS->VGAMemBase == NULL) return; - -+#if XSERVER_LIBPCIACCESS -+ (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize); -+#else - xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize); -+#endif -+ - pSiS->VGAMemBase = NULL; - } - #endif -diff --git a/src/sis_video.c b/src/sis_video.c -index 7322efb..2006858 100644 ---- a/src/sis_video.c -+++ b/src/sis_video.c -@@ -326,7 +326,7 @@ SISInitVideo(ScreenPtr pScreen) - if(newAdaptor) size++; - if(newBlitAdaptor) size++; - -- newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*)); -+ newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - if(num_adaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); -@@ -356,7 +356,7 @@ SISInitVideo(ScreenPtr pScreen) - } - - if(newAdaptors) { -- xfree(newAdaptors); -+ free(newAdaptors); - } - } - -@@ -877,7 +877,7 @@ SISSetupImageVideo(ScreenPtr pScreen) - } - #endif - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(SISPortPrivRec) + - sizeof(DevUnion)))) { - return NULL; -@@ -4067,7 +4067,7 @@ SISSetupBlitVideo(ScreenPtr pScreen) - } - #endif - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - (sizeof(DevUnion) * NUM_BLIT_PORTS) + - sizeof(SISBPortPrivRec)))) { - return NULL; -diff --git a/src/sispcirename.h b/src/sispcirename.h -index c4beac6..a354ac4 100644 ---- a/src/sispcirename.h -+++ b/src/sispcirename.h -@@ -29,11 +29,40 @@ - #ifndef SISPCIRENAME_H - #define SISPCIRENAME_H - -+#include <stdint.h> -+ - enum region_type { - REGION_MEM, - REGION_IO - }; - -+#include "xf86Module.h" -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 -+ -+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux) -+#define PCI_DOM_MASK 0x01fful -+#else -+#define PCI_DOM_MASK 0x0ffu -+#endif -+ -+#ifndef PCI_DOM_MASK -+# define PCI_DOM_MASK 0x0ffu -+#endif -+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu) -+ -+static inline uint32_t -+pciTag(int busnum, int devnum, int funcnum) -+{ -+ uint32_t tag; -+ tag = (busnum & (PCI_DOMBUS_MASK)) << 16; -+ tag |= (devnum & 0x00001fu) << 11; -+ tag |= (funcnum & 0x000007u) << 8; -+ -+ return tag; -+} -+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */ -+ - #ifndef XSERVER_LIBPCIACCESS - - /* pciVideoPtr */ -diff --git a/src/vgatypes.h b/src/vgatypes.h -index 4be31e4..d6e7b6e 100644 ---- a/src/vgatypes.h -+++ b/src/vgatypes.h -@@ -69,8 +69,9 @@ typedef unsigned int BOOLEAN; - - #define SISIOMEMTYPE - --#ifdef SIS_LINUX_KERNEL - typedef unsigned long SISIOADDRESS; -+ -+#ifdef SIS_LINUX_KERNEL - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8) - #include <linux/types.h> /* Need __iomem */ - #undef SISIOMEMTYPE -@@ -78,15 +79,6 @@ typedef unsigned long SISIOADDRESS; - #endif - #endif - --#ifdef SIS_XORG_XF86 --#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) --typedef unsigned long IOADDRESS; --typedef unsigned long SISIOADDRESS; --#else --typedef IOADDRESS SISIOADDRESS; --#endif --#endif -- - typedef enum _SIS_CHIP_TYPE { - SIS_VGALegacy = 0, - SIS_530, diff --git a/testing/xf86-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD deleted file mode 100644 index 8c70334e6..000000000 --- a/testing/xf86-video-sisusb/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150073 2012-02-12 09:45:43Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sisusb -pkgver=0.9.4 -pkgrel=6 -pkgdesc="X.org SiS USB video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - sisusb-0.9.4-git.patch) -sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e' - 'd74ce7732889c7a00d9d2dcd2bfc8be05c6eb912') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/sisusb-0.9.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-sisusb/sisusb-0.9.4-git.patch b/testing/xf86-video-sisusb/sisusb-0.9.4-git.patch deleted file mode 100644 index 24474954a..000000000 --- a/testing/xf86-video-sisusb/sisusb-0.9.4-git.patch +++ /dev/null @@ -1,794 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 86c6ac5..725d6cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,49 +20,48 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-sisusb], -- 0.9.4, -+ [0.9.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-sisusb) -- -+ [xf86-video-sisusb]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC --XORG_PROG_RAWCPP - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -+# Obtain compiler/linker options for the driver dependencies -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto pciaccess $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") -@@ -70,17 +69,14 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=sisusb - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 1b26ac2..9ceb36f 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MANDEFS = \ -- -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ -- -D__appmansuffix__=$(APP_MAN_SUFFIX) \ -- -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ -- -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -- -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -- -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ -- -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ -- -D__xconfigfile__=xorg.conf \ -- -D__xservername__=Xorg -- --# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM --# to cpp, because that trick does not work on all ANSI C preprocessors. --# Delete line numbers from the cpp output (-P is not portable, I guess). --# Allow XCOMM to be preceded by whitespace and provide a means of generating --# output lines with trailing backslashes. --# Allow XHASH to always be substituted, even in cases where XCOMM isn't. -- --CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ -- -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -- -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ -- -e '/^[ ]*XHASH/s/XHASH/\#/' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -- - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - .man.$(DRIVER_MAN_SUFFIX): -- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -diff --git a/man/sisusb.man b/man/sisusb.man -index 7817cb5..6eafb8e 100644 ---- a/man/sisusb.man -+++ b/man/sisusb.man -@@ -1,17 +1,5 @@ --.\" $XFree86$ --.\" $XdotOrg$ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' --#ifdef __xservername__ --#define __myservername__ __xservername__ --#else --#define __myservername__ XFree86 --#endif --#ifdef __xconfigfile__ --#define __myxconfigfile__ __xconfigfile__ --#else --#define __myxconfigfile__ XF86Config --#endif - .TH SISUSB __drivermansuffix__ __vendorversion__ - .SH NAME - sisusb \- SiS USB video driver -@@ -25,7 +13,7 @@ sisusb \- SiS USB video driver - .fi - .SH DESCRIPTION - .B sisusb --is an __myservername__ driver for SiS (Silicon Integrated Systems) video chips that -+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips that - are connected via a Net2280-based USB dongle. The driver is not accelerated, but - provides support for colordepths of 8, 16 and 24 bpp as well as Render and other - extensions. -@@ -39,7 +27,7 @@ driver supports USB video cards based on the following chipsets: - The SiS315E/PRO features two CRT controllers. However, in its USB version, only - the first output, referred to as "CRT1", is being used. - .SH CONFIGURATION DETAILS --Please refer to __myxconfigfile__(__filemansuffix__) for general configuration -+Please refer to __xconfigfile__(__filemansuffix__) for general configuration - details and to sis(__drivermansuffix__) for more information. This manpage only - covers a subset of the supported options. - .PP -@@ -81,11 +69,7 @@ for device reconnection). - .SH "KNOWN BUGS" - none. - .SH "SEE ALSO" --#ifdef __xservername__ - __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__) --#else --XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__) --#endif - .PP - .B "http://www.winischhofer.at/linuxsisvga.shtml" - for more information and updates -diff --git a/src/sisusb.h b/src/sisusb.h -index b9992ac..82ed509 100644 ---- a/src/sisusb.h -+++ b/src/sisusb.h -@@ -113,6 +113,14 @@ - #include <X11/extensions/Xv.h> - #endif - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+#define _swapl(x, n) swapl(x,n) -+#define _swaps(x, n) swaps(x,n) -+#else -+#define _swapl(x, n) swapl(x) -+#define _swaps(x, n) swaps(x) -+#endif -+ - /* Platform/architecture related definitions: */ - - #undef SIS_PC_PLATFORM -@@ -141,7 +149,6 @@ - #define UNLOCK_ALWAYS /* Always unlock the registers (should be set!) */ - - /* Need that for SiSCtrl */ --#define NEED_REPLIES /* ? */ - #define EXTENSION_PROC_ARGS void * - #include "extnsionst.h" /* required */ - #include <X11/extensions/panoramiXproto.h> /* required */ -@@ -732,7 +739,7 @@ typedef struct { - Bool skipswitchcheck; - ULong VBFlagsInit; - DisplayModePtr currentModeLast; -- IOADDRESS MyPIOOffset; -+ unsigned long MyPIOOffset; - - char messagebuffer[64]; - unsigned int VGAMapSize; /* SiSVGA stuff */ -diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c -index 5e3eb7f..b5c4dce 100644 ---- a/src/sisusb_dac.c -+++ b/src/sisusb_dac.c -@@ -672,7 +672,7 @@ SiSUSBMemCopyToVideoRam(SISUSBPtr pSiSUSB, UChar *to, UChar *from, int size) - int num, retry = 3; - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)to, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)to, SEEK_SET); - num = write(pSiSUSB->sisusbdev, from, size); - } while((num != size) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -958,7 +958,7 @@ void sisclearvram(SISUSBPtr pSiSUSB, UChar *where, unsigned int howmuch) - if(pSiSUSB->sisusbfatalerror) return; - do { - x.operation = SUCMD_CLRSCR; -- x.data3 = (CARD32)where; -+ x.data3 = (CARD32)(uintptr_t)where; - x.data0 = (howmuch >> 16) & 0xff; - x.data1 = (howmuch >> 8) & 0xff; - x.data2 = howmuch & 0xff; -@@ -990,7 +990,7 @@ void SIS_MMIO_OUT8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD8 va - int num, retry = 3; - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &val, 1); - } while((num != 1) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1002,7 +1002,7 @@ void SIS_MMIO_OUT16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD16 - CARD16 buf = sisusb_cpu_to_le16(val); - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &buf, 2); - } while((num != 2) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1014,7 +1014,7 @@ void SIS_MMIO_OUT32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD32 - CARD32 buf = sisusb_cpu_to_le32(val); - if(pSiSUSB->sisusbfatalerror) return; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = write(pSiSUSB->sisusbdev, &buf, 4); - } while((num != 4) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1026,7 +1026,7 @@ CARD8 SIS_MMIO_IN8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD8 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 1); - } while((num != 1) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1039,7 +1039,7 @@ CARD16 SIS_MMIO_IN16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD16 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 2); - } while((num != 2) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -@@ -1052,7 +1052,7 @@ CARD32 SIS_MMIO_IN32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset) - CARD32 tmp; - if(pSiSUSB->sisusbfatalerror) return 0; - do { -- lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET); -+ lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET); - num = read(pSiSUSB->sisusbdev, &tmp, 4); - } while((num != 4) && --retry); - if(!retry) SiSLostConnection(pSiSUSB); -diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c -index 8ba2c33..032225c 100644 ---- a/src/sisusb_driver.c -+++ b/src/sisusb_driver.c -@@ -186,12 +186,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn) - /* Just to make sure... */ - if(!pSiSUSB) return; - -- if(pSiSUSB->pstate) xfree(pSiSUSB->pstate); -+ if(pSiSUSB->pstate) free(pSiSUSB->pstate); - pSiSUSB->pstate = NULL; -- if(pSiSUSB->fonts) xfree(pSiSUSB->fonts); -+ if(pSiSUSB->fonts) free(pSiSUSB->fonts); - pSiSUSB->fonts = NULL; - -- if(pSiSUSB->SiS_Pr) xfree(pSiSUSB->SiS_Pr); -+ if(pSiSUSB->SiS_Pr) free(pSiSUSB->SiS_Pr); - pSiSUSB->SiS_Pr = NULL; - - if(pSiSUSB->sisusbdevopen) { -@@ -200,12 +200,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn) - } - - if(pScrn->chipset) { -- xfree(pScrn->chipset); -+ free(pScrn->chipset); - pScrn->chipset = NULL; - } - - if(pScrn->driverPrivate) { -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - } -@@ -217,14 +217,14 @@ SISUSBErrorLog(ScrnInfoPtr pScrn, const char *format, ...) - static const char *str = "**************************************************\n"; - - va_start(ap, format); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " ERROR:\n"); - xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); - va_end(ap); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " END OF MESSAGE\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - } - - static int -@@ -248,7 +248,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle) - - if((myfile = open(filename, O_RDWR, 0)) != -1) { - if(!ioctl(myfile, SISUSB_GET_CONFIG_SIZE, &sisusbinfosize)) { -- if((mysisusbinfo = xalloc(sisusbinfosize))) { -+ if((mysisusbinfo = malloc(sisusbinfosize))) { - if(!ioctl(myfile, (SISUSB_GET_CONFIG | (sisusbinfosize << 16)), mysisusbinfo)) { - if(mysisusbinfo->sisusb_id == SISUSB_ID) { - sisusbversion = (mysisusbinfo->sisusb_version << 16) | -@@ -280,7 +280,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle) - retval = mysisusbinfo->sisusb_minor; - } - } -- xfree(mysisusbinfo); -+ free(mysisusbinfo); - mysisusbinfo = NULL; - } - } -@@ -307,13 +307,13 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - } - if((p) && (*p) && (*p == '/')) { - gotdev = 1; -- *nameptr = xalloc(strlen(p) + 1); -+ *nameptr = malloc(strlen(p) + 1); - strcpy(*nameptr, p); - retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL); - } else if((p) && (*p) && (sscanf(p, "%d", &i) == 1)) { - if(i >= 0 && i <= 31) { - gotdev = 1; -- *nameptr = xalloc(32); -+ *nameptr = malloc(32); - sprintf(*nameptr, "/dev/sisusbvga%d", i); - retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL); - if(retval < 0) { -@@ -324,7 +324,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - } - } - if(!gotdev) { -- *nameptr = xalloc(32); -+ *nameptr = malloc(32); - for(i = 0; i < 64; i++) { - if(i < 32) sprintf(*nameptr, "/dev/sisusbvga%d", i); - else sprintf(*nameptr, "/dev/usb/sisusbvga%d", i); -@@ -338,7 +338,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam - if(retval >= 0) { - xf86Msg(X_INFO, "Found SiSUSB dongle (node %s, minor %d)\n", *nameptr, retval); - } else if((*nameptr)) { -- xfree(*nameptr); -+ free(*nameptr); - *nameptr = NULL; - } - -@@ -401,14 +401,14 @@ SISUSBProbe(DriverPtr drv, int flags) - */ - - /* Allocate and initialize an array of ints for storing the minors */ -- if(!(minorArray = (int *)xalloc(numDevSections * sizeof(int)))) { -+ if(!(minorArray = (int *)malloc(numDevSections * sizeof(int)))) { - return FALSE; - } - for(i = 0; i < numDevSections; i++) minorArray[i] = -1; - - /* Allocate an array of char ptrs for storing the device node names */ -- if(!(devnameArray = (char **)xalloc(numDevSections * sizeof(char *)))) { -- xfree(minorArray); -+ if(!(devnameArray = (char **)malloc(numDevSections * sizeof(char *)))) { -+ free(minorArray); - return FALSE; - } - -@@ -420,20 +420,20 @@ SISUSBProbe(DriverPtr drv, int flags) - if((myminor = SiSUSBFindUSBDongle(devSections[i], minorArray, numDevSections, &nameptr)) >= 0) { - if(!SiSUSBFindDuplicate(myminor, minorArray, numDevSections)) { - minorArray[numUsed] = myminor; -- devnameArray[numUsed] = xalloc(strlen(nameptr) + 1); -+ devnameArray[numUsed] = malloc(strlen(nameptr) + 1); - strcpy(devnameArray[numUsed], nameptr); - numUsed++; - } -- xfree(nameptr); -+ free(nameptr); - } - } - - /* Free the minor array, we don't need it anymore */ -- xfree(minorArray); -+ free(minorArray); - - if(numUsed <= 0) { -- xfree(devSections); -- xfree(devnameArray); -+ free(devSections); -+ free(devnameArray); - return FALSE; - } - -@@ -470,8 +470,8 @@ SISUSBProbe(DriverPtr drv, int flags) - - } - -- xfree(devSections); -- xfree(devnameArray); -+ free(devSections); -+ free(devnameArray); - return foundScreen; - } - -@@ -622,10 +622,10 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - if(!(nramp = xf86GetGammaRampSize(pScreen))) return; - - for(i=0; i<3; i++) { -- ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort)); -+ ramp[i] = (UShort *)malloc(nramp * sizeof(UShort)); - if(!ramp[i]) { -- if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; } -- if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; } -+ if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; } -+ if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; } - return; - } - } -@@ -685,9 +685,9 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn) - - xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]); - -- xfree(ramp[0]); -- xfree(ramp[1]); -- xfree(ramp[2]); -+ free(ramp[0]); -+ free(ramp[1]); -+ free(ramp[2]); - ramp[0] = ramp[1] = ramp[2] = NULL; - } - #endif -@@ -906,11 +906,11 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - Bool gotit = FALSE; - - if(!ioctl(fd, SISUSBFB_GET_INFO_SIZE, &sisfbinfosize)) { -- if((mysisfbinfo = xalloc(sisfbinfosize))) { -+ if((mysisfbinfo = malloc(sisfbinfosize))) { - if(!ioctl(fd, (SISUSBFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) { - gotit = TRUE; - } else { -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - } -@@ -944,7 +944,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - - } - } -- xfree(mysisfbinfo); -+ free(mysisfbinfo); - mysisfbinfo = NULL; - } - close (fd); -@@ -1147,7 +1147,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) - #endif - - if(pSiSUSB->HWCursor) { -- if(!(pSiSUSB->USBCursorBuf = xcalloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; -+ if(!(pSiSUSB->USBCursorBuf = calloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; - - pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); - if(pSiSUSB->OptUseColorCursor) pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); -@@ -1456,8 +1456,8 @@ SISUSBMapMem(ScrnInfoPtr pScrn) - { - SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); - -- pSiSUSB->FbBase = (UChar *)pSiSUSB->FbAddress; -- pSiSUSB->IOBase = (UChar *)pSiSUSB->IOAddress; -+ pSiSUSB->FbBase = (UChar *)(uintptr_t)pSiSUSB->FbAddress; -+ pSiSUSB->IOBase = (UChar *)(uintptr_t)pSiSUSB->IOAddress; - - return TRUE; - } -@@ -1811,7 +1811,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pSiSUSB->ShadowFB) { - pSiSUSB->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * displayWidth); -- pSiSUSB->ShadowPtr = xalloc(pSiSUSB->ShadowPitch * height); -+ pSiSUSB->ShadowPtr = malloc(pSiSUSB->ShadowPitch * height); - if(!(FBStart = pSiSUSB->ShadowPtr)) { - SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF); - SISUSBErrorLog(pScrn, "Failed to allocate shadow framebuffer\n"); -@@ -1820,7 +1820,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - #if X_BYTE_ORDER == X_BIG_ENDIAN - if(pScrn->bitsPerPixel == 16) { - /* For 16bpp, we need to swap the bytes in the framebuffer */ -- if(!(pSiSUSB->ShadowPtrSwap = xalloc(pSiSUSB->ShadowPitch * height))) { -+ if(!(pSiSUSB->ShadowPtrSwap = malloc(pSiSUSB->ShadowPitch * height))) { - SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF); - SISUSBErrorLog(pScrn, "Failed to allocate swap buffer for shadow framebuffer\n"); - return FALSE; -@@ -2238,24 +2238,24 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen) - } - - if(pSiSUSB->USBCursorBuf) { -- xfree(pSiSUSB->USBCursorBuf); -+ free(pSiSUSB->USBCursorBuf); - pSiSUSB->USBCursorBuf = NULL; - } - - if(pSiSUSB->ShadowPtr) { -- xfree(pSiSUSB->ShadowPtr); -+ free(pSiSUSB->ShadowPtr); - pSiSUSB->ShadowPtr = NULL; - } - - #if 0 - if(pSiSUSB->PreAllocMem) { -- xfree(pSiSUSB->PreAllocMem); -+ free(pSiSUSB->PreAllocMem); - pSiSUSB->PreAllocMem = NULL; - } - #endif - - if(pSiSUSB->adaptor) { -- xfree(pSiSUSB->adaptor); -+ free(pSiSUSB->adaptor); - pSiSUSB->adaptor = NULL; - pSiSUSB->ResetXv = pSiSUSB->ResetXvGamma = NULL; - } -diff --git a/src/sisusb_init.c b/src/sisusb_init.c -index ba44431..99ec519 100644 ---- a/src/sisusb_init.c -+++ b/src/sisusb_init.c -@@ -1301,10 +1301,10 @@ SiSUSBBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN i - } - } - -- if(!(new = xalloc(sizeof(DisplayModeRec)))) return first; -+ if(!(new = malloc(sizeof(DisplayModeRec)))) return first; - memset(new, 0, sizeof(DisplayModeRec)); -- if(!(new->name = xalloc(10))) { -- xfree(new); -+ if(!(new->name = malloc(10))) { -+ free(new); - return first; - } - if(!first) first = new; -diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c -index d4612b0..4d5cfa3 100644 ---- a/src/sisusb_opt.c -+++ b/src/sisusb_opt.c -@@ -228,7 +228,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if(!(pSiSUSB->Options = xalloc(sizeof(SISUSBOptions)))) return; -+ if(!(pSiSUSB->Options = malloc(sizeof(SISUSBOptions)))) return; - - memcpy(pSiSUSB->Options, SISUSBOptions, sizeof(SISUSBOptions)); - -diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h -index 2d938ad..500bffb 100644 ---- a/src/sisusb_osdef.h -+++ b/src/sisusb_osdef.h -@@ -77,11 +77,11 @@ - - #define SIS315H - --#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v)) --#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v)) --#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v)) --#define InPortByte(p) inSISREG((IOADDRESS)(p)) --#define InPortWord(p) inSISREGW((IOADDRESS)(p)) --#define InPortLong(p) inSISREGL((IOADDRESS)(p)) -+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v)) -+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v)) -+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v)) -+#define InPortByte(p) inSISREG((unsigned long)(p)) -+#define InPortWord(p) inSISREGW((unsigned long)(p)) -+#define InPortLong(p) inSISREGL((unsigned long)(p)) - - #endif /* _SISUSB_OSDEF_H_ */ -diff --git a/src/sisusb_types.h b/src/sisusb_types.h -index 04c7a7a..9fc6b41 100644 ---- a/src/sisusb_types.h -+++ b/src/sisusb_types.h -@@ -51,6 +51,8 @@ - #ifndef _VGATYPES_ - #define _VGATYPES_ - -+#include <xf86Pci.h> -+ - #ifndef FALSE - #define FALSE 0 - #endif -@@ -93,7 +95,7 @@ typedef unsigned char BOOLEAN; - - #define SISIOMEMTYPE - --typedef IOADDRESS SISIOADDRESS; -+typedef unsigned long SISIOADDRESS; - - typedef enum _SIS_CHIP_TYPE { - SIS_VGALegacy = 0, -diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c -index 8c03d63..a9c1ee1 100644 ---- a/src/sisusb_utility.c -+++ b/src/sisusb_utility.c -@@ -34,8 +34,6 @@ - #endif - - #include "sisusb.h" --#define NEED_REPLIES --#define NEED_EVENTS - #include <X11/X.h> - #include "dixstruct.h" - -@@ -789,10 +787,10 @@ SiSUSBProcSiSCtrlQueryVersion(ClientPtr client) - rep.majorVersion = SISCTRL_MAJOR_VERSION; - rep.minorVersion = SISCTRL_MINOR_VERSION; - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swaps(&rep.majorVersion, n); -- swaps(&rep.minorVersion, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swaps(&rep.majorVersion, n); -+ _swaps(&rep.minorVersion, n); - } - WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep); - return (client->noClientException); -@@ -834,15 +832,15 @@ SiSUSBProcSiSCtrlCommand(ClientPtr client) - rep.sequenceNumber = client->sequence; - - if(client->swapped) { -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.screen, n); -- swapl(&rep.sdc_id, n); -- swapl(&rep.sdc_command, n); -- swapl(&rep.sdc_result_header, n); -+ _swaps(&rep.sequenceNumber, n); -+ _swapl(&rep.length, n); -+ _swapl(&rep.screen, n); -+ _swapl(&rep.sdc_id, n); -+ _swapl(&rep.sdc_command, n); -+ _swapl(&rep.sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&rep.sdc_parm[i], n); -- swapl(&rep.sdc_result[i], n); -+ _swapl(&rep.sdc_parm[i], n); -+ _swapl(&rep.sdc_result[i], n); - } - } - WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep); -@@ -869,7 +867,7 @@ SiSUSBSProcSiSCtrlQueryVersion(ClientPtr client) - { - REQUEST(xSiSCtrlQueryVersionReq); - register int n; -- swaps(&stuff->length, n); -+ _swaps(&stuff->length, n); - REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq); - return SiSUSBProcSiSCtrlQueryVersion(client); - } -@@ -880,14 +878,14 @@ SiSUSBSProcSiSCtrlCommand(ClientPtr client) - REQUEST(xSiSCtrlCommandReq); - register int n; - int i; -- swaps(&stuff->length, n); -- swapl(&stuff->screen, n); -- swapl(&stuff->sdc_id, n); -- swapl(&stuff->sdc_command, n); -- swapl(&stuff->sdc_result_header, n); -+ _swaps(&stuff->length, n); -+ _swapl(&stuff->screen, n); -+ _swapl(&stuff->sdc_id, n); -+ _swapl(&stuff->sdc_command, n); -+ _swapl(&stuff->sdc_result_header, n); - for(i = 0; i < SDC_NUM_PARM_RESULT; i++) { -- swapl(&stuff->sdc_parm[i], n); -- swapl(&stuff->sdc_result[i], n); -+ _swapl(&stuff->sdc_parm[i], n); -+ _swapl(&stuff->sdc_result[i], n); - } - REQUEST_SIZE_MATCH(xSiSCtrlCommandReq); - return SiSUSBProcSiSCtrlCommand(client); -@@ -911,7 +909,7 @@ SiSUSBCtrlResetProc(ExtensionEntry* extEntry) - { - /* Called by CloseDownExtensions() */ - if(extEntry->extPrivate) { -- xfree(extEntry->extPrivate); -+ free(extEntry->extPrivate); - extEntry->extPrivate = NULL; - } - } -@@ -928,7 +926,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn) - - if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) { - -- if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1))) -+ if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1))) - return; - - if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0, -@@ -938,7 +936,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn) - StandardMinorOpcode))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to add SISCTRL extension\n"); -- xfree(myctrl); -+ free(myctrl); - return; - } - -diff --git a/src/sisusb_video.c b/src/sisusb_video.c -index bc469b0..1dbf4f1 100644 ---- a/src/sisusb_video.c -+++ b/src/sisusb_video.c -@@ -216,7 +216,7 @@ void SISUSBInitVideo(ScreenPtr pScreen) - - if(newAdaptor) size++; - -- newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*)); -+ newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - if(num_adaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); -@@ -234,7 +234,7 @@ void SISUSBInitVideo(ScreenPtr pScreen) - } - - if(newAdaptors) { -- xfree(newAdaptors); -+ free(newAdaptors); - } - } - -@@ -377,7 +377,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) - XF86VideoAdaptorPtr adapt; - SISUSBPortPrivPtr pPriv; - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(SISUSBPortPrivRec) + - sizeof(DevUnion)))) - return NULL; diff --git a/testing/xf86-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD deleted file mode 100644 index b84d724e5..000000000 --- a/testing/xf86-video-tdfx/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 150075 2012-02-12 09:45:45Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tdfx -pkgver=1.4.3 -pkgrel=8 -_gitver=a985b54c8559d7ff8f5481004d54989ed7499237 -pkgdesc="X.org tdfx video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.902') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/snapshot/xf86-video-tdfx-${_gitver}.tar.gz) -sha1sums=('01c13cdec926c1aaa9c8c8855995c6cc38149ab2') - -build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - autoreconf -fi - ./configure --prefix=/usr #--enable-dri - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD deleted file mode 100644 index cfb5908b5..000000000 --- a/testing/xf86-video-trident/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 150077 2012-02-12 09:45:47Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-trident -pkgver=1.3.4 -pkgrel=6 -pkgdesc="X.org Trident video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - trident-1.3.4-git.patch) -sha1sums=('7c40f5c02bddf399862782b708941e79302318af' - 'cba17aad6cf2f051d89e65ffe26242ed62ea4454') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-trident/trident-1.3.4-git.patch b/testing/xf86-video-trident/trident-1.3.4-git.patch deleted file mode 100644 index 4e0cc27b2..000000000 --- a/testing/xf86-video-trident/trident-1.3.4-git.patch +++ /dev/null @@ -1,523 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index be54427..0fc2066 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,47 +20,47 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-trident], -- 1.3.4, -+ [1.3.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-trident) -- -+ [xf86-video-trident]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), -@@ -90,17 +90,14 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=trident - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/trident.man b/man/trident.man -index 8d04ed0..f461e10 100644 ---- a/man/trident.man -+++ b/man/trident.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH TRIDENT __drivermansuffix__ __vendorversion__ -diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c -index 80e3f23..3129623 100644 ---- a/src/blade_accel_exa.c -+++ b/src/blade_accel_exa.c -@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker) - } - } - --static Bool PrepareAccess(PixmapPtr pPix, int index) --{ --} -- --static void FinishAccess(PixmapPtr pPix, int index) --{ --} -- - static void BladeInitializeAccelerator(ScrnInfoPtr pScrn) - { - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); -diff --git a/src/trident.h b/src/trident.h -index c15d39c..a28c9fc 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -70,7 +70,7 @@ typedef struct { - typedef struct { - ScrnInfoPtr pScrn; - pciVideoPtr PciInfo; -- PCITAG PciTag; -+ uint32_t PciTag; - EntityInfoPtr pEnt; - ExaDriverPtr EXADriverPtr; - int useEXA; -@@ -85,7 +85,7 @@ typedef struct { - unsigned char * IOBase; - unsigned char * FbBase; - long FbMapSize; -- IOADDRESS PIOBase; -+ unsigned long PIOBase; - Bool NoAccel; - Bool HWCursor; - Bool UsePCIRetry; -diff --git a/src/trident_dga.c b/src/trident_dga.c -index 78fa8f4..dd836a6 100644 ---- a/src/trident_dga.c -+++ b/src/trident_dga.c -@@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen) - while(pMode) { - - if(0 /*pScrn->displayWidth != pMode->HDisplay*/) { -- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - } else { -- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -diff --git a/src/trident_driver.c b/src/trident_driver.c -index 31cbb83..472c9b7 100644 ---- a/src/trident_driver.c -+++ b/src/trident_driver.c -@@ -63,7 +63,7 @@ - - #ifdef XFreeXDGA - #define _XF86DGA_SERVER_ --#include <X11/extensions/xf86dgastr.h> -+#include <X11/extensions/xf86dgaproto.h> - #endif - - #include "globals.h" -@@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn) - { - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - } - -@@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - #endif - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - -@@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) - hwp = VGAHWPTR(pScrn); - vgaHWGetIOBase(hwp); - vgaIOBase = hwp->IOBase; -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pTrident->PIOBase = hwp->PIOOffset; -+#else -+ pTrident->PIOBase = 0; -+#endif - - #ifndef XSERVER_LIBPCIACCESS - xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr); -@@ -1163,7 +1168,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions)))) -+ if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions)))) - return FALSE; - memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options); -@@ -2617,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - TRIDENTRegPtr tridentReg; - -- if (!xf86IsPc98()) WAITFORVSYNC; -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (!xf86IsPc98()) -+#endif -+ WAITFORVSYNC; - - TridentFindClock(pScrn,mode->Clock); - -@@ -2709,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - - vgaHWProtect(pScrn, FALSE); - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (xf86IsPc98()) - PC98TRIDENTEnable(pScrn); -+#endif - - if (pTrident->TVChipset != 0) - VIA_TVInit(pScrn); -@@ -2782,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!TRIDENTMapMem(pScrn)) - return FALSE; - -- if (!xf86IsPc98()) { -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (!xf86IsPc98()) -+#endif -+ { - #ifdef VBE_INFO - if (pTrident->vbeModes) { - pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index); -@@ -2796,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - } - } -- -+ - hwp = VGAHWPTR(pScrn); - - if (IsPciCard && UseMMIO) { -@@ -2813,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - * Some Trident chip on PC-9821 needs setup, - * because VGA chip is not initialized by VGA BIOS. - */ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (IsPciCard && xf86IsPc98()) { - PC98TRIDENTInit(pScrn); -- } else tridentSetModeBIOS(pScrn,pScrn->currentMode); -+ } else -+#endif -+ tridentSetModeBIOS(pScrn,pScrn->currentMode); - - /* Initialise the first mode */ - if (!TRIDENTModeInit(pScrn, pScrn->currentMode)) -@@ -2868,7 +2884,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if(pTrident->ShadowFB) { - pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height); -+ pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height); - displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = pTrident->ShadowPtr; - } else { -@@ -2958,7 +2974,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - (miBankProcPtr)TVGA8900SetReadWrite; - if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, - pScrn->displayWidth, pBankInfo)) { -- xfree(pBankInfo); -+ free(pBankInfo); - pBankInfo = NULL; - if (pTrident->pVbe) - vbeFree(pTrident->pVbe); -@@ -3200,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags) - TRIDENTRestore(pScrn); - vgaHWLock(hwp); - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (xf86IsPc98()) - PC98TRIDENTDisable(pScrn); -+#endif - - if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn); - } -@@ -3225,28 +3243,31 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen) - pTrident->AccelInfoRec->Sync(pScrn); - else if (!pTrident->NoAccel && pTrident->useEXA) - pTrident->EXADriverPtr->WaitMarker(pScreen, 0); -- -+ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (xf86IsPc98()) - PC98TRIDENTDisable(pScrn); -+#endif - - TRIDENTRestore(pScrn); - vgaHWLock(hwp); - if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn); - TRIDENTUnmapMem(pScrn); - } -+ - if (pTrident->AccelInfoRec) - XAADestroyInfoRec(pTrident->AccelInfoRec); - if (pTrident->EXADriverPtr) { - exaDriverFini(pScreen); -- xfree(pTrident->EXADriverPtr); -+ free(pTrident->EXADriverPtr); - pTrident->EXADriverPtr = NULL; - } - if (pTrident->CursorInfoRec) - xf86DestroyCursorInfoRec(pTrident->CursorInfoRec); - if (pTrident->ShadowPtr) -- xfree(pTrident->ShadowPtr); -+ free(pTrident->ShadowPtr); - if (pTrident->DGAModes) -- xfree(pTrident->DGAModes); -+ free(pTrident->DGAModes); - pScrn->vtSema = FALSE; - - if(pTrident->BlockHandler) -@@ -3317,15 +3338,17 @@ static void - TRIDENTEnableMMIO(ScrnInfoPtr pScrn) - { - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); -- IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase; -+ unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase; - CARD8 temp = 0, protect = 0; - - /* - * Skip MMIO Enable in PC-9821 PCI Trident Card!! - * Because of lack of non PCI VGA port - */ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (IsPciCard && xf86IsPc98()) - return; -+#endif - - /* Goto New Mode */ - outb(pTrident->PIOBase + 0x3C4, 0x0B); -@@ -3366,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn) - * Skip MMIO Disable in PC-9821 PCI Trident Card!! - * Because of lack of non PCI VGA port - */ -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - if (IsPciCard && xf86IsPc98()) - return; -+#endif - - /* Goto New Mode */ - OUTB(0x3C4, 0x0B); temp = INB(0x3C5); -@@ -3395,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn) - outb(pTrident->PIOBase + 0x3C5, temp); - } - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - /* Initialize VGA Block for Trident Chip on PC-98x1 */ - static void - PC98TRIDENTInit(ScrnInfoPtr pScrn) -@@ -3637,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn) - outb(0x6A, 0x06); - outb(0x68, 0x0F); - } -- -+#endif - - /* - * This is a terrible hack! If we are on a notebook in a stretched -diff --git a/src/trident_video.c b/src/trident_video.c -index 0c5497b..0ae1d14 100644 ---- a/src/trident_video.c -+++ b/src/trident_video.c -@@ -125,7 +125,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen) - adaptors = &newAdaptor; - } else { - newAdaptors = /* need to free this someplace */ -- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - - if (pTrident->videoFlags) - xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3, -@@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen) - XF86VideoAdaptorPtr adapt; - TRIDENTPortPrivPtr pPriv; - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(TRIDENTPortPrivRec) + - sizeof(DevUnion)))) - return NULL; -@@ -978,18 +978,18 @@ TRIDENTAllocateSurface( - surface->width = w; - surface->height = h; - -- if(!(surface->pitches = xalloc(sizeof(int)))) { -+ if(!(surface->pitches = malloc(sizeof(int)))) { - xf86FreeOffscreenLinear(linear); - return BadAlloc; - } -- if(!(surface->offsets = xalloc(sizeof(int)))) { -- xfree(surface->pitches); -+ if(!(surface->offsets = malloc(sizeof(int)))) { -+ free(surface->pitches); - xf86FreeOffscreenLinear(linear); - return BadAlloc; - } -- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { -- xfree(surface->pitches); -- xfree(surface->offsets); -+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) { -+ free(surface->pitches); -+ free(surface->offsets); - xf86FreeOffscreenLinear(linear); - return BadAlloc; - } -@@ -1034,9 +1034,9 @@ TRIDENTFreeSurface( - if(pPriv->isOn) - TRIDENTStopSurface(surface); - xf86FreeOffscreenLinear(pPriv->linear); -- xfree(surface->pitches); -- xfree(surface->offsets); -- xfree(surface->devPrivate.ptr); -+ free(surface->pitches); -+ free(surface->offsets); -+ free(surface->devPrivate.ptr); - - return Success; - } -@@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen) - XF86OffscreenImagePtr offscreenImages; - - /* need to free this someplace */ -- if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) -+ if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec)))) - return; - - offscreenImages[0].image = &Images[0]; -@@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn) - * full vblank has passed. - * - Alan. - */ -- if (!xf86IsPc98()) { -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ if (!xf86IsPc98()) -+#endif -+ { - WAITFORVSYNC; - WAITFORVSYNC; - } diff --git a/testing/xf86-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD deleted file mode 100644 index 24aeede8a..000000000 --- a/testing/xf86-video-tseng/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150079 2012-02-12 09:45:50Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tseng -pkgver=1.2.4 -pkgrel=6 -pkgdesc="X.org tseng video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - tseng-1.2.4-git.patch) -sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7' - 'd84bb75d62888096da7477b38e8b13f9c23d4e3a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/tseng-1.2.4-git.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-tseng/tseng-1.2.4-git.patch b/testing/xf86-video-tseng/tseng-1.2.4-git.patch deleted file mode 100644 index 082b2cb0b..000000000 --- a/testing/xf86-video-tseng/tseng-1.2.4-git.patch +++ /dev/null @@ -1,317 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 62cc318..8458c06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,46 +20,46 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-tseng], -- 1.2.4, -+ [1.2.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-tseng) -- -+ [xf86-video-tseng]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) - - # Checks for libraries. -@@ -78,17 +78,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=tseng - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 8f2454b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -+ -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -+ - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/tseng.man b/man/tseng.man -index 403782f..984c8e7 100644 ---- a/man/tseng.man -+++ b/man/tseng.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH TSENG __drivermansuffix__ __vendorversion__ -diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c -index d4fb847..2412b31 100644 ---- a/src/tseng_cursor.c -+++ b/src/tseng_cursor.c -@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) - } - } - --void -+static void - TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits) - { - vgaHWPtr hwp = VGAHWPTR(pScrn); -diff --git a/src/tseng_dga.c b/src/tseng_dga.c -index 70ebe23..528ba4c 100644 ---- a/src/tseng_dga.c -+++ b/src/tseng_dga.c -@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen) - if (!pTseng->DGAnumModes) { - pMode = firstMode = pScrn->modes; - while (pMode) { -- newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec)); -+ newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec)); - if (!newmodes) { -- xfree(modes); -+ free(modes); - return FALSE; - } - modes = newmodes; -@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer( - TsengPtr pTseng = TsengPTR(pScrn); - - *name = NULL; /* no special device */ -- *mem = (unsigned char*)pTseng->FbAddress; -+ *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress; - *size = pTseng->FbMapSize; - *offset = 0; /* Always */ - *flags = 0; /* Root permissions OS-dependent */ -diff --git a/src/tseng_driver.c b/src/tseng_driver.c -index 445c17e..d36b62c 100644 ---- a/src/tseng_driver.c -+++ b/src/tseng_driver.c -@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn) - pTseng = TsengPTR(pScrn); - - if (pTseng->SavedReg.RAMDAC) -- xfree(pTseng->SavedReg.RAMDAC); -+ free(pTseng->SavedReg.RAMDAC); - -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - -- xfree(devSections); -+ free(devSections); - return foundScreen; - } - -@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if (!(pTseng->Options = xalloc(sizeof(TsengOptions)))) -+ if (!(pTseng->Options = malloc(sizeof(TsengOptions)))) - return FALSE; - memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions)); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options); -@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn) - PDEBUG(" TsengGetFbAddress\n"); - - /* base0 is the framebuffer and base1 is the PCI IO space. */ -- if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { -+ if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "No valid Framebuffer address in PCI config space;\n"); - return FALSE; -diff --git a/src/tseng_mode.c b/src/tseng_mode.c -index f075226..a3ff87d 100644 ---- a/src/tseng_mode.c -+++ b/src/tseng_mode.c -@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - outb(hwp->PIOOffset + VGA_BANK, value); -+#else -+ pci_io_write8(hwp->io, VGA_BANK, value); -+#endif - } - - CARD8 -@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp) - if (hwp->MMIOBase) - return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - return inb(hwp->PIOOffset + VGA_BANK); -+#else -+ return pci_io_read8(hwp->io, VGA_BANK); -+#endif - } - - #define VGA_SEGMENT 0x3CD -@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - outb(hwp->PIOOffset + VGA_SEGMENT, value); -+#else -+ pci_io_write8(hwp->io, VGA_SEGMENT, value); -+#endif - } - - CARD8 -@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp) - if (hwp->MMIOBase) - return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT); - else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - return inb(hwp->PIOOffset + VGA_SEGMENT); -+#else -+ return pci_io_read8(hwp->io, VGA_SEGMENT); -+#endif - } - - /* -@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value) - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, - hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value); -- else -- outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value); -+ else -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ outb(hwp->PIOOffset + VGA_MODE_CONTROL, value); -+#else -+ pci_io_write8(hwp->io, VGA_MODE_CONTROL, value); -+#endif - } - - /* -@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable) - - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp); - } else { -- tmp = inb(hwp->PIOOffset + VGA_HERCULES); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ tmp = inb(hwp->PIOOffset + VGA_HERCULES); -+#else -+ tmp = pci_io_read8(hwp->io, VGA_HERCULES); -+#endif - - if (Enable) - tmp |= 0x02; - else - tmp &= ~0x02; - -- outb(hwp->PIOOffset + VGA_HERCULES, tmp); -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 -+ outb(hwp->PIOOffset + VGA_HERCULES, tmp); -+#else -+ pci_io_write8(hwp->io, VGA_HERCULES, tmp); -+#endif - } - } - -@@ -1502,7 +1530,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode) - - /* clean up */ - if (new->RAMDAC) -- xfree(new->RAMDAC); -+ free(new->RAMDAC); - - return TRUE; - } diff --git a/testing/xf86-video-unichrome/LICENSE b/testing/xf86-video-unichrome/LICENSE deleted file mode 100644 index f4007667b..000000000 --- a/testing/xf86-video-unichrome/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved. -Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved. -Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved. -Copyright (c) 2001-2003 S3 Graphics, Inc. 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, sub license, -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 NON-INFRINGEMENT. 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. diff --git a/testing/xf86-video-unichrome/PKGBUILD b/testing/xf86-video-unichrome/PKGBUILD deleted file mode 100644 index 6f6424407..000000000 --- a/testing/xf86-video-unichrome/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150081 2012-02-12 09:45:52Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-unichrome -pkgver=0.2.7 -pkgrel=7 -_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2 -pkgdesc="Unichrome video drivers for X.Org" -arch=(i686 x86_64) -url="http://unichrome.sf.net/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') # 'glproto') -options=('!libtool') -conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.11.99.903') -source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2) -md5sums=('f7adef052de08a01af86e245d1932239') - -build() { - cd "${srcdir}/${pkgname}-${_gitversion}" - ./autogen.sh --prefix=/usr #--enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${_gitversion}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/testing/xf86-video-v4l/LICENSE b/testing/xf86-video-v4l/LICENSE deleted file mode 100644 index 535595b88..000000000 --- a/testing/xf86-video-v4l/LICENSE +++ /dev/null @@ -1,826 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Licenses - - The X.Org Foundation - - March 2004 - -1. Introduction - -The X.org Foundation X Window System distribution is a compilation of code -and documentation from many sources. This document is intended primarily as -a guide to the licenses used in the distribution: you must check each file -and/or package for precise redistribution terms. None-the-less, this summary -may be useful to many users. No software incorporating the XFree86 1.1 -license has been incorporated. - -This document is based on the compilation from XFree86. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following copy- -right/license: - -Copyright (C) 1994-2003 The XFree86 Project, Inc. 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 fur- -nished 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, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from the XFree86 -Project. - -3. Other Licenses - -Portions of code are covered by the following licenses/copyrights. See indi- -vidual files for the copyright dates. - -3.1 X/MIT Copyrights - -3.1.1 X Consortium - -Copyright (C) <date> X Consortium - -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 fur- -nished 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, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X -CONSORTIUM 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. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2 The Open Group - -Copyright <date> The Open Group - -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. - -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, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP 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. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -3.2 Berkeley-based copyrights: - -o - -3.2.1 General - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, 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 OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.2 UCB/LBL - -Copyright (c) 1993 The Regents of the University of California. All rights -reserved. - -This software was developed by the Computer Systems Engineering group at -Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to -Berkeley. - -All advertising materials mentioning features or use of this software must -display the following acknowledgement: This product includes software devel- -oped by the University of California, Lawrence Berkeley Laboratory. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the University of California, Berkeley and its con- - tributors. - - 4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 DIS- -CLAIMED. IN NO EVENT SHALL THE REGENTS 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. - -3.2.3 The NetBSD Foundation, Inc. - -Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. - -This code is derived from software contributed to The NetBSD Foundation by -Ben Collver <collver1@attbi.com> - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the NetBSD Foundation, Inc. and its contributors. - - 4. Neither the name of The NetBSD Foundation nor the names of its con- - tributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE- -QUENTIAL 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 DAM- -AGE. - -3.2.4 Theodore Ts'o. - -Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights -reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - and the entire permission notice in its entirety, including the dis- - claimer of warranties. - - 2. 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. - - 3. he name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS 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, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, 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 OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.5 Theo de Raadt and Damien Miller - -Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c) -2001-2002 Damien Miller. All rights reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, 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 OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.6 Todd C. Miller - -Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON- -TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -3.2.7 Thomas Winischhofer - -Copyright (C) 2001-2004 Thomas Winischhofer - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED 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, SPE- -CIAL, 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 OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.3 NVIDIA Corp - -Copyright (c) 1996 NVIDIA, Corp. All rights reserved. - -NOTICE TO USER: The source code is copyrighted under U.S. and international -laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as -design patents pending on the design and interface of the NV chips. Users -and possessors of this source code are hereby granted a nonexclusive, roy- -alty-free copyright and design patent license to use this code in individual -and commercial software. - -Any use of this source code must include, in the user documentation and -internal comments to the code, notices to the end user as follows: - -Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. -and foreign countries. - -NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE -CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- -RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE -FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- -AGES 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 SOURCE CODE. - -3.4 GLX Public License - -GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") - -Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby -grants permission to Recipient (defined below), under Recipient's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below), and to permit persons to whom the Subject Software is furnished in -accordance with this License to do the same, subject to all of the following -terms and conditions, which Recipient accepts by engaging in any such use, -copying, modifying, merging, publishing, distributing, sublicensing or sell- -ing: - -1. Definitions. - - (a) "Original Software" means source code of computer software code - which is described in Exhibit A as Original Software. - - (b) "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - (c) "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - (d) "Recipient" means an individual or a legal entity exercising - rights under, and complying with all of the terms of, this License. - For legal entities, "Recipient" includes any entity which controls, - is controlled by, or is under common control with Recipient. For - purposes of this definition, "control" of an entity means (a) the - power, direct or indirect, to direct or manage such entity, or (b) - ownership of fifty percent (50%) or more of the outstanding shares - or beneficial ownership of such entity. - -2. Redistribution of Source Code Subject to These Terms. Redistributions of -Subject Software in source code form must retain the notice set forth in -Exhibit A, below, in every file. A copy of this License must be included in -any documentation for such Subject Software where the recipients' rights -relating to Subject Software are described. Recipient may distribute the -source code version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 -of this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the source code version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -3. Redistribution in Executable Form. The notice set forth in Exhibit A must -be conspicuously included in any notice in an executable version of Subject -Software, related documentation or collateral in which Recipient describes -the user's rights relating to the Subject Software. Recipient may distribute -the executable version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of -this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the executable version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -4. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software which is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -5. No Trademark Rights. This License does not grant any rights to use any -trade name, trademark or service mark whatsoever. No trade name, trademark or -service mark of SGI may be used to endorse or promote products derived from -the Subject Software without prior written permission of SGI. - -6. No Other Rights. This License does not grant any rights with respect to -the OpenGL API or to any software or hardware implementation thereof or to -any other software whatsoever, nor shall any other rights or licenses not -expressly granted hereunder arise by implication, estoppel or otherwise with -respect to the Subject Software. Title to and ownership of the Original Soft- -ware at all times remains with SGI. All rights in the Original Software not -expressly granted under this License are reserved. - -7. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -8. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Exhibit A notice required under Sec- -tions 2 and 3, above, and in the text of any related documentation, license -agreement or collateral in which Recipient describes end user's rights relat- -ing to the Subject Software. If Recipient obtains such knowledge after it -makes Subject Software available to any other person or entity, Recipient -shall take other steps (such as notifying appropriate mailing lists or news- -groups) reasonably calculated to inform those who received the Subject Soft- -ware that new knowledge has been obtained. - -9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- -ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- -BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR -ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY -CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK -STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER -COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF -THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY -TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO -THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO -NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, -SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. - -11. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. -from and against any loss, liability, damages, costs or expenses (including -the payment of reasonable attorneys fees) arising out of Recipient's use, -modification, reproduction and distribution of the Subject Software or out of -any representation or warranty made by Recipient. - -12. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End -Users acquire only the rights set forth in this License and are subject to -the terms of this License. - -13. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable, such provision shall be reformed so as to achieve as nearly as -possible the same economic effect as the original provision and the remainder -of this License will remain in effect. This License shall be governed by and -construed in accordance with the laws of the United States and the State of -California as applied to agreements entered into and to be performed entirely -within California between California residents. Any litigation relating to -this License shall be subject to the exclusive jurisdiction of the Federal -Courts of the Northern District of California (or, absent subject matter -jurisdiction in such courts, the courts of the State of California), with -venue lying exclusively in Santa Clara County, California, with the losing -party responsible for costs, including without limitation, court costs and -reasonable attorneys fees and expenses. The application of the United Nations -Convention on Contracts for the International Sale of Goods is expressly -excluded. Any law or regulation which provides that the language of a con- -tract shall be construed against the drafter shall not apply to this License. - -Exhibit A - -The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and -13 of the GLX Public License Version 1.0 (the "License"). You may not use -this file except in compliance with those sections of the License. You may -obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, -2011 N. Shoreline Blvd., Mountain View, CA 94043 or at -http://www.sgi.com/software/opensource/glx/license.html. - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software is GLX version 1.2 source code, released February, -1999. The developer of the Original Software is Silicon Graphics, Inc. Those -portions of the Subject Software created by Silicon Graphics, Inc. are Copy- -right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -3.5 CID Font Code Public License - -CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") - -Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") -hereby grants permission to Recipient (defined below), under SGI's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below) in both source code and executable form, and to permit persons to whom -the Subject Software is furnished in accordance with this License to do the -same, subject to all of the following terms and conditions, which Recipient -accepts by engaging in any such use, copying, modifying, merging, publica- -tion, distributing, sublicensing or selling: - -1. Definitions. - - a. "Original Software" means source code of computer software code - that is described in Exhibit A as Original Software. - - b. "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - c. "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - d. "Recipient" means an individual or a legal entity exercising - rights under the terms of this License. For legal entities, "Recip- - ient" includes any entity that controls, is controlled by, or is - under common control with Recipient. For purposes of this defini- - tion, "control" of an entity means (i) the power, direct or indi- - rect, to direct or manage such entity, or (ii) ownership of fifty - percent (50%) or more of the outstanding shares or beneficial own- - ership of such entity. - - e. "Required Notice" means the notice set forth in Exhibit A to - this License. - - f. "Accompanying Technology" means any software or other technology - that is not a Modification and that is distributed or made publicly - available by Recipient with the Subject Software. Separate soft- - ware files that do not contain any Original Software or any previ- - ous Modification shall not be deemed a Modification, even if such - software files are aggregated as part of a product, or in any - medium of storage, with any file that does contain Original Soft- - ware or any previous Modification. - -2. License Terms. All distribution of the Subject Software must be made sub- -ject to the terms of this License. A copy of this License and the Required -Notice must be included in any documentation for Subject Software where -Recipient's rights relating to Subject Software and/or any Accompanying Tech- -nology are described. Distributions of Subject Software in source code form -must also include the Required Notice in every file distributed. In addition, -a ReadMe file entitled "Important Legal Notice" must be distributed with each -distribution of one or more files that incorporate Subject Software. That -file must be included with distributions made in both source code and exe- -cutable form. A copy of the License and the Required Notice must be included -in that file. Recipient may distribute Accompanying Technology under a -license of Recipient's choice, which may contain terms different from this -License, provided that (i) Recipient is in compliance with the terms of this -License, (ii) such other license terms do not modify or supersede the terms -of this License as applicable to the Subject Software, (iii) Recipient hereby -indemnifies SGI for any liability incurred by SGI as a result of the distri- -bution of Accompanying Technology or the use of other license terms. - -3. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software that is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -4. Trademark Rights. This License does not grant any rights to use any trade -name, trademark or service mark whatsoever. No trade name, trademark or ser- -vice mark of SGI may be used to endorse or promote products derived from or -incorporating any Subject Software without prior written permission of SGI. - -5. No Other Rights. No rights or licenses not expressly granted hereunder -shall arise by implication, estoppel or otherwise. Title to and ownership of -the Original Software at all times remains with SGI. All rights in the Origi- -nal Software not expressly granted under this License are reserved. - -6. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity, or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -7. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Required Notice, and in the text of -any related documentation, license agreement or collateral in which Recipient -describes end user's rights relating to the Subject Software. If Recipient -obtains such knowledge after it makes Subject Software available to any other -person or entity, Recipient shall take other steps (such as notifying appro- -priate mailing lists or newsgroups) reasonably calculated to provide such -knowledge to those who received the Subject Software. - -8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, -WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), -CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR 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 SUBJECT SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT -ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND -LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. - -10. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold SGI and its successors and assigns -harmless from and against any loss, liability, damages, costs or expenses -(including the payment of reasonable attorneys fees) arising out of (Recipi- -ent's use, modification, reproduction and distribution of the Subject Soft- -ware or out of any representation or warranty made by Recipient. - -11. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End Users -acquire only the rights set forth in this License and are subject to the -terms of this License. - -12. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable by any judicial or administrative authority having proper jurisdic- -tion with respect thereto, such provision shall be reformed so as to achieve -as nearly as possible the same economic effect as the original provision and -the remainder of this License will remain in effect. This License shall be -governed by and construed in accordance with the laws of the United States -and the State of California as applied to agreements entered into and to be -performed entirely within California between California residents. Any liti- -gation relating to this License shall be subject to the exclusive jurisdic- -tion of the Federal Courts of the Northern District of California (or, absent -subject matter jurisdiction in such courts, the courts of the State of Cali- -fornia), with venue lying exclusively in Santa Clara County, California, with -the losing party responsible for costs, including without limitation, court -costs and reasonable attorneys fees and expenses. The application of the -United Nations Convention on Contracts for the International Sale of Goods is -expressly excluded. Any law or regulation that provides that the language of -a contract shall be construed against the drafter shall not apply to this -License. - -Exhibit A - -Copyright (c) 1994-1999 Silicon Graphics, Inc. - -The contents of this file are subject to the CID Font Code Public License -Version 1.0 (the "License"). You may not use this file except in compliance -with the License. You may obtain a copy of the License at Silicon Graphics, -Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -or at http://www.sgi.com/software/opensource/cid/license.html - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software (as defined in the License) is CID font code that was -developed by Silicon Graphics, Inc. Those portions of the Subject Software -(as defined in the License) that were created by Silicon Graphics, Inc. are -Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. - -[NOTE: When using this text in connection with Subject Software delivered -solely in object code form, Recipient may replace the words "this file" with -"this software" in both the first and second sentences.] - -3.6 Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as long as -"Bitstream" or "Vera" are not in the names), and full redistribution (so long -as they are not *sold* by themselves). They can be be bundled, redistributed -and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated documentation -files (the "Font Software"), to reproduce and distribute the Font Software, -including without limitation the rights to use, copy, merge, publish, dis- -tribute, and/or sell copies of the Font Software, and to permit persons to -whom the Font Software is furnished to do so, subject to the following condi- -tions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and addi- -tional glyphs or characters may be added to the Fonts, only if the fonts are -renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream Vera" -names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA- -TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, -and Bitstream Inc., shall not be used in advertising or otherwise to promote -the sale, use or other dealings in this Font Software without prior written -authorization from the Gnome Foundation or Bitstream Inc., respectively. For -further information, contact: fonts at gnome dot org. - -3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license - -Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction -code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis- -tered trademark of Bigelow & Holmes Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of these Fonts and associated documentation files (the "Font Software"), to -deal in the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, sublicense, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished to do -so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software. - -The Font Software may not be modified, altered, or added to, and in particu- -lar the designs of glyphs or characters in the Fonts may not be modified nor -may additional glyphs or characters be added to the Fonts. This License -becomes null and void when the Fonts or Font Software have been modified. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ -GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Bigelow & Holmes Inc. and -URW++ GmbH. shall not be used in advertising or otherwise to promote the -sale, use or other dealings in this Font Software without prior written -authorization from Bigelow & Holmes Inc. and URW++ GmbH. - -For further information, contact: - -info@urwpp.de or design@bigelowandholmes.com - - $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $ diff --git a/testing/xf86-video-v4l/PKGBUILD b/testing/xf86-video-v4l/PKGBUILD deleted file mode 100644 index a947504f5..000000000 --- a/testing/xf86-video-v4l/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 150083 2012-02-12 09:45:54Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-v4l -pkgver=0.2.0 -pkgrel=10 -pkgdesc="X.org v4l video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch - LICENSE) -md5sums=('2251ae2a0a905764941cd7b098e85ad1' - 'cdb7113a9564ea9202e847de88440540' - '7d4d018f6bbff7e42672d1aabc75c5cf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-v4l/git-fixes.patch b/testing/xf86-video-v4l/git-fixes.patch deleted file mode 100644 index 2f752fc8c..000000000 --- a/testing/xf86-video-v4l/git-fixes.patch +++ /dev/null @@ -1,4362 +0,0 @@ -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index 02fc6fa..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,57 +0,0 @@ --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/v4l.c: -- Bump to 0.1.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/v4l.c: (V4lPutVideo), (V4lPutStill): -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/v4l.c: -- Unlibcwrap. Bump server version requirement. Bump to 0.1.0. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * man/Makefile.am: -- Change *man_SOURCES ==> *man_PRE to fix autotools warnings. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 3ae2692..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,6 +18,15 @@ - # 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. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man --EXTRA_DIST = README -+MAINTAINERCLEANFILES = ChangeLog INSTALL -+ -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index d9ac542..c490919 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,57 +20,56 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-v4l], -- 0.2.0, -+ [0.2.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-v4l) -- -+ [xf86-video-v4l]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=v4l - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# 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. --# --# 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 THE OPEN GROUP 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. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# 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. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/v4l.man b/man/v4l.man -index 7d35b86..dc1e201 100644 ---- a/man/v4l.man -+++ b/man/v4l.man -@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration - details. This section only covers configuration details specific to this - driver. - .SH "SEE ALSO" --__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) -+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) - .SH AUTHORS - Authors include: Gerd Knorr <kraxel@bytesex.org> -diff --git a/src/Makefile.am b/src/Makefile.am -index ed30a80..08afe60 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la - v4l_drv_la_LDFLAGS = -module -avoid-version - v4l_drv_ladir = @moduledir@/drivers - --v4l_drv_la_SOURCES = \ -- v4l.c -- --EXTRA_DIST = videodev.h -+v4l_drv_la_SOURCES = \ -+ v4l.c \ -+ videodev.h -diff --git a/src/v4l.c b/src/v4l.c -index b827f80..10e782b 100644 ---- a/src/v4l.c -+++ b/src/v4l.c -@@ -1,6 +1,9 @@ - /* -- * video4linux Xv Driver -+ * video4linux Xv Driver - * based on Michael Schimek's permedia 2 driver. -+ * -+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for: -+ * - Major rewrite, as driver got ported to V4L2 API - */ - - #ifdef HAVE_CONFIG_H -@@ -9,12 +12,16 @@ - - #include <sys/types.h> - #include <sys/stat.h> -+#include <ctype.h> -+ - #include <fcntl.h> - #include <errno.h> - #include <string.h> - #include <stdio.h> -+#include <unistd.h> -+#include <sys/ioctl.h> - --#include "videodev.h" -+#include "videodev2.h" - #include "xf86.h" - #include "xf86_OSproc.h" - #include "xf86Pci.h" -@@ -25,8 +32,9 @@ - #include "regionstr.h" - #include "dgaproc.h" - #include "xf86str.h" -+#include "fourcc.h" - --#include <asm/ioctl.h> /* _IORW(xxx) #defines are here */ -+#include <asm/ioctl.h> /* _IORW(xxx) #defines are here */ - - #if 0 - # define DEBUG(x) (x) -@@ -34,20 +42,22 @@ - # define DEBUG(x) - #endif - -+/***************************************************************************/ -+ - static void V4LIdentify(int flags); - static Bool V4LProbe(DriverPtr drv, int flags); - static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid); - - _X_EXPORT DriverRec V4L = { -- 40000, -- "v4l", -- V4LIdentify, /* Identify*/ -- V4LProbe, /* Probe */ -- V4LAvailableOptions, -- NULL, -- 0 --}; -- -+ .driverVersion = 50000, -+ .driverName = "v4l", -+ .Identify = V4LIdentify, -+ .Probe = V4LProbe, -+ .AvailableOptions = V4LAvailableOptions, -+ .module = NULL, -+ .refCount = 0, -+ .driverFunc = NULL, /* FIXME: Need to implement for new probing mode */ -+}; - - #ifdef XFree86LOADER - -@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup); - - static XF86ModuleVersionInfo v4lVersRec = - { -- "v4l", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- 0, 1, 1, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_NONE, -- {0,0,0,0} -+ "v4l", -+ MODULEVENDORSTRING, -+ MODINFOSTRING1, -+ MODINFOSTRING2, -+ XORG_VERSION_CURRENT, -+ 0, 1, 1, -+ ABI_CLASS_VIDEODRV, -+ ABI_VIDEODRV_VERSION, -+ MOD_CLASS_NONE, -+ {0,0,0,0} - }; - - _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL }; -@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL }; - static pointer - v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - { -- const char *osname; -- static Bool setupDone = FALSE; -- -- if (setupDone) { -- if (errmaj) -- *errmaj = LDR_ONCEONLY; -- return NULL; -- } -- -- setupDone = TRUE; -- -- /* Check that we're being loaded on a Linux system */ -- LoaderGetOS(&osname, NULL, NULL, NULL); -- if (!osname || strcmp(osname, "linux") != 0) { -- if (errmaj) -- *errmaj = LDR_BADOS; -- if (errmin) -- *errmin = 0; -- return NULL; -- } else { -- /* OK */ -- -- xf86AddDriver (&V4L, module, 0); -- -- return (pointer)1; -- } -+ const char *osname; -+ static Bool setupDone = FALSE; -+ -+ if (setupDone) { -+ if (errmaj) -+ *errmaj = LDR_ONCEONLY; -+ return NULL; -+ } -+ -+ setupDone = TRUE; -+ -+ /* Check that we're being loaded on a Linux system */ -+ LoaderGetOS(&osname, NULL, NULL, NULL); -+ if (!osname || strcmp(osname, "linux") != 0) { -+ if (errmaj) -+ *errmaj = LDR_BADOS; -+ if (errmin) -+ *errmin = 0; -+ return NULL; -+ } else { -+ /* OK */ -+ -+ xf86AddDriver (&V4L, module, 0); -+ -+ return (pointer)1; -+ } - } - - #else -@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - #define VIDEO_YUV 2 /* yuv overlay (to offscreen memory + hw scaling) */ - #define VIDEO_RECLIP 3 /* temporarly off, window clipping changes */ - -+typedef struct _XvV4LCtrlRec { -+ struct v4l2_queryctrl qctrl; -+ Atom xv; -+} XvV4LCtrlRec, *XvV4LCtrlPtr; -+ - typedef struct _PortPrivRec { - ScrnInfoPtr pScrn; -- FBAreaPtr pFBArea[2]; -- int VideoOn; -- Bool StreamOn; -+ FBAreaPtr pFBArea[2]; -+ int VideoOn; -+ Bool StreamOn; - - /* file handle */ -- int nr; -- struct video_capability cap; -+ int nr; -+ struct v4l2_capability cap; - - /* RGB overlay */ -- struct video_buffer rgb_fbuf; -- struct video_window rgb_win; -- int rgbpalette; -+ struct v4l2_framebuffer rgb_fbuf; -+ struct v4l2_window rgb_win; - int rgbdepth; - - /* attributes */ -- struct video_picture pict; -- struct video_audio audio; -+ CARD32 pixelformat; - - XF86VideoEncodingPtr enc; - int *input; -@@ -145,24 +158,21 @@ typedef struct _PortPrivRec { - - int yuv_width,yuv_height; - XF86SurfacePtr surface; -- struct video_buffer yuv_fbuf; -- struct video_window yuv_win; --} PortPrivRec, *PortPrivPtr; -+ struct v4l2_framebuffer yuv_fbuf; -+ struct v4l2_window yuv_win; -+ -+ struct v4l2_standard *standard; /* FIXME: can be removed */ - --#define XV_ENCODING "XV_ENCODING" --#define XV_BRIGHTNESS "XV_BRIGHTNESS" --#define XV_CONTRAST "XV_CONTRAST" --#define XV_SATURATION "XV_SATURATION" --#define XV_HUE "XV_HUE" -+ XvV4LCtrlPtr XvV4LCtrl; -+ int n_qctrl; -+} PortPrivRec, *PortPrivPtr; - --#define XV_FREQ "XV_FREQ" --#define XV_MUTE "XV_MUTE" --#define XV_VOLUME "XV_VOLUME" -+#define XV_ENCODING "XV_ENCODING" -+#define XV_FREQ "XV_FREQ" - --#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) -+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE) - --static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue; --static Atom xvFreq, xvMute, xvVolume; -+static Atom xvEncoding, xvFreq; - - static XF86VideoFormatRec - InputVideoFormats[] = { -@@ -176,16 +186,8 @@ InputVideoFormats[] = { - - static const XF86AttributeRec Attributes[] = { - {XvSettable | XvGettable, -1000, 1000, XV_ENCODING}, -- {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 VolumeAttr = -- {XvSettable | XvGettable, -1000, 1000, XV_VOLUME}; --static const XF86AttributeRec MuteAttr = -- {XvSettable | XvGettable, 0, 1, XV_MUTE}; --static const XF86AttributeRec FreqAttr = -+static const XF86AttributeRec FreqAttr = - {XvSettable | XvGettable, 0, 16*1000, XV_FREQ}; - - -@@ -206,59 +208,247 @@ static struct V4L_DEVICE { - }; - - /* ---------------------------------------------------------------------- */ --/* forward decl */ - --static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion, -- short vid_w, short vid_h, short drw_w, short drw_h, -- unsigned int *p_w, unsigned int *p_h, pointer data); -+static int SetV4LFmt(int fd, CARD32 pixelformat) -+{ -+ struct v4l2_framebuffer fbuf; -+ char *p = (char *)&pixelformat; -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ if (fbuf.fmt.pixelformat != pixelformat) { -+ fbuf.fmt.pixelformat = pixelformat; -+ if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n", -+ errno, p[0], p[1], p[2], p[3]); -+ return errno; -+ } -+ } -+ DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n", -+ p[0], p[1], p[2], p[3])); -+ return 0; -+} -+static int GetV4LFmt(int fd, CARD32 *pixelformat) -+{ -+ struct v4l2_framebuffer fbuf; -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ -+ *pixelformat = fbuf.fmt.pixelformat; -+ -+ return 0; -+} -+ -+#define ATTR_NAME_PREFIX "XV_" -+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count, -+ struct v4l2_queryctrl *qctrl, int *n) -+{ -+ char *ptr; -+ -+/* v4l_add_attr */ -+ if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED) -+ return 0; -+ switch (qctrl->type) { -+ case V4L2_CTRL_TYPE_INTEGER: -+ case V4L2_CTRL_TYPE_BOOLEAN: -+ case V4L2_CTRL_TYPE_MENU: -+ case V4L2_CTRL_TYPE_BUTTON: -+ break; -+ default: -+ return 0; -+ } -+ -+ p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1)); -+ if (!p->XvV4LCtrl) { -+ if (*list) { -+ free (*list); -+ *count = 0; -+ *n = 0; -+ } -+ return -1; -+ } -+ -+ *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1)); -+ if (NULL == *list) { -+ if (p->XvV4LCtrl) -+ free (p->XvV4LCtrl); -+ *count = 0; -+ return -1; -+ } -+ -+ memset(*list + *count, 0, sizeof(XF86AttributeRec)); -+ (*list)[*count].flags = XvSettable | XvGettable; -+ -+ if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY) -+ (*list)[*count].flags &= ~XvSettable; -+ if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY) -+ (*list)[*count].flags &= ~XvGettable; -+ (*list)[*count].min_value = qctrl->minimum; -+ (*list)[*count].max_value = qctrl->maximum; -+ (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX)); -+ strcpy((*list)[*count].name, ATTR_NAME_PREFIX); -+ strcat((*list)[*count].name, (char *)qctrl->name); -+ for (ptr = (*list)[*count].name; *ptr; ptr++) { -+ *ptr = toupper(*ptr); -+ if (*ptr == ' ') -+ *ptr = '_'; -+ } -+ -+ p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name); -+ memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl)); -+ -+ xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n", -+ (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv, -+ p->XvV4LCtrl[*n].qctrl.minimum, -+ p->XvV4LCtrl[*n].qctrl.maximum); -+ -+ (*count)++; -+ (*n)++; -+ -+ return 0; -+} -+ -+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list, -+ int *count, int fd) -+{ -+ int entries = 0; -+ CARD32 id; -+ struct v4l2_queryctrl qctrl; -+ -+ memset(&qctrl, 0, sizeof(qctrl)); -+ qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -+ while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL; -+ } -+ if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL) -+ return; -+ for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) { -+ qctrl.id = id; -+ if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ } -+ } -+ qctrl.id = V4L2_CID_PRIVATE_BASE; -+ while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ qctrl.id++; -+ } -+ p->n_qctrl = entries; -+} - - /* ---------------------------------------------------------------------- */ - -+/* setup yuv overlay + hw scaling: look if we find some common video -+ format which both v4l driver and the X-Server can handle */ -+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv, -+ char *dev, int fd) -+{ -+ static const struct { -+ CARD32 v4l_palette; -+ unsigned int xv_id; -+ unsigned int xv_format; -+ } yuvlist[] = { -+ { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked }, -+ { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked }, -+ { 0 /* end of list */ }, -+ }; -+ /* FIXME: Why pScrn->scrnIndex? */ -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ int fmt,i; -+ -+ pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat); -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "v4l: Number of Xv formats: %d\n", pPPriv->nformat); -+ if (!pPPriv->nformat) -+ return FALSE; -+ -+ for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) { -+ pPPriv->pixelformat = yuvlist[fmt].v4l_palette; -+ if (-1 == SetV4LFmt(fd, pPPriv->pixelformat)) -+ continue; -+ GetV4LFmt(fd, &pPPriv->pixelformat); -+ if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette) -+ continue; -+ /* ... works, check available offscreen image formats now ... */ -+ for (i = 0; i < pPPriv->nformat; i++) { -+ if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id && -+ pPPriv->format[i].image->format == yuvlist[fmt].xv_format) { -+ /* ... match found, good. */ -+ pPPriv->yuv_format = yuvlist[fmt].v4l_palette; -+ pPPriv->myfmt = pPPriv->format+i; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "v4l[%s]: using hw video scaling [%4.4s].\n", -+ dev,(char*)&(pPPriv->format[i].image->id)); -+ return TRUE; -+ } -+ } -+ } -+ return TRUE; -+} -+ - static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn) - { - static int first = 1; - -+#if 0 -+ /* -+ * It may be a good idea to probe here, but this would break -+ * some things, as initialization uses yuv_format -+ */ -+ if (!pPPriv->yuv_format && first) -+ v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD); -+#endif - if (-1 == V4L_FD) { -- V4L_FD = open(V4L_NAME, O_RDWR, 0); -- -- pPPriv->rgb_fbuf.width = pScrn->virtualX; -- pPPriv->rgb_fbuf.height = pScrn->virtualY; -- pPPriv->rgb_fbuf.depth = pScrn->bitsPerPixel; -- pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8); -- pPPriv->rgb_fbuf.base = (pointer)(pScrn->memPhysBase + pScrn->fbOffset); -- if (first) { -- first = 0; -- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase); -- } -- -- switch (pScrn->bitsPerPixel) { -- case 16: -- if (pScrn->weight.green == 5) { -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB555; -- pPPriv->rgbdepth = 16; -- } else { -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB565; -- pPPriv->rgbdepth = 16; -- } -- break; -- case 24: -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB24; -- pPPriv->rgbdepth = 24; -- break; -- case 32: -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB32; -- pPPriv->rgbdepth = 32; -- break; -- } -+ V4L_FD = open(V4L_NAME, O_RDWR, 0); -+ -+ if (-1 == V4L_FD) -+ return errno; -+ -+ if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ pPPriv->rgb_fbuf.fmt.width = pScrn->virtualX; -+ pPPriv->rgb_fbuf.fmt.height = pScrn->virtualY; -+ pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8); -+ pPPriv->rgb_fbuf.base = (pointer)(pScrn->memPhysBase + pScrn->fbOffset); -+ if (first) { -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase); -+ first = 0; -+ } -+ -+ switch (pScrn->bitsPerPixel) { -+ case 16: -+ if (pScrn->weight.green == 5) { -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555; -+ } else { -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565; -+ } -+ break; -+ case 24: -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24; -+ break; -+ case 32: -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32; -+ break; -+ } - } - -- if (-1 == V4L_FD) -- return errno; -- - V4L_REF++; - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/open: refcount=%d\n",V4L_REF)); -+ "Xv/open: refcount=%d\n",V4L_REF)); - - return 0; - } -@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn) - { - V4L_REF--; - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/close: refcount=%d\n",V4L_REF)); -+ "Xv/close: refcount=%d\n",V4L_REF)); - if (0 == V4L_REF && -1 != V4L_FD) { -- close(V4L_FD); -- V4L_FD = -1; -+ close(V4L_FD); -+ V4L_FD = -1; - } - } - -@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn, - short vid_w, short vid_h, short drw_w, short drw_h, - RegionPtr clipBoxes, pointer data, DrawablePtr pDraw) - { -+ struct v4l2_format fmt; -+ - PortPrivPtr pPPriv = (PortPrivPtr) data; -- struct video_clip *clip; -+ struct v4l2_clip *clip; - BoxPtr pBox; - RegionRec newReg; - BoxRec newBox; -@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn, - - /* Open a file handle to the device */ - if (VIDEO_OFF == pPPriv->VideoOn) { -- if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ if (V4lOpenDevice(pPPriv, pScrn)) -+ return Success; - } - - if (0 != pPPriv->yuv_format) { -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n")); -- width = pPPriv->enc[pPPriv->cenc].width; -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n")); -+ width = pPPriv->enc[pPPriv->cenc].width; - height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */ -- if (drw_w < width) -- width = drw_w; -- if (drw_h < height) -- height = drw_h; -- if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) { -- /* new size -- free old surface */ -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface resize\n")); -- if (pPPriv->surface) { -- pPPriv->VideoOn = VIDEO_OFF; -- pPPriv->myfmt->stop(pPPriv->surface); -- pPPriv->myfmt->free_surface(pPPriv->surface); -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- } -- pPPriv->yuv_width = width; -- pPPriv->yuv_height = height; -- } -- if (!pPPriv->surface) { -- /* allocate + setup offscreen surface */ -- if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec)))) -- return FALSE; -- if (Success != pPPriv->myfmt->alloc_surface -- (pScrn,pPPriv->myfmt->image->id, -- pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) { -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- goto fallback_to_rgb; -- } -- pPPriv->yuv_fbuf.width = pPPriv->surface->width; -- pPPriv->yuv_fbuf.height = pPPriv->surface->height; -- pPPriv->yuv_fbuf.depth = 16; -- pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0]; -- pPPriv->yuv_fbuf.base = -- (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]); -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface: %p+%d = %p, %dx%d, pitch %d\n", -- pScrn->memPhysBase,pPPriv->surface->offsets[0], -- pScrn->memPhysBase+pPPriv->surface->offsets[0], -- pPPriv->surface->width,pPPriv->surface->height, -- pPPriv->surface->pitches[0])); -- pPPriv->yuv_win.width = pPPriv->surface->width; -- pPPriv->yuv_win.height = pPPriv->surface->height; -- } -- -- /* program driver */ -- if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf))) -- perror("ioctl VIDIOCSFBUF"); -- if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCGPICT"); -- pPPriv->pict.palette = pPPriv->yuv_format; -- pPPriv->pict.depth = 16; -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win))) -- perror("ioctl VIDIOCSWIN"); -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one)) -- perror("ioctl VIDIOCCAPTURE(1)"); -- -- if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -- /* invert cliplist */ -- newBox.x1 = drw_x; -- newBox.y1 = drw_y; -- newBox.x2 = drw_x + drw_w; -- newBox.y2 = drw_y + drw_h; -- -- if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) { -- /* trim to the viewport */ -- if(newBox.x1 < pScrn->frameX0) -- newBox.x1 = pScrn->frameX0; -- if(newBox.x2 > pScrn->frameX1) -- newBox.x2 = pScrn->frameX1; -- -- if(newBox.y1 < pScrn->frameY0) -- newBox.y1 = pScrn->frameY0; -- if(newBox.y2 > pScrn->frameY1) -- newBox.y2 = pScrn->frameY1; -- } -+ if (drw_w < width) -+ width = drw_w; -+ if (drw_h < height) -+ height = drw_h; -+ if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) { -+ /* new size -- free old surface */ -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface resize\n")); -+ if (pPPriv->surface) { -+ pPPriv->VideoOn = VIDEO_OFF; -+ pPPriv->myfmt->stop(pPPriv->surface); -+ pPPriv->myfmt->free_surface(pPPriv->surface); -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ } -+ pPPriv->yuv_width = width; -+ pPPriv->yuv_height = height; -+ } -+ if (!pPPriv->surface) { -+ /* allocate + setup offscreen surface */ -+ if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec)))) -+ return FALSE; -+ if (Success != pPPriv->myfmt->alloc_surface -+ (pScrn,pPPriv->myfmt->image->id, -+ pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) { -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ goto fallback_to_rgb; -+ } -+ -+ if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ pPPriv->yuv_fbuf.fmt.width = pPPriv->surface->width; -+ pPPriv->yuv_fbuf.fmt.height = pPPriv->surface->height; -+ pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0]; -+ pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format; -+ pPPriv->yuv_fbuf.base = -+ (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]); -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ " surface: %p+%d = %p, %dx%d, pitch %d\n", -+ (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0], -+ (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0], -+ pPPriv->surface->width, pPPriv->surface->height, -+ pPPriv->surface->pitches[0])); -+ memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win)); -+ pPPriv->yuv_win.w.left = 0; -+ pPPriv->yuv_win.w.top = 0; -+ pPPriv->yuv_win.w.width = pPPriv->surface->width; -+ pPPriv->yuv_win.w.height = pPPriv->surface->height; -+ } - -- REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1); -- REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes); -- clipBoxes = &newReg; -- } -- -- /* start overlay */ -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "over: - %d,%d -> %d,%d (%dx%d) (yuv=%dx%d)\n", -- drw_x, drw_y, -- drw_x+drw_w, drw_y+drw_h, -- drw_w, drw_h, -- pPPriv->surface->width,pPPriv->surface->height)); -- pPPriv->myfmt->display(pPPriv->surface, -- 0, 0, drw_x, drw_y, -- pPPriv->surface->width, -- pPPriv->surface->height, -- drw_w, drw_h, -- clipBoxes); -- if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -- REGION_UNINIT(pScrn->pScreen, &newReg); -- } -- pPPriv->VideoOn = VIDEO_YUV; -- return Success; -+ /* program driver */ -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno); -+ return BadValue; -+ } -+ pPPriv->pixelformat = pPPriv->yuv_format; -+ if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) -+ return BadValue; -+ -+ memset(&fmt, 0, sizeof(fmt)); -+ fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; -+ memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win)); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno); -+ return BadValue; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) { -+ xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno); -+ return BadValue; -+ } -+ -+ if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -+ /* invert cliplist */ -+ newBox.x1 = drw_x; -+ newBox.y1 = drw_y; -+ newBox.x2 = drw_x + drw_w; -+ newBox.y2 = drw_y + drw_h; -+ -+ if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) { -+ /* trim to the viewport */ -+ if(newBox.x1 < pScrn->frameX0) -+ newBox.x1 = pScrn->frameX0; -+ if(newBox.x2 > pScrn->frameX1) -+ newBox.x2 = pScrn->frameX1; -+ -+ if(newBox.y1 < pScrn->frameY0) -+ newBox.y1 = pScrn->frameY0; -+ if(newBox.y2 > pScrn->frameY1) -+ newBox.y2 = pScrn->frameY1; -+ } -+ -+ REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1); -+ REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes); -+ clipBoxes = &newReg; -+ } -+ -+ /* start overlay */ -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "over: - %d,%d -> %d,%d (%dx%d) (yuv=%dx%d)\n", -+ drw_x, drw_y, -+ drw_x+drw_w, drw_y+drw_h, -+ drw_w, drw_h, -+ pPPriv->surface->width,pPPriv->surface->height)); -+ pPPriv->myfmt->display(pPPriv->surface, -+ 0, 0, drw_x, drw_y, -+ pPPriv->surface->width, -+ pPPriv->surface->height, -+ drw_w, drw_h, -+ clipBoxes); -+ if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -+ REGION_UNINIT(pScrn->pScreen, &newReg); -+ } -+ pPPriv->VideoOn = VIDEO_YUV; -+ return Success; - } - -- fallback_to_rgb: -+fallback_to_rgb: - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n")); - /* FIXME: vid-* is ignored for now, not supported by v4l */ - - dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ? -- drw_w : pPPriv->enc[pPPriv->cenc].width; -+ drw_w : pPPriv->enc[pPPriv->cenc].width; - dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ? -- drw_h : pPPriv->enc[pPPriv->cenc].height; -+ drw_h : pPPriv->enc[pPPriv->cenc].height; - /* if the window is too big, center the video */ - dx = drw_x + (drw_w - dw)/2; - dy = drw_y + (drw_h - dh)/2; - /* bttv prefeares aligned addresses */ - dx &= ~3; -- if (dx < drw_x) dx += 4; -- if (dx+dw > drw_x+drw_w) dw -= 4; -+ if (dx < drw_x) -+ dx += 4; -+ if (dx+dw > drw_x+drw_w) -+ dw -= 4; - - /* window */ - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " win: %dx%d+%d+%d\n", -- drw_w,drw_h,drw_x,drw_y)); -+ drw_w,drw_h,drw_x,drw_y)); - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " use: %dx%d+%d+%d\n", -- dw,dh,dx,dy)); -- pPPriv->rgb_win.x = dx; -- pPPriv->rgb_win.y = dy; -- pPPriv->rgb_win.width = dw; -- pPPriv->rgb_win.height = dh; -- pPPriv->rgb_win.flags = 0; -- -+ dw,dh,dx,dy)); -+ memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win)); -+ pPPriv->rgb_win.w.left = dx; -+ pPPriv->rgb_win.w.top = dy; -+ pPPriv->rgb_win.w.width = dw; -+ pPPriv->rgb_win.w.height = dh; -+ - /* clipping */ - if (pPPriv->rgb_win.clips) { -- xfree(pPPriv->rgb_win.clips); -- pPPriv->rgb_win.clips = NULL; -+ free(pPPriv->rgb_win.clips); -+ pPPriv->rgb_win.clips = NULL; - } - pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes); - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2," clip: have #%d\n", -- pPPriv->rgb_win.clipcount)); -+ pPPriv->rgb_win.clipcount)); - if (0 != pPPriv->rgb_win.clipcount) { -- pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip)); -- if (NULL != pPPriv->rgb_win.clips) { -- memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip)); -- pBox = REGION_RECTS(clipBoxes); -- clip = pPPriv->rgb_win.clips; -- for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) { -- clip->x = pBox->x1 - dx; -- clip->y = pBox->y1 - dy; -- clip->width = pBox->x2 - pBox->x1; -- clip->height = pBox->y2 - pBox->y1; -- } -- } -+ pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip)); -+ if (NULL != pPPriv->rgb_win.clips) { -+ memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip)); -+ pBox = REGION_RECTS(clipBoxes); -+ clip = pPPriv->rgb_win.clips; -+ -+ /* -+ * FIXME: This code currently does nothing, as we don't emulate -+ * The V4L1 clipping stuff -+ */ -+ for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) { -+ clip->c.left = pBox->x1 - dx; -+ clip->c.top = pBox->y1 - dy; -+ clip->c.width = pBox->x2 - pBox->x1; -+ clip->c.height = pBox->y2 - pBox->y1; -+ } -+ } - } - - /* start */ -- if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf))) -- perror("ioctl VIDIOCSFBUF"); -- if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCGPICT"); -- pPPriv->pict.palette = pPPriv->rgbpalette; -- pPPriv->pict.depth = pPPriv->rgbdepth; -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win))) -- perror("ioctl VIDIOCSWIN"); -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one)) -- perror("ioctl VIDIOCCAPTURE(1)"); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno); -+ return BadValue; -+ } -+ if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) { -+ xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno); -+ return BadValue; -+ } -+ pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat; -+ if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) { -+ xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno); -+ return BadValue; -+ } -+ memset(&fmt, 0, sizeof(fmt)); -+ fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; -+ memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win)); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno); -+ return BadValue; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) { -+ xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno); -+ return BadValue; -+ } - pPPriv->VideoOn = VIDEO_RGB; - - return Success; -@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn, - RegionPtr clipBoxes, pointer data, DrawablePtr pDraw) - { - #if 0 -- PortPrivPtr pPPriv = (PortPrivPtr) data; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; - #endif - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n")); -@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn, - static void - V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) - { -- PortPrivPtr pPPriv = (PortPrivPtr) data; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; - int zero=0; - - if (VIDEO_OFF == pPPriv->VideoOn) { -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/StopVideo called with video already off\n")); -- return; -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "Xv/StopVideo called with video already off\n")); -+ return; - } - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown)); - - if (!shutdown) { -- /* just reclipping, we have to stop DMA transfers to the visible screen */ -- if (VIDEO_RGB == pPPriv->VideoOn) { -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero)) -- perror("ioctl VIDIOCCAPTURE(0)"); -- pPPriv->VideoOn = VIDEO_RECLIP; -- } -+ /* just reclipping, we have to stop DMA transfers to the visible screen */ -+ if (VIDEO_RGB == pPPriv->VideoOn) { -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero)) -+ xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno); -+ pPPriv->VideoOn = VIDEO_RECLIP; -+ } - } else { -- /* video stop - turn off and free everything */ -- if (VIDEO_YUV == pPPriv->VideoOn) { -- pPPriv->myfmt->stop(pPPriv->surface); -- pPPriv->myfmt->free_surface(pPPriv->surface); -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- } -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero)) -- perror("ioctl VIDIOCCAPTURE(0)"); -- -- V4lCloseDevice(pPPriv,pScrn); -- pPPriv->VideoOn = VIDEO_OFF; -- } --} -+ /* video stop - turn off and free everything */ -+ if (VIDEO_YUV == pPPriv->VideoOn) { -+ pPPriv->myfmt->stop(pPPriv->surface); -+ pPPriv->myfmt->free_surface(pPPriv->surface); -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero)) -+ xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno); - --/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */ --static int --v4l_to_xv(int val) { -- val = val * 2000 / 65536 - 1000; -- if (val < -1000) val = -1000; -- if (val > 1000) val = 1000; -- return val; --} --static int --xv_to_v4l(int val) { -- val = val * 65536 / 2000 + 32768; -- if (val < -0) val = 0; -- if (val > 65535) val = 65535; -- return val; -+ V4lCloseDevice(pPPriv,pScrn); -+ pPPriv->VideoOn = VIDEO_OFF; -+ } - } - - static int - V4lSetPortAttribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 value, pointer data) - { -- PortPrivPtr pPPriv = (PortPrivPtr) data; -- struct video_channel chan; -- int ret = Success; -+ struct v4l2_control ctrl; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; -+ int i, ret = BadValue; - - if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ return Success; - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n", -- attribute, value)); -+ (int)attribute, (int)value)); - - if (-1 == V4L_FD) { -- ret = Success; -+ ret = Success; - } else if (attribute == xvEncoding) { -- if (value >= 0 && value < pPPriv->nenc) { -- pPPriv->cenc = value; -- chan.channel = pPPriv->input[value]; -- chan.norm = pPPriv->norm[value]; -- if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan)) -- perror("ioctl VIDIOCSCHAN"); -- } else { -- ret = BadValue; -- } -- } else if (attribute == xvBrightness || -- attribute == xvContrast || -- attribute == xvSaturation || -- attribute == xvHue) { -- ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict); -- if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value); -- if (attribute == xvContrast) pPPriv->pict.contrast = xv_to_v4l(value); -- if (attribute == xvSaturation) pPPriv->pict.colour = xv_to_v4l(value); -- if (attribute == xvHue) pPPriv->pict.hue = xv_to_v4l(value); -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- } else if (attribute == xvMute || -- attribute == xvVolume) { -- ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio); -- if (attribute == xvMute) { -- if (value) -- pPPriv->audio.flags |= VIDEO_AUDIO_MUTE; -- else -- pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE; -- } else if (attribute == xvVolume) { -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- pPPriv->audio.volume = xv_to_v4l(value); -- } else { -- ret = BadValue; -- } -- if (ret != BadValue) -- if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio)) -- perror("ioctl VIDIOCSAUDIO"); -+ if (value < 0 || value >= pPPriv->nenc) -+ goto err; -+ if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno); -+ goto err; -+ } -+ if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno); -+ goto err; -+ } -+ pPPriv->cenc = value; -+ ret = Success; - } else if (attribute == xvFreq) { -- unsigned long freq = value; -- if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq)) -- perror("ioctl VIDIOCSFREQ"); -- } else if (0 != pPPriv->yuv_format && -- pPPriv->myfmt->setAttribute) { -- /* not mine -> pass to yuv scaler driver */ -- ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value); -+ struct v4l2_frequency freq; -+ memset(&freq, 0, sizeof(freq)); -+ ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq); -+ freq.frequency = value; -+ if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1) -+ xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno); -+ else -+ ret = Success; - } else { -- ret = BadValue; -+ for (i = 0; i < pPPriv->n_qctrl; i++) -+ if (pPPriv->XvV4LCtrl[i].xv == attribute) -+ break; -+ if (i == pPPriv->n_qctrl) { -+ /* not mine -> pass to yuv scaler driver */ -+ if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute) -+ ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value); -+ else -+ ret = BadMatch; -+ goto err; -+ } -+ if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED) -+ goto err; -+ ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id; -+ ctrl.value = value; -+ if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1) -+ ret = Success; - } - -+err: - V4lCloseDevice(pPPriv,pScrn); - return ret; - } - - static int --V4lGetPortAttribute(ScrnInfoPtr pScrn, -+V4lGetPortAttribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 *value, pointer data) - { -+ struct v4l2_control ctrl; - PortPrivPtr pPPriv = (PortPrivPtr) data; -- int ret = Success; -+ int i, ret = BadValue; - - if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ return Success; - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n", -- attribute)); -+ (int)attribute)); - - if (-1 == V4L_FD) { -- ret = Success; -+ ret = Success; - } else if (attribute == xvEncoding) { -- *value = pPPriv->cenc; -- } else if (attribute == xvBrightness || -- attribute == xvContrast || -- attribute == xvSaturation || -- attribute == xvHue) { -- ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict); -- if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness); -- if (attribute == xvContrast) *value = v4l_to_xv(pPPriv->pict.contrast); -- if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour); -- if (attribute == xvHue) *value = v4l_to_xv(pPPriv->pict.hue); -- } else if (attribute == xvMute || -- attribute == xvVolume) { -- ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio); -- if (attribute == xvMute) { -- *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0; -- } else if (attribute == xvVolume) { -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- *value = v4l_to_xv(pPPriv->audio.volume); -- } else { -- ret = BadValue; -- } -+ *value = pPPriv->cenc; -+ ret = Success; - } else if (attribute == xvFreq) { -- unsigned long freq; -- ioctl(V4L_FD,VIDIOCGFREQ,&freq); -- *value = freq; -- } else if (0 != pPPriv->yuv_format && -- pPPriv->myfmt->getAttribute) { -- /* not mine -> pass to yuv scaler driver */ -- ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value); -+ struct v4l2_frequency freq; -+ memset(&freq, 0, sizeof(freq)); -+ if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) { -+ *value = freq.frequency; -+ ret = Success; -+ } - } else { -- ret = BadValue; -+ for (i = 0; i < pPPriv->n_qctrl; i++) -+ if (pPPriv->XvV4LCtrl[i].xv == attribute) -+ break; -+ if (i == pPPriv->n_qctrl) { -+ /* not mine -> pass to yuv scaler driver */ -+ if (0 != pPPriv->yuv_format && pPPriv->myfmt->getAttribute) -+ ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value); -+ else -+ ret = BadMatch; -+ goto err; -+ } -+ if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED) -+ goto err; -+ ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id; -+ if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) { -+ *value = ctrl.value; -+ ret = Success; -+ } - } -- - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n", -- attribute, *value)); -+ (int)attribute, (int)*value)); - -+err: - V4lCloseDevice(pPPriv,pScrn); - return ret; - } -@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion, - int maxy = pPPriv->enc[pPPriv->cenc].height; - - if (0 != pPPriv->yuv_format) { -- *p_w = pPPriv->myfmt->max_width; -- *p_h = pPPriv->myfmt->max_height; -+ *p_w = pPPriv->myfmt->max_width; -+ *p_h = pPPriv->myfmt->max_height; - } else { -- *p_w = (drw_w < maxx) ? drw_w : maxx; -- *p_h = (drw_h < maxy) ? drw_h : maxy; -+ *p_w = (drw_w < maxx) ? drw_w : maxx; -+ *p_h = (drw_h < maxy) ? drw_h : maxy; - } - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n", -- pPPriv->cenc,drw_w,drw_h,*p_w,*p_h)); -+ pPPriv->cenc,drw_w,drw_h,*p_w,*p_h)); - } - - static const OptionInfoRec * -@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid) - static void - V4LIdentify(int flags) - { -- xf86Msg(X_INFO, "v4l driver for Video4Linux\n"); --} -+ xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n"); -+} - - static char* - fixname(char *str) - { - int s,d; - for (s=0, d=0;; s++) { -- if (str[s] == '-') -- continue; -- str[d++] = tolower(str[s]); -- if (0 == str[s]) -- break; -+ if (str[s] == '-') -+ continue; -+ str[d++] = tolower(str[s]); -+ if (0 == str[s]) -+ break; - } - return str; - } - - static int --v4l_add_enc(XF86VideoEncodingPtr enc, int i, -- char *norm, char *input, int width, int height, int n, int d) -+AddV4LEnc(XF86VideoEncodingPtr enc, int entry, -+ char *norm, char *input, int width, int height, int n, int d) - { -- enc[i].id = i; -- enc[i].name = xalloc(strlen(norm)+strlen(input)+2); -- if (NULL == enc[i].name) -- return -1; -- enc[i].width = width; -- enc[i].height = height; -- enc[i].rate.numerator = n; -- enc[i].rate.denominator = d; -- sprintf(enc[i].name,"%s-%s",norm,fixname(input)); -+ enc->id = entry; -+ enc->name = malloc(strlen(norm) + strlen(input) + 2); -+ if (!enc->name) -+ return -1; -+ -+ enc->width = width; -+ enc->height = height; -+ enc->rate.numerator = n; -+ enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */ -+ sprintf(enc->name,"%s-%s",norm,fixname(input)); -+ -+ xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n", -+ enc->name, enc->width, enc->height, (d + n - 1)/n); -+ - return 0; - } - -+static int -+V4LGetStd(PortPrivPtr p, int fd) -+{ -+ struct v4l2_standard standard; -+ int entries = 0; -+ -+ /* -+ * 128 is just an arbitrary large number. There aren't that many video stds -+ * The max value is there just to avoid an endless loop, if the driver is -+ * broken. -+ */ -+ for (entries = 0; entries < 128; entries++) { -+ memset(&standard, 0, sizeof(standard)); -+ standard.index = entries; -+ if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard)) -+ break; -+ p->standard = realloc(p->standard, sizeof(standard) * (entries + 1)); -+ memcpy(&p->standard[entries], &standard, sizeof(standard)); -+ } -+ -+ /* -+ * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it -+ * This is currently unused, as no webcam driver allows OVERLAY mode, -+ * but the code is here, in the case some webcam driver starts allowing -+ * overlay. -+ * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and -+ * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune -+ * their needs. Those ioctl's could be used here in order to better -+ * support webcams. -+ */ -+ if (!entries) { -+ xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno); -+ p->standard = realloc(p->standard, sizeof(standard) * (entries + 1)); -+ p->standard[0].id = V4L2_STD_ALL; -+ strcpy((char *)p->standard[0].name, "CAMERA"); -+ p->standard[0].frameperiod.numerator = 1001; -+ p->standard[0].frameperiod.denominator = 300001; -+ p->standard[0].framelines = 480; -+ entries++; -+ } -+ return entries; -+} -+ - static void --V4LBuildEncodings(PortPrivPtr p, int fd, int channels) -+V4LBuildEncodings(PortPrivPtr p, int fd) - { -- static struct video_channel channel; -- int i,entries,have_bttv,bttv_ver; -- --#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) -- have_bttv = 0; -- if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver)) -- have_bttv = 1; -- -- entries = (have_bttv ? 7 : 3) * channels; -- p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries); -- if (NULL == p->enc) -- goto fail; -- memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries); -- p->norm = xalloc(sizeof(int) * entries); -- if (NULL == p->norm) -- goto fail; -- memset(p->norm,0,sizeof(int) * entries); -- p->input = xalloc(sizeof(int) * entries); -- if (NULL == p->input) -- goto fail; -- memset(p->input,0,sizeof(int) * entries); -+ unsigned int inp, std, num_std; -+ -+ num_std = V4LGetStd(p, fd); - - p->nenc = 0; -- for (i = 0; i < channels; i++) { -- channel.channel = i; -- if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) { -- perror("ioctl VIDIOCGCHAN"); -- continue; -- } -- -- v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50); -- p->norm[p->nenc] = VIDEO_MODE_PAL; -- p->input[p->nenc] = i; -- p->nenc++; -- -- v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000); -- p->norm[p->nenc] = VIDEO_MODE_NTSC; -- p->input[p->nenc] = i; -- p->nenc++; -- -- v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50); -- p->norm[p->nenc] = VIDEO_MODE_SECAM; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (have_bttv) { -- /* workaround for a v4l design flaw: The v4l API knows just pal, -- ntsc and secam. But there are a few more norms (pal versions -- with a different timings used in south america for example). -- The bttv driver can handle these too. */ -- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name, -- 640, 576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 3; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name, -- 640, 576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 4; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name, -- 768,576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 5; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name, -- 640,480, 1001,60000)) -- goto fail; -- p->norm[p->nenc] = 6; -- p->input[p->nenc] = i; -- p->nenc++; -- } -+ -+ /* -+ * 256 is just an arbitrary large number. There aren't that many video -+ * inputs on any driver. The max value is there just to avoid an endless -+ * loop, if the driver is broken. -+ */ -+ for (inp = 0; inp < 256; inp++) { -+ struct v4l2_input input; -+ -+ memset(&input, 0, sizeof(input)); -+ input.index = inp; -+ if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1) -+ break; -+ -+ for (std = 0; std < num_std; std++) { -+ int width, height; -+ -+ /* -+ * Currently, this code is not reliable, due to driver -+ * non-compliance on both saa7134 and bttv. So, instead, -+ * just use the video standard information -+ */ -+#if 0 -+ struct v4l2_framebuffer fbuf; -+ -+ /* Some webcam drivers will fail here, but that's OK */ -+ ioctl(fd, VIDIOC_S_STD, &p->standard[std].id); -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno); -+ return; -+ } -+ height = fbuf.fmt.height; -+ width = fbuf.fmt.width; -+ -+ /* -+ * If the overlay method fails, get the resolution -+ * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE -+ */ -+ if (!height || !width) { -+ struct v4l2_format format; -+ -+ format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -+ if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) { -+ /* Hmm... device doesn't support capture. */ -+ height = p->standard[std].framelines; -+ if (height == 480) -+ width = 640; -+ else if (height == 576) -+ width = 768; -+ else -+ continue; -+ } else { -+ height = format.fmt.pix.height; -+ width = format.fmt.pix.width; -+ } -+ } -+#else -+ if (p->standard[std].id & V4L2_STD_525_60) { -+ height = 480; -+ width = 640; -+ } else { -+ height = 576; -+ width = 768; -+ } -+ -+#endif -+ /* Fixup for some driver bug */ -+ if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576)) -+ height = 480; -+ -+ p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1)); -+ p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1)); -+ p->input = realloc(p->input, sizeof(int) * (p->nenc + 1)); -+ if (!p->enc || !p->norm || !p->input) -+ goto fail; -+ if (AddV4LEnc(&p->enc[p->nenc], p->nenc, -+ (char *)p->standard[std].name, -+ (char *)input.name, width, height, -+ p->standard[std].frameperiod.numerator, -+ p->standard[std].frameperiod.denominator)) -+ goto fail; -+ p->norm[p->nenc] = p->standard[std].id; -+ p->input[p->nenc] = inp; -+ p->nenc++; -+ } - } -+ -+ if (!p->nenc) -+ xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n"); - return; -- -- fail: -+ -+fail: -+ xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno); - if (p->input) -- xfree(p->input); -+ free(p->input); - p->input = NULL; - if (p->norm) -- xfree(p->norm); -+ free(p->norm); - p->norm = NULL; - if (p->enc) -- xfree(p->enc); -+ free(p->enc); - p->enc = NULL; - p->nenc = 0; - } -@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) - /* add a attribute a list */ - static void - v4l_add_attr(XF86AttributeRec **list, int *count, -- const XF86AttributeRec *attr) -+ const XF86AttributeRec *attr) - { - XF86AttributeRec *oldlist = *list; - int i; -+ Atom gpa; - - for (i = 0; i < *count; i++) { -- if (0 == strcmp((*list)[i].name,attr->name)) { -- DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name)); -- return; -- } -+ if (0 == strcmp((*list)[i].name,attr->name)) { -+ DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name)); -+ return; -+ } - } -- -- DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name)); -- *list = xalloc((*count + 1) * sizeof(XF86AttributeRec)); -+ -+ *list = malloc((*count + 1) * sizeof(XF86AttributeRec)); - if (NULL == *list) { -- *count = 0; -- return; -+ *count = 0; -+ return; - } - if (*count) -- memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec)); -+ memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec)); - memcpy(*list + *count, attr, sizeof(XF86AttributeRec)); -- (*count)++; --} - --/* setup yuv overlay + hw scaling: look if we find some common video -- format which both v4l driver and the X-Server can handle */ --static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv, -- char *dev, int fd) --{ -- static const struct { -- unsigned int v4l_palette; -- unsigned int v4l_depth; -- unsigned int xv_id; -- unsigned int xv_format; -- } yuvlist[] = { -- { VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked }, -- { VIDEO_PALETTE_UYVY, 16, 0x59565955, XvPacked }, -- { 0 /* end of list */ }, -- }; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -- int fmt,i; -+ gpa = MAKE_ATOM((*list)[*count].name); -+ xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n", -+ attr->name, (int)gpa, attr->min_value, attr->max_value); - -- pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat); -- for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) { -- /* check v4l ... */ -- ioctl(fd,VIDIOCGPICT,&pPPriv->pict); -- pPPriv->pict.palette = yuvlist[fmt].v4l_palette; -- pPPriv->pict.depth = yuvlist[fmt].v4l_depth; -- if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict)) -- continue; -- ioctl(fd,VIDIOCGPICT,&pPPriv->pict); -- if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette) -- continue; -- /* ... works, check available offscreen image formats now ... */ -- for (i = 0; i < pPPriv->nformat; i++) { -- if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id && -- pPPriv->format[i].image->format == yuvlist[fmt].xv_format) { -- /* ... match found, good. */ -- pPPriv->yuv_format = yuvlist[fmt].v4l_palette; -- pPPriv->myfmt = pPPriv->format+i; -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "v4l[%s]: using hw video scaling [%4.4s].\n", -- dev,(char*)&(pPPriv->format[i].image->id)); -- return; -- } -- } -- } -+ (*count)++; - } - - static int -@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors) - char dev[18]; - int fd,i,j,d; - -- DEBUG(xf86Msg(X_INFO, "v4l: init start\n")); -- - for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) { -- sprintf(dev, "/dev/video%d", d); -- fd = open(dev, O_RDWR, 0); -- if (fd == -1) { -- sprintf(dev, "/dev/v4l/video%d", d); -- fd = open(dev, O_RDWR, 0); -- if (fd == -1) -- break; -- } -- DEBUG(xf86Msg(X_INFO, "v4l: %s open ok\n",dev)); -- -- /* our private data */ -- pPPriv = xalloc(sizeof(PortPrivRec)); -- if (!pPPriv) -- return FALSE; -- memset(pPPriv,0,sizeof(PortPrivRec)); -- pPPriv->nr = d; -- -- /* check device */ -- if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) || -- 0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) { -- DEBUG(xf86Msg(X_INFO, "v4l: %s: no overlay support\n",dev)); -- xfree(pPPriv); -- close(fd); -- continue; -- } -- strncpy(V4L_NAME, dev, 16); -- V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels); -- if (NULL == pPPriv->enc) -- return FALSE; -- v4l_check_yuv(pScrn,pPPriv,dev,fd); -- -- /* alloc VideoAdaptorRec */ -- VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1)); -- VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec)); -- if (!VAR[i]) -- return FALSE; -- memset(VAR[i],0,sizeof(XF86VideoAdaptorRec)); -- -- -- /* build attribute list */ -- for (j = 0; j < V4L_ATTR; j++) { -- /* video attributes */ -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &Attributes[j]); -- } -- if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) { -- /* audio attributes */ -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &VolumeAttr); -- if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE) -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &MuteAttr); -- } -- if (pPPriv->cap.type & VID_TYPE_TUNER) { -- /* tuner attributes */ -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &FreqAttr); -- } -- if (0 != pPPriv->yuv_format) { -- /* pass throuth scaler attributes */ -- for (j = 0; j < pPPriv->myfmt->num_attributes; j++) { -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- pPPriv->myfmt->attributes+j); -- } -- } -- -- -- /* hook in private data */ -- Private = xalloc(sizeof(DevUnion)); -- if (!Private) -- return FALSE; -- memset(Private,0,sizeof(DevUnion)); -- Private->ptr = (pointer)pPPriv; -- VAR[i]->pPortPrivates = Private; -- VAR[i]->nPorts = 1; -- -- /* init VideoAdaptorRec */ -- VAR[i]->type = XvInputMask | XvWindowMask | XvVideoMask; -- VAR[i]->name = "video4linux"; -- VAR[i]->flags = VIDEO_INVERT_CLIPLIST; -- -- VAR[i]->PutVideo = V4lPutVideo; -- VAR[i]->PutStill = V4lPutStill; -- VAR[i]->StopVideo = V4lStopVideo; -- VAR[i]->SetPortAttribute = V4lSetPortAttribute; -- VAR[i]->GetPortAttribute = V4lGetPortAttribute; -- VAR[i]->QueryBestSize = V4lQueryBestSize; -- -- VAR[i]->nEncodings = pPPriv->nenc; -- VAR[i]->pEncodings = pPPriv->enc; -- VAR[i]->nFormats = -- sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]); -- VAR[i]->pFormats = InputVideoFormats; -- -- if (fd != -1) -- close(fd); -- i++; -+ sprintf(dev, "/dev/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) { -+ sprintf(dev, "/dev/v4l/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) -+ break; -+ } -+ DEBUG(xf86Msg(X_INFO, "v4l: %s open ok\n",dev)); -+ -+ /* our private data */ -+ pPPriv = malloc(sizeof(PortPrivRec)); -+ if (!pPPriv) -+ return FALSE; -+ memset(pPPriv,0,sizeof(PortPrivRec)); -+ pPPriv->nr = d; -+ -+ /* check device capabilities */ -+ memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap)); -+ if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) || -+ 0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) { -+ xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev); -+ free(pPPriv); -+ close(fd); -+ continue; -+ } -+ -+ if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) { -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "Xv Overlay not supported. Can't use v4l driver\n"); -+ free(pPPriv); -+ close(fd); -+ continue; -+ } -+ -+ xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev); -+ strncpy(V4L_NAME, dev, 16); -+ V4LBuildEncodings(pPPriv, fd); -+ if (NULL == pPPriv->enc) -+ return FALSE; -+ -+ /* alloc VideoAdaptorRec */ -+ VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1)); -+ VAR[i] = malloc(sizeof(XF86VideoAdaptorRec)); -+ if (!VAR[i]) -+ return FALSE; -+ memset(VAR[i],0,sizeof(XF86VideoAdaptorRec)); -+ -+ /* build attribute list */ -+ AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd); -+ -+ for (j = 0; j < V4L_ATTR; j++) { -+ /* Other video attributes */ -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ &Attributes[j]); -+ } -+ if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) { -+ /* tuner attributes */ -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ &FreqAttr); -+ } -+ -+ /* Initialize yuv_format */ -+ if (0 != pPPriv->yuv_format) { -+ /* pass throuth scaler attributes */ -+ for (j = 0; j < pPPriv->myfmt->num_attributes; j++) { -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ pPPriv->myfmt->attributes+j); -+ } -+ } -+ -+ DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n")); -+ /* hook in private data */ -+ Private = malloc(sizeof(DevUnion)); -+ if (!Private) -+ return FALSE; -+ memset(Private,0,sizeof(DevUnion)); -+ Private->ptr = (pointer)pPPriv; -+ VAR[i]->pPortPrivates = Private; -+ VAR[i]->nPorts = 1; -+ -+ /* init VideoAdaptorRec */ -+ VAR[i]->type = XvInputMask | XvWindowMask | XvVideoMask; -+ VAR[i]->name = "video4linux"; -+ VAR[i]->flags = VIDEO_INVERT_CLIPLIST; -+ -+ VAR[i]->PutVideo = V4lPutVideo; -+ VAR[i]->PutStill = V4lPutStill; -+ VAR[i]->StopVideo = V4lStopVideo; -+ VAR[i]->SetPortAttribute = V4lSetPortAttribute; -+ VAR[i]->GetPortAttribute = V4lGetPortAttribute; -+ VAR[i]->QueryBestSize = V4lQueryBestSize; -+ -+ VAR[i]->nEncodings = pPPriv->nenc; -+ VAR[i]->pEncodings = pPPriv->enc; -+ VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]); -+ VAR[i]->pFormats = InputVideoFormats; -+ -+ if (fd != -1) { -+ DEBUG(xf86Msg(X_INFO, "v4l: %s init finished.\n",dev)); -+ close(fd); -+ } -+ i++; - } - - xvEncoding = MAKE_ATOM(XV_ENCODING); -- xvHue = MAKE_ATOM(XV_HUE); -- xvSaturation = MAKE_ATOM(XV_SATURATION); -- xvBrightness = MAKE_ATOM(XV_BRIGHTNESS); -- xvContrast = MAKE_ATOM(XV_CONTRAST); -- - xvFreq = MAKE_ATOM(XV_FREQ); -- xvMute = MAKE_ATOM(XV_MUTE); -- xvVolume = MAKE_ATOM(XV_VOLUME); - - DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i)); - -@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors) - } - - static Bool -+V4LDetect(void) -+{ -+ struct v4l2_capability cap; -+ int fd, d, n = 0; -+ char dev[18]; -+ -+ for (d = 0; d < MAX_V4L_DEVICES; d++) { -+ sprintf(dev, "/dev/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) { -+ sprintf(dev, "/dev/v4l/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) -+ break; -+ } -+ close (fd); -+ memset(&cap, 0, sizeof(cap)); -+ if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) && -+ (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) -+ n++; -+ } -+ xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n); -+ -+ return (n > 0) ? TRUE : FALSE; -+} -+ -+static Bool - V4LProbe(DriverPtr drv, int flags) - { -- if (flags & PROBE_DETECT) -- return TRUE; -+ /* -+ * Don't try to register adapter at the detection phase, as Xv -+ * extensions won't be there -+ */ -+ if (flags == PROBE_DETECT) -+ return V4LDetect(); -+ -+ DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n")); - - xf86XVRegisterGenericAdaptorDriver(V4LInit); - drv->refCount++; -diff --git a/src/videodev.h b/src/videodev.h -deleted file mode 100644 -index 3c9a7d8..0000000 ---- a/src/videodev.h -+++ /dev/null -@@ -1,254 +0,0 @@ --#ifndef __LINUX_VIDEODEV_H --#define __LINUX_VIDEODEV_H -- --/* Linux V4L API, Version 1 -- * videodev.h from v4l driver in Linux 2.2.3 -- * -- * Used here with the explicit permission of the original author, Alan Cox. -- * <alan@lxorguk.ukuu.org.uk> -- */ -- --#include <X11/Xmd.h> -- --#define VID_TYPE_CAPTURE 1 /* Can capture */ --#define VID_TYPE_TUNER 2 /* Can tune */ --#define VID_TYPE_TELETEXT 4 /* Does teletext */ --#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ --#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ --#define VID_TYPE_CLIPPING 32 /* Can clip */ --#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ --#define VID_TYPE_SCALES 128 /* Scalable */ --#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ --#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -- --struct video_capability --{ -- char name[32]; -- int type; -- int channels; /* Num channels */ -- int audios; /* Num audio devices */ -- int maxwidth; /* Supported width */ -- int maxheight; /* And height */ -- int minwidth; /* Supported width */ -- int minheight; /* And height */ --}; -- -- --struct video_channel --{ -- int channel; -- char name[32]; -- int tuners; -- CARD32 flags; --#define VIDEO_VC_TUNER 1 /* Channel has a tuner */ --#define VIDEO_VC_AUDIO 2 /* Channel has audio */ -- CARD16 type; --#define VIDEO_TYPE_TV 1 --#define VIDEO_TYPE_CAMERA 2 -- CARD16 norm; /* Norm set by channel */ --}; -- --struct video_tuner --{ -- int tuner; -- char name[32]; -- unsigned long rangelow, rangehigh; /* Tuner range */ -- CARD32 flags; --#define VIDEO_TUNER_PAL 1 --#define VIDEO_TUNER_NTSC 2 --#define VIDEO_TUNER_SECAM 4 --#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ --#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ --#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ -- CARD16 mode; /* PAL/NTSC/SECAM/OTHER */ --#define VIDEO_MODE_PAL 0 --#define VIDEO_MODE_NTSC 1 --#define VIDEO_MODE_SECAM 2 --#define VIDEO_MODE_AUTO 3 -- CARD16 signal; /* Signal strength 16bit scale */ --}; -- --struct video_picture --{ -- CARD16 brightness; -- CARD16 hue; -- CARD16 colour; -- CARD16 contrast; -- CARD16 whiteness; /* Black and white only */ -- CARD16 depth; /* Capture depth */ -- CARD16 palette; /* Palette in use */ --#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */ --#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ --#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ --#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */ --#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ --#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */ --#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */ --#define VIDEO_PALETTE_YUYV 8 --#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */ --#define VIDEO_PALETTE_YUV420 10 --#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */ --#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */ --#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */ --#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */ --#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */ --#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */ --#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */ --#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */ --}; -- --struct video_audio --{ -- int audio; /* Audio channel */ -- CARD16 volume; /* If settable */ -- CARD16 bass, treble; -- CARD32 flags; --#define VIDEO_AUDIO_MUTE 1 --#define VIDEO_AUDIO_MUTABLE 2 --#define VIDEO_AUDIO_VOLUME 4 --#define VIDEO_AUDIO_BASS 8 --#define VIDEO_AUDIO_TREBLE 16 -- char name[16]; --#define VIDEO_SOUND_MONO 1 --#define VIDEO_SOUND_STEREO 2 --#define VIDEO_SOUND_LANG1 4 --#define VIDEO_SOUND_LANG2 8 -- CARD16 mode; -- CARD16 balance; /* Stereo balance */ -- CARD16 step; /* Step actual volume uses */ --}; -- --struct video_clip --{ -- INT32 x,y; -- INT32 width, height; -- struct video_clip *next; /* For user use/driver use only */ --}; -- --struct video_window --{ -- CARD32 x,y; /* Position of window */ -- CARD32 width,height; /* Its size */ -- CARD32 chromakey; -- CARD32 flags; -- struct video_clip *clips; /* Set only */ -- int clipcount; --#define VIDEO_WINDOW_INTERLACE 1 --#define VIDEO_CLIP_BITMAP -1 --/* bitmap is 1024x625, a '1' bit represents a clipped pixel */ --#define VIDEO_CLIPMAP_SIZE (128 * 625) --}; -- --struct video_capture --{ -- CARD32 x,y; /* Offsets into image */ -- CARD32 width, height; /* Area to capture */ -- CARD16 decimation; /* Decimation divder */ -- CARD16 flags; /* Flags for capture */ --#define VIDEO_CAPTURE_ODD 0 /* Temporal */ --#define VIDEO_CAPTURE_EVEN 1 --}; -- --struct video_buffer --{ -- void *base; -- int height,width; -- int depth; -- int bytesperline; --}; -- --struct video_mmap --{ -- unsigned int frame; /* Frame (0 - n) for double buffer */ -- int height,width; -- unsigned int format; /* should be VIDEO_PALETTE_* */ --}; -- --struct video_key --{ -- CARD8 key[8]; -- CARD32 flags; --}; -- -- --#define VIDEO_MAX_FRAME 32 -- --struct video_mbuf --{ -- int size; /* Total memory to map */ -- int frames; /* Frames */ -- int offsets[VIDEO_MAX_FRAME]; --}; -- -- --#define VIDEO_NO_UNIT (-1) -- -- --struct video_unit --{ -- int video; /* Video minor */ -- int vbi; /* VBI minor */ -- int radio; /* Radio minor */ -- int audio; /* Audio minor */ -- int teletext; /* Teletext minor */ --}; -- --#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */ --#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */ --#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */ --#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */ --#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */ --#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */ --#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */ --#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */ --#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Set the video overlay window */ --#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */ --#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */ --#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */ --#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */ --#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */ --#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */ --#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */ --#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */ --#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */ --#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */ --#define VIDIOCGMBUF _IOR('v', 20, struct video_mbuf) /* Memory map buffer info */ --#define VIDIOCGUNIT _IOR('v', 21, struct video_unit) /* Get attached units */ --#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get frame buffer */ --#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set frame buffer - root only */ -- --#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ -- -- --#define VID_HARDWARE_BT848 1 --#define VID_HARDWARE_QCAM_BW 2 --#define VID_HARDWARE_PMS 3 --#define VID_HARDWARE_QCAM_C 4 --#define VID_HARDWARE_PSEUDO 5 --#define VID_HARDWARE_SAA5249 6 --#define VID_HARDWARE_AZTECH 7 --#define VID_HARDWARE_SF16MI 8 --#define VID_HARDWARE_RTRACK 9 --#define VID_HARDWARE_ZOLTRIX 10 --#define VID_HARDWARE_SAA7146 11 --#define VID_HARDWARE_VIDEUM 12 /* Reserved for Winnov videum */ --#define VID_HARDWARE_RTRACK2 13 --#define VID_HARDWARE_PERMEDIA2 14 /* Reserved for Permedia2 */ --#define VID_HARDWARE_RIVA128 15 /* Reserved for RIVA 128 */ --#define VID_HARDWARE_PLANB 16 /* PowerMac motherboard video-in */ --#define VID_HARDWARE_BROADWAY 17 /* Broadway project */ --#define VID_HARDWARE_GEMTEK 18 --#define VID_HARDWARE_TYPHOON 19 --#define VID_HARDWARE_VINO 20 /* Reserved for SGI Indy Vino */ -- --/* -- * Initialiser list -- */ -- --struct video_init --{ -- char *name; -- int (*init)(struct video_init *); --}; -- --#endif -diff --git a/src/videodev2.h b/src/videodev2.h -new file mode 100644 -index 0000000..bf6dde2 ---- /dev/null -+++ b/src/videodev2.h -@@ -0,0 +1,1929 @@ -+/* -+ * Video for Linux Two header file -+ * -+ * Copyright (C) 1999-2007 the contributors -+ * -+ * 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. -+ * -+ * Alternatively you can redistribute this file under the terms of the -+ * BSD license as stated below: -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. 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. -+ * 3. The names of its contributors may not be used to endorse or promote -+ * products derived from this software without specific prior written -+ * permission. -+ * -+ * 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 -+ * OWNER 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. -+ * -+ * Header file for v4l or V4L2 drivers and applications -+ * with public API. -+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so -+ * no #if __KERNEL tests are allowed here -+ * -+ * See http://linuxtv.org for more info -+ * -+ * Author: Bill Dirks <bill@thedirks.org> -+ * Justin Schoeman -+ * Hans Verkuil <hverkuil@xs4all.nl> -+ * et al. -+ */ -+#ifndef __LINUX_VIDEODEV2_H -+#define __LINUX_VIDEODEV2_H -+ -+#include <linux/ioctl.h> -+#include <linux/types.h> -+#include <sys/time.h> -+ -+/* -+ * Common stuff for both V4L1 and V4L2 -+ * Moved from videodev.h -+ */ -+#define VIDEO_MAX_FRAME 32 -+#define VIDEO_MAX_PLANES 8 -+ -+/* These defines are V4L1 specific and should not be used with the V4L2 API! -+ They will be removed from this header in the future. */ -+ -+#define VID_TYPE_CAPTURE 1 /* Can capture */ -+#define VID_TYPE_TUNER 2 /* Can tune */ -+#define VID_TYPE_TELETEXT 4 /* Does teletext */ -+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -+#define VID_TYPE_CLIPPING 32 /* Can clip */ -+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -+#define VID_TYPE_SCALES 128 /* Scalable */ -+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ -+ -+/* -+ * M I S C E L L A N E O U S -+ */ -+ -+/* Four-character-code (FOURCC) */ -+#define v4l2_fourcc(a, b, c, d)\ -+ ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24)) -+ -+/* -+ * E N U M S -+ */ -+enum v4l2_field { -+ V4L2_FIELD_ANY = 0, /* driver can choose from none, -+ top, bottom, interlaced -+ depending on whatever it thinks -+ is approximate ... */ -+ V4L2_FIELD_NONE = 1, /* this device has no fields ... */ -+ V4L2_FIELD_TOP = 2, /* top field only */ -+ V4L2_FIELD_BOTTOM = 3, /* bottom field only */ -+ V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */ -+ V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one -+ buffer, top-bottom order */ -+ V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */ -+ V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into -+ separate buffers */ -+ V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field -+ first and the top field is -+ transmitted first */ -+ V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field -+ first and the bottom field is -+ transmitted first */ -+}; -+#define V4L2_FIELD_HAS_TOP(field) \ -+ ((field) == V4L2_FIELD_TOP ||\ -+ (field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+#define V4L2_FIELD_HAS_BOTTOM(field) \ -+ ((field) == V4L2_FIELD_BOTTOM ||\ -+ (field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+#define V4L2_FIELD_HAS_BOTH(field) \ -+ ((field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+ -+enum v4l2_buf_type { -+ V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, -+ V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, -+ V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, -+ V4L2_BUF_TYPE_VBI_CAPTURE = 4, -+ V4L2_BUF_TYPE_VBI_OUTPUT = 5, -+ V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6, -+ V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7, -+#if 1 -+ /* Experimental */ -+ V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8, -+#endif -+ V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9, -+ V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10, -+ V4L2_BUF_TYPE_PRIVATE = 0x80, -+}; -+ -+#define V4L2_TYPE_IS_MULTIPLANAR(type) \ -+ ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) -+ -+#define V4L2_TYPE_IS_OUTPUT(type) \ -+ ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \ -+ || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \ -+ || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) -+ -+enum v4l2_tuner_type { -+ V4L2_TUNER_RADIO = 1, -+ V4L2_TUNER_ANALOG_TV = 2, -+ V4L2_TUNER_DIGITAL_TV = 3, -+}; -+ -+enum v4l2_memory { -+ V4L2_MEMORY_MMAP = 1, -+ V4L2_MEMORY_USERPTR = 2, -+ V4L2_MEMORY_OVERLAY = 3, -+}; -+ -+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */ -+enum v4l2_colorspace { -+ /* ITU-R 601 -- broadcast NTSC/PAL */ -+ V4L2_COLORSPACE_SMPTE170M = 1, -+ -+ /* 1125-Line (US) HDTV */ -+ V4L2_COLORSPACE_SMPTE240M = 2, -+ -+ /* HD and modern captures. */ -+ V4L2_COLORSPACE_REC709 = 3, -+ -+ /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */ -+ V4L2_COLORSPACE_BT878 = 4, -+ -+ /* These should be useful. Assume 601 extents. */ -+ V4L2_COLORSPACE_470_SYSTEM_M = 5, -+ V4L2_COLORSPACE_470_SYSTEM_BG = 6, -+ -+ /* I know there will be cameras that send this. So, this is -+ * unspecified chromaticities and full 0-255 on each of the -+ * Y'CbCr components -+ */ -+ V4L2_COLORSPACE_JPEG = 7, -+ -+ /* For RGB colourspaces, this is probably a good start. */ -+ V4L2_COLORSPACE_SRGB = 8, -+}; -+ -+enum v4l2_priority { -+ V4L2_PRIORITY_UNSET = 0, /* not initialized */ -+ V4L2_PRIORITY_BACKGROUND = 1, -+ V4L2_PRIORITY_INTERACTIVE = 2, -+ V4L2_PRIORITY_RECORD = 3, -+ V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE, -+}; -+ -+struct v4l2_rect { -+ __s32 left; -+ __s32 top; -+ __s32 width; -+ __s32 height; -+}; -+ -+struct v4l2_fract { -+ __u32 numerator; -+ __u32 denominator; -+}; -+ -+/* -+ * D R I V E R C A P A B I L I T I E S -+ */ -+struct v4l2_capability { -+ __u8 driver[16]; /* i.e. "bttv" */ -+ __u8 card[32]; /* i.e. "Hauppauge WinTV" */ -+ __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ -+ __u32 version; /* should use KERNEL_VERSION() */ -+ __u32 capabilities; /* Device capabilities */ -+ __u32 reserved[4]; -+}; -+ -+/* Values for 'capabilities' field */ -+#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */ -+#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */ -+#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */ -+#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a raw VBI capture device */ -+#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a raw VBI output device */ -+#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 /* Is a sliced VBI capture device */ -+#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 /* Is a sliced VBI output device */ -+#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ -+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output overlay */ -+#define V4L2_CAP_HW_FREQ_SEEK 0x00000400 /* Can do hardware frequency seek */ -+#define V4L2_CAP_RDS_OUTPUT 0x00000800 /* Is an RDS encoder */ -+ -+/* Is a video capture device that supports multiplanar formats */ -+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE 0x00001000 -+/* Is a video output device that supports multiplanar formats */ -+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE 0x00002000 -+ -+#define V4L2_CAP_TUNER 0x00010000 /* has a tuner */ -+#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ -+#define V4L2_CAP_RADIO 0x00040000 /* is a radio device */ -+#define V4L2_CAP_MODULATOR 0x00080000 /* has a modulator */ -+ -+#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ -+#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ -+#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ -+ -+/* -+ * V I D E O I M A G E F O R M A T -+ */ -+struct v4l2_pix_format { -+ __u32 width; -+ __u32 height; -+ __u32 pixelformat; -+ enum v4l2_field field; -+ __u32 bytesperline; /* for padding, zero if unused */ -+ __u32 sizeimage; -+ enum v4l2_colorspace colorspace; -+ __u32 priv; /* private data, depends on pixelformat */ -+}; -+ -+/* Pixel format FOURCC depth Description */ -+ -+/* RGB formats */ -+#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ -+#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R', '4', '4', '4') /* 16 xxxxrrrr ggggbbbb */ -+#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R', 'G', 'B', 'O') /* 16 RGB-5-5-5 */ -+#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */ -+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */ -+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16 RGB-5-6-5 BE */ -+#define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H') /* 18 BGR-6-6-6 */ -+#define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3') /* 24 BGR-8-8-8 */ -+#define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3') /* 24 RGB-8-8-8 */ -+#define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4') /* 32 BGR-8-8-8-8 */ -+#define V4L2_PIX_FMT_RGB32 v4l2_fourcc('R', 'G', 'B', '4') /* 32 RGB-8-8-8-8 */ -+ -+/* Grey formats */ -+#define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale */ -+#define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ') /* 4 Greyscale */ -+#define V4L2_PIX_FMT_Y6 v4l2_fourcc('Y', '0', '6', ' ') /* 6 Greyscale */ -+#define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') /* 10 Greyscale */ -+#define V4L2_PIX_FMT_Y16 v4l2_fourcc('Y', '1', '6', ' ') /* 16 Greyscale */ -+ -+/* Palette formats */ -+#define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */ -+ -+/* Luminance+Chrominance formats */ -+#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0 */ -+#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0 */ -+#define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ -+#define V4L2_PIX_FMT_UYVY v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_VYUY v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422 planar */ -+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16 YVU411 planar */ -+#define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y', '4', '1', 'P') /* 12 YUV 4:1:1 */ -+#define V4L2_PIX_FMT_YUV444 v4l2_fourcc('Y', '4', '4', '4') /* 16 xxxxyyyy uuuuvvvv */ -+#define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */ -+#define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */ -+#define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */ -+#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0 */ -+#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y', 'U', '1', '2') /* 12 YUV 4:2:0 */ -+#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */ -+#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */ -+ -+/* two planes -- one Y, one Cr + Cb interleaved */ -+#define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ -+#define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb 4:2:0 */ -+#define V4L2_PIX_FMT_NV16 v4l2_fourcc('N', 'V', '1', '6') /* 16 Y/CbCr 4:2:2 */ -+#define V4L2_PIX_FMT_NV61 v4l2_fourcc('N', 'V', '6', '1') /* 16 Y/CrCb 4:2:2 */ -+ -+/* two non contiguous planes - one Y, one Cr + Cb interleaved */ -+#define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ -+#define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ -+ -+/* three non contiguous planes - Y, Cb, Cr */ -+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */ -+ -+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ -+#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ -+#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ -+#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR.. BGBG.. */ -+#define V4L2_PIX_FMT_SRGGB8 v4l2_fourcc('R', 'G', 'G', 'B') /* 8 RGRG.. GBGB.. */ -+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10 BGBG.. GRGR.. */ -+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10 GBGB.. RGRG.. */ -+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10 GRGR.. BGBG.. */ -+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10 RGRG.. GBGB.. */ -+ /* 10bit raw bayer DPCM compressed to 8 bits */ -+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0') -+ /* -+ * 10bit raw bayer, expanded to 16 bits -+ * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb... -+ */ -+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */ -+ -+/* compressed formats */ -+#define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG */ -+#define V4L2_PIX_FMT_JPEG v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG */ -+#define V4L2_PIX_FMT_DV v4l2_fourcc('d', 'v', 's', 'd') /* 1394 */ -+#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 */ -+ -+/* Vendor-specific formats */ -+#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ -+#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */ -+#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */ -+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */ -+#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ -+#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */ -+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */ -+#define V4L2_PIX_FMT_SPCA501 v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */ -+#define V4L2_PIX_FMT_SPCA505 v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */ -+#define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */ -+#define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */ -+#define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */ -+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */ -+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */ -+#define V4L2_PIX_FMT_SQ905C v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */ -+#define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ -+#define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ -+#define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ -+#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */ -+#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ -+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */ -+#define V4L2_PIX_FMT_KONICA420 v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */ -+ -+/* -+ * F O R M A T E N U M E R A T I O N -+ */ -+struct v4l2_fmtdesc { -+ __u32 index; /* Format number */ -+ enum v4l2_buf_type type; /* buffer type */ -+ __u32 flags; -+ __u8 description[32]; /* Description string */ -+ __u32 pixelformat; /* Format fourcc */ -+ __u32 reserved[4]; -+}; -+ -+#define V4L2_FMT_FLAG_COMPRESSED 0x0001 -+#define V4L2_FMT_FLAG_EMULATED 0x0002 -+ -+#if 1 -+ /* Experimental Frame Size and frame rate enumeration */ -+/* -+ * F R A M E S I Z E E N U M E R A T I O N -+ */ -+enum v4l2_frmsizetypes { -+ V4L2_FRMSIZE_TYPE_DISCRETE = 1, -+ V4L2_FRMSIZE_TYPE_CONTINUOUS = 2, -+ V4L2_FRMSIZE_TYPE_STEPWISE = 3, -+}; -+ -+struct v4l2_frmsize_discrete { -+ __u32 width; /* Frame width [pixel] */ -+ __u32 height; /* Frame height [pixel] */ -+}; -+ -+struct v4l2_frmsize_stepwise { -+ __u32 min_width; /* Minimum frame width [pixel] */ -+ __u32 max_width; /* Maximum frame width [pixel] */ -+ __u32 step_width; /* Frame width step size [pixel] */ -+ __u32 min_height; /* Minimum frame height [pixel] */ -+ __u32 max_height; /* Maximum frame height [pixel] */ -+ __u32 step_height; /* Frame height step size [pixel] */ -+}; -+ -+struct v4l2_frmsizeenum { -+ __u32 index; /* Frame size number */ -+ __u32 pixel_format; /* Pixel format */ -+ __u32 type; /* Frame size type the device supports. */ -+ -+ union { /* Frame size */ -+ struct v4l2_frmsize_discrete discrete; -+ struct v4l2_frmsize_stepwise stepwise; -+ }; -+ -+ __u32 reserved[2]; /* Reserved space for future use */ -+}; -+ -+/* -+ * F R A M E R A T E E N U M E R A T I O N -+ */ -+enum v4l2_frmivaltypes { -+ V4L2_FRMIVAL_TYPE_DISCRETE = 1, -+ V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, -+ V4L2_FRMIVAL_TYPE_STEPWISE = 3, -+}; -+ -+struct v4l2_frmival_stepwise { -+ struct v4l2_fract min; /* Minimum frame interval [s] */ -+ struct v4l2_fract max; /* Maximum frame interval [s] */ -+ struct v4l2_fract step; /* Frame interval step size [s] */ -+}; -+ -+struct v4l2_frmivalenum { -+ __u32 index; /* Frame format index */ -+ __u32 pixel_format; /* Pixel format */ -+ __u32 width; /* Frame width */ -+ __u32 height; /* Frame height */ -+ __u32 type; /* Frame interval type the device supports. */ -+ -+ union { /* Frame interval */ -+ struct v4l2_fract discrete; -+ struct v4l2_frmival_stepwise stepwise; -+ }; -+ -+ __u32 reserved[2]; /* Reserved space for future use */ -+}; -+#endif -+ -+/* -+ * T I M E C O D E -+ */ -+struct v4l2_timecode { -+ __u32 type; -+ __u32 flags; -+ __u8 frames; -+ __u8 seconds; -+ __u8 minutes; -+ __u8 hours; -+ __u8 userbits[4]; -+}; -+ -+/* Type */ -+#define V4L2_TC_TYPE_24FPS 1 -+#define V4L2_TC_TYPE_25FPS 2 -+#define V4L2_TC_TYPE_30FPS 3 -+#define V4L2_TC_TYPE_50FPS 4 -+#define V4L2_TC_TYPE_60FPS 5 -+ -+/* Flags */ -+#define V4L2_TC_FLAG_DROPFRAME 0x0001 /* "drop-frame" mode */ -+#define V4L2_TC_FLAG_COLORFRAME 0x0002 -+#define V4L2_TC_USERBITS_field 0x000C -+#define V4L2_TC_USERBITS_USERDEFINED 0x0000 -+#define V4L2_TC_USERBITS_8BITCHARS 0x0008 -+/* The above is based on SMPTE timecodes */ -+ -+struct v4l2_jpegcompression { -+ int quality; -+ -+ int APPn; /* Number of APP segment to be written, -+ * must be 0..15 */ -+ int APP_len; /* Length of data in JPEG APPn segment */ -+ char APP_data[60]; /* Data in the JPEG APPn segment. */ -+ -+ int COM_len; /* Length of data in JPEG COM segment */ -+ char COM_data[60]; /* Data in JPEG COM segment */ -+ -+ __u32 jpeg_markers; /* Which markers should go into the JPEG -+ * output. Unless you exactly know what -+ * you do, leave them untouched. -+ * Inluding less markers will make the -+ * resulting code smaller, but there will -+ * be fewer applications which can read it. -+ * The presence of the APP and COM marker -+ * is influenced by APP_len and COM_len -+ * ONLY, not by this property! */ -+ -+#define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */ -+#define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */ -+#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ -+#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ -+#define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will -+ * allways use APP0 */ -+}; -+ -+/* -+ * M E M O R Y - M A P P I N G B U F F E R S -+ */ -+struct v4l2_requestbuffers { -+ __u32 count; -+ enum v4l2_buf_type type; -+ enum v4l2_memory memory; -+ __u32 reserved[2]; -+}; -+ -+/** -+ * struct v4l2_plane - plane info for multi-planar buffers -+ * @bytesused: number of bytes occupied by data in the plane (payload) -+ * @length: size of this plane (NOT the payload) in bytes -+ * @mem_offset: when memory in the associated struct v4l2_buffer is -+ * V4L2_MEMORY_MMAP, equals the offset from the start of -+ * the device memory for this plane (or is a "cookie" that -+ * should be passed to mmap() called on the video node) -+ * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer -+ * pointing to this plane -+ * @data_offset: offset in the plane to the start of data; usually 0, -+ * unless there is a header in front of the data -+ * -+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer -+ * with two planes can have one plane for Y, and another for interleaved CbCr -+ * components. Each plane can reside in a separate memory buffer, or even in -+ * a completely separate memory node (e.g. in embedded devices). -+ */ -+struct v4l2_plane { -+ __u32 bytesused; -+ __u32 length; -+ union { -+ __u32 mem_offset; -+ unsigned long userptr; -+ } m; -+ __u32 data_offset; -+ __u32 reserved[11]; -+}; -+ -+/** -+ * struct v4l2_buffer - video buffer info -+ * @index: id number of the buffer -+ * @type: buffer type (type == *_MPLANE for multiplanar buffers) -+ * @bytesused: number of bytes occupied by data in the buffer (payload); -+ * unused (set to 0) for multiplanar buffers -+ * @flags: buffer informational flags -+ * @field: field order of the image in the buffer -+ * @timestamp: frame timestamp -+ * @timecode: frame timecode -+ * @sequence: sequence count of this frame -+ * @memory: the method, in which the actual video data is passed -+ * @offset: for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP; -+ * offset from the start of the device memory for this plane, -+ * (or a "cookie" that should be passed to mmap() as offset) -+ * @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR; -+ * a userspace pointer pointing to this buffer -+ * @planes: for multiplanar buffers; userspace pointer to the array of plane -+ * info structs for this buffer -+ * @length: size in bytes of the buffer (NOT its payload) for single-plane -+ * buffers (when type != *_MPLANE); number of elements in the -+ * planes array for multi-plane buffers -+ * @input: input number from which the video data has has been captured -+ * -+ * Contains data exchanged by application and driver using one of the Streaming -+ * I/O methods. -+ */ -+struct v4l2_buffer { -+ __u32 index; -+ enum v4l2_buf_type type; -+ __u32 bytesused; -+ __u32 flags; -+ enum v4l2_field field; -+ struct timeval timestamp; -+ struct v4l2_timecode timecode; -+ __u32 sequence; -+ -+ /* memory location */ -+ enum v4l2_memory memory; -+ union { -+ __u32 offset; -+ unsigned long userptr; -+ struct v4l2_plane *planes; -+ } m; -+ __u32 length; -+ __u32 input; -+ __u32 reserved; -+}; -+ -+/* Flags for 'flags' field */ -+#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -+#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ -+#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ -+#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ -+#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ -+#define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */ -+/* Buffer is ready, but the data contained within is corrupted. */ -+#define V4L2_BUF_FLAG_ERROR 0x0040 -+#define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */ -+#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */ -+ -+/* -+ * O V E R L A Y P R E V I E W -+ */ -+struct v4l2_framebuffer { -+ __u32 capability; -+ __u32 flags; -+/* FIXME: in theory we should pass something like PCI device + memory -+ * region + offset instead of some physical address */ -+ void *base; -+ struct v4l2_pix_format fmt; -+}; -+/* Flags for the 'capability' field. Read only */ -+#define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001 -+#define V4L2_FBUF_CAP_CHROMAKEY 0x0002 -+#define V4L2_FBUF_CAP_LIST_CLIPPING 0x0004 -+#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008 -+#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 -+#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 -+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 -+#define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080 -+/* Flags for the 'flags' field. */ -+#define V4L2_FBUF_FLAG_PRIMARY 0x0001 -+#define V4L2_FBUF_FLAG_OVERLAY 0x0002 -+#define V4L2_FBUF_FLAG_CHROMAKEY 0x0004 -+#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 -+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 -+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 -+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 -+ -+struct v4l2_clip { -+ struct v4l2_rect c; -+ struct v4l2_clip *next; -+}; -+ -+struct v4l2_window { -+ struct v4l2_rect w; -+ enum v4l2_field field; -+ __u32 chromakey; -+ struct v4l2_clip *clips; -+ __u32 clipcount; -+ void *bitmap; -+ __u8 global_alpha; -+}; -+ -+/* -+ * C A P T U R E P A R A M E T E R S -+ */ -+struct v4l2_captureparm { -+ __u32 capability; /* Supported modes */ -+ __u32 capturemode; /* Current mode */ -+ struct v4l2_fract timeperframe; /* Time per frame in .1us units */ -+ __u32 extendedmode; /* Driver-specific extensions */ -+ __u32 readbuffers; /* # of buffers for read */ -+ __u32 reserved[4]; -+}; -+ -+/* Flags for 'capability' and 'capturemode' fields */ -+#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ -+#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ -+ -+struct v4l2_outputparm { -+ __u32 capability; /* Supported modes */ -+ __u32 outputmode; /* Current mode */ -+ struct v4l2_fract timeperframe; /* Time per frame in seconds */ -+ __u32 extendedmode; /* Driver-specific extensions */ -+ __u32 writebuffers; /* # of buffers for write */ -+ __u32 reserved[4]; -+}; -+ -+/* -+ * I N P U T I M A G E C R O P P I N G -+ */ -+struct v4l2_cropcap { -+ enum v4l2_buf_type type; -+ struct v4l2_rect bounds; -+ struct v4l2_rect defrect; -+ struct v4l2_fract pixelaspect; -+}; -+ -+struct v4l2_crop { -+ enum v4l2_buf_type type; -+ struct v4l2_rect c; -+}; -+ -+/* -+ * A N A L O G V I D E O S T A N D A R D -+ */ -+ -+typedef __u64 v4l2_std_id; -+ -+/* one bit for each */ -+#define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001) -+#define V4L2_STD_PAL_B1 ((v4l2_std_id)0x00000002) -+#define V4L2_STD_PAL_G ((v4l2_std_id)0x00000004) -+#define V4L2_STD_PAL_H ((v4l2_std_id)0x00000008) -+#define V4L2_STD_PAL_I ((v4l2_std_id)0x00000010) -+#define V4L2_STD_PAL_D ((v4l2_std_id)0x00000020) -+#define V4L2_STD_PAL_D1 ((v4l2_std_id)0x00000040) -+#define V4L2_STD_PAL_K ((v4l2_std_id)0x00000080) -+ -+#define V4L2_STD_PAL_M ((v4l2_std_id)0x00000100) -+#define V4L2_STD_PAL_N ((v4l2_std_id)0x00000200) -+#define V4L2_STD_PAL_Nc ((v4l2_std_id)0x00000400) -+#define V4L2_STD_PAL_60 ((v4l2_std_id)0x00000800) -+ -+#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) -+#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) -+#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) -+#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) -+ -+#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) -+#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) -+#define V4L2_STD_SECAM_G ((v4l2_std_id)0x00040000) -+#define V4L2_STD_SECAM_H ((v4l2_std_id)0x00080000) -+#define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000) -+#define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000) -+#define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000) -+#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000) -+ -+/* ATSC/HDTV */ -+#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) -+#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) -+ -+/* FIXME: -+ Although std_id is 64 bits, there is an issue on PPC32 architecture that -+ makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding -+ this value to 32 bits. -+ As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide), -+ it should work fine. However, if needed to add more than two standards, -+ v4l2-common.c should be fixed. -+ */ -+ -+/* some merged standards */ -+#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) -+#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) -+#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) -+#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) -+ -+/* some common needed stuff */ -+#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ -+ V4L2_STD_PAL_B1 |\ -+ V4L2_STD_PAL_G) -+#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D |\ -+ V4L2_STD_PAL_D1 |\ -+ V4L2_STD_PAL_K) -+#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\ -+ V4L2_STD_PAL_DK |\ -+ V4L2_STD_PAL_H |\ -+ V4L2_STD_PAL_I) -+#define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ -+ V4L2_STD_NTSC_M_JP |\ -+ V4L2_STD_NTSC_M_KR) -+#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ -+ V4L2_STD_SECAM_K |\ -+ V4L2_STD_SECAM_K1) -+#define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\ -+ V4L2_STD_SECAM_G |\ -+ V4L2_STD_SECAM_H |\ -+ V4L2_STD_SECAM_DK |\ -+ V4L2_STD_SECAM_L |\ -+ V4L2_STD_SECAM_LC) -+ -+#define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ -+ V4L2_STD_PAL_60 |\ -+ V4L2_STD_NTSC |\ -+ V4L2_STD_NTSC_443) -+#define V4L2_STD_625_50 (V4L2_STD_PAL |\ -+ V4L2_STD_PAL_N |\ -+ V4L2_STD_PAL_Nc |\ -+ V4L2_STD_SECAM) -+#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\ -+ V4L2_STD_ATSC_16_VSB) -+ -+#define V4L2_STD_UNKNOWN 0 -+#define V4L2_STD_ALL (V4L2_STD_525_60 |\ -+ V4L2_STD_625_50) -+ -+struct v4l2_standard { -+ __u32 index; -+ v4l2_std_id id; -+ __u8 name[24]; -+ struct v4l2_fract frameperiod; /* Frames, not fields */ -+ __u32 framelines; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * V I D E O T I M I N G S D V P R E S E T -+ */ -+struct v4l2_dv_preset { -+ __u32 preset; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * D V P R E S E T S E N U M E R A T I O N -+ */ -+struct v4l2_dv_enum_preset { -+ __u32 index; -+ __u32 preset; -+ __u8 name[32]; /* Name of the preset timing */ -+ __u32 width; -+ __u32 height; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * D V P R E S E T V A L U E S -+ */ -+#define V4L2_DV_INVALID 0 -+#define V4L2_DV_480P59_94 1 /* BT.1362 */ -+#define V4L2_DV_576P50 2 /* BT.1362 */ -+#define V4L2_DV_720P24 3 /* SMPTE 296M */ -+#define V4L2_DV_720P25 4 /* SMPTE 296M */ -+#define V4L2_DV_720P30 5 /* SMPTE 296M */ -+#define V4L2_DV_720P50 6 /* SMPTE 296M */ -+#define V4L2_DV_720P59_94 7 /* SMPTE 274M */ -+#define V4L2_DV_720P60 8 /* SMPTE 274M/296M */ -+#define V4L2_DV_1080I29_97 9 /* BT.1120/ SMPTE 274M */ -+#define V4L2_DV_1080I30 10 /* BT.1120/ SMPTE 274M */ -+#define V4L2_DV_1080I25 11 /* BT.1120 */ -+#define V4L2_DV_1080I50 12 /* SMPTE 296M */ -+#define V4L2_DV_1080I60 13 /* SMPTE 296M */ -+#define V4L2_DV_1080P24 14 /* SMPTE 296M */ -+#define V4L2_DV_1080P25 15 /* SMPTE 296M */ -+#define V4L2_DV_1080P30 16 /* SMPTE 296M */ -+#define V4L2_DV_1080P50 17 /* BT.1120 */ -+#define V4L2_DV_1080P60 18 /* BT.1120 */ -+ -+/* -+ * D V B T T I M I N G S -+ */ -+ -+/* BT.656/BT.1120 timing data */ -+struct v4l2_bt_timings { -+ __u32 width; /* width in pixels */ -+ __u32 height; /* height in lines */ -+ __u32 interlaced; /* Interlaced or progressive */ -+ __u32 polarities; /* Positive or negative polarity */ -+ __u64 pixelclock; /* Pixel clock in HZ. Ex. 74.25MHz->74250000 */ -+ __u32 hfrontporch; /* Horizpontal front porch in pixels */ -+ __u32 hsync; /* Horizontal Sync length in pixels */ -+ __u32 hbackporch; /* Horizontal back porch in pixels */ -+ __u32 vfrontporch; /* Vertical front porch in pixels */ -+ __u32 vsync; /* Vertical Sync length in lines */ -+ __u32 vbackporch; /* Vertical back porch in lines */ -+ __u32 il_vfrontporch; /* Vertical front porch for bottom field of -+ * interlaced field formats -+ */ -+ __u32 il_vsync; /* Vertical sync length for bottom field of -+ * interlaced field formats -+ */ -+ __u32 il_vbackporch; /* Vertical back porch for bottom field of -+ * interlaced field formats -+ */ -+ __u32 reserved[16]; -+} __attribute__ ((packed)); -+ -+/* Interlaced or progressive format */ -+#define V4L2_DV_PROGRESSIVE 0 -+#define V4L2_DV_INTERLACED 1 -+ -+/* Polarities. If bit is not set, it is assumed to be negative polarity */ -+#define V4L2_DV_VSYNC_POS_POL 0x00000001 -+#define V4L2_DV_HSYNC_POS_POL 0x00000002 -+ -+ -+/* DV timings */ -+struct v4l2_dv_timings { -+ __u32 type; -+ union { -+ struct v4l2_bt_timings bt; -+ __u32 reserved[32]; -+ }; -+} __attribute__ ((packed)); -+ -+/* Values for the type field */ -+#define V4L2_DV_BT_656_1120 0 /* BT.656/1120 timing type */ -+ -+/* -+ * V I D E O I N P U T S -+ */ -+struct v4l2_input { -+ __u32 index; /* Which input */ -+ __u8 name[32]; /* Label */ -+ __u32 type; /* Type of input */ -+ __u32 audioset; /* Associated audios (bitfield) */ -+ __u32 tuner; /* Associated tuner */ -+ v4l2_std_id std; -+ __u32 status; -+ __u32 capabilities; -+ __u32 reserved[3]; -+}; -+ -+/* Values for the 'type' field */ -+#define V4L2_INPUT_TYPE_TUNER 1 -+#define V4L2_INPUT_TYPE_CAMERA 2 -+ -+/* field 'status' - general */ -+#define V4L2_IN_ST_NO_POWER 0x00000001 /* Attached device is off */ -+#define V4L2_IN_ST_NO_SIGNAL 0x00000002 -+#define V4L2_IN_ST_NO_COLOR 0x00000004 -+ -+/* field 'status' - sensor orientation */ -+/* If sensor is mounted upside down set both bits */ -+#define V4L2_IN_ST_HFLIP 0x00000010 /* Frames are flipped horizontally */ -+#define V4L2_IN_ST_VFLIP 0x00000020 /* Frames are flipped vertically */ -+ -+/* field 'status' - analog */ -+#define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */ -+#define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */ -+ -+/* field 'status' - digital */ -+#define V4L2_IN_ST_NO_SYNC 0x00010000 /* No synchronization lock */ -+#define V4L2_IN_ST_NO_EQU 0x00020000 /* No equalizer lock */ -+#define V4L2_IN_ST_NO_CARRIER 0x00040000 /* Carrier recovery failed */ -+ -+/* field 'status' - VCR and set-top box */ -+#define V4L2_IN_ST_MACROVISION 0x01000000 /* Macrovision detected */ -+#define V4L2_IN_ST_NO_ACCESS 0x02000000 /* Conditional access denied */ -+#define V4L2_IN_ST_VTR 0x04000000 /* VTR time constant */ -+ -+/* capabilities flags */ -+#define V4L2_IN_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ -+#define V4L2_IN_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ -+#define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ -+ -+/* -+ * V I D E O O U T P U T S -+ */ -+struct v4l2_output { -+ __u32 index; /* Which output */ -+ __u8 name[32]; /* Label */ -+ __u32 type; /* Type of output */ -+ __u32 audioset; /* Associated audios (bitfield) */ -+ __u32 modulator; /* Associated modulator */ -+ v4l2_std_id std; -+ __u32 capabilities; -+ __u32 reserved[3]; -+}; -+/* Values for the 'type' field */ -+#define V4L2_OUTPUT_TYPE_MODULATOR 1 -+#define V4L2_OUTPUT_TYPE_ANALOG 2 -+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3 -+ -+/* capabilities flags */ -+#define V4L2_OUT_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ -+#define V4L2_OUT_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ -+#define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ -+ -+/* -+ * C O N T R O L S -+ */ -+struct v4l2_control { -+ __u32 id; -+ __s32 value; -+}; -+ -+struct v4l2_ext_control { -+ __u32 id; -+ __u32 size; -+ __u32 reserved2[1]; -+ union { -+ __s32 value; -+ __s64 value64; -+ char *string; -+ }; -+} __attribute__ ((packed)); -+ -+struct v4l2_ext_controls { -+ __u32 ctrl_class; -+ __u32 count; -+ __u32 error_idx; -+ __u32 reserved[2]; -+ struct v4l2_ext_control *controls; -+}; -+ -+/* Values for ctrl_class field */ -+#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ -+#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ -+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */ -+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */ -+ -+#define V4L2_CTRL_ID_MASK (0x0fffffff) -+#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) -+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) -+ -+enum v4l2_ctrl_type { -+ V4L2_CTRL_TYPE_INTEGER = 1, -+ V4L2_CTRL_TYPE_BOOLEAN = 2, -+ V4L2_CTRL_TYPE_MENU = 3, -+ V4L2_CTRL_TYPE_BUTTON = 4, -+ V4L2_CTRL_TYPE_INTEGER64 = 5, -+ V4L2_CTRL_TYPE_CTRL_CLASS = 6, -+ V4L2_CTRL_TYPE_STRING = 7, -+}; -+ -+/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -+struct v4l2_queryctrl { -+ __u32 id; -+ enum v4l2_ctrl_type type; -+ __u8 name[32]; /* Whatever */ -+ __s32 minimum; /* Note signedness */ -+ __s32 maximum; -+ __s32 step; -+ __s32 default_value; -+ __u32 flags; -+ __u32 reserved[2]; -+}; -+ -+/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ -+struct v4l2_querymenu { -+ __u32 id; -+ __u32 index; -+ __u8 name[32]; /* Whatever */ -+ __u32 reserved; -+}; -+ -+/* Control flags */ -+#define V4L2_CTRL_FLAG_DISABLED 0x0001 -+#define V4L2_CTRL_FLAG_GRABBED 0x0002 -+#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 -+#define V4L2_CTRL_FLAG_UPDATE 0x0008 -+#define V4L2_CTRL_FLAG_INACTIVE 0x0010 -+#define V4L2_CTRL_FLAG_SLIDER 0x0020 -+#define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 -+ -+/* Query flag, to be ORed with the control ID */ -+#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 -+ -+/* User-class control IDs defined by V4L2 */ -+#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) -+#define V4L2_CID_USER_BASE V4L2_CID_BASE -+/* IDs reserved for driver specific controls */ -+#define V4L2_CID_PRIVATE_BASE 0x08000000 -+ -+#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) -+#define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) -+#define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) -+#define V4L2_CID_SATURATION (V4L2_CID_BASE+2) -+#define V4L2_CID_HUE (V4L2_CID_BASE+3) -+#define V4L2_CID_AUDIO_VOLUME (V4L2_CID_BASE+5) -+#define V4L2_CID_AUDIO_BALANCE (V4L2_CID_BASE+6) -+#define V4L2_CID_AUDIO_BASS (V4L2_CID_BASE+7) -+#define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8) -+#define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9) -+#define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10) -+#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) /* Deprecated */ -+#define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12) -+#define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13) -+#define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14) -+#define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15) -+#define V4L2_CID_GAMMA (V4L2_CID_BASE+16) -+#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* Deprecated */ -+#define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17) -+#define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18) -+#define V4L2_CID_GAIN (V4L2_CID_BASE+19) -+#define V4L2_CID_HFLIP (V4L2_CID_BASE+20) -+#define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -+ -+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ -+#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) -+#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) -+ -+#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) -+enum v4l2_power_line_frequency { -+ V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0, -+ V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1, -+ V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2, -+}; -+#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) -+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) -+#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) -+#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) -+#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) -+#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) -+#define V4L2_CID_COLORFX (V4L2_CID_BASE+31) -+enum v4l2_colorfx { -+ V4L2_COLORFX_NONE = 0, -+ V4L2_COLORFX_BW = 1, -+ V4L2_COLORFX_SEPIA = 2, -+ V4L2_COLORFX_NEGATIVE = 3, -+ V4L2_COLORFX_EMBOSS = 4, -+ V4L2_COLORFX_SKETCH = 5, -+ V4L2_COLORFX_SKY_BLUE = 6, -+ V4L2_COLORFX_GRASS_GREEN = 7, -+ V4L2_COLORFX_SKIN_WHITEN = 8, -+ V4L2_COLORFX_VIVID = 9, -+}; -+#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32) -+#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33) -+ -+#define V4L2_CID_ROTATE (V4L2_CID_BASE+34) -+#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35) -+ -+#define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36) -+ -+#define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+37) -+#define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+38) -+ -+/* last CID + 1 */ -+#define V4L2_CID_LASTP1 (V4L2_CID_BASE+39) -+ -+/* MPEG-class control IDs defined by V4L2 */ -+#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) -+#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) -+ -+/* MPEG streams */ -+#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) -+enum v4l2_mpeg_stream_type { -+ V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ -+}; -+#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) -+#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) -+#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) -+#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) -+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) -+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) -+#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) -+enum v4l2_mpeg_stream_vbi_fmt { -+ V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ -+ V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ -+}; -+ -+/* MPEG audio */ -+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) -+enum v4l2_mpeg_audio_sampling_freq { -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, -+}; -+#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) -+enum v4l2_mpeg_audio_encoding { -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2, -+ V4L2_MPEG_AUDIO_ENCODING_AAC = 3, -+ V4L2_MPEG_AUDIO_ENCODING_AC3 = 4, -+}; -+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) -+enum v4l2_mpeg_audio_l1_bitrate { -+ V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, -+ V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2, -+ V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3, -+ V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4, -+ V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5, -+ V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6, -+ V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7, -+ V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8, -+ V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9, -+ V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10, -+ V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11, -+ V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, -+ V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) -+enum v4l2_mpeg_audio_l2_bitrate { -+ V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, -+ V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2, -+ V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3, -+ V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4, -+ V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5, -+ V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6, -+ V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7, -+ V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8, -+ V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9, -+ V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10, -+ V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11, -+ V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, -+ V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) -+enum v4l2_mpeg_audio_l3_bitrate { -+ V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, -+ V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2, -+ V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3, -+ V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4, -+ V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5, -+ V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6, -+ V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7, -+ V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8, -+ V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9, -+ V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10, -+ V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11, -+ V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, -+ V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) -+enum v4l2_mpeg_audio_mode { -+ V4L2_MPEG_AUDIO_MODE_STEREO = 0, -+ V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, -+ V4L2_MPEG_AUDIO_MODE_DUAL = 2, -+ V4L2_MPEG_AUDIO_MODE_MONO = 3, -+}; -+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) -+enum v4l2_mpeg_audio_mode_extension { -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, -+}; -+#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) -+enum v4l2_mpeg_audio_emphasis { -+ V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, -+ V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, -+ V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, -+}; -+#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) -+enum v4l2_mpeg_audio_crc { -+ V4L2_MPEG_AUDIO_CRC_NONE = 0, -+ V4L2_MPEG_AUDIO_CRC_CRC16 = 1, -+}; -+#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) -+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110) -+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111) -+enum v4l2_mpeg_audio_ac3_bitrate { -+ V4L2_MPEG_AUDIO_AC3_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_40K = 1, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_48K = 2, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_56K = 3, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_64K = 4, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_80K = 5, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_96K = 6, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18, -+}; -+ -+/* MPEG video */ -+#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) -+enum v4l2_mpeg_video_encoding { -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2, -+}; -+#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) -+enum v4l2_mpeg_video_aspect { -+ V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, -+ V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, -+ V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, -+ V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, -+}; -+#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) -+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) -+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) -+#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) -+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) -+enum v4l2_mpeg_video_bitrate_mode { -+ V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, -+ V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, -+}; -+#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) -+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) -+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) -+#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) -+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) -+ -+/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ -+#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) -+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { -+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, -+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) -+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) -+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) -+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { -+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, -+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) -+enum v4l2_mpeg_cx2341x_video_median_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) -+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) -+ -+/* Camera class control IDs */ -+#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) -+#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) -+ -+#define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1) -+enum v4l2_exposure_auto_type { -+ V4L2_EXPOSURE_AUTO = 0, -+ V4L2_EXPOSURE_MANUAL = 1, -+ V4L2_EXPOSURE_SHUTTER_PRIORITY = 2, -+ V4L2_EXPOSURE_APERTURE_PRIORITY = 3 -+}; -+#define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2) -+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+3) -+ -+#define V4L2_CID_PAN_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+4) -+#define V4L2_CID_TILT_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+5) -+#define V4L2_CID_PAN_RESET (V4L2_CID_CAMERA_CLASS_BASE+6) -+#define V4L2_CID_TILT_RESET (V4L2_CID_CAMERA_CLASS_BASE+7) -+ -+#define V4L2_CID_PAN_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+8) -+#define V4L2_CID_TILT_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+9) -+ -+#define V4L2_CID_FOCUS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+10) -+#define V4L2_CID_FOCUS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+11) -+#define V4L2_CID_FOCUS_AUTO (V4L2_CID_CAMERA_CLASS_BASE+12) -+ -+#define V4L2_CID_ZOOM_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+13) -+#define V4L2_CID_ZOOM_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+14) -+#define V4L2_CID_ZOOM_CONTINUOUS (V4L2_CID_CAMERA_CLASS_BASE+15) -+ -+#define V4L2_CID_PRIVACY (V4L2_CID_CAMERA_CLASS_BASE+16) -+ -+#define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17) -+#define V4L2_CID_IRIS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+18) -+ -+/* FM Modulator class control IDs */ -+#define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) -+#define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1) -+ -+#define V4L2_CID_RDS_TX_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 1) -+#define V4L2_CID_RDS_TX_PI (V4L2_CID_FM_TX_CLASS_BASE + 2) -+#define V4L2_CID_RDS_TX_PTY (V4L2_CID_FM_TX_CLASS_BASE + 3) -+#define V4L2_CID_RDS_TX_PS_NAME (V4L2_CID_FM_TX_CLASS_BASE + 5) -+#define V4L2_CID_RDS_TX_RADIO_TEXT (V4L2_CID_FM_TX_CLASS_BASE + 6) -+ -+#define V4L2_CID_AUDIO_LIMITER_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 64) -+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 65) -+#define V4L2_CID_AUDIO_LIMITER_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 66) -+ -+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 80) -+#define V4L2_CID_AUDIO_COMPRESSION_GAIN (V4L2_CID_FM_TX_CLASS_BASE + 81) -+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD (V4L2_CID_FM_TX_CLASS_BASE + 82) -+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME (V4L2_CID_FM_TX_CLASS_BASE + 83) -+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 84) -+ -+#define V4L2_CID_PILOT_TONE_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 96) -+#define V4L2_CID_PILOT_TONE_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 97) -+#define V4L2_CID_PILOT_TONE_FREQUENCY (V4L2_CID_FM_TX_CLASS_BASE + 98) -+ -+#define V4L2_CID_TUNE_PREEMPHASIS (V4L2_CID_FM_TX_CLASS_BASE + 112) -+enum v4l2_preemphasis { -+ V4L2_PREEMPHASIS_DISABLED = 0, -+ V4L2_PREEMPHASIS_50_uS = 1, -+ V4L2_PREEMPHASIS_75_uS = 2, -+}; -+#define V4L2_CID_TUNE_POWER_LEVEL (V4L2_CID_FM_TX_CLASS_BASE + 113) -+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR (V4L2_CID_FM_TX_CLASS_BASE + 114) -+ -+/* -+ * T U N I N G -+ */ -+struct v4l2_tuner { -+ __u32 index; -+ __u8 name[32]; -+ enum v4l2_tuner_type type; -+ __u32 capability; -+ __u32 rangelow; -+ __u32 rangehigh; -+ __u32 rxsubchans; -+ __u32 audmode; -+ __s32 signal; -+ __s32 afc; -+ __u32 reserved[4]; -+}; -+ -+struct v4l2_modulator { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 rangelow; -+ __u32 rangehigh; -+ __u32 txsubchans; -+ __u32 reserved[4]; -+}; -+ -+/* Flags for the 'capability' field */ -+#define V4L2_TUNER_CAP_LOW 0x0001 -+#define V4L2_TUNER_CAP_NORM 0x0002 -+#define V4L2_TUNER_CAP_STEREO 0x0010 -+#define V4L2_TUNER_CAP_LANG2 0x0020 -+#define V4L2_TUNER_CAP_SAP 0x0020 -+#define V4L2_TUNER_CAP_LANG1 0x0040 -+#define V4L2_TUNER_CAP_RDS 0x0080 -+#define V4L2_TUNER_CAP_RDS_BLOCK_IO 0x0100 -+#define V4L2_TUNER_CAP_RDS_CONTROLS 0x0200 -+ -+/* Flags for the 'rxsubchans' field */ -+#define V4L2_TUNER_SUB_MONO 0x0001 -+#define V4L2_TUNER_SUB_STEREO 0x0002 -+#define V4L2_TUNER_SUB_LANG2 0x0004 -+#define V4L2_TUNER_SUB_SAP 0x0004 -+#define V4L2_TUNER_SUB_LANG1 0x0008 -+#define V4L2_TUNER_SUB_RDS 0x0010 -+ -+/* Values for the 'audmode' field */ -+#define V4L2_TUNER_MODE_MONO 0x0000 -+#define V4L2_TUNER_MODE_STEREO 0x0001 -+#define V4L2_TUNER_MODE_LANG2 0x0002 -+#define V4L2_TUNER_MODE_SAP 0x0002 -+#define V4L2_TUNER_MODE_LANG1 0x0003 -+#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 -+ -+struct v4l2_frequency { -+ __u32 tuner; -+ enum v4l2_tuner_type type; -+ __u32 frequency; -+ __u32 reserved[8]; -+}; -+ -+struct v4l2_hw_freq_seek { -+ __u32 tuner; -+ enum v4l2_tuner_type type; -+ __u32 seek_upward; -+ __u32 wrap_around; -+ __u32 spacing; -+ __u32 reserved[7]; -+}; -+ -+/* -+ * R D S -+ */ -+ -+struct v4l2_rds_data { -+ __u8 lsb; -+ __u8 msb; -+ __u8 block; -+} __attribute__ ((packed)); -+ -+#define V4L2_RDS_BLOCK_MSK 0x7 -+#define V4L2_RDS_BLOCK_A 0 -+#define V4L2_RDS_BLOCK_B 1 -+#define V4L2_RDS_BLOCK_C 2 -+#define V4L2_RDS_BLOCK_D 3 -+#define V4L2_RDS_BLOCK_C_ALT 4 -+#define V4L2_RDS_BLOCK_INVALID 7 -+ -+#define V4L2_RDS_BLOCK_CORRECTED 0x40 -+#define V4L2_RDS_BLOCK_ERROR 0x80 -+ -+/* -+ * A U D I O -+ */ -+struct v4l2_audio { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 mode; -+ __u32 reserved[2]; -+}; -+ -+/* Flags for the 'capability' field */ -+#define V4L2_AUDCAP_STEREO 0x00001 -+#define V4L2_AUDCAP_AVL 0x00002 -+ -+/* Flags for the 'mode' field */ -+#define V4L2_AUDMODE_AVL 0x00001 -+ -+struct v4l2_audioout { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 mode; -+ __u32 reserved[2]; -+}; -+ -+/* -+ * M P E G S E R V I C E S -+ * -+ * NOTE: EXPERIMENTAL API -+ */ -+#if 1 -+#define V4L2_ENC_IDX_FRAME_I (0) -+#define V4L2_ENC_IDX_FRAME_P (1) -+#define V4L2_ENC_IDX_FRAME_B (2) -+#define V4L2_ENC_IDX_FRAME_MASK (0xf) -+ -+struct v4l2_enc_idx_entry { -+ __u64 offset; -+ __u64 pts; -+ __u32 length; -+ __u32 flags; -+ __u32 reserved[2]; -+}; -+ -+#define V4L2_ENC_IDX_ENTRIES (64) -+struct v4l2_enc_idx { -+ __u32 entries; -+ __u32 entries_cap; -+ __u32 reserved[4]; -+ struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES]; -+}; -+ -+ -+#define V4L2_ENC_CMD_START (0) -+#define V4L2_ENC_CMD_STOP (1) -+#define V4L2_ENC_CMD_PAUSE (2) -+#define V4L2_ENC_CMD_RESUME (3) -+ -+/* Flags for V4L2_ENC_CMD_STOP */ -+#define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0) -+ -+struct v4l2_encoder_cmd { -+ __u32 cmd; -+ __u32 flags; -+ union { -+ struct { -+ __u32 data[8]; -+ } raw; -+ }; -+}; -+ -+#endif -+ -+ -+/* -+ * D A T A S E R V I C E S ( V B I ) -+ * -+ * Data services API by Michael Schimek -+ */ -+ -+/* Raw VBI */ -+struct v4l2_vbi_format { -+ __u32 sampling_rate; /* in 1 Hz */ -+ __u32 offset; -+ __u32 samples_per_line; -+ __u32 sample_format; /* V4L2_PIX_FMT_* */ -+ __s32 start[2]; -+ __u32 count[2]; -+ __u32 flags; /* V4L2_VBI_* */ -+ __u32 reserved[2]; /* must be zero */ -+}; -+ -+/* VBI flags */ -+#define V4L2_VBI_UNSYNC (1 << 0) -+#define V4L2_VBI_INTERLACED (1 << 1) -+ -+/* Sliced VBI -+ * -+ * This implements is a proposal V4L2 API to allow SLICED VBI -+ * required for some hardware encoders. It should change without -+ * notice in the definitive implementation. -+ */ -+ -+struct v4l2_sliced_vbi_format { -+ __u16 service_set; -+ /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field -+ service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field -+ (equals frame lines 313-336 for 625 line video -+ standards, 263-286 for 525 line standards) */ -+ __u16 service_lines[2][24]; -+ __u32 io_size; -+ __u32 reserved[2]; /* must be zero */ -+}; -+ -+/* Teletext World System Teletext -+ (WST), defined on ITU-R BT.653-2 */ -+#define V4L2_SLICED_TELETEXT_B (0x0001) -+/* Video Program System, defined on ETS 300 231*/ -+#define V4L2_SLICED_VPS (0x0400) -+/* Closed Caption, defined on EIA-608 */ -+#define V4L2_SLICED_CAPTION_525 (0x1000) -+/* Wide Screen System, defined on ITU-R BT1119.1 */ -+#define V4L2_SLICED_WSS_625 (0x4000) -+ -+#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) -+#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) -+ -+struct v4l2_sliced_vbi_cap { -+ __u16 service_set; -+ /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field -+ service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field -+ (equals frame lines 313-336 for 625 line video -+ standards, 263-286 for 525 line standards) */ -+ __u16 service_lines[2][24]; -+ enum v4l2_buf_type type; -+ __u32 reserved[3]; /* must be 0 */ -+}; -+ -+struct v4l2_sliced_vbi_data { -+ __u32 id; -+ __u32 field; /* 0: first field, 1: second field */ -+ __u32 line; /* 1-23 */ -+ __u32 reserved; /* must be 0 */ -+ __u8 data[48]; -+}; -+ -+/* -+ * Sliced VBI data inserted into MPEG Streams -+ */ -+ -+/* -+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV: -+ * -+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an -+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI -+ * data -+ * -+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header -+ * definitions are not included here. See the MPEG-2 specifications for details -+ * on these headers. -+ */ -+ -+/* Line type IDs */ -+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B (1) -+#define V4L2_MPEG_VBI_IVTV_CAPTION_525 (4) -+#define V4L2_MPEG_VBI_IVTV_WSS_625 (5) -+#define V4L2_MPEG_VBI_IVTV_VPS (7) -+ -+struct v4l2_mpeg_vbi_itv0_line { -+ __u8 id; /* One of V4L2_MPEG_VBI_IVTV_* above */ -+ __u8 data[42]; /* Sliced VBI data for the line */ -+} __attribute__ ((packed)); -+ -+struct v4l2_mpeg_vbi_itv0 { -+ __le32 linemask[2]; /* Bitmasks of VBI service lines present */ -+ struct v4l2_mpeg_vbi_itv0_line line[35]; -+} __attribute__ ((packed)); -+ -+struct v4l2_mpeg_vbi_ITV0 { -+ struct v4l2_mpeg_vbi_itv0_line line[36]; -+} __attribute__ ((packed)); -+ -+#define V4L2_MPEG_VBI_IVTV_MAGIC0 "itv0" -+#define V4L2_MPEG_VBI_IVTV_MAGIC1 "ITV0" -+ -+struct v4l2_mpeg_vbi_fmt_ivtv { -+ __u8 magic[4]; -+ union { -+ struct v4l2_mpeg_vbi_itv0 itv0; -+ struct v4l2_mpeg_vbi_ITV0 ITV0; -+ }; -+} __attribute__ ((packed)); -+ -+/* -+ * A G G R E G A T E S T R U C T U R E S -+ */ -+ -+/** -+ * struct v4l2_plane_pix_format - additional, per-plane format definition -+ * @sizeimage: maximum size in bytes required for data, for which -+ * this plane will be used -+ * @bytesperline: distance in bytes between the leftmost pixels in two -+ * adjacent lines -+ */ -+struct v4l2_plane_pix_format { -+ __u32 sizeimage; -+ __u16 bytesperline; -+ __u16 reserved[7]; -+} __attribute__ ((packed)); -+ -+/** -+ * struct v4l2_pix_format_mplane - multiplanar format definition -+ * @width: image width in pixels -+ * @height: image height in pixels -+ * @pixelformat: little endian four character code (fourcc) -+ * @field: field order (for interlaced video) -+ * @colorspace: supplemental to pixelformat -+ * @plane_fmt: per-plane information -+ * @num_planes: number of planes for this format -+ */ -+struct v4l2_pix_format_mplane { -+ __u32 width; -+ __u32 height; -+ __u32 pixelformat; -+ enum v4l2_field field; -+ enum v4l2_colorspace colorspace; -+ -+ struct v4l2_plane_pix_format plane_fmt[VIDEO_MAX_PLANES]; -+ __u8 num_planes; -+ __u8 reserved[11]; -+} __attribute__ ((packed)); -+ -+/** -+ * struct v4l2_format - stream data format -+ * @type: type of the data stream -+ * @pix: definition of an image format -+ * @pix_mp: definition of a multiplanar image format -+ * @win: definition of an overlaid image -+ * @vbi: raw VBI capture or output parameters -+ * @sliced: sliced VBI capture or output parameters -+ * @raw_data: placeholder for future extensions and custom formats -+ */ -+struct v4l2_format { -+ enum v4l2_buf_type type; -+ union { -+ struct v4l2_pix_format pix; /* V4L2_BUF_TYPE_VIDEO_CAPTURE */ -+ struct v4l2_pix_format_mplane pix_mp; /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */ -+ struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */ -+ struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */ -+ struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */ -+ __u8 raw_data[200]; /* user-defined */ -+ } fmt; -+}; -+ -+/* Stream type-dependent parameters -+ */ -+struct v4l2_streamparm { -+ enum v4l2_buf_type type; -+ union { -+ struct v4l2_captureparm capture; -+ struct v4l2_outputparm output; -+ __u8 raw_data[200]; /* user-defined */ -+ } parm; -+}; -+ -+/* -+ * E V E N T S -+ */ -+ -+#define V4L2_EVENT_ALL 0 -+#define V4L2_EVENT_VSYNC 1 -+#define V4L2_EVENT_EOS 2 -+#define V4L2_EVENT_PRIVATE_START 0x08000000 -+ -+/* Payload for V4L2_EVENT_VSYNC */ -+struct v4l2_event_vsync { -+ /* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */ -+ __u8 field; -+} __attribute__ ((packed)); -+ -+struct v4l2_event { -+ __u32 type; -+ union { -+ struct v4l2_event_vsync vsync; -+ __u8 data[64]; -+ } u; -+ __u32 pending; -+ __u32 sequence; -+ struct timespec timestamp; -+ __u32 reserved[9]; -+}; -+ -+struct v4l2_event_subscription { -+ __u32 type; -+ __u32 reserved[7]; -+}; -+ -+/* -+ * A D V A N C E D D E B U G G I N G -+ * -+ * NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS! -+ * FOR DEBUGGING, TESTING AND INTERNAL USE ONLY! -+ */ -+ -+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ -+ -+#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for the host) */ -+#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */ -+#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ -+#define V4L2_CHIP_MATCH_AC97 3 /* Match against anciliary AC97 chip */ -+ -+struct v4l2_dbg_match { -+ __u32 type; /* Match type */ -+ union { /* Match this chip, meaning determined by type */ -+ __u32 addr; -+ char name[32]; -+ }; -+} __attribute__ ((packed)); -+ -+struct v4l2_dbg_register { -+ struct v4l2_dbg_match match; -+ __u32 size; /* register size in bytes */ -+ __u64 reg; -+ __u64 val; -+} __attribute__ ((packed)); -+ -+/* VIDIOC_DBG_G_CHIP_IDENT */ -+struct v4l2_dbg_chip_ident { -+ struct v4l2_dbg_match match; -+ __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */ -+ __u32 revision; /* chip revision, chip specific */ -+} __attribute__ ((packed)); -+ -+/* -+ * I O C T L C O D E S F O R V I D E O D E V I C E S -+ * -+ */ -+#define VIDIOC_QUERYCAP _IOR('V', 0, struct v4l2_capability) -+#define VIDIOC_RESERVED _IO('V', 1) -+#define VIDIOC_ENUM_FMT _IOWR('V', 2, struct v4l2_fmtdesc) -+#define VIDIOC_G_FMT _IOWR('V', 4, struct v4l2_format) -+#define VIDIOC_S_FMT _IOWR('V', 5, struct v4l2_format) -+#define VIDIOC_REQBUFS _IOWR('V', 8, struct v4l2_requestbuffers) -+#define VIDIOC_QUERYBUF _IOWR('V', 9, struct v4l2_buffer) -+#define VIDIOC_G_FBUF _IOR('V', 10, struct v4l2_framebuffer) -+#define VIDIOC_S_FBUF _IOW('V', 11, struct v4l2_framebuffer) -+#define VIDIOC_OVERLAY _IOW('V', 14, int) -+#define VIDIOC_QBUF _IOWR('V', 15, struct v4l2_buffer) -+#define VIDIOC_DQBUF _IOWR('V', 17, struct v4l2_buffer) -+#define VIDIOC_STREAMON _IOW('V', 18, int) -+#define VIDIOC_STREAMOFF _IOW('V', 19, int) -+#define VIDIOC_G_PARM _IOWR('V', 21, struct v4l2_streamparm) -+#define VIDIOC_S_PARM _IOWR('V', 22, struct v4l2_streamparm) -+#define VIDIOC_G_STD _IOR('V', 23, v4l2_std_id) -+#define VIDIOC_S_STD _IOW('V', 24, v4l2_std_id) -+#define VIDIOC_ENUMSTD _IOWR('V', 25, struct v4l2_standard) -+#define VIDIOC_ENUMINPUT _IOWR('V', 26, struct v4l2_input) -+#define VIDIOC_G_CTRL _IOWR('V', 27, struct v4l2_control) -+#define VIDIOC_S_CTRL _IOWR('V', 28, struct v4l2_control) -+#define VIDIOC_G_TUNER _IOWR('V', 29, struct v4l2_tuner) -+#define VIDIOC_S_TUNER _IOW('V', 30, struct v4l2_tuner) -+#define VIDIOC_G_AUDIO _IOR('V', 33, struct v4l2_audio) -+#define VIDIOC_S_AUDIO _IOW('V', 34, struct v4l2_audio) -+#define VIDIOC_QUERYCTRL _IOWR('V', 36, struct v4l2_queryctrl) -+#define VIDIOC_QUERYMENU _IOWR('V', 37, struct v4l2_querymenu) -+#define VIDIOC_G_INPUT _IOR('V', 38, int) -+#define VIDIOC_S_INPUT _IOWR('V', 39, int) -+#define VIDIOC_G_OUTPUT _IOR('V', 46, int) -+#define VIDIOC_S_OUTPUT _IOWR('V', 47, int) -+#define VIDIOC_ENUMOUTPUT _IOWR('V', 48, struct v4l2_output) -+#define VIDIOC_G_AUDOUT _IOR('V', 49, struct v4l2_audioout) -+#define VIDIOC_S_AUDOUT _IOW('V', 50, struct v4l2_audioout) -+#define VIDIOC_G_MODULATOR _IOWR('V', 54, struct v4l2_modulator) -+#define VIDIOC_S_MODULATOR _IOW('V', 55, struct v4l2_modulator) -+#define VIDIOC_G_FREQUENCY _IOWR('V', 56, struct v4l2_frequency) -+#define VIDIOC_S_FREQUENCY _IOW('V', 57, struct v4l2_frequency) -+#define VIDIOC_CROPCAP _IOWR('V', 58, struct v4l2_cropcap) -+#define VIDIOC_G_CROP _IOWR('V', 59, struct v4l2_crop) -+#define VIDIOC_S_CROP _IOW('V', 60, struct v4l2_crop) -+#define VIDIOC_G_JPEGCOMP _IOR('V', 61, struct v4l2_jpegcompression) -+#define VIDIOC_S_JPEGCOMP _IOW('V', 62, struct v4l2_jpegcompression) -+#define VIDIOC_QUERYSTD _IOR('V', 63, v4l2_std_id) -+#define VIDIOC_TRY_FMT _IOWR('V', 64, struct v4l2_format) -+#define VIDIOC_ENUMAUDIO _IOWR('V', 65, struct v4l2_audio) -+#define VIDIOC_ENUMAUDOUT _IOWR('V', 66, struct v4l2_audioout) -+#define VIDIOC_G_PRIORITY _IOR('V', 67, enum v4l2_priority) -+#define VIDIOC_S_PRIORITY _IOW('V', 68, enum v4l2_priority) -+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap) -+#define VIDIOC_LOG_STATUS _IO('V', 70) -+#define VIDIOC_G_EXT_CTRLS _IOWR('V', 71, struct v4l2_ext_controls) -+#define VIDIOC_S_EXT_CTRLS _IOWR('V', 72, struct v4l2_ext_controls) -+#define VIDIOC_TRY_EXT_CTRLS _IOWR('V', 73, struct v4l2_ext_controls) -+#if 1 -+#define VIDIOC_ENUM_FRAMESIZES _IOWR('V', 74, struct v4l2_frmsizeenum) -+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum) -+#define VIDIOC_G_ENC_INDEX _IOR('V', 76, struct v4l2_enc_idx) -+#define VIDIOC_ENCODER_CMD _IOWR('V', 77, struct v4l2_encoder_cmd) -+#define VIDIOC_TRY_ENCODER_CMD _IOWR('V', 78, struct v4l2_encoder_cmd) -+#endif -+ -+#if 1 -+/* Experimental, meant for debugging, testing and internal use. -+ Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined. -+ You must be root to use these ioctls. Never use these in applications! */ -+#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register) -+#define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register) -+ -+/* Experimental, meant for debugging, testing and internal use. -+ Never use this ioctl in applications! */ -+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident) -+#endif -+ -+#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) -+#define VIDIOC_ENUM_DV_PRESETS _IOWR('V', 83, struct v4l2_dv_enum_preset) -+#define VIDIOC_S_DV_PRESET _IOWR('V', 84, struct v4l2_dv_preset) -+#define VIDIOC_G_DV_PRESET _IOWR('V', 85, struct v4l2_dv_preset) -+#define VIDIOC_QUERY_DV_PRESET _IOR('V', 86, struct v4l2_dv_preset) -+#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings) -+#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings) -+#define VIDIOC_DQEVENT _IOR('V', 89, struct v4l2_event) -+#define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct v4l2_event_subscription) -+#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription) -+ -+#define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ -+ -+#endif /* __LINUX_VIDEODEV2_H */ diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD deleted file mode 100644 index eadf3d5f3..000000000 --- a/testing/xf86-video-vesa/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 150085 2012-02-12 09:45:57Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-vesa -pkgver=2.3.0 -pkgrel=8 -_gitver=4ba7306fd0c9533750d389829e2cbf0522e149b3 -pkgdesc="X.org vesa video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa/snapshot/xf86-video-vesa-${_gitver}.tar.gz - #git-fixes.patch - revert-kernelcheck.patch) -sha1sums=('52f5bf577038c6fe7819743ceac787bb619b6d47' - 'c14454521ac91aaa08aad8a6025d7720a613d54b') - -build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - #patch -Np1 -i "${srcdir}/git-fixes.patch" - patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-vesa/git-fixes.patch b/testing/xf86-video-vesa/git-fixes.patch deleted file mode 100644 index c4f442265..000000000 --- a/testing/xf86-video-vesa/git-fixes.patch +++ /dev/null @@ -1,444 +0,0 @@ -diff --git a/COPYING b/COPYING -index 22b4b13..f101fb8 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,4 +1,5 @@ - Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) -+Copyright 2008 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"), -diff --git a/configure.ac b/configure.ac -index ff4713d..2e4f542 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,45 +20,44 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-vesa], -- 2.3.0, -+ [2.3.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-vesa) -- -+ [xf86-video-vesa]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - -+# Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) -- - AM_MAINTAINER_MODE - --# Require xorg-macros: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) - XORG_DEFAULT_OPTIONS - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ], - [ moduledir="$withval" ], - [ moduledir="$libdir/xorg/modules" ]) - AC_SUBST(moduledir) - -- --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), -@@ -93,21 +92,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' --INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' --AC_SUBST([CFLAGS]) --AC_SUBST([INCLUDES]) -- - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- - DRIVER_NAME=vesa - AC_SUBST([DRIVER_NAME]) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# 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. --# --# 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 THE OPEN GROUP 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. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# 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. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/vesa.man b/man/vesa.man -index 19cb766..ce4b369 100644 ---- a/man/vesa.man -+++ b/man/vesa.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH VESA __drivermansuffix__ __vendorversion__ -diff --git a/src/Makefile.am b/src/Makefile.am -index 88da8a2..dc702f0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,6 +24,9 @@ - # -avoid-version prevents gratuitous .0.0.0 version numbers on the end - # _ladir passes a dummy rpath to libtool so the thing will actually link - # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -+ -+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) -+ - vesa_drv_la_LTLIBRARIES = vesa_drv.la - vesa_drv_la_LDFLAGS = -module -avoid-version - vesa_drv_ladir = @moduledir@/drivers -diff --git a/src/vesa.c b/src/vesa.c -index 034a019..61d3550 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -281,7 +281,7 @@ static VESAPtr - VESAGetRec(ScrnInfoPtr pScrn) - { - if (!pScrn->driverPrivate) -- pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1); -+ pScrn->driverPrivate = calloc(sizeof(VESARec), 1); - - return ((VESAPtr)pScrn->driverPrivate); - } -@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode, - - data = (VbeModeInfoData *)vbemode->Private; - -- data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1); -+ data->block = calloc(sizeof(VbeCRTCInfoBlock), 1); - data->block->HorizontalTotal = ddcmode->HTotal; - data->block->HorizontalSyncStart = ddcmode->HSyncStart; - data->block->HorizontalSyncEnd = ddcmode->HSyncEnd; -@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode, - (double)(ddcmode->HTotal * ddcmode->VTotal)); - } - -+/* -+ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes -+ * think they can only give sizes in multiples of character cells; and -+ * indeed, the reference CVT and GTF formulae only give results where -+ * (h % 8) == 0. Whatever, let's just try to cope. What we're looking for -+ * here is cases where the display says 1366x768 and the BIOS says 1360x768. -+ */ -+static Bool -+vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe) -+{ -+ if (!(edid->type & M_T_DRIVER)) -+ return FALSE; -+ -+ /* never seen a height granularity... */ -+ if (edid->VDisplay != vbe->VDisplay) -+ return FALSE; -+ -+ if (edid->HDisplay >= vbe->HDisplay && -+ (edid->HDisplay & ~7) == (vbe->HDisplay & ~7)) -+ return TRUE; -+ -+ return FALSE; -+} -+ - static ModeStatus - VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) - { -@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) - */ - if (pScrn->monitor->DDC) { - for (mode = pScrn->monitor->Modes; mode; mode = mode->next) { -- if (mode->type & M_T_DRIVER && -- mode->HDisplay == p->HDisplay && -- mode->VDisplay == p->VDisplay) { -+ if (vesaModesCloseEnough(mode, p)) { - if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) { - found = 1; - break; -@@ -391,7 +413,8 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) - for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) { - mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0); - ret = xf86CheckModeForMonitor(mode, mon); -- xfree(mode); -+ free(mode->name); -+ free(mode); - if (ret == MODE_OK) - break; - } -@@ -431,8 +454,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { -- VESAPtr pVesa = VESAGetRec(pScrn); -+ VESAPtr pVesa; -+ -+ if (pci_device_has_kernel_driver(dev)) { -+ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); -+ return FALSE; -+ } - -+ pVesa = VESAGetRec(pScrn); - VESAInitScrn(pScrn); - pVesa->pciInfo = dev; - } -@@ -480,7 +509,7 @@ VESAProbe(DriverPtr drv, int flags) - } - } - } -- xfree(usedChips); -+ free(usedChips); - } - } - #endif -@@ -503,11 +532,11 @@ VESAProbe(DriverPtr drv, int flags) - foundScreen = TRUE; - } - } -- xfree(usedChips); -+ free(usedChips); - } - #endif - -- xfree(devSections); -+ free(devSections); - - return (foundScreen); - } -@@ -554,9 +583,9 @@ VESAFreeRec(ScrnInfoPtr pScrn) - VbeModeInfoData *data = (VbeModeInfoData*)mode->Private; - - if (data->block) -- xfree(data->block); -+ free(data->block); - -- xfree(data); -+ free(data); - - mode->Private = NULL; - } -@@ -564,12 +593,12 @@ VESAFreeRec(ScrnInfoPtr pScrn) - } while (mode && mode != pScrn->modes); - } - #endif -- xfree(pVesa->monitor); -- xfree(pVesa->vbeInfo); -- xfree(pVesa->pal); -- xfree(pVesa->savedPal); -- xfree(pVesa->fonts); -- xfree(pScrn->driverPrivate); -+ free(pVesa->monitor); -+ free(pVesa->vbeInfo); -+ free(pVesa->pal); -+ free(pVesa->savedPal); -+ free(pVesa->fonts); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -712,7 +741,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) - else { - void *panelid = VBEReadPanelID(pVesa->pVbe); - VBEInterpretPanelID(pScrn->scrnIndex, panelid); -- xfree(panelid); -+ free(panelid); - } - #endif - -@@ -805,7 +834,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) - - /* options */ - xf86CollectOptions(pScrn, NULL); -- if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) { -+ if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) { - vbeFree(pVesa->pVbe); - return FALSE; - } -@@ -940,7 +969,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - pScrn->bitsPerPixel = 8; - - if (pVesa->shadowFB) { -- pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY * -+ pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY * - ((pScrn->bitsPerPixel + 7) / 8)); - if (!pVesa->shadow) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -@@ -1119,10 +1148,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen) - } - if (pVesa->shadowFB && pVesa->shadow) { - shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); -- xfree(pVesa->shadow); -+ free(pVesa->shadow); - } - if (pVesa->pDGAMode) { -- xfree(pVesa->pDGAMode); -+ free(pVesa->pDGAMode); - pVesa->pDGAMode = NULL; - pVesa->nDGAMode = 0; - } -@@ -1180,7 +1209,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode) - * Free it as it will not be any longer useful - */ - xf86ErrorF(", mode set without customized refresh.\n"); -- xfree(data->block); -+ free(data->block); - data->block = NULL; - data->mode &= ~(1 << 11); - } -@@ -1315,7 +1344,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, - int base; - - if (pVesa->pal == NULL) -- pVesa->pal = xcalloc(1, sizeof(CARD32) * 256); -+ pVesa->pal = calloc(1, sizeof(CARD32) * 256); - - for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) { - int j = indices[i]; -@@ -1414,7 +1443,7 @@ SaveFonts(ScrnInfoPtr pScrn) - if (attr10 & 0x01) - return; - -- pVesa->fonts = xalloc(16384); -+ pVesa->fonts = malloc(16384); - - /* save the registers that are needed here */ - miscOut = ReadMiscOut(); -@@ -1622,7 +1651,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) - && function == MODE_SAVE) { - /* don't rely on the memory not being touched */ - if (pVesa->pstate == NULL) -- pVesa->pstate = xalloc(pVesa->stateSize); -+ pVesa->pstate = malloc(pVesa->stateSize); - memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize); - } - } -@@ -1737,7 +1766,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn) - DGAModePtr pDGAMode; - - do { -- pDGAMode = xrealloc(pVesa->pDGAMode, -+ pDGAMode = realloc(pVesa->pDGAMode, - (pVesa->nDGAMode + 1) * sizeof(DGAModeRec)); - if (!pDGAMode) - break; -diff --git a/src/vesa.h b/src/vesa.h -index 4656e4c..89245b9 100644 ---- a/src/vesa.h -+++ b/src/vesa.h -@@ -25,8 +25,6 @@ - * Conectiva Linux. - * - * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> -- * -- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $ - */ - - #ifndef _VESA_H_ diff --git a/testing/xf86-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch deleted file mode 100644 index 37418cc3f..000000000 --- a/testing/xf86-video-vesa/revert-kernelcheck.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 08 Dec 2010 18:45:32 +0000 -Subject: Refuse to load if there's a kernel driver bound to the device - -Ported from the equivalent check in nv. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/vesa.c b/src/vesa.c -index 168fde1..2523d76 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { -- VESAPtr pVesa = VESAGetRec(pScrn); -+ VESAPtr pVesa; - -+ if (pci_device_has_kernel_driver(dev)) { -+ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); -+ return FALSE; -+ } -+ -+ pVesa = VESAGetRec(pScrn); - VESAInitScrn(pScrn); - pVesa->pciInfo = dev; - } --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD deleted file mode 100644 index 78320a904..000000000 --- a/testing/xf86-video-voodoo/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 150089 2012-02-12 09:46:01Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-voodoo -pkgver=1.2.4 -pkgrel=6 -pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xf86-video-xgixp/PKGBUILD b/testing/xf86-video-xgixp/PKGBUILD deleted file mode 100644 index a8afd402d..000000000 --- a/testing/xf86-video-xgixp/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 150091 2012-02-12 09:46:03Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-xgixp -pkgver=1.8.0 -pkgrel=5 -pkgdesc="X.org XGIXP video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - api-compat-fix-for-DRAWABLE_BUFFER.patch) -sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' - 'ea140a13963bbf33cdff1ad75789d765867ec53b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${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/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch deleted file mode 100644 index f8cb64673..000000000 --- a/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Fri, 25 Mar 2011 22:46:55 +0000 -Subject: API compat fix for DRAWABLE_BUFFER - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/xgi_driver.c b/src/xgi_driver.c -index e54d8c7..189b84a 100644 ---- a/src/xgi_driver.c -+++ b/src/xgi_driver.c -@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, - { - switch (pDraw->type) { - case DRAWABLE_WINDOW: -+#ifdef DRAWABLE_BUFFER - case DRAWABLE_BUFFER: -+#endif - *read_ptr = xg47_read_memory_swap_func; - *write_ptr = xg47_write_memory_swap_func; - break; --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index ec72f28f7..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,194 +0,0 @@ -# $Id: PKGBUILD 154933 2012-03-31 09:51:27Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.0.901 -pkgrel=1 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - #git-fixes.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7' - '63836e5cfb4ae7353fb2e31239a544409c7ead32' - '175de5630b43dbc97778adfba5563b7fdd77f11f' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # Add post-release patches from 1.11 branch -# patch -Np1 -i "${srcdir}/git-fixes.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - conflicts=('nvidia-utils<=290.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/testing/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch deleted file mode 100644 index 27da61eca..000000000 --- a/testing/xorg-server/git-fixes.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Thu, 20 Oct 2011 13:43:01 +0000 -Subject: xf86Crtc: handle no outputs with no modes harder. - -If you started an X server with no connected outputs, we pick a default -1024x768 mode, however if you then ran an xvidmode using app against that -server it would segfault the server due to not finding any valid modes. - -This was due to the no output mode set code, only adding the modes to the -scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would -get called and remove all the modes and we'd end up with 0. - -This change fixes xf86SetScrnInfoModes to always report a scrn mode of at -least 1024x768, and pushes the initial configuration to just call it instead -of setting up the mode itself. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 - -I've seen other bugs like this on other distros so it might also actually fix them. - -Signed-off-by: Dave Airlie <airlied@redhat.com> -Reviewed-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) ---- -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index d75cd77..8906806 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) - break; - } - -- if (scrn->modes != NULL) { -- /* For some reason, scrn->modes is circular, unlike the other mode -- * lists. How great is that? -- */ -- for (last = scrn->modes; last && last->next; last = last->next) -- ; -- last->next = scrn->modes; -- scrn->modes->prev = last; -- if (mode) { -- while (scrn->modes != mode) -- scrn->modes = scrn->modes->next; -- } -+ if (!scrn->modes) { -+ scrn->modes = xf86ModesAdd(scrn->modes, -+ xf86CVTMode(scrn->display->virtualX, -+ scrn->display->virtualY, -+ 60, 0, 0)); -+ } -+ -+ /* For some reason, scrn->modes is circular, unlike the other mode -+ * lists. How great is that? -+ */ -+ for (last = scrn->modes; last && last->next; last = last->next) -+ ; -+ last->next = scrn->modes; -+ scrn->modes->prev = last; -+ if (mode) { -+ while (scrn->modes != mode) -+ scrn->modes = scrn->modes->next; - } -+ - scrn->currentMode = scrn->modes; - #ifdef XFreeXDGA - if (scrn->pScreen) -@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - width, height); - } - -- if (have_outputs) { -- /* Mirror output modes to scrn mode list */ -- xf86SetScrnInfoModes (scrn); -- } else { -- /* Clear any existing modes from scrn->modes */ -- while (scrn->modes != NULL) -- xf86DeleteMode(&scrn->modes, scrn->modes); -- scrn->modes = xf86ModesAdd(scrn->modes, -- xf86CVTMode(width, height, 60, 0, 0)); -- } -+ xf86SetScrnInfoModes (scrn); - - success = TRUE; - bailout: --- -cgit v0.9.0.2-2-gbebe -From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 -From: Christopher Yeleighton <giecrilj@stegny.2a.pl> -Date: Tue, 25 Oct 2011 01:47:06 +0000 -Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 - -https://bugs.freedesktop.org/show_bug.cgi?id=38420 - -Exit with fatal error message, not segfault. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) ---- -diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c -index 31ed505..dce3f84 100644 ---- a/hw/vfb/InitOutput.c -+++ b/hw/vfb/InitOutput.c -@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) - (1 << DirectColor)), - 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); - break; -+ default: -+ return FALSE; - } - - miSetPixmapDepths (); --- -cgit v0.9.0.2-2-gbebe -From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 24 Oct 2011 02:00:32 +0000 -Subject: dix: block signals when closing all devices - -When closing down all devices, we manually unset master for all attached -devices, but the device's sprite info still points to the master's sprite -info. This leaves us a window where the master is freed already but the -device isn't yet. A signal during that window causes dereference of the -already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. - -Simply block signals when removing all devices. It's not like we're really -worrying about high-responsive input at this stage. - -https://bugzilla.redhat.com/show_bug.cgi?id=737031 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Julien Cristau <jcristau@debian.org> -(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) ---- -diff --git a/dix/devices.c b/dix/devices.c -index 0ccf252..cbdd4ea 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -982,6 +982,8 @@ CloseDownDevices(void) - { - DeviceIntPtr dev; - -+ OsBlockSignals(); -+ - /* Float all SDs before closing them. Note that at this point resources - * (e.g. cursors) have been freed already, so we can't just call - * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master -@@ -1004,6 +1006,8 @@ CloseDownDevices(void) - inputInfo.keyboard = NULL; - inputInfo.pointer = NULL; - XkbDeleteRulesDflts(); -+ -+ OsReleaseSignals(); - } - - /** --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may 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, -.\" or (at your option) any later version. -.\" -.\" This 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 with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/testing/xorg-xinput/PKGBUILD b/testing/xorg-xinput/PKGBUILD deleted file mode 100644 index 7d9b5c2bf..000000000 --- a/testing/xorg-xinput/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 150095 2012-02-12 09:46:08Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xinput -pkgver=1.5.99.1 -pkgrel=1 -pkgdesc="Small commandline tool to configure devices" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama') -makedepends=('xorg-util-macros' 'inputproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) -sha1sums=('f979d9a4005d71db7e58064dff6ca6738bd9a345') - -build() { - cd "${srcdir}/xinput-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/xinput-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD deleted file mode 100644 index 8b76f6420..000000000 --- a/testing/xz/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 154765 2012-03-30 16:41:04Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> -# Contributor: François Charette <firmicus@gmx.net> - -pkgname=xz -pkgver=5.0.3 -pkgrel=2 -pkgdesc='Library and command line tools for XZ and LZMA compressed files' -arch=('i686' 'x86_64') -url='http://tukaani.org/xz/' -license=('GPL' 'LGPL' 'custom') -depends=('sh') -options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig" - 'compile-fix.patch') -md5sums=('fefe52f9ecd521de2a8ce38c21a27574' - 'd0725667a6dae0853194dc691e900e26' - 'b74e4f7793848cc5765c848ea30f971f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/compile-fix.patch - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-werror - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 -} diff --git a/testing/xz/compile-fix.patch b/testing/xz/compile-fix.patch deleted file mode 100644 index f3b7878d1..000000000 --- a/testing/xz/compile-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 -From: Lasse Collin <lasse.collin@tukaani.org> -Date: Tue, 10 Jan 2012 17:13:03 +0200 -Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE. - -Reported here: -http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 ---- - tests/create_compress_files.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c -index 44367d8..bd5b4ef 100644 ---- a/tests/create_compress_files.c -+++ b/tests/create_compress_files.c -@@ -79,7 +79,8 @@ static void - write_abc(FILE *file) - { - for (size_t i = 0; i < 12345; ++i) -- fwrite("abc\n", 4, 1, file); -+ if (fwrite("abc\n", 4, 1, file) != 1) -+ exit(1); - } - - --- -1.7.6 - diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD deleted file mode 100644 index c78f6d1dd..000000000 --- a/testing/ypbind-mt/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 149344 2012-02-06 23:02:05Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypbind-mt -pkgver=1.33 -pkgrel=4 -pkgdesc='Linux NIS daemon' -url='http://www.linux-nis.org/nis/ypbind-mt/' -license=('GPL2') -arch=('i686' 'x86_64') -makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'dbus-glib') -optdepends=('yp-tools: to set a domain name') -backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') -#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'nisdomainname.conf' - 'ypbind.conf' - 'ypbind') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --enable-dbus-nm \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf - install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind - install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind - install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname - install -d -m755 "${pkgdir}"/var/yp/binding -} -md5sums=('692f68ed0476762be4228ce543a5b791' - 'e83a85291ea2ee152a78f2c16b0b1185' - '229309a989abad27703ac2e6d07dc7ae' - '1f7a4c80414d580c9afb3a08267beed0') diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf deleted file mode 100644 index bbbbf8fc7..000000000 --- a/testing/ypbind-mt/nisdomainname.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# NIS domain to be set in /etc/rc.d/ypbind -# -NISDOMAINNAME="" diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind deleted file mode 100755 index 6a5ef11e3..000000000 --- a/testing/ypbind-mt/ypbind +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/ypbind -. /etc/conf.d/nisdomainname - -name=ypbind -PID=$(pidof -o %PPID /usr/sbin/ypbind) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null - [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; -esac diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf deleted file mode 100644 index fd0ebd491..000000000 --- a/testing/ypbind-mt/ypbind.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ypbind -# -YPBIND_ARGS="" diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD deleted file mode 100644 index 2e125cbee..000000000 --- a/testing/ypserv/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 151498 2012-02-26 19:05:20Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ypserv -pkgver=2.27 -pkgrel=1 -pkgdesc='Linux NIS Server' -arch=('i686' 'x86_64') -url='http://www.linux-nis.org/nis/ypserv/' -license=('GPL2') -depends=('gdbm' 'openslp' 'inetutils') -optdepends=('gawk: for printcap support') -backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') -source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - confpost.patch - 'yppasswd' - 'ypserv') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../confpost.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup - install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf - install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets - install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv - install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd -} -md5sums=('fd9c43aec932a92be07b723c647b02a4' - '8acb314f30d6e531ac9efa8655f68ccb' - '4bc84c48ed1bb9659698853acb5cfd76' - 'c40befe5932f1b42efaced6b46809303') diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch deleted file mode 100644 index 489e4368a..000000000 --- a/testing/ypserv/confpost.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h ---- ypserv-2.27/conf_post.h.qdbm 2012-02-01 14:18:01.780846425 +0100 -+++ ypserv-2.27/conf_post.h 2012-02-01 14:18:01.780846425 +0100 -@@ -0,0 +1,10 @@ -+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since -+ * libraries gdbm and qdbm have same symbol names. */ -+#undef HAVE_COMPAT_LIBGDBM -+#ifdef HAVE_LIBGDBM -+#define HAVE_COMPAT_LIBGDBM -+#endif -+#ifdef HAVE_LIBQDBM -+#define HAVE_COMPAT_LIBGDBM -+#endif -+ diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd deleted file mode 100755 index c2b00b2ca..000000000 --- a/testing/ypserv/yppasswd +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting NIS Password Daemon" - /usr/sbin/rpc.yppasswdd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon yppasswd - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Password Daemon" - killall -q /usr/sbin/rpc.yppasswdd - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon yppasswd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv deleted file mode 100755 index c36e6901b..000000000 --- a/testing/ypserv/ypserv +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting NIS Server" - /usr/sbin/ypserv - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ypserv - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Server" - killall -q /usr/sbin/ypserv - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ypserv - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac |
