summaryrefslogtreecommitdiffstats
path: root/recipe.d
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2012-06-26 21:49:09 -0400
committerDJ Delorie <dj@delorie.com>2012-06-26 21:49:09 -0400
commit989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea (patch)
tree7ca707e1503139bedc8ecd511e7e4928eb2f1a16 /recipe.d
parent257e214b8e4f79a77feb25399c53a0e2ef8274b1 (diff)
downloadbootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.tar.gz
bootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.tar.xz
bootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.zip
F17 udpates
Various updates to stage 1 and 2 to build with F17 GA SRPMs
Diffstat (limited to 'recipe.d')
-rw-r--r--recipe.d/0002-ncurses3
-rw-r--r--recipe.d/0006-readline (renamed from recipe.d/0011-readline)0
-rw-r--r--recipe.d/0007-gdb2
-rw-r--r--recipe.d/0009-nspr13
-rw-r--r--recipe.d/0010-pcre2
-rw-r--r--recipe.d/0012-chkconfig9
-rw-r--r--recipe.d/0019-perl6
-rw-r--r--recipe.d/0020-openssl10
-rw-r--r--recipe.d/0021-popt (renamed from recipe.d/0022-popt)0
-rw-r--r--recipe.d/0022-libffi5
-rw-r--r--recipe.d/0022-pkgconfig (renamed from recipe.d/0024-pkgconfig)0
-rw-r--r--recipe.d/0023-glib25
-rw-r--r--recipe.d/0023-nss-util48
-rw-r--r--recipe.d/0024-nss-softokn53
-rw-r--r--recipe.d/0025-nss18
-rw-r--r--[-rwxr-xr-x]recipe.d/0026-rsync0
-rw-r--r--[-rwxr-xr-x]recipe.d/0030-file0
-rw-r--r--[-rwxr-xr-x]recipe.d/0031-ustr0
-rw-r--r--recipe.d/0032-libusb14
-rw-r--r--[-rwxr-xr-x]recipe.d/0033-libusb2
-rw-r--r--[-rwxr-xr-x]recipe.d/0034-tzdata1
-rw-r--r--recipe.d/0101-libsepol5
-rw-r--r--recipe.d/0102-attr7
-rw-r--r--recipe.d/0102-pam12
-rw-r--r--recipe.d/0103-acl8
-rw-r--r--recipe.d/0104-libsemanage5
-rw-r--r--recipe.d/0105-pam16
-rw-r--r--recipe.d/0105-util-linux4
-rw-r--r--recipe.d/0106-libxcb4
-rw-r--r--recipe.d/0106-shadow-utils (renamed from recipe.d/0103-shadow)0
-rw-r--r--recipe.d/0107-strace (renamed from recipe.d/0104-strace)0
-rw-r--r--[-rwxr-xr-x]recipe.d/XXXX-audit0
32 files changed, 204 insertions, 38 deletions
diff --git a/recipe.d/0002-ncurses b/recipe.d/0002-ncurses
index 767b582..f950766 100644
--- a/recipe.d/0002-ncurses
+++ b/recipe.d/0002-ncurses
@@ -11,3 +11,6 @@
make $J
make $J install
+echo "INPUT(-lncurses)" > /usr/lib/libcurses.so
+echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so
+echo "INPUT(-ltinfo)" > /usr/lib/libtermcap.so
diff --git a/recipe.d/0011-readline b/recipe.d/0006-readline
index ed2f513..ed2f513 100644
--- a/recipe.d/0011-readline
+++ b/recipe.d/0006-readline
diff --git a/recipe.d/0007-gdb b/recipe.d/0007-gdb
index 7be409b..62b8aaf 100644
--- a/recipe.d/0007-gdb
+++ b/recipe.d/0007-gdb
@@ -1,5 +1,5 @@
mcd $BUILDDIR/gdb
- $SRC/gdb-*/configure $TCONFIGARGS --without-rpm
+ $SRC/gdb-*/configure $TCONFIGARGS --without-rpm --with-system-readline
notparallel
make $J -k
make $J -k install
diff --git a/recipe.d/0009-nspr b/recipe.d/0009-nspr
index d1bc7ce..de46994 100644
--- a/recipe.d/0009-nspr
+++ b/recipe.d/0009-nspr
@@ -1,5 +1,10 @@
- mcd $BUILDDIR/nspr
- $SRC/nspr-*/mozilla/nsprpub/configure $TCONFIGARGS --enable-thumb2
- make $J
- make $J install
+case "$TARGET" in
+ *armv[567]* ) FLAGS2="--enable-thumb2" ;;
+ * ) FLAGS2="" ;;
+esac
+
+mcd $BUILDDIR/nspr
+$SRC/nspr-*/mozilla/nsprpub/configure $TCONFIGARGS $FLAGS2
+make $J
+make $J install
diff --git a/recipe.d/0010-pcre b/recipe.d/0010-pcre
index 9ef89ef..bfcb1dd 100644
--- a/recipe.d/0010-pcre
+++ b/recipe.d/0010-pcre
@@ -1,3 +1,5 @@
+# install fails if these files already exist!
+rm -f /usr/share/man/man3/pcre* || true
mcd $BUILDDIR/pcre
$SRC/pcre-*/configure $TCONFIGARGS
make $J
diff --git a/recipe.d/0012-chkconfig b/recipe.d/0012-chkconfig
index a423cbe..4a5686e 100644
--- a/recipe.d/0012-chkconfig
+++ b/recipe.d/0012-chkconfig
@@ -1,5 +1,6 @@
- mcd $BUILDDIR/pth
- #$SRC/${1}-*/configure $TCONFIGARGS
- make $J
- make $J install
+mcd $BUILDDIR/chkconfig
+cp -rp $SRC/chkconfig-*/* .
+sed '/install.*ntsysv/d; /all/s/ntsysv//' Makefile > Makefile.stage2
+make -f Makefile.stage2 $J CC=gcc
+make -f Makefile.stage2 $J -k install || true
diff --git a/recipe.d/0019-perl b/recipe.d/0019-perl
index 2505a78..2a1ebf3 100644
--- a/recipe.d/0019-perl
+++ b/recipe.d/0019-perl
@@ -1,6 +1,12 @@
mcd $BUILDDIR/perl
cd $SRC/perl-*
+
sh $SRC/perl-*/Configure -des -Dprefix=/usr -DDEBUGGING=-g -Dcc=gcc -Dmyhostname=localhost -Dperladmin=root@localhost -Duseshrplib -Dusethreads -Duseithreads -Uusedtrace -Duselargefiles -Dd_semctl_semun -Di_db -Ui_ndbm -Di_gdbm -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl=n -Ubincompat5005 -Uversiononly -Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto -Ud_endservent_r_proto -Ud_setservent_r_proto
+
+BUILD_BZIP2=0
+BZIP2_LIB=%{_libdir}
+export BUILD_BZIP2 BZIP2_LIB
+
make
make install
diff --git a/recipe.d/0020-openssl b/recipe.d/0020-openssl
index a8379c1..b47a1a5 100644
--- a/recipe.d/0020-openssl
+++ b/recipe.d/0020-openssl
@@ -1,6 +1,14 @@
mcd $BUILDDIR/openssl
cd $SRC/openssl-*
- ./Configure --prefix=/usr --openssldir=/etc/pki/tls zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa shared linux-generic32
+./Configure \
+ --prefix=/usr --openssldir=/etc/pki/tls \
+ zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 \
+ enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ec2m no-ecdh no-ecdsa no-srp \
+ --enginesdir=/usr/lib/openssl/engines \
+ shared linux-generic32 fips
+
+# ./Configure --prefix=/usr --openssldir=/etc/pki/tls zlib enable-camellia enable-seed enable-tlsext enable-rfc3779 enable-cms enable-md2 no-idea no-mdc2 no-rc5 no-ec no-ecdh no-ecdsa no-srp fips shared linux-generic32
+
make depend
make all
make rehash
diff --git a/recipe.d/0022-popt b/recipe.d/0021-popt
index 18cccaf..18cccaf 100644
--- a/recipe.d/0022-popt
+++ b/recipe.d/0021-popt
diff --git a/recipe.d/0022-libffi b/recipe.d/0022-libffi
new file mode 100644
index 0000000..cd0d9b1
--- /dev/null
+++ b/recipe.d/0022-libffi
@@ -0,0 +1,5 @@
+mcd $BUILDDIR/libffi
+$SRC/libffi-*/configure $TCONFIGARGS
+make $J
+make $J install
+
diff --git a/recipe.d/0024-pkgconfig b/recipe.d/0022-pkgconfig
index 863e66d..863e66d 100644
--- a/recipe.d/0024-pkgconfig
+++ b/recipe.d/0022-pkgconfig
diff --git a/recipe.d/0023-glib2 b/recipe.d/0023-glib2
index 750d709..294be35 100644
--- a/recipe.d/0023-glib2
+++ b/recipe.d/0023-glib2
@@ -1,6 +1,11 @@
mcd $BUILDDIR/glib2
# glib2 expects --enable-threads=yes to enable threads,
# anything else disables threads
+
+ GIO=`cd $SRC/glib-*/gio; pwd`
+ sed 's@gdbus-2.0/codegen@@g' $GIO/Makefile.in | sed 's/ tests$//' > $GIO/Makefile.stage2
+ mv $GIO/Makefile.stage2 $GIO/Makefile.in
+
$SRC/glib-*/configure `echo $TCONFIGARGS | sed 's/posix/yes/'` --enable-static
make $J
make $J install
diff --git a/recipe.d/0023-nss-util b/recipe.d/0023-nss-util
new file mode 100644
index 0000000..1c546d5
--- /dev/null
+++ b/recipe.d/0023-nss-util
@@ -0,0 +1,48 @@
+########################################################
+# needs perl
+########################################################
+
+mcd $BUILDDIR/nss
+
+BUILD_OPT=1
+export BUILD_OPT
+
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+
+NSPR_INCLUDE_DIR=/usr/include/nspr
+NSPR_LIB_DIR=/usr/lib
+export NSPR_INCLUDE_DIR
+export NSPR_LIB_DIR
+
+FREEBL_NO_DEPEND=1
+export FREEBL_NO_DEPEND
+
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
+
+make -C $SRC/${1}-3.*/mozilla/security/coreconf
+make -C $SRC/${1}-3.*/mozilla/security/dbm
+make -C $SRC/${1}-3.*/mozilla/security/nss
+
+cd $SRC/${1}-3.*/mozilla/security/coreconf
+make install
+cd $SRC/${1}-3.*/mozilla/security/dbm
+make install
+cd $SRC/${1}-3.*/mozilla/security/nss
+make install
+# Copy the binary libraries we want
+cd $SRC/${1}-3.*
+
+for file in `cd mozilla/dist/*.OBJ/lib; echo *`
+do
+ install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib/
+done
+# Copy the include files we want
+test -d /usr/include/nss3 || mkdir -p /usr/include/nss3
+for file in $SRC/nss-*/mozilla/dist/public/nss/*.h
+do
+ install -p -m 644 $file /usr/include/nss3/
+done
diff --git a/recipe.d/0024-nss-softokn b/recipe.d/0024-nss-softokn
new file mode 100644
index 0000000..2df15e6
--- /dev/null
+++ b/recipe.d/0024-nss-softokn
@@ -0,0 +1,53 @@
+########################################################
+# needs perl
+########################################################
+
+mcd $BUILDDIR/nss
+
+BUILD_OPT=1
+export BUILD_OPT
+
+PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+
+NSPR_INCLUDE_DIR=/usr/include/nspr
+NSPR_LIB_DIR=/usr/lib
+export NSPR_INCLUDE_DIR
+export NSPR_LIB_DIR
+
+NSSUTIL_INCLUDE_DIR=/usr/include/nss3
+NSSUTIL_LIB_DIR=/usr/lib
+export NSSUTIL_INCLUDE_DIR
+export NSS_LIB_DIR
+
+FREEBL_NO_DEPEND=1
+export FREEBL_NO_DEPEND
+
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
+
+make -C $SRC/${1}-3.*/mozilla/security/coreconf
+make -C $SRC/${1}-3.*/mozilla/security/dbm
+make -C $SRC/${1}-3.*/mozilla/security/nss
+
+cd $SRC/${1}-3.*/mozilla/security/coreconf
+make install
+cd $SRC/${1}-3.*/mozilla/security/dbm
+make install
+cd $SRC/${1}-3.*/mozilla/security/nss
+make install
+# Copy the binary libraries we want
+cd $SRC/${1}-3.*
+
+for file in `cd mozilla/dist/*.OBJ/lib; echo *`
+do
+ install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib/
+done
+# Copy the include files we want
+test -d /usr/include/nss3 || mkdir -p /usr/include/nss3
+for file in $SRC/nss-*/mozilla/dist/public/nss/*.h
+do
+ install -p -m 644 $file /usr/include/nss3/
+done
diff --git a/recipe.d/0025-nss b/recipe.d/0025-nss
index 19b631d..0050a57 100644
--- a/recipe.d/0025-nss
+++ b/recipe.d/0025-nss
@@ -15,17 +15,21 @@
export NSPR_LIB_DIR
NSS_USE_SYSTEM_SQLITE=1
export NSS_USE_SYSTEM_SQLITE
- make -C $SRC/${1}-3.12.10/mozilla/security/coreconf
- make -C $SRC/${1}-3.12.10/mozilla/security/dbm
- make -C $SRC/${1}-3.12.10/mozilla/security/nss
- cd $SRC/${1}-3.12.10/mozilla/security/coreconf
+
+ FREEBL_LIB_DIR=/usr/lib
+ export FREEBL_LIB_DIR
+
+ make -C $SRC/${1}-3.*/mozilla/security/coreconf
+ make -C $SRC/${1}-3.*/mozilla/security/dbm
+ make -C $SRC/${1}-3.*/mozilla/security/nss
+ cd $SRC/${1}-3.*/mozilla/security/coreconf
make install
- cd $SRC/${1}-3.12.10/mozilla/security/dbm
+ cd $SRC/${1}-3.*/mozilla/security/dbm
make install
- cd $SRC/${1}-3.12.10/mozilla/security/nss
+ cd $SRC/${1}-3.*/mozilla/security/nss
make install
# Copy the binary libraries we want
- cd $SRC/${1}-3.12.10
+ cd $SRC/${1}-3.*
for file in libnss3.so libnssckbi.so libnsspem.so libnsssysinit.so libsmime3.so libssl3.so libnssutil3.so libnssdbm3.chk libfreebl3.chk libfreebl3.so libnssdbm3.so libsoftokn3.chk libsoftokn3.so
do
install -p -m 755 mozilla/dist/*.OBJ/lib/$file /usr/lib/
diff --git a/recipe.d/0026-rsync b/recipe.d/0026-rsync
index 785adab..785adab 100755..100644
--- a/recipe.d/0026-rsync
+++ b/recipe.d/0026-rsync
diff --git a/recipe.d/0030-file b/recipe.d/0030-file
index 477096d..477096d 100755..100644
--- a/recipe.d/0030-file
+++ b/recipe.d/0030-file
diff --git a/recipe.d/0031-ustr b/recipe.d/0031-ustr
index bbf1738..bbf1738 100755..100644
--- a/recipe.d/0031-ustr
+++ b/recipe.d/0031-ustr
diff --git a/recipe.d/0032-libusb1 b/recipe.d/0032-libusb1
new file mode 100644
index 0000000..ea29d44
--- /dev/null
+++ b/recipe.d/0032-libusb1
@@ -0,0 +1,4 @@
+cd $SRC/libusb-1*
+./configure $TCONFIGARGS
+make $J
+make install
diff --git a/recipe.d/0033-libusb b/recipe.d/0033-libusb
index 477096d..f8ed4bb 100755..100644
--- a/recipe.d/0033-libusb
+++ b/recipe.d/0033-libusb
@@ -1,4 +1,4 @@
-cd $SRC/${1}-*
+cd $SRC/libusb-compat-*
./configure $TCONFIGARGS
make $J
make install
diff --git a/recipe.d/0034-tzdata b/recipe.d/0034-tzdata
index f9f8056..0362bf6 100755..100644
--- a/recipe.d/0034-tzdata
+++ b/recipe.d/0034-tzdata
@@ -2,6 +2,7 @@
# Note: java tzdata is not built (unlike tzdata.spec)
#
cd $SRC/$1
+test -d obj && rm -rf obj
make $J
make $J install
diff --git a/recipe.d/0101-libsepol b/recipe.d/0101-libsepol
new file mode 100644
index 0000000..427647f
--- /dev/null
+++ b/recipe.d/0101-libsepol
@@ -0,0 +1,5 @@
+mcd $BUILDDIR/libsepol
+rsync -av $SRC/libsepol-*/ ./
+
+make $J
+make $J install
diff --git a/recipe.d/0102-attr b/recipe.d/0102-attr
new file mode 100644
index 0000000..6f9d867
--- /dev/null
+++ b/recipe.d/0102-attr
@@ -0,0 +1,7 @@
+mcd $BUILDDIR/attr
+rsync -av $SRC/attr-*/ ./
+./configure $TCONFIGARGS --libexecdir=/usr/lib
+make $J LIBTOOL="libtool --tag=CC"
+make $J install
+make $J install-dev
+make $J install-lib
diff --git a/recipe.d/0102-pam b/recipe.d/0102-pam
deleted file mode 100644
index 4b1e00e..0000000
--- a/recipe.d/0102-pam
+++ /dev/null
@@ -1,12 +0,0 @@
- # FIXME: this possibly has a problem with pam_faillock.8
- # not sure if configure would re-generate that warning at this point
- mcd $BUILDDIR/pam
- rsync -av $SRC/Linux-PAM-*/ ./
- ./configure \
- --libdir=/lib \
- --includedir=/usr/include/security \
- --disable-prelude \
- --disable-selinux \
- --disable-audit
- make $J
- make $J install
diff --git a/recipe.d/0103-acl b/recipe.d/0103-acl
new file mode 100644
index 0000000..878a406
--- /dev/null
+++ b/recipe.d/0103-acl
@@ -0,0 +1,8 @@
+mcd $BUILDDIR/acl
+rsync -av $SRC/acl-*/ ./
+touch .census
+./configure $TCONFIGARGS --libexecdir=/usr/lib
+make $J LIBTOOL="libtool --tag=CC"
+make $J install
+make $J install-dev
+make $J install-lib
diff --git a/recipe.d/0104-libsemanage b/recipe.d/0104-libsemanage
new file mode 100644
index 0000000..ce9ff42
--- /dev/null
+++ b/recipe.d/0104-libsemanage
@@ -0,0 +1,5 @@
+mcd $BUILDDIR/libsemanage
+rsync -av $SRC/libsemanage-*/ ./
+
+make $J
+make $J install
diff --git a/recipe.d/0105-pam b/recipe.d/0105-pam
new file mode 100644
index 0000000..479b3c4
--- /dev/null
+++ b/recipe.d/0105-pam
@@ -0,0 +1,16 @@
+# FIXME: this possibly has a problem with pam_faillock.8
+# not sure if configure would re-generate that warning at this point
+mcd $BUILDDIR/pam
+rsync -av $SRC/Linux-PAM-*/ ./
+
+./configure \
+ --libdir=/lib \
+ --includedir=/usr/include/security \
+ --disable-prelude \
+ --disable-selinux \
+ --disable-audit
+make Makefile
+sed 's/= .*\.8.*/=/' modules/pam_faillock/Makefile > modules/pam_faillock/Makefile.stage2
+mv modules/pam_faillock/Makefile.stage2 modules/pam_faillock/Makefile
+make $J
+make $J install
diff --git a/recipe.d/0105-util-linux b/recipe.d/0105-util-linux
deleted file mode 100644
index c755d60..0000000
--- a/recipe.d/0105-util-linux
+++ /dev/null
@@ -1,4 +0,0 @@
- mcd $BUILDDIR/strace
- $SRC/strace-*/configure $TCONFIGARGS
- make $J
- make $J install
diff --git a/recipe.d/0106-libxcb b/recipe.d/0106-libxcb
deleted file mode 100644
index 5108bc1..0000000
--- a/recipe.d/0106-libxcb
+++ /dev/null
@@ -1,4 +0,0 @@
- mcd $BUILDDIR/libxcb
- $SRC/libxcb-*/configure $TCONFIGARGS
- make $J
- make $J install
diff --git a/recipe.d/0103-shadow b/recipe.d/0106-shadow-utils
index 7cef382..7cef382 100644
--- a/recipe.d/0103-shadow
+++ b/recipe.d/0106-shadow-utils
diff --git a/recipe.d/0104-strace b/recipe.d/0107-strace
index c755d60..c755d60 100644
--- a/recipe.d/0104-strace
+++ b/recipe.d/0107-strace
diff --git a/recipe.d/XXXX-audit b/recipe.d/XXXX-audit
index 6aa2091..6aa2091 100755..100644
--- a/recipe.d/XXXX-audit
+++ b/recipe.d/XXXX-audit