mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-01-23 18:14:54 +08:00
fix quirks due git conflict
This commit is contained in:
philm
parent
05792d4820
commit
8b6015c0cf
@ -4,9 +4,6 @@
|
||||
# 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=3
|
||||
@ -19,23 +16,34 @@ makedepends=('perl')
|
||||
provides=('heimdal')
|
||||
replaces=('heimdal')
|
||||
conflicts=('heimdal')
|
||||
backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
|
||||
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
|
||||
source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
|
||||
kadmind.rc
|
||||
krb5-kdc.rc)
|
||||
krb5-kadmind
|
||||
krb5-kdc
|
||||
krb5-1.9.1-config-script.patch)
|
||||
sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
|
||||
'640e3046c6558313d2be81cf2252afc8622892b0'
|
||||
'77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
|
||||
'2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
|
||||
'77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
|
||||
'8d1ec8bdb39fec230caace112d1a41ad792f7d97')
|
||||
options=('!emptydirs')
|
||||
|
||||
build() {
|
||||
tar zxvf ${pkgname}-${pkgver}.tar.gz
|
||||
cd "${srcdir}/${pkgname}-${pkgver}/src"
|
||||
|
||||
# - Make krb5-config suppress CFLAGS output when called with --libs
|
||||
# cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
|
||||
# http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-buildconf.patch
|
||||
#
|
||||
# - Omit extra libraries because their interfaces are not exposed to applications
|
||||
# by libkrb5, unless do_deps is set to 1, which indicates that the caller
|
||||
# wants the whole list.
|
||||
# cf http://pkgs.fedoraproject.org/gitweb/?p=krb5.git;a=blob;f=krb5-1.7-nodeplibs.patch
|
||||
patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
|
||||
|
||||
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 \
|
||||
@ -45,26 +53,24 @@ build() {
|
||||
--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
|
||||
# Sample KDC config file
|
||||
install -dm 755 "${pkgdir}"/var/lib/krb5kdc
|
||||
install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.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
|
||||
# Default configuration file
|
||||
install -dm 755 "${pkgdir}"/etc
|
||||
install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
|
||||
|
||||
install -dm 755 "${pkgdir}"/etc/rc.d
|
||||
install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
|
||||
install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d
|
||||
|
||||
install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
pkgname=libgssglue
|
||||
pkgver=0.3
|
||||
pkgrel=1
|
||||
pkgdesc="exports a gssapi interface which calls other random gssapi libraries"
|
||||
pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.citi.umich.edu/projects/nfsv4/linux/"
|
||||
license=('BSD')
|
||||
@ -18,7 +18,7 @@ options=('!libtool')
|
||||
source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
|
||||
gssapi_mech.conf)
|
||||
md5sums=('48aaad11b7371ba3270faa322202c038'
|
||||
'234b9cca75a33af98eda3f1683756879')
|
||||
'080be866717e4e06fa6f7d6f43cb395a')
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/$pkgname-$pkgver
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
# library initialization function
|
||||
# ================================ ==========================
|
||||
# The MIT K5 gssapi library, use special function for initialization.
|
||||
#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init
|
||||
/usr/lib/libgssapi.so mechglue_internal_krb5_init
|
||||
/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init
|
||||
#/usr/lib/libgssapi.so mechglue_internal_krb5_init
|
||||
#
|
||||
# The SPKM3 gssapi library function. Use the function spkm3_gss_initialize.
|
||||
# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize
|
||||
|
||||
@ -12,12 +12,10 @@ arch=('i686' 'x86_64')
|
||||
url="http://www.citi.umich.edu/projects/nfsv4/linux/"
|
||||
license=('GPL')
|
||||
depends=('glibc' 'krb5' 'libgssglue')
|
||||
makedepends=('pkgconfig' 'autoconf')
|
||||
makedepends=('pkg-config' 'autoconf')
|
||||
options=('!libtool')
|
||||
source=("http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
#librpcsecgss-0.18-heimdal.patch)
|
||||
source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz")
|
||||
md5sums=('b45ed565bdc3099023aa35830ec92997')
|
||||
#'0cfe088551d5776f5bc08c1741a34346')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
@ -6,12 +6,14 @@
|
||||
|
||||
pkgname=libtirpc
|
||||
pkgver=0.2.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Transport Independent RPC library (SunRPC replacement)"
|
||||
arch=(i686 x86_64)
|
||||
depends=('libgssglue')
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://libtirpc.sourceforge.net/"
|
||||
license=('GPL2')
|
||||
license=('BSD')
|
||||
depends=('libgssglue')
|
||||
backup=('etc/netconfig')
|
||||
options=('!libtool')
|
||||
source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
|
||||
libtirpc-0.2.1-fortify.patch
|
||||
libtirpc-0.2.3rc1.patch
|
||||
@ -34,3 +36,10 @@ build() {
|
||||
./configure --prefix=/usr --enable-gss
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig
|
||||
install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ _kernelname=${pkgname#linux}
|
||||
_basekernel=2.6.35
|
||||
pkgver=${_basekernel}.14
|
||||
pkgrel=2
|
||||
_patchname="patch-${pkgver}-1-CHAKRA-LTS"
|
||||
_patchname="patch-${pkgver}-2-CHAKRA-LTS"
|
||||
arch=(i686 x86_64)
|
||||
license=('GPL2')
|
||||
url="http://www.kernel.org"
|
||||
@ -24,7 +24,7 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
|
||||
# standard config files for mkinitcpio ramdisk
|
||||
${pkgname}.preset)
|
||||
md5sums=('091abeb4684ce03d1d936851618687b6'
|
||||
'2523c5f9c1fc8f1b20472a017587f222'
|
||||
'5ba067ccfa42ca8aaa84eaa847c7c9dc'
|
||||
'960176c1988f2bdc98ef4c407edcad1c'
|
||||
'382cdfe6a3b8af870a626a2c3bc256d2'
|
||||
'56cdd0978dd4a539a25813fd4273c834')
|
||||
@ -81,7 +81,8 @@ package_linux-lts() {
|
||||
'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
|
||||
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500'
|
||||
'aufs2' 'nouveau-drm-lts' 'kernel26-lts')
|
||||
provides=('aufs2' 'nouveau-drm-lts' "kernel26-lts=${pkgver}")
|
||||
provides=('aufs2' 'nouveau-drm-lts' "kernel26-lts=${pkgver}"
|
||||
"linux=${pkgver}" "kernel26=${pkgver}")
|
||||
conflicts=('kernel26-lts')
|
||||
install=linux-lts.install
|
||||
optdepends=('crda: to set the correct wireless channels of your country')
|
||||
@ -125,7 +126,8 @@ package_linux-lts() {
|
||||
|
||||
package_linux-lts-headers() {
|
||||
pkgdesc="Header files and scripts for building modules for linux-lts"
|
||||
provides=("kernel26-headers=${pkgver}" "linux-headers")
|
||||
provides=("kernel26-lts-headers=${pkgver}" "kernel26-headers=${pkgver}"
|
||||
"linux-headers=${pkgver}")
|
||||
replaces=("kernel26-lts-headers")
|
||||
conflicts=("kernel26-lts-headers")
|
||||
cd ${srcdir}/linux-${_basekernel}/
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
#
|
||||
# Packages for Chakra, part of chakra-project.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>
|
||||
|
||||
pkgname=nfs-utils
|
||||
pkgver=1.2.4
|
||||
pkgrel=1
|
||||
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' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue')
|
||||
makedepends=('pkgconfig' 'autoconf' 'automake')
|
||||
source=(http://downloads.sourceforge.net/nfs/${pkgname}-${pkgver}.tar.bz2
|
||||
depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue')
|
||||
makedepends=('pkgconfig' 'autoconf' 'automake' 'keyutils')
|
||||
source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
|
||||
nfs-common
|
||||
nfs-common.conf
|
||||
nfs-server
|
||||
@ -27,16 +27,13 @@ source=(http://downloads.sourceforge.net/nfs/${pkgname}-${pkgver}.tar.bz2
|
||||
kernel-3.0-segfault.patch)
|
||||
install=nfs-utils.install
|
||||
md5sums=('938dc0574f3eb9891a8ed4746f806277'
|
||||
'990a07943fa958d4abb1cb7bd52c9a7b'
|
||||
'fc508e10cdf5e8ddd80373b1b2bc99a1'
|
||||
'f73f197a16b02c3e248488ec35c4cf43'
|
||||
'5ae080f6117cef3140f02bc162bdc755'
|
||||
'b9b334414baec31b97f0431d9ecdcfb9'
|
||||
'2bf71def3263325643a09458635520f0'
|
||||
'ff585faf410a62c4333a027c50b56bae'
|
||||
'eb4f4027fab6fc1201f1ca04f5954c76'
|
||||
'e24f81a8c8657672e262c61235d34b4a'
|
||||
#'f3be115d392d9f9bb0f056e8d4341a14'
|
||||
#'20c6fae1c771b9d8e91c4973f16372e3'
|
||||
#'e6fd3a8acfe97970a53db1b902c34f45'
|
||||
'7674106eaaa4c149bccd4f05fe3604e9'
|
||||
'4f4827dfc93008dfadd0a530ad0872b2'
|
||||
'ab92e67f3d0ee2935faab9cdabef8003')
|
||||
@ -46,11 +43,11 @@ build() {
|
||||
patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
|
||||
#patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
|
||||
patch -Np1 -i ../kernel-3.0-segfault.patch
|
||||
# arch specific patch
|
||||
# chakra specific patch
|
||||
patch -Np0 -i $srcdir/start-statd.patch
|
||||
|
||||
./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
|
||||
--with-tcp-wrappers --with-statedir=/var/lib/nfs --sysconfdir=/etc
|
||||
--without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc
|
||||
|
||||
make
|
||||
}
|
||||
@ -75,4 +72,3 @@ package() {
|
||||
mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
|
||||
mkdir "$pkgdir/"var/lib/nfs/v4recovery
|
||||
}
|
||||
|
||||
|
||||
@ -68,4 +68,4 @@ package() {
|
||||
sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
|
||||
-e '/^#UsePAM no$/c UsePAM yes' \
|
||||
"${pkgdir}"/etc/ssh/sshd_config
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user