summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac David <isacdaavid@isacdaavid.info>2017-08-08 20:19:37 -0500
committerIsaac David <isacdaavid@isacdaavid.info>2017-08-08 20:19:37 -0500
commitf6bff2f09f354b08d04f43c7954e7e594d804320 (patch)
treebe5f2cf3f2a2d91ec15716356f41522128e48cbc
parent8973bc1820b4106d7fbf2052dc5dc2689681d308 (diff)
downloadabslibre-f6bff2f09f354b08d04f43c7954e7e594d804320.tar.gz
abslibre-f6bff2f09f354b08d04f43c7954e7e594d804320.tar.bz2
abslibre-f6bff2f09f354b08d04f43c7954e7e594d804320.zip
remove old unnecessary packages from [libre]
- javacc - psi - spacefm - usermin - webmin - xbmc-pvr-addons-lts - xchat more rationale on this here: https://lists.parabola.nu/pipermail/dev/2017-July/005786.html
-rw-r--r--libre/javacc/PKGBUILD59
-rw-r--r--libre/javacc/build-xml-bootstrap.patch65
-rw-r--r--libre/psi/PKGBUILD36
-rw-r--r--libre/psi/parabola.patch54
-rw-r--r--libre/spacefm/PKGBUILD45
-rw-r--r--libre/spacefm/libre.patch15
-rw-r--r--libre/usermin/PKGBUILD131
-rw-r--r--libre/usermin/usermin.install34
-rw-r--r--libre/usermin/usermin.service9
-rw-r--r--libre/webmin/PKGBUILD220
-rw-r--r--libre/webmin/webmin.install35
-rw-r--r--libre/webmin/webmin.service11
-rw-r--r--libre/xbmc-pvr-addons-lts/PKGBUILD30
-rw-r--r--libre/xchat/ChangeLog49
-rw-r--r--libre/xchat/PKGBUILD85
-rw-r--r--libre/xchat/no-firefox.patch16
-rw-r--r--libre/xchat/remove-non-free-suggestion.patch12
-rw-r--r--libre/xchat/xchat-2.8.8-glib-2.31.patch62
-rw-r--r--libre/xchat/xchat-2.8.8-libnotify07.patch24
-rw-r--r--libre/xchat/xchat-2.8.8-link-against-libnotify.patch343
-rw-r--r--libre/xchat/xchat-sslv23.patch22
21 files changed, 0 insertions, 1357 deletions
diff --git a/libre/javacc/PKGBUILD b/libre/javacc/PKGBUILD
deleted file mode 100644
index 5aa3b3c71..000000000
--- a/libre/javacc/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=javacc
-pkgver=6.1.2
-pkgdesc="Java Compiler Compiler; a parser generator"
-url="http://javacc.java.net/"
-license=('BSD3')
-
-arch=('any')
-pkgrel=1
-depends=('java-runtime')
-makedepends=('apache-ant' 'junit' 'jh')
-source=("https://java.net/projects/${pkgname}/downloads/download/releases/Release%20${pkgver}/${pkgname}-${pkgver}-sources.jar"
- 'build-xml-bootstrap.patch')
-md5sums=('a29fdd55ccb738dc07a489b80b74e062'
- 'c863ce2ed275f36ff0eebfc9e2776592')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- ln -sfT /usr/share/java/junit.jar lib/junit3.8.1/junit.jar
- rm -f bootstrap/javacc.jar
- sed -i "s|^ <version>.*</version>| <version>$pkgver</version>|" pom.xml
- cd ..
- cp -a "$pkgname-$pkgver" "$pkgname-$pkgver"-bootstrap
- patch -i build-xml-bootstrap.patch "$pkgname-$pkgver"-bootstrap/build.xml
- rm -rf "$pkgname-$pkgver"/src/main/generated-sources
-}
-
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver-bootstrap
- ant
- cd ../$pkgname-$pkgver
- ln -srf "$PWD"-bootstrap/target/javacc-$pkgver.jar bootstrap/javacc.jar
-
- ant
-
- cd ..
- local prog
- for prog in javacc jjdoc jjtree; do
- printf '#!/bin/sh\nexec java -classpath %q %s "$@"\n' \
- /usr/share/java/javacc.jar $prog \
- > $prog.sh
- done
-}
-
-package() {
- cd "$srcdir"
-
- local prog
- for prog in javacc jjdoc jjtree; do
- install -Dm755 $prog.sh "$pkgdir"/usr/bin/$prog
- done
-
- cd "$pkgname-$pkgver"
- DESTDIR="$pkgdir" jh mvn-install net.java.dev.javacc javacc "$pkgver" \
- pom.xml target/javacc-$pkgver.jar javacc.jar
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/javacc/build-xml-bootstrap.patch b/libre/javacc/build-xml-bootstrap.patch
deleted file mode 100644
index 993aa82fd..000000000
--- a/libre/javacc/build-xml-bootstrap.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/javacc-6.1.2/build.xml 2014-05-04 23:04:10.000000000 -0600
-+++ build.xml 2015-06-14 20:30:21.775223860 -0600
-@@ -59,61 +59,7 @@
- </target>
-
-
-- <target name="compile" depends="clean, clean_generated_sources">
--
-- <!-- Create the folders we need in the generated sources folder -->
--
-- <mkdir dir="${generated-sources-src}"/>
-- <mkdir dir="${generated-sources-src}/org/javacc/parser"/>
-- <mkdir dir="${generated-sources-src}/org/javacc/utils"/>
-- <mkdir dir="${generated-sources-src}/org/javacc/jjtree"/>
--
-- <!-- Generate the Java CC Main Parser -->
--
-- <java classname="${javacc-bootstrap-class}" classpath="${bootstrap-jar}" dir="${basedir}/src/main/javacc" fork="true">
-- <arg value="JavaCC.jj"/>
-- </java>
--
-- <!-- This class is overrriden -->
-- <delete file="${generated-sources-src}/org/javacc/parser/Token.java" />
--
-- <!-- Generate the JJTree Parser Definition (from the tree definition) -->
--
-- <java classname="${jjtree-bootstrap-class}" classpath="${bootstrap-jar}" dir="${basedir}/src/main/jjtree" fork="true">
-- <arg value="JJTree.jjt"/>
-- </java>
--
-- <!-- Generate the JJTree Parser -->
--
-- <java classname="${javacc-bootstrap-class}" classpath="${bootstrap-jar}" dir="${generated-sources-src}/org/javacc/jjtree" fork="true">
-- <arg value="JJTree.jj"/>
-- </java>
--
-- <!-- Delete the .jj file created by the jjtree program and the classes that were override and already added into the main source path -->
--
-- <delete file="${generated-sources-src}/org/javacc/jjtree/JJTree.jj" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTBNF.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTBNFAction.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTBNFDeclaration.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTBNFNodeScope.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTCompilationUnit.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTExpansionNodeScope.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTGrammar.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTJavacode.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTJavacodeBody.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTNodeDescriptor.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTNodeDescriptorExpression.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTOptionBinding.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/ASTOptions.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/JJTreeParserVisitor.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/JJTreeParserDefaultVisitor.java" />
-- <delete file="${generated-sources-src}/org/javacc/jjtree/Token.java" />
--
-- <!-- Generate the Condition Parser -->
--
-- <java classname="${javacc-bootstrap-class}" classpath="${bootstrap-jar}" dir="${basedir}/src/main/javacc" fork="true">
-- <arg value="ConditionParser.jj"/>
-- </java>
-+ <target name="compile" depends="clean">
-
- <mkdir dir="classes"/>
-
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
deleted file mode 100644
index fcb259a18..000000000
--- a/libre/psi/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 266279 2016-04-27 17:05:31Z pierre $
-# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgname=psi
-pkgver=0.15
-pkgrel=4.parabola1
-pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'armv7h')
-depends=('qca-qt4' 'enchant' 'libxss' 'xdg-utils')
-makedepends=('icu')
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
- 'parabola.patch')
-md5sums=('aea15f17cf93e7cea52f305523f761be'
- '8a5c799ad8b6fd5310d4a849c324c82c')
-
-prepare() {
- cd ${srcdir}/psi-${pkgver}
- patch -p0 -i ${srcdir}/parabola.patch
-}
-
-build() {
- cd ${srcdir}/psi-${pkgver}
- ./configure --prefix=/usr --release --no-separate-debug-info
- make
-}
-
-package() {
- cd ${srcdir}/psi-${pkgver}
- make INSTALL_ROOT=${pkgdir} install
- rm -rf ${pkgdir}/usr/share/psi/certs/
-}
diff --git a/libre/psi/parabola.patch b/libre/psi/parabola.patch
deleted file mode 100644
index 9d41bffc4..000000000
--- a/libre/psi/parabola.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/systeminfo.cpp 2012-10-03 21:53:03.000000000 -0300
-+++ src/systeminfo.cpp 2013-03-25 21:27:28.691880863 -0300
-@@ -75,23 +75,7 @@
- enum LinuxName {
- LinuxNone = 0,
-
-- LinuxMandrake,
-- LinuxDebian,
-- LinuxRedHat,
-- LinuxGentoo,
-- LinuxExherbo,
-- LinuxSlackware,
-- LinuxSuSE,
-- LinuxConectiva,
-- LinuxCaldera,
-- LinuxLFS,
--
-- LinuxASP, // Russian Linux distros
-- LinuxALT,
--
-- LinuxPLD, // Polish Linux distros
-- LinuxAurox,
-- LinuxArch
-+ LinuxParabola
- };
-
- enum OsFlags {
-@@ -106,24 +90,8 @@
- QString file;
- QString name;
- } osInfo[] = {
-- { LinuxMandrake, OsUseFile, "/etc/mandrake-release", "Mandrake Linux" },
-- { LinuxDebian, OsAppendFile, "/etc/debian_version", "Debian GNU/Linux" },
-- { LinuxGentoo, OsUseFile, "/etc/gentoo-release", "Gentoo Linux" },
-- { LinuxExherbo, OsUseName, "/etc/exherbo-release", "Exherbo Linux" },
-- { LinuxArch, OsUseName, "/etc/arch-release", "Arch Linux" },
-- { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" },
-- { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" },
-- { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" },
-- { LinuxArch, OsUseFile, "/etc/arch-release", "Arch Linux" },
-- { LinuxLFS, OsAppendFile, "/etc/lfs-release", "LFS Linux" },
--
-- // untested
-- { LinuxSuSE, OsUseFile, "/etc/SuSE-release", "SuSE Linux" },
-- { LinuxConectiva, OsUseFile, "/etc/conectiva-release", "Conectiva Linux" },
-- { LinuxCaldera, OsUseFile, "/etc/.installed", "Caldera Linux" },
--
-- // many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :)
-- { LinuxRedHat, OsUseFile, "/etc/redhat-release", "RedHat Linux" },
-+ { LinuxParabola, OsUseName, "/etc/parabola-release", "Parabola GNU/Linux-libre" },
-+ { LinuxParabola, OsUseFile, "/etc/parabola-release", "Parabola GNU/Linux-libre" },
-
- { LinuxNone, OsUseName, "", "" }
- };
diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD
deleted file mode 100644
index d815607ed..000000000
--- a/libre/spacefm/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 172395 2016-04-28 09:15:47Z eworm $
-# Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
-# Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Edison Ibañez <arkhan.xxx@gmail.com>
-
-pkgname=spacefm
-pkgver=1.0.5
-pkgrel=2.parabola1
-pkgdesc='Multi-panel tabbed file manager, with unar support'
-arch=('i686' 'x86_64' 'armv7h')
-url='http://ignorantguru.github.com/spacefm/'
-license=('GPL3')
-depends=('gtk3' 'desktop-file-utils' 'startup-notification' 'ffmpegthumbnailer' 'unar')
-makedepends=('intltool' 'gettext')
-optdepends=('lsof: device processes'
- 'wget: plugin download'
- 'gksu: perform as root functionality'
- 'udevil: mount as non-root user and mount networks'
- 'udisks2: mount as non-root user')
-replaces=(${pkgname}-libre)
-conflicts=(${pkgname}-libre)
-source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz
- libre.patch)
-md5sums=('634763f4d3886a00088e06a4295982b2'
- '66cc35023050ff6664bf14b1073700e2')
-
-prepare() {
- cd $pkgname-$pkgver
- # replace nonfree unrar with unar support
- patch -Np1 -i $srcdir/libre.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --disable-pixmaps
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch
deleted file mode 100644
index d27b1b850..000000000
--- a/libre/spacefm/libre.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur spacefm-1.0.1.orig/src/ptk/ptk-handler.c spacefm-1.0.1/src/ptk/ptk-handler.c
---- spacefm-1.0.1.orig/src/ptk/ptk-handler.c 2015-05-04 09:33:53.000000000 -0300
-+++ spacefm-1.0.1/src/ptk/ptk-handler.c 2015-05-11 19:11:14.248923712 -0300
-@@ -173,9 +173,9 @@
- "*.rar *.RAR",
- "rar a -r %o %N",
- TRUE,
-- "unrar -o- x %x",
-+ "unar -D %x",
- TRUE,
-- "unrar lt %x",
-+ "unar -D %x",
- TRUE
- },
- {
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
deleted file mode 100644
index 600e34db0..000000000
--- a/libre/usermin/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: PKGBUILD 221299 2014-09-09 12:47:52Z tpowa $
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
-pkgver=1.610
-pkgrel=1.parabola2
-pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)"
-arch=(i686 x86_64 mips64el)
-license=('custom:usermin')
-url="http://www.webmin.com/"
-depends=('perl' 'webmin')
-makedepends=('perl-net-ssleay')
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
-backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
-'etc/usermin/at/config' \
-'etc/usermin/man/config' \
-'etc/usermin/ssh/config' \
-'etc/usermin/chfn/config' \
-'etc/usermin/cron/config' \
-'etc/usermin/file/config' \
-'etc/usermin/plan/config' \
-'etc/usermin/proc/config' \
-'etc/usermin/spam/config' \
-'etc/usermin/htaccess/config' \
-'etc/usermin/cshrc/config' \
-'etc/usermin/gnupg/config' \
-'etc/usermin/mysql/config' \
-'etc/usermin/quota/config' \
-'etc/usermin/shell/config' \
-'etc/usermin/theme/config' \
-'etc/usermin/mailbox/config' \
-'etc/usermin/schedule/config' \
-'etc/usermin/config' \
-'etc/usermin/commands/config' \
-'etc/usermin/htaccess-htpasswd/config' \
-'etc/usermin/forward/config' \
-'etc/usermin/telnet/config' \
-'etc/usermin/tunnel/config' \
-'etc/usermin/updown/config' \
-'etc/usermin/procmail/config' \
-'etc/usermin/fetchmail/config' \
-'etc/usermin/changepass/config' \
-'etc/usermin/language/config' \
-'etc/usermin/postgresql/config' \
-'etc/usermin/usermount/config' \
-)
-install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
- usermin.service
- ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2)
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
-
- # remove modules we do not support
-
- #remove config files from other distros
- rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-
- # remove caldera theme
- rm -rf caldera
-
- # remove init-scripts from other distros
- rm usermin-init
- rm usermin-daemon
-
- # setting perl path
- (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-
- # create dirs
- mkdir -p "$pkgdir"/opt/usermin
- mkdir -p "$pkgdir"/var/log/usermin
- mkdir -p "$pkgdir"/etc/usermin
-
- # install pam stuff
- install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin
-
- # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
- rm os_list.txt
- echo 'Parabola GNU/Linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt
-
- # copy stuff to right dirs
- cd "$srcdir"/$pkgname-$pkgver
- cp -rp * "$pkgdir"/opt/usermin
- cd "$srcdir"/usermin-config
- cp -rfp * "$pkgdir"/opt/usermin
-
- # define parameters for setup.sh
- config_dir="$pkgdir"/etc/usermin
- var_dir="$pkgdir"/var/log/usermin
- perl=/usr/bin/perl
- autoos=1
- port=20000
- login=root
- crypt="XXX"
- ssl=1
- atboot=0
- nostart=1
- nochown=1
- autothird=1
- nouninstall=1
- noperlpath=1
- atbootyn=n
- tempdir="$pkgdir"/tmp
- export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
-
- # Fix setup.sh
- sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh
- "$pkgdir"/opt/usermin/setup.sh
-
- # Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
- find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \;
-
- # make it only accessible by localhost
- echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf
-
- # enable user and password login
- sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf
-
- #install systemd service file
- install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
-
- # delete temp dir
- rm -r "$pkgdir"/tmp
- #install license
- install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
-}
-md5sums=('d73f0696e2644034f1ec8202b9f020be'
- 'a5bd5e5ee779f8a3cf3d776ca77ee36e'
- 'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/usermin/usermin.install b/libre/usermin/usermin.install
deleted file mode 100644
index 3ace10ea2..000000000
--- a/libre/usermin/usermin.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# arg 1: the new package version
-post_install() {
- local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
- crypt=${crypt//\\/\\\\}
- crypt=${crypt//\//\\\/}
- sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make usermin start at boot time, add usermin to rc.conf daemons
-==> Point your web browser to http://localhost:20000 to use usermin.
-==> To change the modules setup please use webmin.
-
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
- cd /opt/usermin/man
- gzip -df $(find . -name '*.gz')
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- # uninstall unzipped files
- rm -r /opt/usermin/man
-}
diff --git a/libre/usermin/usermin.service b/libre/usermin/usermin.service
deleted file mode 100644
index e91164c63..000000000
--- a/libre/usermin/usermin.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Usermin
-
-[Service]
-Type=forking
-ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
deleted file mode 100644
index fac84125b..000000000
--- a/libre/webmin/PKGBUILD
+++ /dev/null
@@ -1,220 +0,0 @@
-# $Id: PKGBUILD 223780 2014-10-02 20:25:48Z tpowa $
-# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
-pkgname=webmin
-pkgver=1.710
-pkgrel=1.parabola2
-pkgdesc="a web-based interface for system administration (Parabola rebranded)"
-arch=(i686 x86_64 mips64el)
-license=('custom:webmin')
-url="http://www.webmin.com/"
-depends=('perl' 'perl-perl4-corelibs')
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
-makedepends=('perl-net-ssleay')
-backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
-'etc/webmin/pacman/config' \
-'etc/webmin/at/config' \
-'etc/webmin/acl/config' \
-'etc/webmin/lvm/config' \
-'etc/webmin/net/config' \
-'etc/webmin/nis/config' \
-'etc/webmin/pam/config' \
-'etc/webmin/cron/config' \
-'etc/webmin/file/config' \
-'etc/webmin/grub/config' \
-'etc/webmin/init/config' \
-'etc/webmin/ipfw/config' \
-'etc/webmin/lilo/config' \
-'etc/webmin/proc/config' \
-'etc/webmin/raid/config' \
-'etc/webmin/spam/config' \
-'etc/webmin/sshd/config' \
-'etc/webmin/time/config' \
-'etc/webmin/cluster-passwd/config' \
-'etc/webmin/software/config' \
-'etc/webmin/webminlog/config' \
-'etc/webmin/cluster-webmin/config' \
-'etc/webmin/bind8/config' \
-'etc/webmin/dhcpd/config' \
-'etc/webmin/fdisk/config' \
-'etc/webmin/mount/config' \
-'etc/webmin/mysql/config' \
-'etc/webmin/quota/config' \
-'etc/webmin/samba/config' \
-'etc/webmin/shell/config' \
-'etc/webmin/squid/config' \
-'etc/webmin/adsl-client/config' \
-'etc/webmin/servers/config' \
-'etc/webmin/cluster-shell/config' \
-'etc/webmin/bandwidth/config' \
-'etc/webmin/ppp-client/config' \
-'etc/webmin/lpadmin/config' \
-'etc/webmin/apache/config' \
-'etc/webmin/firewall/config' \
-'etc/webmin/stunnel/config' \
-'etc/webmin/burner/config' \
-'etc/webmin/exports/config' \
-'etc/webmin/backup-config/config' \
-'etc/webmin/custom/config' \
-'etc/webmin/htaccess-htpasswd/config' \
-'etc/webmin/logrotate/config' \
-'etc/webmin/format/config' \
-'etc/webmin/fsdump/config' \
-'etc/webmin/passwd/config' \
-'etc/webmin/cluster-useradmin/config' \
-'etc/webmin/cluster-software/config' \
-'etc/webmin/cluster-copy/config' \
-'etc/webmin/cluster-cron/config' \
-'etc/webmin/telnet/config' \
-'etc/webmin/status/config' \
-'etc/webmin/syslog/config' \
-'etc/webmin/updown/config' \
-'etc/webmin/usermin/config' \
-'etc/webmin/webmin/config' \
-'etc/webmin/xinetd/config' \
-'etc/webmin/openslp/config' \
-'etc/webmin/procmail/config' \
-'etc/webmin/fetchmail/config' \
-'etc/webmin/postgresql/config' \
-'etc/webmin/useradmin/config' \
-'etc/webmin/mailboxes/config' \
-'etc/webmin/inittab/config' \
-'etc/webmin/change-user/config' \
-'etc/webmin/postfix/config' \
-'etc/webmin/proftpd/config' \
-'etc/webmin/pserver/config' \
-'etc/webmin/dnsadmin/config' )
-install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
- ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2
- ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
- webmin.service)
-options=(!strip)
-
-package() {
- # NOTE: USE --asroot build option to avoid fakeroot error!
- cd "$srcdir"/$pkgname-$pkgver
- # add patches from webmin.com
- #for i in ../*.wbm
- #do tar xvf $i
- #done
- #for i in ../*.wbt
- #do tar xvf $i
- #done
- # delete stuff that's not needed
- rm -f mount/freebsd-mounts*
- rm -f mount/openbsd-mounts*
- rm -f mount/macos-mounts*
-
- # remove modules we do not support
- rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-
- #remove config files from other distros
- rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-
- # remove caldera theme
- rm -rf caldera
-
- # remove init-scripts from other distros
- rm webmin-gentoo-init
- rm webmin-init
- rm webmin-caldera-init
- rm webmin-daemon
-
- # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
- rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
- rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-
- # remove modules add because we don't want files installed without pacman control
- rm -f webmin/{install_mod.cgi,delete_mod.cgi}
-
- # setting perl path
- (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-
- # create dirs
- mkdir -p "$pkgdir"/opt/webmin
- mkdir -p "$pkgdir"/var/log/webmin
- mkdir -p "$pkgdir"/etc/webmin
-
- # install pam stuff
- install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
-
- # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
- rm os_list.txt
- echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt
-
- # Add rc.conf support to boot and shutdown menu and lock editing of this module
- cd init/
- sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
- sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
- sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/*
- sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/*
- sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl
-
- # Add pacman menu
- cd "$srcdir"/$pkgname-$pkgver
- cp -rf custom/ pacman
- cp -rf mscstyle3/custom mscstyle3/pacman
- sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
- sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info
- sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info
- echo 'category=system' >> pacman/module.info
- echo 'desc=Pacman' >> pacman/module.info
- sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
-
- # copy stuff to right dirs
- cd "$srcdir"/$pkgname-$pkgver
- cp -rp * "$pkgdir"/opt/webmin
- cd "$srcdir"/webmin-config
- cp -rfp * "$pkgdir"/opt/webmin
-
- # define parameters for setup.sh
- config_dir="$pkgdir"/etc/webmin
- var_dir="$pkgdir"/var/log/webmin
- perl=/usr/bin/perl
- autoos=1
- port=10000
- login=root
- crypt="XXX"
- ssl=1
- atboot=0
- nostart=1
- nochown=1
- autothird=1
- nouninstall=1
- noperlpath=1
- atbootyn=n
- tempdir="$pkgdir"/tmp
- export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-
- # Fix setup.sh
- sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
- "$pkgdir"/opt/webmin/setup.sh
-
- # Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
- find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
-
- # make it only accessible by localhost
- echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
-
- # install pacman menu
- cd "$srcdir"/webmin-pacman/config
- cp -rfp * "$pkgdir"/etc/webmin/pacman
-
- # install systemd files
- install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
-
- # delete temp dir
- rm -r "$pkgdir"/tmp
- # change sticky bit
- chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
- # install license
- install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
-}
-
-
-md5sums=('cf270b18644884b1c791ba963d9a630d'
- 'b0b3e3fb231a12e60165b6b4d604dcfa'
- 'c86518037449e0fc0c60fc24537ea038'
- 'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/libre/webmin/webmin.install b/libre/webmin/webmin.install
deleted file mode 100644
index efdd9291d..000000000
--- a/libre/webmin/webmin.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1: the new package version
-post_install() {
- local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
- crypt=${crypt//\\/\\\\}
- crypt=${crypt//\//\\\/}
- sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make webmin start at boot time, add webmin to rc.conf daemons
-==> Point your web browser to http://localhost:10000 to use webmin.
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
- cd /opt/webmin/man
- for i in $(find . -name '*.gz'); do
- gzip -df $i
- done
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- # uninstall unzipped files
- rm -r /opt/webmin/man
-}
diff --git a/libre/webmin/webmin.service b/libre/webmin/webmin.service
deleted file mode 100644
index a8a384a8c..000000000
--- a/libre/webmin/webmin.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Webmin
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/webmin/start
-ExecStop=/etc/webmin/stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/xbmc-pvr-addons-lts/PKGBUILD b/libre/xbmc-pvr-addons-lts/PKGBUILD
deleted file mode 100644
index 990d6e049..000000000
--- a/libre/xbmc-pvr-addons-lts/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 110811 2014-05-07 15:05:32Z spupykin $
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-_pkgname=xbmc-pvr-addons
-pkgname=xbmc-pvr-addons-lts
-pkgver=20131106.Frodo
-pkgrel=1
-pkgdesc="XBMC PVR add-ons for current stable xbmc"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://github.com/opdenkamp/xbmc-pvr-addons"
-license=('GPL3')
-depends=('xbmc-libre-lts' 'libmysqlclient')
-makedepends=('git' 'libmysqlclient' 'boost')
-optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
-conflicts=('xbmc-pvr-addons-git' 'xbmc-pvr-addons')
-source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo")
-md5sums=('SKIP')
-
-build() {
- cd "$srcdir/$_pkgname"
- ./bootstrap
- ./configure --prefix=/usr --enable-addons-with-dependencies
- make
-}
-
-package() {
- cd "$srcdir/$_pkgname"
- make DESTDIR="$pkgdir/" install
-}
diff --git a/libre/xchat/ChangeLog b/libre/xchat/ChangeLog
deleted file mode 100644
index faa8383c8..000000000
--- a/libre/xchat/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-2010-08-21 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.8-3
- * Rebuilt for python2
-
-2010-08-13 Ionut Biru <ibiru@archlinux.org>
-
- * xchat 2.8.8-2
- * perl 5.12 rebuild
-
-2010-05-30 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.8-1
- * Upstream update
- * Added python optdepends
- * Removed old patches
-
-2010-03-29 Eric Belanger <eric@archlinux.org>
-
- * Fixed buttons hotkey (close FS#17076)
-
-2009-09-30 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.6-5
- * Rebuilt against perl 5.10.1-3
-
-2009-09-28 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.6-4
- * Fixed crash when transparent background is enabled (close FS#15360)
-
-2008-11-08 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.6-3
- * Rebuild for python-2.6 (close FS#11998)
- * Applied gtk2 patch
-
-2008-09-05 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.6-2
- * Applied upstream maintenance patch
- * Added tcl optdepends
-
-2008-06-13 Eric Belanger <eric@archlinux.org>
-
- * xchat 2.8.6-1
- * Upstream update
- * Added spell checking support (close FS#10395)
- * Added ChangeLog
diff --git a/libre/xchat/PKGBUILD b/libre/xchat/PKGBUILD
deleted file mode 100644
index df7247a42..000000000
--- a/libre/xchat/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 267688 2016-05-10 21:47:55Z arojas $
-# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
-# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgname=xchat
-pkgver=2.8.8
-pkgrel=19.parabola2
-pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://www.xchat.org/"
-replaces=('xchat-libre')
-conflicts=('xchat-libre')
-license=('GPL')
-depends=('gtk2' 'dbus-glib' 'libnotify')
-# until openssl-1.1 arrives in arm packages...
-depends_armv7h=('openssl')
-depends_i686=('openssl-1.0')
-depends_x86_64=('openssl-1.0')
-makedepends=('tcl' 'perl' 'python2' 'librsvg')
-optdepends=('enchant: for spell checking support'
- 'perl: for perl plugin'
- 'tcl: for tcl plugin'
- 'python2: for python plugin')
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- http://xchat.org/files/icons/xchat-svg.tar.bz2
- xchat-2.8.8-libnotify07.patch
- xchat-2.8.8-link-against-libnotify.patch
- xchat-2.8.8-glib-2.31.patch
- xchat-sslv23.patch
- remove-non-free-suggestion.patch
- no-firefox.patch)
-sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
- '0d366346cc11e0efb57fc2648fe423c94a3469bd'
- 'a053fba4e1911d1ee6a8248fe19e344797920fe3'
- '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
- 'aecaf6176a7cfd62555207b02f2793b360aa39da'
- 'ff2a3ca5ac297071c8a084d90fe9562e14745bc1'
- 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911'
- '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
- patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
- patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
- patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
- patch -p1 -i "${srcdir}/xchat-sslv23.patch"
- patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
- patch -p1 -i "${srcdir}/no-firefox.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- autoconf
- autoheader
-
- if [[ "$CARCH" != "arm" ]]; then
- LIBS+=" -lgmodule-2.0 -l:libssl.so.1.0.0 -l:libcrypto.so.1.0.0" \
- CFLAGS+=" -I /usr/include/openssl-1.0" \
- ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \
- --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 \
- --enable-shm --enable-spell=static
- else
- LIBS+=" -lgmodule-2.0" \
- ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \
- --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 \
- --enable-shm --enable-spell=static
- fi
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- for i in 24 32 48 64 128 256 ; do
- install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps"
- rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg
- done
- install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg"
- install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg"
-}
diff --git a/libre/xchat/no-firefox.patch b/libre/xchat/no-firefox.patch
deleted file mode 100644
index 60c4846ee..000000000
--- a/libre/xchat/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c xchat-2.8.8/src/fe-gtk/fe-gtk.c
---- xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c 2010-05-16 00:15:42.000000000 -0300
-+++ xchat-2.8.8/src/fe-gtk/fe-gtk.c 2013-01-19 02:11:00.691529212 -0200
-@@ -955,8 +955,10 @@
- return;
- }
-
-- /* everything failed, what now? just try firefox */
-- if (try_browser ("firefox", NULL, url))
-+ /* everything failed, what now? just try iceweasel or icecat */
-+ if (try_browser ("iceweasel", NULL, url))
-+ return;
-+ if (try_browser ("icecat", NULL, url))
- return;
-
- /* fresh out of ideas... */
diff --git a/libre/xchat/remove-non-free-suggestion.patch b/libre/xchat/remove-non-free-suggestion.patch
deleted file mode 100644
index f20894610..000000000
--- a/libre/xchat/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c 2010-05-16 04:04:45.000000000 -0300
-+++ xchat-2.8.8/src/common/xchat.c 2013-01-30 22:23:44.481258504 -0200
-@@ -602,7 +602,7 @@
- "NAME WII\n" "CMD quote WHOIS %2 %2\n\n";
-
- static char defaultconf_urlhandlers[] =
-- "NAME Open Link in Opera\n" "CMD !opera -remote 'openURL(%s)'\n\n";
-+ "" "";
-
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/libre/xchat/xchat-2.8.8-glib-2.31.patch b/libre/xchat/xchat-2.8.8-glib-2.31.patch
deleted file mode 100644
index 63f562ff8..000000000
--- a/libre/xchat/xchat-2.8.8-glib-2.31.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: Dominique Leuenberger <dimstar@opensuse.org>
-
-http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
-
-glib got stricter in checking includes. Only glib.h (and a few exceptions)
-are to be included directly.
-
-Index: xchat-2.8.8/src/common/servlist.c
-===================================================================
---- xchat-2.8.8.orig/src/common/servlist.c
-+++ xchat-2.8.8/src/common/servlist.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
-
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
-
- #include "cfgfiles.h"
- #include "fe.h"
-Index: xchat-2.8.8/src/common/text.c
-===================================================================
---- xchat-2.8.8.orig/src/common/text.c
-+++ xchat-2.8.8/src/common/text.c
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
-
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-Index: xchat-2.8.8/src/common/util.c
-===================================================================
---- xchat-2.8.8.orig/src/common/util.c
-+++ xchat-2.8.8/src/common/util.c
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-Index: xchat-2.8.8/src/common/xchat.h
-===================================================================
---- xchat-2.8.8.orig/src/common/xchat.h
-+++ xchat-2.8.8/src/common/xchat.h
-@@ -1,10 +1,6 @@
- #include "../../config.h"
-
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h> /* need time_t */
-
- #ifndef XCHAT_H
diff --git a/libre/xchat/xchat-2.8.8-libnotify07.patch b/libre/xchat/xchat-2.8.8-libnotify07.patch
deleted file mode 100644
index 2a6dce9a2..000000000
--- a/libre/xchat/xchat-2.8.8-libnotify07.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 2010-11-15 17:32:15.708325783 -0500
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2010-11-15 18:05:17.322141789 -0500
-@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
- /* prototypes */
- static gboolean (*nn_init) (char *);
- static void (*nn_uninit) (void);
--static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
-+/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-+ * extra NULL argument will be fine */
-+static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
- static gboolean (*nn_show) (void *noti, GError **error);
- static void (*nn_set_timeout) (void *noti, gint timeout);
-
-@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
- goto bad;
- if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
- goto bad;
-- if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
-- goto bad;
- if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
- goto bad;
- if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
diff --git a/libre/xchat/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
deleted file mode 100644
index 31e6c0854..000000000
--- a/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From: Christopher Aillon <caillon@redhat.com>
-Date: Thu, 7 Apr 2011 19:34:14 -0700
-Subject: [PATCH] Link directly against libnotify
-
-Dynamically loading the library isn't ideal since the soname
-can change silently on us. Additionally, notify-send is
-shipped as part of libnotify, so we aren't actually bringing
-in a new dependency. Since we'd need to patch the source and
-rebuild for new sonames anyway, there's little benefit to
-dynamically loading libnotify.
-
-Plus, this has the benefit of cleaning up the code, as well as
-ensuring we'll catch any future soname changes sooner.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=693362
-https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239
----
- configure.in | 23 +++++++
- src/fe-gtk/plugin-tray.c | 144 ++++++++++-------------------------------------
- 2 files changed, 55 insertions(+), 112 deletions(-)
-
-diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in
---- xchat-2.8.8/configure.in.libnotifyso4 2010-05-29 23:01:16.000000000 -0700
-+++ xchat-2.8.8/configure.in 2011-04-07 19:27:00.448137113 -0700
-@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX])
- AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR])
- AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR])
- AH_VERBATIM([SOCKS],[#undef SOCKS])
- AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
- dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME])
- AH_VERBATIM([USE_SHM],[#undef USE_SHM])
- AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
- AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
-+AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
- AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
- AH_VERBATIM([USE_MMX],[#undef USE_MMX])
- AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
- AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
- AH_VERBATIM([USE_XFT],[#undef USE_XFT])
- AH_VERBATIM([USE_XLIB],[#undef USE_XLIB])
- AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
- AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD])
-@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl,
- AC_ARG_ENABLE(plugin,
- [ --disable-plugin disable plugin support],
- plugin=$enableval, plugin=yes)
-
- AC_ARG_ENABLE(dbus,
- [ --disable-dbus disable DBUS support],
- dbus=$enableval, dbus=yes)
-
-+AC_ARG_ENABLE(libnotify,
-+[ --disable-libnotify disable libnotify support],
-+ libnotify=$enableval, libnotify=yes)
-+
- AC_ARG_ENABLE(mmx,
- [ --disable-mmx disable MMX assembly routines],
- mmx=$enableval, mmx=yes)
-
- AC_ARG_ENABLE(shm,
- [ --enable-shm enable use of XShm for fast tinting (default: no)],
- shm=$enableval, shm=no)
-
-@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then
-
- DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
- AC_SUBST(DBUS_SERVICES_DIR)
- AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
- fi
- fi
-
- dnl *********************************************************************
-+dnl ** LIBNOTIFY ********************************************************
-+dnl *********************************************************************
-+
-+if test "x$libnotify" = "xyes" ; then
-+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
-+ AC_MSG_RESULT(no)
-+ libnotify=no
-+ ])
-+ if test "$libnotify" != "no" ; then
-+ GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
-+ GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
-+ AC_DEFINE(USE_LIBNOTIFY)
-+ fi
-+fi
-+
-+dnl *********************************************************************
- dnl ** SPELL ************************************************************
- dnl *********************************************************************
-
- if test "$spell" = "gtkspell" ; then
- PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [
- AC_MSG_RESULT(no)
- spell=no
- ])
-@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then
- fi
-
- dnl *********************************************************************
- dnl ** CONDITIONALS *****************************************************
- dnl *********************************************************************
-
- AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
- AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic")
-+AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
- AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
- AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
- AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
- AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
- AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
- AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
- AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
- AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
-@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\ spell
- echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin
- if test "$xft" = no; then
- echo text backend ........ : pango\ nls/gettext ........... : $USE_NLS
- else
- echo text backend ........ : xft\ nls/gettext ........... : $USE_NLS
- fi
- echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6
- echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm
-+echo libnotify support ... : $libnotify
- echo
- echo The binary will be installed in $prefix/bin
- echo
-
- if test "$gtkfe" = no; then
- echo Warning: The GTK \(GUI\) frontend will not be built.
- echo
- fi
-diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 2011-04-07 17:57:27.524307905 -0700
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c 2011-04-07 19:18:33.429475719 -0700
-@@ -10,17 +10,27 @@
- #include "../common/fe.h"
- #include "../common/util.h"
- #include "fe-gtk.h"
- #include "pixmaps.h"
- #include "maingui.h"
- #include "menu.h"
- #include <gtk/gtk.h>
-
--#define LIBNOTIFY
-+#ifdef USE_LIBNOTIFY
-+#include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#if NOTIFY_CHECK_VERSION(0,7,0)
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c)
-+#else
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d)
-+#endif
-+#endif
-
- typedef enum /* current icon status */
- {
- TS_NONE,
- TS_MESSAGE,
- TS_HIGHLIGHT,
- TS_FILEOFFER,
- TS_CUSTOM /* plugin */
-@@ -112,90 +122,16 @@ tray_count_networks (void)
-
- void
- fe_tray_set_tooltip (const char *text)
- {
- if (sticon)
- gtk_status_icon_set_tooltip (sticon, text);
- }
-
--#ifdef LIBNOTIFY
--
--/* dynamic access to libnotify.so */
--
--static void *nn_mod = NULL;
--/* prototypes */
--static gboolean (*nn_init) (char *);
--static void (*nn_uninit) (void);
--/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-- * extra NULL argument will be fine */
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
--static gboolean (*nn_show) (void *noti, GError **error);
--static void (*nn_set_timeout) (void *noti, gint timeout);
--
--static void
--libnotify_cleanup (void)
--{
-- if (nn_mod)
-- {
-- nn_uninit ();
-- g_module_close (nn_mod);
-- nn_mod = NULL;
-- }
--}
--
--static gboolean
--libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon)
--{
-- void *noti;
--
-- if (!nn_mod)
-- {
-- nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY);
-- if (!nn_mod)
-- {
-- nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY);
-- if (!nn_mod)
-- return FALSE;
-- }
--
-- if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init))
-- goto bad;
-- if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
-- goto bad;
-- if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
-- goto bad;
-- if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
-- goto bad;
-- if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout))
-- goto bad;
-- if (!nn_init (PACKAGE_NAME))
-- goto bad;
-- }
--
-- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
-- title = strip_color (title, -1, STRIP_ALL);
-- noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
-- g_free ((char *)title);
-- g_free ((char *)text);
--
-- nn_set_timeout (noti, prefs.input_balloon_time*1000);
-- nn_show (noti, NULL);
-- g_object_unref (G_OBJECT (noti));
--
-- return TRUE;
--
--bad:
-- g_module_close (nn_mod);
-- nn_mod = NULL;
-- return FALSE;
--}
--
--#endif
--
- void
- fe_tray_set_balloon (const char *title, const char *text)
- {
- #ifndef WIN32
- const char *argv[8];
- const char *path;
- char time[16];
- WinStatus ws;
-@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title,
- /* bit 1 of flags means "no balloons unless hidden/iconified" */
- if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2))
- return;
-
- /* FIXME: this should close the current balloon */
- if (!text)
- return;
-
--#ifdef LIBNOTIFY
-- /* try it via libnotify.so */
-- if (libnotify_notify_new (title, text, sticon))
-- return; /* success */
--#endif
-+#ifdef USE_LIBNOTIFY
-+ NotifyNotification *notification;
-+ char *notify_text, *notify_title;
-
-- /* try it the crude way */
-- path = g_find_program_in_path ("notify-send");
-- if (path)
-- {
-- sprintf(time, "%d000",prefs.input_balloon_time);
-- argv[0] = path;
-- argv[1] = "-i";
-- argv[2] = "gtk-dialog-info";
-- if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
-- argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
-- argv[3] = "-t";
-- argv[4] = time;
-- argv[5] = title;
-- text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
-- argv[6] = text;
-- argv[7] = NULL;
-- xchat_execv (argv);
-- g_free ((char *)path);
-- g_free ((char *)text);
-- }
-- else
-- {
-- /* show this error only once */
-- static unsigned char said_it = FALSE;
-- if (!said_it)
-- {
-- said_it = TRUE;
-- fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR);
-- }
-- }
-+ if (!notify_is_initted())
-+ notify_init(PACKAGE_NAME);
-+
-+ notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
-+ notify_title = strip_color (title, -1, STRIP_ALL);
-+
-+ notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
-+
-+ g_free ((char *)notify_title);
-+ g_free ((char *)notify_text);
-+
-+ notify_notification_set_timeout (notification, prefs.input_balloon_time*1000);
-+ notify_notification_show (notification, NULL);
-+
-+ g_object_unref (notification);
-+#endif
- #endif
- }
-
- static void
- tray_set_balloonf (const char *text, const char *format, ...)
- {
- va_list args;
- char *buf;
-@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h
- return 1; /* return 1 for success */
- }
-
- int
- tray_plugin_deinit (xchat_plugin *plugin_handle)
- {
- #ifdef WIN32
- tray_cleanup ();
--#elif defined(LIBNOTIFY)
-- libnotify_cleanup ();
-+#elif defined(USE_LIBNOTIFY)
-+ notify_uninit ();
- #endif
- return 1;
- }
diff --git a/libre/xchat/xchat-sslv23.patch b/libre/xchat/xchat-sslv23.patch
deleted file mode 100644
index fc8f02e97..000000000
--- a/libre/xchat/xchat-sslv23.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/common/ssl.c
-+++ b/src/common/ssl.c
-@@ -70,8 +70,9 @@
-
- SSLeay_add_ssl_algorithms ();
- SSL_load_error_strings ();
-- ctx = SSL_CTX_new (server ? SSLv3_server_method() : SSLv3_client_method ());
-+ ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ());
-
-+ SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
- SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
- SSL_CTX_set_timeout (ctx, 300);
-
-@@ -281,7 +282,7 @@
- __SSL_critical_error ("SSL_new");
-
- SSL_set_fd (ssl, sd);
-- if (ctx->method == SSLv3_client_method())
-+ if (ctx->method == SSLv23_client_method())
- SSL_set_connect_state (ssl);
- else
- SSL_set_accept_state(ssl);