mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-01-25 11:02:16 +08:00
Merge branch 'testing' of gitorious.org:chakra-packages/core into testing
This commit is contained in:
philm
commit
60a3de71aa
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=apr-util
|
||||
pkgver=1.3.11
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="The Apache Portable Runtime"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://apr.apache.org/"
|
||||
|
||||
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=autoconf
|
||||
pkgver=2.68
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A GNU tool for automatically configuring source code"
|
||||
arch=('any')
|
||||
license=('GPL2' 'GPL3' 'custom')
|
||||
|
||||
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=automake
|
||||
pkgver=1.11.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
|
||||
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=bison
|
||||
pkgver=2.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="The GNU general-purpose parser generator"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL3')
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
# $Id: PKGBUILD 40883 2009-05-31 17:12:07Z thomas $
|
||||
# Maintainer: Thomas Bächler <thomas@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=crda
|
||||
pkgver=1.1.0
|
||||
pkgver=1.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="Central Regulatory Domain Agent"
|
||||
arch=(i686 x86_64)
|
||||
@ -13,7 +19,7 @@ makedepends=('python-m2crypto')
|
||||
install=crda.install
|
||||
source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
|
||||
crda.rc)
|
||||
md5sums=('6004584d2e39e899f7642b141dd72028'
|
||||
md5sums=('5fc77af68b3e21736b8ef2f8b061c810'
|
||||
'014eef3f8655e9a130064ec6891317fc')
|
||||
|
||||
build() {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
pkgname=cvs
|
||||
pkgver=1.11.23
|
||||
pkgrel=1
|
||||
pkgrel=6
|
||||
pkgdesc="Concurrent Versions System - a source control system"
|
||||
arch=(i686 x86_64)
|
||||
url="http://cvs.nongnu.org"
|
||||
|
||||
25
db/PKGBUILD
25
db/PKGBUILD
@ -1,27 +1,32 @@
|
||||
# $Id: PKGBUILD 76949 2010-04-09 08:14:30Z allan $
|
||||
# Maintainer: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: Andreas Radke <andyrtr@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=db
|
||||
pkgver=4.8.26
|
||||
_basever=4.8.26
|
||||
pkgrel=2
|
||||
pkgver=4.8.30
|
||||
_basever=4.8.30
|
||||
pkgrel=1
|
||||
pkgdesc="The Berkeley DB embedded database system"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
|
||||
license=('custom')
|
||||
depends=('gcc-libs' 'sh')
|
||||
conflicts=('db4')
|
||||
options=('!libtool' 'force')
|
||||
options=('!libtool')
|
||||
install=db.install
|
||||
source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz)
|
||||
md5sums=('3476bac9ec0f3c40729c8a404151d5e3')
|
||||
md5sums=('f80022099c5742cd179343556179aa8c')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/$pkgname-${_basever}/build_unix
|
||||
../dist/configure --prefix=/usr --enable-compat185 \
|
||||
--enable-shared --enable-static --enable-cxx
|
||||
make LIBSO_LIBS=-lpthread || return 1
|
||||
--enable-shared --enable-static --enable-cxx --enable-dbm
|
||||
make LIBSO_LIBS=-lpthread
|
||||
}
|
||||
|
||||
package() {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
post_upgrade() {
|
||||
if [ "$(vercmp $2 4.8)" -lt 0 ]; then
|
||||
if [ "$(vercmp $2 5.1)" -lt 0 ]; then
|
||||
echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
|
||||
fi
|
||||
}
|
||||
|
||||
@ -1,23 +1,28 @@
|
||||
# $Id: PKGBUILD 73063 2010-03-22 08:28:27Z ronald $
|
||||
# Maintainer: Ronald van Haren <ronald.archlinux.org>
|
||||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=e2fsprogs
|
||||
pkgver=1.41.11
|
||||
pkgver=1.41.14
|
||||
pkgrel=1
|
||||
pkgdesc="Ext2/3/4 filesystem utilities"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL' 'LGPL' 'MIT')
|
||||
url="http://e2fsprogs.sourceforge.net"
|
||||
groups=('base')
|
||||
depends=('sh' 'util-linux-ng>=2.16')
|
||||
depends=('sh' 'util-linux-ng')
|
||||
makedepends=('bc')
|
||||
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
|
||||
'MIT-LICENSE')
|
||||
backup=('etc/mke2fs.conf')
|
||||
install=${pkgname}.install
|
||||
md5sums=('fb507a40c2706bc38306f150d069e345'
|
||||
'035b7c69b7a2cecf996a4708c262245e')
|
||||
sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5'
|
||||
'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
@ -35,6 +40,10 @@ build() {
|
||||
|
||||
sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1
|
||||
|
||||
# remove references to build directory
|
||||
sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
|
||||
sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
|
||||
|
||||
# install MIT license
|
||||
install -Dm644 "${srcdir}/MIT-LICENSE" \
|
||||
"${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
# $Id: PKGBUILD 23147 2009-01-04 01:41:50Z eric $
|
||||
# Maintainer: Eric Belanger <eric@archlinux.org>
|
||||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=eventlog
|
||||
pkgver=0.2.9
|
||||
pkgver=0.2.12
|
||||
pkgrel=1
|
||||
pkgdesc="A new API to format and send structured log messages"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -12,8 +17,8 @@ license=('BSD')
|
||||
depends=('glibc')
|
||||
options=('!libtool')
|
||||
source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz)
|
||||
md5sums=('76e3d7a0b8f335c12099e9b91191fbf1')
|
||||
sha1sums=('2cc6a4d1dc07ab84832f2cd44822ee7b339deb51')
|
||||
md5sums=('3d6ebda8a161d36cb40d09328f78786b')
|
||||
sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
# $Id: PKGBUILD 62836 2010-01-12 23:27:10Z allan $
|
||||
# Maintainer: dorphell <dorphell@archlinux.org>
|
||||
# Committer: Judd Vinet <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=expat
|
||||
pkgver=2.0.1
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
pkgdesc="An XML Parser library written in C"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://expat.sourceforge.net/"
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
# $Id: PKGBUILD 41636 2009-06-06 06:14:45Z allan $
|
||||
# Maintainer: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=flex
|
||||
pkgver=2.5.35
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="A tool for generating text-scanning programs"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://flex.sourceforge.net"
|
||||
@ -14,14 +19,23 @@ depends=('glibc' 'm4' 'sh')
|
||||
install=flex.install
|
||||
source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
|
||||
flex-2.5.35-gcc44.patch
|
||||
flex-2.5.35-hardening.patch
|
||||
flex-2.5.35-missing-prototypes.patch
|
||||
flex-2.5.35-sign.patch
|
||||
lex.sh)
|
||||
md5sums=('10714e50cea54dc7a227e3eddcd44d57'
|
||||
'e4444ef5c07db71a43280be74139bdea'
|
||||
'de952b3ed7cc074bc8c3e6ab73634048'
|
||||
'6b83f56b1b654c6a321cdc530a3ec68d'
|
||||
'd87fd9e9762ba7e230d516bdcf1c8c6f'
|
||||
'f725259ec23a9e87ee29e2ef82eda9a5')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver || return 1
|
||||
patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch || return 1
|
||||
patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch || return 1
|
||||
patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch || return 1
|
||||
patch -Np1 -i $srcdir/flex-2.5.35-sign.patch || return 1
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/share/man --infodir=/usr/share/info || return 1
|
||||
@ -34,7 +48,5 @@ build() {
|
||||
|
||||
install -Dm644 COPYING \
|
||||
$pkgdir/usr/share/licenses/$pkgname/license.txt || return 1
|
||||
|
||||
rm -f $pkgdir/usr/share/info/dir
|
||||
gzip -9 $pkgdir/usr/share/info/*
|
||||
|
||||
}
|
||||
|
||||
36
flex/flex-2.5.35-hardening.patch
Normal file
36
flex/flex-2.5.35-hardening.patch
Normal file
@ -0,0 +1,36 @@
|
||||
diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
|
||||
--- flex-2.5.35/scan.c
|
||||
+++ flex-2.5.35/scan.c
|
||||
@@ -2096,7 +2096,7 @@
|
||||
/* This used to be an fputs(), but since the string might contain NUL's,
|
||||
* we now use fwrite().
|
||||
*/
|
||||
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
|
||||
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
||||
#endif
|
||||
|
||||
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
||||
diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
|
||||
--- flex-2.5.35/flex.skl
|
||||
+++ flex-2.5.35/flex.skl
|
||||
@@ -1075,7 +1075,7 @@
|
||||
/* This used to be an fputs(), but since the string might contain NUL's,
|
||||
* we now use fwrite().
|
||||
*/
|
||||
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
|
||||
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
||||
%endif
|
||||
%if-c++-only C++ definition
|
||||
#define ECHO LexerOutput( yytext, yyleng )
|
||||
diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
|
||||
--- flex-2.5.35/skel.c
|
||||
+++ flex-2.5.35/skel.c
|
||||
@@ -1142,7 +1142,7 @@
|
||||
"/* This used to be an fputs(), but since the string might contain NUL's,",
|
||||
" * we now use fwrite().",
|
||||
" */",
|
||||
- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
|
||||
+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
|
||||
"%endif",
|
||||
"%if-c++-only C++ definition",
|
||||
"#define ECHO LexerOutput( yytext, yyleng )",
|
||||
53
flex/flex-2.5.35-missing-prototypes.patch
Normal file
53
flex/flex-2.5.35-missing-prototypes.patch
Normal file
@ -0,0 +1,53 @@
|
||||
diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
|
||||
--- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
|
||||
+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
|
||||
@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
|
||||
void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
|
||||
]])
|
||||
|
||||
+m4_ifdef( [[M4_YY_REENTRANT]],
|
||||
+[[
|
||||
+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
|
||||
+[[
|
||||
+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
|
||||
+]])
|
||||
+]])
|
||||
+
|
||||
+m4_ifdef( [[M4_YY_REENTRANT]],
|
||||
+[[
|
||||
+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
|
||||
+[[
|
||||
+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
|
||||
+]])
|
||||
+]])
|
||||
+
|
||||
%if-bison-bridge
|
||||
m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
|
||||
[[
|
||||
|
||||
Diff finished. Tue Jul 13 17:27:50 2010
|
||||
--- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200
|
||||
+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200
|
||||
@@ -1027,6 +1027,22 @@
|
||||
"void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
|
||||
"]])",
|
||||
"",
|
||||
+ "m4_ifdef( [[M4_YY_REENTRANT]],",
|
||||
+ "[[",
|
||||
+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
|
||||
+ "[[",
|
||||
+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
|
||||
+ "]])",
|
||||
+ "]])",
|
||||
+ "",
|
||||
+ "m4_ifdef( [[M4_YY_REENTRANT]],",
|
||||
+ "[[",
|
||||
+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
|
||||
+ "[[",
|
||||
+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
|
||||
+ "]])",
|
||||
+ "]])",
|
||||
+ "",
|
||||
"%if-bison-bridge",
|
||||
"m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
|
||||
"[[",
|
||||
11
flex/flex-2.5.35-sign.patch
Normal file
11
flex/flex-2.5.35-sign.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
|
||||
+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
|
||||
@@ -1890,7 +1890,7 @@
|
||||
outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
|
||||
outn ("\t\t{ \\");
|
||||
outn ("\t\tint c = '*'; \\");
|
||||
- outn ("\t\tint n; \\");
|
||||
+ outn ("\t\tunsigned n; \\");
|
||||
outn ("\t\tfor ( n = 0; n < max_size && \\");
|
||||
outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
|
||||
outn ("\t\t\tbuf[n] = (char) c; \\");
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
pkgname=heimdal
|
||||
pkgver=1.3.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Implementation of Kerberos V5 libraries"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.h5l.org/"
|
||||
|
||||
18
iw/PKGBUILD
18
iw/PKGBUILD
@ -1,8 +1,14 @@
|
||||
# $Id: PKGBUILD 89940 2010-09-05 11:20:33Z thomas $
|
||||
# Maintainer: Thomas Bächler <thomas@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=iw
|
||||
pkgver=0.9.20
|
||||
pkgver=0.9.22
|
||||
pkgrel=1
|
||||
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
|
||||
arch=("i686" "x86_64")
|
||||
@ -12,13 +18,13 @@ depends=("libnl")
|
||||
makedepends=("kernel-headers")
|
||||
source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2
|
||||
version-sh.patch)
|
||||
sha256sums=('2d665fbfbe4fd6a40159fb821518fc5337da37448416405b936a393a14cbc7d3'
|
||||
'1ffbbca148b3c29446e2116e114d30b866dadbdf54cd276db02bd09e52bedf19')
|
||||
sha256sums=('138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1'
|
||||
'92a556cd1a958e45cf891223876c61150b937f1aacf6c8044a4ab53830efe21e')
|
||||
|
||||
build() {
|
||||
patch -Np0 -i ${srcdir}/version-sh.patch || return 1
|
||||
|
||||
cd ${pkgname}-${pkgver}
|
||||
cd "$srcdir"/$pkgname-$pkgver
|
||||
|
||||
make || return 1
|
||||
make DESTDIR=$pkgdir install
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- iw-0.9.20/version.sh.orig 2010-07-14 17:02:21.000000000 +0000
|
||||
+++ iw-0.9.20/version.sh 2010-09-21 22:39:53.739802790 +0000
|
||||
--- iw-0.9.22/version.sh.orig
|
||||
+++ iw-0.9.22/version.sh
|
||||
@@ -5,20 +5,20 @@
|
||||
|
||||
echo '#include "iw.h"' > "$OUT"
|
||||
|
||||
31
keyutils/PKGBUILD
Normal file
31
keyutils/PKGBUILD
Normal file
@ -0,0 +1,31 @@
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=keyutils
|
||||
pkgver=1.4
|
||||
pkgrel=1
|
||||
pkgdesc="Linux Key Management Utilities"
|
||||
arch=(i686 x86_64)
|
||||
url="http://www.kernel.org"
|
||||
license=('GPL2' 'LGPL2.1')
|
||||
depends=('glibc' 'sh')
|
||||
backup=(etc/request-key.conf)
|
||||
source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile
|
||||
make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
|
||||
69
krb5/PKGBUILD
Normal file
69
krb5/PKGBUILD
Normal file
@ -0,0 +1,69 @@
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=krb5
|
||||
pkgver=1.9.1
|
||||
pkgrel=1
|
||||
pkgdesc="The Kerberos network authentication system"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://web.mit.edu/kerberos/"
|
||||
license=('custom')
|
||||
depends=('e2fsprogs' 'libldap' 'keyutils')
|
||||
makedepends=('perl')
|
||||
provides=('heimdal')
|
||||
replaces=('heimdal')
|
||||
backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
|
||||
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
|
||||
kadmind.rc
|
||||
krb5-kdc.rc)
|
||||
sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
|
||||
'640e3046c6558313d2be81cf2252afc8622892b0'
|
||||
'77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
|
||||
options=('!emptydirs')
|
||||
|
||||
build() {
|
||||
tar zxvf ${pkgname}-${pkgver}.tar.gz
|
||||
cd "${srcdir}/${pkgname}-${pkgver}/src"
|
||||
|
||||
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
|
||||
export CPPFLAGS+=" -I/usr/include/et"
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc/krb5 \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var/lib \
|
||||
--enable-shared \
|
||||
--with-system-et \
|
||||
--with-system-ss \
|
||||
--disable-rpath \
|
||||
--without-tcl \
|
||||
--enable-dns-for-realm \
|
||||
--with-ldap
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
# We can't do this in the build directory.
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make -C src check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}/src"
|
||||
make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
|
||||
|
||||
install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf
|
||||
install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf
|
||||
|
||||
install -d -m 755 "${pkgdir}"/etc/rc.d
|
||||
install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d
|
||||
install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d
|
||||
|
||||
install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
40
krb5/kadmind.rc
Normal file
40
krb5/kadmind.rc
Normal file
@ -0,0 +1,40 @@
|
||||
#!/bin/bash
|
||||
|
||||
# general config
|
||||
. /etc/rc.conf
|
||||
. /etc/rc.d/functions
|
||||
|
||||
PID=`pidof -o %PPID /usr/sbin/kadmind`
|
||||
case "$1" in
|
||||
start)
|
||||
stat_busy "Starting Kerberos Admin Daemon"
|
||||
if [ -z "$PID" ]; then
|
||||
/usr/sbin/kadmind
|
||||
fi
|
||||
if [ ! -z "$PID" -o $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
add_daemon kadmind
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
stat_busy "Stopping Kerberos Admin Daemon"
|
||||
[ ! -z "$PID" ] && kill $PID &> /dev/null
|
||||
if [ $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
rm_daemon kadmind
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
sleep 1
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 {start|stop|restart}"
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
40
krb5/krb5-kdc.rc
Normal file
40
krb5/krb5-kdc.rc
Normal file
@ -0,0 +1,40 @@
|
||||
#!/bin/bash
|
||||
|
||||
# general config
|
||||
. /etc/rc.conf
|
||||
. /etc/rc.d/functions
|
||||
|
||||
PID=`pidof -o %PPID /usr/sbin/krb5kdc`
|
||||
case "$1" in
|
||||
start)
|
||||
stat_busy "Starting Kerberos Authentication"
|
||||
if [ -z "$PID" ]; then
|
||||
/usr/sbin/krb5kdc
|
||||
fi
|
||||
if [ ! -z "$PID" -o $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
add_daemon krb5-kdc
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
stat_busy "Stopping Kerberos Authentication"
|
||||
[ ! -z "$PID" ] && kill $PID &> /dev/null
|
||||
if [ $? -gt 0 ]; then
|
||||
stat_fail
|
||||
else
|
||||
rm_daemon krb5-kdc
|
||||
stat_done
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
sleep 1
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "usage: $0 {start|stop|restart}"
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
@ -1,9 +1,14 @@
|
||||
# $Id: PKGBUILD 75196 2010-04-01 02:08:56Z pierre $
|
||||
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
|
||||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=libldap
|
||||
pkgver=2.4.23
|
||||
pkgver=2.4.24
|
||||
pkgrel=1
|
||||
pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -15,7 +20,7 @@ makedepends=('tcp_wrappers')
|
||||
options=('!libtool')
|
||||
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
|
||||
ntlm.patch)
|
||||
md5sums=('90150b8c0d0192e10b30157e68844ddf'
|
||||
md5sums=('116fe1e23a7b67686d5e62274367e6c0'
|
||||
'dfa9eb6f2fd9d0a3dab0e1860923489e')
|
||||
|
||||
build() {
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
# $Id: PKGBUILD 78109 2010-04-19 11:02:50Z allan $
|
||||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=libsasl
|
||||
pkgver=2.1.23
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
|
||||
@ -12,16 +18,16 @@ depends=('db>=4.8')
|
||||
optdepends=('cyrus-sasl: saslauthd'
|
||||
'cyrus-sasl-plugins: authentication plugins other than sasldb')
|
||||
source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
|
||||
cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
|
||||
cyrus-sasl-2.1.19-checkpw.c.patch cyrus-sasl-db.patch)
|
||||
options=('!makeflags')
|
||||
md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
|
||||
'e27ddff076342e7a3041c4759817d04b'
|
||||
'71a3b7454f4d7cc2966b347bdf03f2fc')
|
||||
'0658201497aad359c0d66b0ab8032859')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/cyrus-sasl-${pkgver}"
|
||||
patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/db-4.7.patch || return 1
|
||||
patch -Np0 -i ${srcdir}/cyrus-sasl-db.patch || return 1
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
|
||||
34
libsasl/cyrus-sasl-db.patch
Normal file
34
libsasl/cyrus-sasl-db.patch
Normal file
@ -0,0 +1,34 @@
|
||||
diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4
|
||||
--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000 +0200
|
||||
+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392 +0200
|
||||
@@ -213,7 +213,7 @@
|
||||
fi
|
||||
|
||||
saved_LIBS=$LIBS
|
||||
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
||||
+ for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
||||
do
|
||||
LIBS="$saved_LIBS -l$dbname"
|
||||
AC_TRY_LINK([#include <db.h>],
|
||||
--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28 17:09:18.000000000 +0200
|
||||
+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 +0200
|
||||
@@ -100,7 +100,7 @@
|
||||
ret = db_create(mbdb, NULL, 0);
|
||||
if (ret == 0 && *mbdb != NULL)
|
||||
{
|
||||
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
||||
+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
|
||||
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
|
||||
#else
|
||||
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
|
||||
--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13 20:56:17.000000000 +0100
|
||||
+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556 +0200
|
||||
@@ -214,7 +214,7 @@
|
||||
ret = db_create(mbdb, NULL, 0);
|
||||
if (ret == 0 && *mbdb != NULL)
|
||||
{
|
||||
-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
|
||||
+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
|
||||
ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
|
||||
#else
|
||||
ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
|
||||
15
m4/PKGBUILD
15
m4/PKGBUILD
@ -1,9 +1,14 @@
|
||||
# $Id: PKGBUILD 70182 2010-02-25 10:44:28Z allan $
|
||||
# Maintainer: Allan McRae <allan@archlinux.org>
|
||||
# Contributor: Andreas Radke <andyrtr@archlinux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=m4
|
||||
pkgver=1.4.14
|
||||
pkgver=1.4.16
|
||||
pkgrel=1
|
||||
pkgdesc="m4 macro processor"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -13,7 +18,7 @@ install=m4.install
|
||||
groups=('base-devel')
|
||||
depends=('glibc' 'bash')
|
||||
source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz)
|
||||
md5sums=('e2b871099546846d1df586f195f79b53')
|
||||
md5sums=('7548ec061a1ba993790159764f522d0e')
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/$pkgname-$pkgver
|
||||
|
||||
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=pam
|
||||
pkgver=1.1.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="PAM (Pluggable Authentication Modules) library"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL2')
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
pkgname=perl
|
||||
pkgver=5.12.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A highly capable, feature-rich programming language"
|
||||
arch=(i686 x86_64)
|
||||
license=('GPL' 'PerlArtistic')
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
pkgname=python
|
||||
pkgver=2.7.1
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
_pybasever=2.7
|
||||
pkgdesc="A high-level scripting language"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('PSF')
|
||||
url="http://www.python.org"
|
||||
depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
|
||||
depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
|
||||
makedepends=('tk')
|
||||
provides=('python2' 'python-elementtree' 'python-ctypes')
|
||||
replaces=('python-elementtree' 'python-ctypes')
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
pkgname=('ruby' 'ruby-docs')
|
||||
pkgver=1.9.2_p180
|
||||
_pkgver=1.9.2-p180
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="An object-oriented language for quick and easy programming"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.ruby-lang.org/en/"
|
||||
|
||||
@ -1,46 +1,46 @@
|
||||
# $Id: PKGBUILD 77152 2010-04-11 11:03:39Z allan $
|
||||
# Maintainer: Aaron Griffin <aaron@archlinux.org>
|
||||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
#
|
||||
# Core Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=syslog-ng
|
||||
pkgver=3.1.0
|
||||
pkgver=3.2.4
|
||||
pkgrel=1
|
||||
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL2')
|
||||
groups=('base')
|
||||
url="http://www.balabit.com/network-security/syslog-ng/"
|
||||
depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl')
|
||||
depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk')
|
||||
makedepends=('flex' 'pkgconfig')
|
||||
optdepends=('logrotate')
|
||||
provides=('logger')
|
||||
backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
|
||||
backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
|
||||
'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
|
||||
source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz
|
||||
syslog-ng.conf
|
||||
syslog-ng.logrotate
|
||||
syslog-ng.rc)
|
||||
install=syslog-ng.install
|
||||
md5sums=('10f2ad8df738d9551996be4367d1cf4e'
|
||||
'e02be6637d0c3b5484d4597ce049ae39'
|
||||
syslog-ng.rc
|
||||
cap_syslog.patch)
|
||||
md5sums=('5995f7dad0053a478b60a63f6f754203'
|
||||
'344dddfff946300f5576b13a7e8ea19f'
|
||||
'735636090be4582885974542d2a75855'
|
||||
'9bd98250cfa49e13fa3fa731b6040549')
|
||||
'9bd98250cfa49e13fa3fa731b6040549'
|
||||
'46e5dcff71f820d497898331a3f608fe')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
|
||||
# NOTE - re-assess this with later releases
|
||||
# FS#15787: syslog-ng does not write to files not owned by root
|
||||
# Upstream: https://bugzilla.balabit.com/show_bug.cgi?id=52
|
||||
# Solution: --disable-linux-caps
|
||||
|
||||
LDFLAGS="$LDFLAGS -Wl,--no-undefined" ./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var/lib/syslog-ng \
|
||||
--enable-tcp-wrapper \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--disable-spoof-source \
|
||||
--disable-linux-caps
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
# fix #22555 for kernels >=2.6.38
|
||||
patch -p1 -i ../cap_syslog.patch
|
||||
./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
|
||||
--libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
|
||||
--enable-tcp-wrapper \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--disable-spoof-source
|
||||
|
||||
make || return 1
|
||||
}
|
||||
@ -48,10 +48,8 @@ build() {
|
||||
package() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
make DESTDIR=$pkgdir install || return 1
|
||||
install -dm755 $pkgdir/var/lib/syslog-ng
|
||||
install -Dm644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf
|
||||
install -Dm644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng
|
||||
install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng
|
||||
# remove libexec
|
||||
rm -rf $pkgdir/usr/libexec
|
||||
install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d"
|
||||
install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf"
|
||||
install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng"
|
||||
install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng"
|
||||
}
|
||||
|
||||
101
syslog-ng/cap_syslog.patch
Normal file
101
syslog-ng/cap_syslog.patch
Normal file
@ -0,0 +1,101 @@
|
||||
diff --git a/lib/gprocess.h b/lib/gprocess.h
|
||||
index cda35b0..5c449f7 100644
|
||||
--- a/lib/gprocess.h
|
||||
+++ b/lib/gprocess.h
|
||||
@@ -28,9 +28,14 @@
|
||||
#include "syslog-ng.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
+#include <sys/utsname.h>
|
||||
|
||||
#if ENABLE_LINUX_CAPS
|
||||
# include <sys/capability.h>
|
||||
+#
|
||||
+# ifndef CAP_SYSLOG
|
||||
+# define CAP_SYSLOG 34
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
typedef enum
|
||||
@@ -78,5 +83,8 @@ void g_process_finish(void);
|
||||
|
||||
void g_process_add_option_group(GOptionContext *ctx);
|
||||
|
||||
+extern int kernel_version;
|
||||
+extern void get_kernel_version(void);
|
||||
+#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z)
|
||||
|
||||
#endif
|
||||
diff --git a/modules/affile/affile.c b/modules/affile/affile.c
|
||||
index e145324..886fa72 100644
|
||||
--- a/modules/affile/affile.c
|
||||
+++ b/modules/affile/affile.c
|
||||
@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags,
|
||||
if (privileged)
|
||||
{
|
||||
g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE);
|
||||
- g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
|
||||
+ if (!kernel_version)
|
||||
+ get_kernel_version();
|
||||
+ if (kernel_version < LINUX_VERSION(2, 6, 38))
|
||||
+ g_process_cap_modify(CAP_SYS_ADMIN, TRUE);
|
||||
+ else
|
||||
+ g_process_cap_modify(CAP_SYSLOG, TRUE);
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/syslog-ng/main.c b/syslog-ng/main.c
|
||||
index 9880c1f..ee5031b 100644
|
||||
--- a/syslog-ng/main.c
|
||||
+++ b/syslog-ng/main.c
|
||||
@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE;
|
||||
static gboolean display_version = FALSE;
|
||||
static gchar *ctlfilename = PATH_CONTROL_SOCKET;
|
||||
static gchar *preprocess_into = NULL;
|
||||
+int kernel_version;
|
||||
|
||||
static volatile sig_atomic_t sig_hup_received = FALSE;
|
||||
static volatile sig_atomic_t sig_term_received = FALSE;
|
||||
@@ -363,6 +364,20 @@ version(void)
|
||||
ON_OFF_STR(ENABLE_PACCT_MODULE));
|
||||
}
|
||||
|
||||
+void
|
||||
+get_kernel_version(void) {
|
||||
+ static struct utsname uts;
|
||||
+ int x = 0, y = 0, z = 0;
|
||||
+
|
||||
+ if (uname(&uts) == -1) {
|
||||
+ fprintf(stderr, "Unable to retrieve kernel version.\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
+ sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
|
||||
+ kernel_version = LINUX_VERSION(x, y, z);
|
||||
+}
|
||||
+
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
@@ -379,9 +394,20 @@ main(int argc, char *argv[])
|
||||
* indicate readability. Enabling/disabling cap_sys_admin on every poll
|
||||
* invocation seems to be too expensive. So I enable it for now. */
|
||||
|
||||
- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
|
||||
+ if (!kernel_version)
|
||||
+ get_kernel_version();
|
||||
+ if (kernel_version < LINUX_VERSION(2, 6, 34))
|
||||
+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
|
||||
"cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p "
|
||||
"cap_sys_admin=ep");
|
||||
+ else if (kernel_version < LINUX_VERSION(2, 6, 38))
|
||||
+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
|
||||
+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
|
||||
+ "cap_sys_admin=p");
|
||||
+ else
|
||||
+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw,"
|
||||
+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner,"
|
||||
+ "cap_syslog=p");
|
||||
ctx = g_option_context_new("syslog-ng");
|
||||
g_process_add_option_group(ctx);
|
||||
msg_add_option_group(ctx);
|
||||
@ -1,6 +1,6 @@
|
||||
@version: 3.0
|
||||
@version: 3.2
|
||||
#
|
||||
# /etc/syslog-ng.conf
|
||||
# /etc/syslog-ng/syslog-ng.conf
|
||||
#
|
||||
|
||||
options {
|
||||
@ -18,7 +18,7 @@ options {
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-stream("/dev/log");
|
||||
unix-dgram("/dev/log");
|
||||
internal();
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
@ -55,8 +55,7 @@ filter f_lpr { facility(lpr); };
|
||||
filter f_mail { facility(mail); };
|
||||
filter f_news { facility(news); };
|
||||
filter f_user { facility(user); };
|
||||
filter f_uucp { facility(cron); };
|
||||
filter f_news { facility(news); };
|
||||
filter f_uucp { facility(uucp); };
|
||||
filter f_ppp { facility(local2); };
|
||||
filter f_debug { not facility(auth, authpriv, news, mail); };
|
||||
filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user