Merge remote-tracking branch 'x/master'

* x/master:
  xbps-devel: update for pkgconfig support.
  sudo: simplify pam file, revbump.
This commit is contained in:
davehome 2012-01-17 21:29:43 -07:00
commit 0fe1cd5e83
4 changed files with 6 additions and 9 deletions

View file

@ -1,6 +1,2 @@
auth required pam_unix.so
account required pam_unix.so
session optional pam_mail.so dir=/var/mail standard
session optional pam_xauth.so
session required pam_env.so
session required pam_unix.so
auth required pam_nologin.so

View file

@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--with-ignore-dot -with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
--disable-root-sudo --with-logfac=auth --disable-root-mailer"
revision=1
revision=2
short_desc="Allow others to run commands as root"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gratisoft.us/sudo/"
@ -26,7 +26,6 @@ Add_dependency build zlib-devel
Add_dependency build pam-devel
Add_dependency build coreutils
post_install()
{
post_install() {
vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
}

View file

@ -3,7 +3,8 @@ pkgname=xbps-devel
version="$(date -u +%Y%m%d)"
build_style=configure
configure_args="--prefix=/ --includedir=/usr/include
--datadir=/usr/share --mandir=/usr/share/man --with-pie"
--datadir=/usr/share --mandir=/usr/share/man --with-pie
--pkgconfigdir=/usr/lib/pkgconfig"
short_desc="The XBPS package system (development branch)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps"

View file

@ -16,4 +16,5 @@ do_install()
vmove usr/include usr
vmove "sbin/*.static" sbin
vmove "lib/*.a" usr/lib
vmove usr/lib/pkgconfig usr/lib
}